diff --git a/ApplicationCode/ProjectDataModel/RimCase.h b/ApplicationCode/ProjectDataModel/RimCase.h index 675c5649ac..e7785b6dff 100644 --- a/ApplicationCode/ProjectDataModel/RimCase.h +++ b/ApplicationCode/ProjectDataModel/RimCase.h @@ -51,8 +51,8 @@ public: virtual void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath) = 0; - virtual QStringList timeStepStrings() = 0; - virtual QString timeStepName(int frameIdx) = 0; + virtual QStringList timeStepStrings() const = 0; + virtual QString timeStepName(int frameIdx) const = 0; virtual cvf::BoundingBox activeCellsBoundingBox() const = 0; virtual cvf::BoundingBox allCellsBoundingBox() const = 0; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp index 673d7b6238..7f102c395d 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp @@ -525,7 +525,18 @@ RimReservoirCellResultsStorage* RimEclipseCase::results(RifReaderInterface::Poro return m_fractureModelResults(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +const RimReservoirCellResultsStorage* RimEclipseCase::results(RifReaderInterface::PorosityModelResultType porosityModel) const +{ + if (porosityModel == RifReaderInterface::MATRIX_RESULTS) + { + return m_matrixModelResults(); + } + return m_fractureModelResults(); +} //-------------------------------------------------------------------------------------------------- /// @@ -582,7 +593,7 @@ std::vector RimEclipseCase::views() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QStringList RimEclipseCase::timeStepStrings() +QStringList RimEclipseCase::timeStepStrings() const { QStringList stringList; @@ -598,7 +609,7 @@ QStringList RimEclipseCase::timeStepStrings() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimEclipseCase::timeStepName(int frameIdx) +QString RimEclipseCase::timeStepName(int frameIdx) const { std::vector timeStepDates = this->timeStepDates(); CVF_ASSERT(frameIdx < static_cast(timeStepDates.size())); @@ -671,7 +682,7 @@ void RimEclipseCase::reloadDataAndUpdate() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimEclipseCase::timeStepDates() +std::vector RimEclipseCase::timeStepDates() const { return results(RifReaderInterface::MATRIX_RESULTS)->cellResults()->timeStepDates(); } diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.h b/ApplicationCode/ProjectDataModel/RimEclipseCase.h index 5cce6417c0..b5ff497ad8 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.h @@ -74,6 +74,7 @@ public: cvf::Color3f defaultWellColor(const QString& wellName); RimReservoirCellResultsStorage* results(RifReaderInterface::PorosityModelResultType porosityModel); + const RimReservoirCellResultsStorage* results(RifReaderInterface::PorosityModelResultType porosityModel) const; RimEclipseView* createAndAddReservoirView(); RimEclipseView* createCopyAndAddView(const RimEclipseView* sourceView); @@ -87,9 +88,9 @@ public: RimCaseCollection* parentCaseCollection(); virtual std::vector views(); - virtual QStringList timeStepStrings(); - virtual QString timeStepName(int frameIdx); - std::vector timeStepDates(); + virtual QStringList timeStepStrings() const override; + virtual QString timeStepName(int frameIdx) const override; + std::vector timeStepDates() const; virtual cvf::BoundingBox activeCellsBoundingBox() const; diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp index 47759350be..b3c6da50f7 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp @@ -191,11 +191,11 @@ void RimGeoMechCase::initAfterRead() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QStringList RimGeoMechCase::timeStepStrings() +QStringList RimGeoMechCase::timeStepStrings() const { QStringList stringList; - RigGeoMechCaseData* rigCaseData = geoMechData(); + const RigGeoMechCaseData* rigCaseData = geoMechData(); if (rigCaseData && rigCaseData->femPartResults()) { std::vector stepNames = rigCaseData->femPartResults()->stepNames(); @@ -211,9 +211,9 @@ QStringList RimGeoMechCase::timeStepStrings() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimGeoMechCase::timeStepName(int frameIdx) +QString RimGeoMechCase::timeStepName(int frameIdx) const { - RigGeoMechCaseData* rigCaseData = geoMechData(); + const RigGeoMechCaseData* rigCaseData = geoMechData(); if (rigCaseData && rigCaseData->femPartResults()) { std::vector stepNames = rigCaseData->femPartResults()->stepNames(); diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechCase.h b/ApplicationCode/ProjectDataModel/RimGeoMechCase.h index 08926ce81a..7fede2fc23 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechCase.h +++ b/ApplicationCode/ProjectDataModel/RimGeoMechCase.h @@ -58,8 +58,8 @@ public: virtual void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath); virtual std::vector views(); - virtual QStringList timeStepStrings(); - virtual QString timeStepName(int frameIdx); + virtual QStringList timeStepStrings() const override; + virtual QString timeStepName(int frameIdx) const override; virtual cvf::BoundingBox activeCellsBoundingBox() const; virtual cvf::BoundingBox allCellsBoundingBox() const;