OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed one linux compile error and cleaned out some compiler warnings

Browse Source
This commit is contained in:
Jacob Støren
2015-06-11 13:05:59 +02:00
parent 4f77afe43c
commit 385fa55cdc
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/UserInterface/RiuFemResultTextBuilder.cpp
View File

@@ -19,7 +19,7 @@
#include "RiuFemResultTextBuilder.h"
#include "RigGeomechCaseData.h"
#include "RigGeoMechCaseData.h"
#include "RimGeoMechView.h"
#include "RimGeoMechCase.h"
#include "RigFemPartCollection.h"
@@ -33,7 +33,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuFemResultTextBuilder::RiuFemResultTextBuilder(RimGeoMechView* reservoirView, size_t gridIndex, size_t cellIndex, size_t timeStepIndex)
RiuFemResultTextBuilder::RiuFemResultTextBuilder(RimGeoMechView* reservoirView, int gridIndex, int cellIndex, int timeStepIndex)
{
CVF_ASSERT(reservoirView);
@@ -156,7 +156,7 @@ QString RiuFemResultTextBuilder::gridResultDetails()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuFemResultTextBuilder::appendTextFromResultSlot(RigGeoMechCaseData* geomData, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimGeoMechResultSlot* resultSlot, QString* resultInfoText)
void RiuFemResultTextBuilder::appendTextFromResultSlot(RigGeoMechCaseData* geomData, int gridIndex, int cellIndex, int timeStepIndex, RimGeoMechResultSlot* resultSlot, QString* resultInfoText)
{
if (!resultSlot)
{

10
ApplicationCode/UserInterface/RiuFemResultTextBuilder.h
View File

@@ -40,7 +40,7 @@ namespace cvf {
class RiuFemResultTextBuilder
{
public:
RiuFemResultTextBuilder(RimGeoMechView* reservoirView, size_t gridIndex, size_t cellIndex, size_t timeStepIndex);
RiuFemResultTextBuilder(RimGeoMechView* reservoirView, int gridIndex, int cellIndex, int timeStepIndex);
void setFace(cvf::StructGridInterface::FaceType face);
void setIntersectionPoint(cvf::Vec3d intersectionPoint);
@@ -55,14 +55,14 @@ private:
QString closestNodeResultText(RimGeoMechResultSlot* resultSlot);
void appendTextFromResultSlot(RigGeoMechCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimGeoMechResultSlot* resultSlot, QString* resultInfoText);
void appendTextFromResultSlot(RigGeoMechCaseData* eclipseCase, int gridIndex, int cellIndex, int timeStepIndex, RimGeoMechResultSlot* resultSlot, QString* resultInfoText);
private:
caf::PdmPointer<RimGeoMechView> m_reservoirView;
size_t m_gridIndex;
size_t m_cellIndex;
size_t m_timeStepIndex;
int m_gridIndex;
int m_cellIndex;
int m_timeStepIndex;
cvf::StructGridInterface::FaceType m_face;

2
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@@ -345,7 +345,7 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY)
}
else if (geomView)
{
RiuFemResultTextBuilder textBuilder(geomView, gridIndex, cellIndex, geomView->currentTimeStep());
RiuFemResultTextBuilder textBuilder(geomView, (int)gridIndex, (int)cellIndex, geomView->currentTimeStep());
//textBuilder.setFace(face);
textBuilder.setIntersectionPoint(localIntersectionPoint);