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

Better naming of eclipse reload data function

Browse Source
This commit is contained in:
Bjørnar Grip Fjær 2017-04-24 12:04:49 +02:00
parent 274a108235
commit 05fb8b8da3
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicReloadCaseFeature.cpp
View File

@ -55,7 +55,7 @@ void RicReloadCaseFeature::onActionTriggered(bool isChecked)
for (RimEclipseCase* selectedCase : selectedEclipseCases) for (RimEclipseCase* selectedCase : selectedEclipseCases)
{ {
selectedCase->releaseResultData(); selectedCase->reloadDataAndUpdate();
} }
} }

5
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -303,7 +303,7 @@ void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
{ {
if (changedField == &releaseResultMemory) if (changedField == &releaseResultMemory)
{ {
releaseResultData(); reloadDataAndUpdate();
releaseResultMemory = oldValue.toBool(); releaseResultMemory = oldValue.toBool();
} }
@ -640,7 +640,7 @@ QString RimEclipseCase::timeStepName(int frameIdx)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimEclipseCase::releaseResultData() void RimEclipseCase::reloadDataAndUpdate()
{ {
if (this->eclipseCaseData()) if (this->eclipseCaseData())
{ {
@ -654,7 +654,6 @@ void RimEclipseCase::releaseResultData()
if (fractureModelResults) if (fractureModelResults)
{ {
fractureModelResults->clearAllResults(); fractureModelResults->clearAllResults();
} }
reloadEclipseGridFile(); reloadEclipseGridFile();

2
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@ -95,7 +95,7 @@ public:
virtual cvf::BoundingBox allCellsBoundingBox() const; virtual cvf::BoundingBox allCellsBoundingBox() const;
virtual cvf::Vec3d displayModelOffset() const; virtual cvf::Vec3d displayModelOffset() const;
void releaseResultData(); void reloadDataAndUpdate();
virtual void reloadEclipseGridFile() = 0; virtual void reloadEclipseGridFile() = 0;
// Overridden methods from PdmObject // Overridden methods from PdmObject