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

#1440 Add const to time string functions

Browse Source
This commit is contained in:
Magne Sjaastad
2017-06-16 16:45:14 +02:00
parent 15848a82dc
commit 759067367b
5 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimCase.h
View File

@@ -51,8 +51,8 @@ public:
virtual void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath) = 0; virtual void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath) = 0;
virtual QStringList timeStepStrings() = 0; virtual QStringList timeStepStrings() const = 0;
virtual QString timeStepName(int frameIdx) = 0; virtual QString timeStepName(int frameIdx) const = 0;
virtual cvf::BoundingBox activeCellsBoundingBox() const = 0; virtual cvf::BoundingBox activeCellsBoundingBox() const = 0;
virtual cvf::BoundingBox allCellsBoundingBox() const = 0; virtual cvf::BoundingBox allCellsBoundingBox() const = 0;

17
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -525,7 +525,18 @@ RimReservoirCellResultsStorage* RimEclipseCase::results(RifReaderInterface::Poro
return m_fractureModelResults(); 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<RimView*> RimEclipseCase::views()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QStringList RimEclipseCase::timeStepStrings() QStringList RimEclipseCase::timeStepStrings() const
{ {
QStringList stringList; QStringList stringList;
@@ -598,7 +609,7 @@ QStringList RimEclipseCase::timeStepStrings()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimEclipseCase::timeStepName(int frameIdx) QString RimEclipseCase::timeStepName(int frameIdx) const
{ {
std::vector<QDateTime> timeStepDates = this->timeStepDates(); std::vector<QDateTime> timeStepDates = this->timeStepDates();
CVF_ASSERT(frameIdx < static_cast<int>(timeStepDates.size())); CVF_ASSERT(frameIdx < static_cast<int>(timeStepDates.size()));
@@ -671,7 +682,7 @@ void RimEclipseCase::reloadDataAndUpdate()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<QDateTime> RimEclipseCase::timeStepDates() std::vector<QDateTime> RimEclipseCase::timeStepDates() const
{ {
return results(RifReaderInterface::MATRIX_RESULTS)->cellResults()->timeStepDates(); return results(RifReaderInterface::MATRIX_RESULTS)->cellResults()->timeStepDates();
} }

7
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@@ -74,6 +74,7 @@ public:
cvf::Color3f defaultWellColor(const QString& wellName); cvf::Color3f defaultWellColor(const QString& wellName);
RimReservoirCellResultsStorage* results(RifReaderInterface::PorosityModelResultType porosityModel); RimReservoirCellResultsStorage* results(RifReaderInterface::PorosityModelResultType porosityModel);
const RimReservoirCellResultsStorage* results(RifReaderInterface::PorosityModelResultType porosityModel) const;
RimEclipseView* createAndAddReservoirView(); RimEclipseView* createAndAddReservoirView();
RimEclipseView* createCopyAndAddView(const RimEclipseView* sourceView); RimEclipseView* createCopyAndAddView(const RimEclipseView* sourceView);
@@ -87,9 +88,9 @@ public:
RimCaseCollection* parentCaseCollection(); RimCaseCollection* parentCaseCollection();
virtual std::vector<RimView*> views(); virtual std::vector<RimView*> views();
virtual QStringList timeStepStrings(); virtual QStringList timeStepStrings() const override;
virtual QString timeStepName(int frameIdx); virtual QString timeStepName(int frameIdx) const override;
std::vector<QDateTime> timeStepDates(); std::vector<QDateTime> timeStepDates() const;
virtual cvf::BoundingBox activeCellsBoundingBox() const; virtual cvf::BoundingBox activeCellsBoundingBox() const;

8
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@@ -191,11 +191,11 @@ void RimGeoMechCase::initAfterRead()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QStringList RimGeoMechCase::timeStepStrings() QStringList RimGeoMechCase::timeStepStrings() const
{ {
QStringList stringList; QStringList stringList;
RigGeoMechCaseData* rigCaseData = geoMechData(); const RigGeoMechCaseData* rigCaseData = geoMechData();
if (rigCaseData && rigCaseData->femPartResults()) if (rigCaseData && rigCaseData->femPartResults())
{ {
std::vector<std::string> stepNames = rigCaseData->femPartResults()->stepNames(); std::vector<std::string> 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()) if (rigCaseData && rigCaseData->femPartResults())
{ {
std::vector<std::string> stepNames = rigCaseData->femPartResults()->stepNames(); std::vector<std::string> stepNames = rigCaseData->femPartResults()->stepNames();

4
ApplicationCode/ProjectDataModel/RimGeoMechCase.h
View File

@@ -58,8 +58,8 @@ public:
virtual void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath); virtual void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath);
virtual std::vector<RimView*> views(); virtual std::vector<RimView*> views();
virtual QStringList timeStepStrings(); virtual QStringList timeStepStrings() const override;
virtual QString timeStepName(int frameIdx); virtual QString timeStepName(int frameIdx) const override;
virtual cvf::BoundingBox activeCellsBoundingBox() const; virtual cvf::BoundingBox activeCellsBoundingBox() const;
virtual cvf::BoundingBox allCellsBoundingBox() const; virtual cvf::BoundingBox allCellsBoundingBox() const;