From 385fa55cdcbb45ba57bc28f58362c1bbddd3f2a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Thu, 11 Jun 2015 13:05:59 +0200 Subject: [PATCH] Fixed one linux compile error and cleaned out some compiler warnings --- .../UserInterface/RiuFemResultTextBuilder.cpp | 6 +++--- .../UserInterface/RiuFemResultTextBuilder.h | 10 +++++----- ApplicationCode/UserInterface/RiuViewerCommands.cpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ApplicationCode/UserInterface/RiuFemResultTextBuilder.cpp b/ApplicationCode/UserInterface/RiuFemResultTextBuilder.cpp index 4e0def7ea8..43d62cca8e 100644 --- a/ApplicationCode/UserInterface/RiuFemResultTextBuilder.cpp +++ b/ApplicationCode/UserInterface/RiuFemResultTextBuilder.cpp @@ -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) { diff --git a/ApplicationCode/UserInterface/RiuFemResultTextBuilder.h b/ApplicationCode/UserInterface/RiuFemResultTextBuilder.h index 68f19f44bd..281299ec16 100644 --- a/ApplicationCode/UserInterface/RiuFemResultTextBuilder.h +++ b/ApplicationCode/UserInterface/RiuFemResultTextBuilder.h @@ -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 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; diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index f471972675..ac9f589d28 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp @@ -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);