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

Simplify access to RimMainPlotCollection

Browse Source 
* Add current() to RimMainPlotCollection to avoid include of RimProject
* Remove "segment" prefix
* Reload data when RftCase changes
This commit is contained in:
Magne Sjaastad
2022-08-19 05:30:25 -07:00
committed by GitHub
parent 506bfbd638
commit 4cd38d7daf
51 changed files with 240 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationLibCode/Application/RiaApplication.cpp
View File

@@ -528,7 +528,7 @@ bool RiaApplication::loadProject( const QString& projectFileName,
}
{
RimMainPlotCollection* mainPlotColl = m_project->mainPlotCollection();
RimMainPlotCollection* mainPlotColl = RimMainPlotCollection::current();
mainPlotColl->ensureCalculationIdsAreAssigned();
mainPlotColl->ensureDefaultFlowPlotsAreCreated();
@@ -1532,10 +1532,7 @@ int RiaApplication::launchUnitTestsWithConsole()
//--------------------------------------------------------------------------------------------------
void RiaApplication::loadAndUpdatePlotData()
{
if ( m_project->mainPlotCollection() )
{
m_project->mainPlotCollection()->loadDataAndUpdateAllPlots();
}
RimMainPlotCollection::current()->loadDataAndUpdateAllPlots();
}
//--------------------------------------------------------------------------------------------------

10
ApplicationLibCode/Application/Tools/RiaExtractionTools.cpp
View File

@@ -21,7 +21,6 @@
#include "RigWellPath.h"
#include "RimEclipseCase.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"
#include "RimSimWellInView.h"
#include "RimWellLogPlotCollection.h"
@@ -84,12 +83,5 @@ RigEclipseWellLogExtractor* RiaExtractionTools::findOrCreateSimWellExtractor( co
//--------------------------------------------------------------------------------------------------
RimWellLogPlotCollection* RiaExtractionTools::wellLogPlotCollection()
{
auto proj = RimProject::current();
if ( !proj ) return nullptr;
auto plotCollection = proj->mainPlotCollection();
if ( !plotCollection ) return nullptr;
auto wellLogPlotCollection = plotCollection->wellLogPlotCollection();
return wellLogPlotCollection;
return RimMainPlotCollection::current()->wellLogPlotCollection();
}

5
ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp
View File

@@ -97,10 +97,7 @@ bool RiaImportEclipseCaseTools::openEclipseCasesFromFile( const QStringList&
if ( !openedFiles.empty() )
{
if ( project && project->mainPlotCollection() )
{
project->mainPlotCollection()->ensureDefaultFlowPlotsAreCreated();
}
RimMainPlotCollection::current()->ensureDefaultFlowPlotsAreCreated();
}
// Import summary cases

3
ApplicationLibCode/Application/Tools/RiaOptionItemFactory.cpp
View File

@@ -22,7 +22,6 @@
#include "RimCase.h"
#include "RimEnsembleCurveSet.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"
//--------------------------------------------------------------------------------------------------
///
@@ -46,7 +45,7 @@ void RiaOptionItemFactory::appendOptionItemsForEnsembleCurveSets( QList<caf::Pdm
{
options->push_back( caf::PdmOptionItemInfo( "None", nullptr ) );
RimMainPlotCollection* mainPlotColl = RimProject::current()->mainPlotCollection();
RimMainPlotCollection* mainPlotColl = RimMainPlotCollection::current();
std::vector<RimEnsembleCurveSet*> ensembleCurveSets;
mainPlotColl->descendantsOfType( ensembleCurveSets );
for ( auto ensembleCurveSet : ensembleCurveSets )

8
ApplicationLibCode/Application/Tools/RiaSummaryTools.cpp
View File

@@ -49,9 +49,7 @@
//--------------------------------------------------------------------------------------------------
RimSummaryMultiPlotCollection* RiaSummaryTools::summaryMultiPlotCollection()
{
RimProject* project = RimProject::current();
return project->mainPlotCollection()->summaryMultiPlotCollection();
return RimMainPlotCollection::current()->summaryMultiPlotCollection();
}
//--------------------------------------------------------------------------------------------------
@@ -59,9 +57,7 @@ RimSummaryMultiPlotCollection* RiaSummaryTools::summaryMultiPlotCollection()
//--------------------------------------------------------------------------------------------------
RimSummaryCrossPlotCollection* RiaSummaryTools::summaryCrossPlotCollection()
{
RimProject* project = RimProject::current();
return project->mainPlotCollection()->summaryCrossPlotCollection();
return RimMainPlotCollection::current()->summaryCrossPlotCollection();
}
//--------------------------------------------------------------------------------------------------