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

Revert "#4018 Result management : Use ensureReservoirCaseIsOpen instead of open..."

Browse Source 
This reverts commit fde60d1e34.
This commit is contained in:
Magne Sjaastad
2019-01-29 10:06:30 +01:00
parent 4c5e277ebf
commit 7518a1880a
7 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/CommandFileInterface/RicfExportProperty.cpp
View File

@@ -71,10 +71,13 @@ void RicfExportProperty::execute()
return; return;
} }
if (!eclipseCase->ensureReservoirCaseIsOpen()) if (!eclipseCase->eclipseCaseData())
{ {
RiaLogging::error(QString("exportProperty: Could not find eclipseCaseData with ID %1").arg(m_caseId())); if (!eclipseCase->openReserviorCase())
return; {
RiaLogging::error(QString("exportProperty: Could not find eclipseCaseData with ID %1").arg(m_caseId()));
return;
}
} }
} }

4
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@@ -70,6 +70,7 @@ public:
void setFilesContainingFaults(const std::vector<QString>& val); void setFilesContainingFaults(const std::vector<QString>& val);
bool ensureReservoirCaseIsOpen(); bool ensureReservoirCaseIsOpen();
bool openReserviorCase();
virtual bool openEclipseGridFile() = 0; virtual bool openEclipseGridFile() = 0;
RigEclipseCaseData* eclipseCaseData(); RigEclipseCaseData* eclipseCaseData();
@@ -130,8 +131,7 @@ protected:
private: private:
void createTimeStepFormatString(); void createTimeStepFormatString();
std::vector<Rim3dView*> allSpecialViews() const override; std::vector<Rim3dView*> allSpecialViews() const override;
bool openReserviorCase();
protected: protected:
caf::PdmField<bool> m_flipXAxis; caf::PdmField<bool> m_flipXAxis;

2
ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp
View File

@@ -233,7 +233,7 @@ bool RimEclipseInputCase::openEclipseGridFile()
void RimEclipseInputCase::reloadEclipseGridFile() void RimEclipseInputCase::reloadEclipseGridFile()
{ {
setReservoirData(nullptr); setReservoirData(nullptr);
ensureReservoirCaseIsOpen(); openReserviorCase();
} }
#define for_all(stdVector, indexName) for (size_t indexName = 0; indexName < stdVector.size(); ++indexName) #define for_all(stdVector, indexName) for (size_t indexName = 0; indexName < stdVector.size(); ++indexName)

2
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@@ -243,7 +243,7 @@ void RimEclipseResultCase::reloadEclipseGridFile()
m_gridAndWellDataIsReadFromFile = false; m_gridAndWellDataIsReadFromFile = false;
m_activeCellInfoIsReadFromFile = false; m_activeCellInfoIsReadFromFile = false;
setReservoirData(nullptr); setReservoirData(nullptr);
ensureReservoirCaseIsOpen(); openReserviorCase();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
View File

@@ -176,7 +176,7 @@ bool RimEclipseStatisticsCase::openEclipseGridFile()
void RimEclipseStatisticsCase::reloadEclipseGridFile() void RimEclipseStatisticsCase::reloadEclipseGridFile()
{ {
setReservoirData(nullptr); setReservoirData(nullptr);
ensureReservoirCaseIsOpen(); openReserviorCase();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -830,7 +830,7 @@ void RimEclipseView::onLoadDataAndUpdate()
if (m_eclipseCase) if (m_eclipseCase)
{ {
if (!m_eclipseCase->ensureReservoirCaseIsOpen()) if (!m_eclipseCase->openReserviorCase())
{ {
QMessageBox::warning(RiuMainWindow::instance(), QMessageBox::warning(RiuMainWindow::instance(),
"Error when opening project file", "Error when opening project file",

2
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@@ -171,7 +171,7 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo()
// When reading active cell info, only the total cell count is tested for consistency // When reading active cell info, only the total cell count is tested for consistency
RimEclipseCase* mainCase = caseCollection()->reservoirs[0]; RimEclipseCase* mainCase = caseCollection()->reservoirs[0];
if (!mainCase->ensureReservoirCaseIsOpen()) if (!mainCase->openReserviorCase())
{ {
QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(), QMessageBox::warning(Riu3DMainWindowTools::mainWindowWidget(),
"Error when opening project file", "Error when opening project file",