diff --git a/ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp b/ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp index 1e8b5c65a3..fde1a30e5a 100644 --- a/ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp +++ b/ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp @@ -43,6 +43,8 @@ #include "RimProject.h" #include "RimWellPathCollection.h" #include "RimWellPathCompletions.h" +#include "RimMainPlotCollection.h" +#include "RimWellLogPlotCollection.h" #include "RiuPlotMainWindow.h" @@ -141,7 +143,9 @@ void RicCreateTemporaryLgrFeature::onActionTriggered(bool isChecked) } deleteAllCachedData(eclipseCase); + RiaApplication::instance()->project()->mainPlotCollection()->deleteAllCachedData(); computeCachedData(eclipseCase); + RiaApplication::instance()->project()->mainPlotCollection()->wellLogPlotCollection()->reloadAllPlots(); activeView->loadDataAndUpdate(); diff --git a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp index df5a17ca16..8baf71ea6f 100644 --- a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp @@ -224,3 +224,13 @@ void RimMainPlotCollection::updatePlotsWithCompletions() } } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimMainPlotCollection::deleteAllCachedData() +{ + m_wellLogPlotCollection()->deleteAllExtractors(); + m_rftPlotCollection()->deleteAllExtractors(); + m_pltPlotCollection()->deleteAllExtractors(); +} + diff --git a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h index 59ef09457d..95cdc674d1 100644 --- a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h +++ b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h @@ -60,6 +60,7 @@ public: void updateCurrentTimeStepInPlots(); void updatePlotsWithFormations(); void updatePlotsWithCompletions(); + void deleteAllCachedData(); private: // Overridden PDM methods diff --git a/ApplicationCode/ProjectDataModel/RimPltPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimPltPlotCollection.cpp index 044af69106..05a6083d7e 100644 --- a/ApplicationCode/ProjectDataModel/RimPltPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimPltPlotCollection.cpp @@ -185,6 +185,15 @@ void RimPltPlotCollection::removeExtractors(const RigGeoMechCaseData* caseData) } } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimPltPlotCollection::deleteAllExtractors() +{ + m_extractors.clear(); + m_geomExtractors.clear(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimPltPlotCollection.h b/ApplicationCode/ProjectDataModel/RimPltPlotCollection.h index d67a10b3f7..544cba00b8 100644 --- a/ApplicationCode/ProjectDataModel/RimPltPlotCollection.h +++ b/ApplicationCode/ProjectDataModel/RimPltPlotCollection.h @@ -58,6 +58,7 @@ public: void removeExtractors(const RigWellPath* wellPath); void removeExtractors(const RigEclipseCaseData* caseData); void removeExtractors(const RigGeoMechCaseData* caseData); + void deleteAllExtractors(); const std::vector pltPlots() const; void addPlot(RimWellPltPlot* newPlot); diff --git a/ApplicationCode/ProjectDataModel/RimRftPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimRftPlotCollection.cpp index ede492a3b0..30f617f0e6 100644 --- a/ApplicationCode/ProjectDataModel/RimRftPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimRftPlotCollection.cpp @@ -185,6 +185,15 @@ void RimRftPlotCollection::removeExtractors(const RigGeoMechCaseData* caseData) } } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimRftPlotCollection::deleteAllExtractors() +{ + m_extractors.clear(); + m_geomExtractors.clear(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimRftPlotCollection.h b/ApplicationCode/ProjectDataModel/RimRftPlotCollection.h index 4bafaa6353..51c24b3d23 100644 --- a/ApplicationCode/ProjectDataModel/RimRftPlotCollection.h +++ b/ApplicationCode/ProjectDataModel/RimRftPlotCollection.h @@ -58,6 +58,7 @@ public: void removeExtractors(const RigWellPath* wellPath); void removeExtractors(const RigEclipseCaseData* caseData); void removeExtractors(const RigGeoMechCaseData* caseData); + void deleteAllExtractors(); const std::vector rftPlots() const; void addPlot(RimWellRftPlot* newPlot); diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp index f89bf09c5a..fcd8254ae1 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp @@ -134,6 +134,26 @@ RigGeoMechWellLogExtractor* RimWellLogPlotCollection::findOrCreateExtractor(RimW return extractor.p(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimWellLogPlotCollection::reloadAllPlots() +{ + for (const auto& w : wellLogPlots()) + { + w->loadDataAndUpdate(); + } +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimWellLogPlotCollection::deleteAllExtractors() +{ + m_extractors.clear(); + m_geomExtractors.clear(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h index 41cadb6124..f0b994bb56 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h @@ -54,6 +54,9 @@ public: RigEclipseWellLogExtractor* findOrCreateExtractor(RimWellPath* wellPath, RimEclipseCase* eclCase); RigGeoMechWellLogExtractor* findOrCreateExtractor(RimWellPath* wellPath, RimGeoMechCase* eclCase); + void reloadAllPlots(); + + void deleteAllExtractors(); void removeExtractors(const RigWellPath* wellPath); void removeExtractors(const RigEclipseCaseData* caseData); void removeExtractors(const RigGeoMechCaseData* caseData); diff --git a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp index c773b50015..ee77d59607 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp @@ -440,7 +440,7 @@ QStringList RigCaseCellResultsData::resultNames(RiaDefines::ResultCatType resTyp } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- RigActiveCellInfo* RigCaseCellResultsData::activeCellInfo() { @@ -448,7 +448,7 @@ RigActiveCellInfo* RigCaseCellResultsData::activeCellInfo() } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- const RigActiveCellInfo* RigCaseCellResultsData::activeCellInfo() const { @@ -783,7 +783,7 @@ const std::vector* } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- const std::vector& RigCaseCellResultsData::infoForEachResultIndex() {