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

Replace RiaApplication::instance()->project() with RimProject::current().

Browse Source 
Also remove uneccessary includes of RiaApplication.h.
This commit is contained in:
Kristian Bendiksen
2020-05-12 09:50:38 +02:00
committed by Magne Sjaastad
parent 7972ff8c02
commit c016c02e40
263 changed files with 320 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@@ -18,7 +18,6 @@
#include "RimAnalysisPlot.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiuGroupedBarChartBuilder.h"
#include "RiuPlotMainWindowTools.h"
@@ -586,7 +585,7 @@ QList<caf::PdmOptionItemInfo> RimAnalysisPlot::calculateValueOptions( const caf:
}
else if ( fieldNeedingOptions == &m_referenceCase )
{
std::vector<RimSummaryCase*> allSummaryCases = RiaApplication::instance()->project()->allSummaryCases();
std::vector<RimSummaryCase*> allSummaryCases = RimProject::current()->allSummaryCases();
options.push_back( {"None", nullptr} );

1
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp
View File

@@ -18,7 +18,6 @@
#include "RimAnnotationCollection.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RimAnnotationGroupCollection.h"

2
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp
View File

@@ -18,8 +18,6 @@
#include "RimAnnotationCollectionBase.h"
#include "RiaApplication.h"
#include "RimPolylinesAnnotation.h"
#include "RimReachCircleAnnotation.h"
#include "RimTextAnnotation.h"

2
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp
View File

@@ -18,8 +18,6 @@
#include "RimAnnotationGroupCollection.h"
#include "RiaApplication.h"
#include "RimPolylinesAnnotation.h"
#include "RimReachCircleAnnotation.h"
#include "RimTextAnnotation.h"

4
ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp
View File

@@ -265,7 +265,7 @@ void RimFracture::fieldChangedByUi( const caf::PdmFieldHandle* changedField, con
RiaCompletionTypeCalculationScheduler::instance()->scheduleRecalculateCompletionTypeAndRedrawAllViews();
}
RiaApplication::instance()->project()->scheduleCreateDisplayModelAndRedrawAllViews();
RimProject::current()->scheduleCreateDisplayModelAndRedrawAllViews();
}
}
@@ -553,7 +553,7 @@ QList<caf::PdmOptionItemInfo> RimFracture::calculateValueOptions( const caf::Pdm
{
QList<caf::PdmOptionItemInfo> options;
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
CVF_ASSERT( proj );
if ( fieldNeedingOptions == &m_fractureTemplate )

3
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp
View File

@@ -18,7 +18,6 @@
#include "RimFractureTemplateCollection.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RigStatisticsMath.h"
@@ -139,7 +138,7 @@ RiaEclipseUnitTools::UnitSystemType RimFractureTemplateCollection::defaultUnitSy
//--------------------------------------------------------------------------------------------------
void RimFractureTemplateCollection::setDefaultUnitSystemBasedOnLoadedCases()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
auto commonUnitSystem = proj->commonUnitSystemForAllCases();
if ( commonUnitSystem != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )

4
ApplicationCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp
View File

@@ -18,8 +18,6 @@
#include "RimValveTemplateCollection.h"
#include "RiaApplication.h"
#include "RimProject.h"
#include "RimValveTemplate.h"
@@ -93,7 +91,7 @@ RiaEclipseUnitTools::UnitSystemType RimValveTemplateCollection::defaultUnitSyste
//--------------------------------------------------------------------------------------------------
void RimValveTemplateCollection::setDefaultUnitSystemBasedOnLoadedCases()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
auto commonUnitSystem = proj->commonUnitSystemForAllCases();
if ( commonUnitSystem != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )

1
ApplicationCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp
View File

@@ -1,6 +1,5 @@
#include "RimAbstractCorrelationPlot.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RiaSummaryCurveDefinition.h"

3
ApplicationCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp
View File

@@ -18,7 +18,6 @@
#include "RimCorrelationMatrixPlot.h"
#include "RiaApplication.h"
#include "RiaColorTools.h"
#include "RiaPreferences.h"
#include "RiaStatisticsTools.h"
@@ -219,7 +218,7 @@ void RimCorrelationMatrixPlot::defineUiOrdering( QString uiConfigName, caf::PdmU
m_selectedVarsUiField = selectedVarsText();
curveDataGroup->add( &m_selectedVarsUiField );
curveDataGroup->add( &m_pushButtonSelectSummaryAddress, { false, 1, 0 } );
curveDataGroup->add( &m_pushButtonSelectSummaryAddress, {false, 1, 0} );
curveDataGroup->add( &m_timeStep );
if ( uiConfigName != "report" )

1
ApplicationCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp
View File

@@ -18,7 +18,6 @@
#include "RimCorrelationPlot.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RiaStatisticsTools.h"
#include "RiuGroupedBarChartBuilder.h"

3
ApplicationCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp
View File

@@ -18,7 +18,6 @@
#include "RimParameterResultCrossPlot.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaPreferences.h"
#include "RiaStatisticsTools.h"
@@ -105,7 +104,7 @@ void RimParameterResultCrossPlot::defineUiOrdering( QString uiConfigName, caf::P
caf::PdmUiGroup* curveDataGroup = uiOrdering.addNewGroup( "Summary Vector" );
curveDataGroup->add( &m_selectedVarsUiField );
curveDataGroup->add( &m_pushButtonSelectSummaryAddress, { false, 1, 0 } );
curveDataGroup->add( &m_pushButtonSelectSummaryAddress, {false, 1, 0} );
curveDataGroup->add( &m_timeStep );
caf::PdmUiGroup* crossPlotGroup = uiOrdering.addNewGroup( "Cross Plot Parameters" );

1
ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp
View File

@@ -18,7 +18,6 @@
#include "RimFlowDiagSolution.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RigActiveCellInfo.h"

2
ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp
View File

@@ -18,8 +18,6 @@
#include "RimFlowPlotCollection.h"
#include "RiaApplication.h"
#include "RimFlowCharacteristicsPlot.h"
#include "RimProject.h"
#include "RimWellAllocationPlot.h"

2
ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp
View File

@@ -18,8 +18,6 @@
#include "RimTofAccumulatedPhaseFractionsPlot.h"
#include "RiaApplication.h"
#include "RimEclipseView.h"
#include "RimSimWellInViewCollection.h"
#include "RimWellAllocationPlot.h"

2
ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp
View File

@@ -18,8 +18,6 @@
#include "RimTotalWellAllocationPlot.h"
#include "RiaApplication.h"
#include "RimEclipseView.h"
#include "RimSimWellInViewCollection.h"

2
ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
View File

@@ -18,8 +18,6 @@
#include "RimWellAllocationPlot.h"
#include "RiaApplication.h"
#include "RigAccWellFlowCalculator.h"
#include "RigEclipseCaseData.h"
#include "RigFlowDiagResultAddress.h"

21
ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.cpp
View File

@@ -18,7 +18,6 @@
#include "RimWellPlotTools.h"
#include "RiaApplication.h"
#include "RiaQDateTimeTools.h"
#include "RiaWellNameComparer.h"
@@ -178,7 +177,7 @@ bool RimWellPlotTools::hasFlowData( const RimWellPath* wellPath )
//--------------------------------------------------------------------------------------------------
bool RimWellPlotTools::hasAssociatedWellPath( const QString& wellName )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimWellPath* wellPath = proj->wellPathByName( wellName );
return wellPath != nullptr;
@@ -276,7 +275,7 @@ void RimWellPlotTools::addTimeStepsToMap( std::map<QDateTime, std::set<RifDataSo
std::vector<RimWellLogFile*> RimWellPlotTools::wellLogFilesContainingPressure( const QString& wellPathNameOrSimWellName )
{
std::vector<RimWellLogFile*> wellLogFiles;
const RimProject* const project = RiaApplication::instance()->project();
const RimProject* const project = RimProject::current();
std::vector<RimWellPath*> wellPaths = project->allWellPaths();
for ( auto wellPath : wellPaths )
@@ -324,7 +323,7 @@ RimWellLogFileChannel* RimWellPlotTools::getPressureChannelFromWellFile( const R
std::vector<RimWellLogFile*> RimWellPlotTools::wellLogFilesContainingFlow( const QString& wellPathName )
{
std::vector<RimWellLogFile*> wellLogFiles;
const RimProject* const project = RiaApplication::instance()->project();
const RimProject* const project = RimProject::current();
std::vector<RimWellPath*> wellPaths = project->allWellPaths();
for ( auto wellPath : wellPaths )
@@ -350,7 +349,7 @@ std::vector<RimWellLogFile*> RimWellPlotTools::wellLogFilesContainingFlow( const
//--------------------------------------------------------------------------------------------------
RimWellPath* RimWellPlotTools::wellPathFromWellLogFile( const RimWellLogFile* wellLogFile )
{
RimProject* const project = RiaApplication::instance()->project();
RimProject* const project = RimProject::current();
for ( const auto& oilField : project->oilFields )
{
auto wellPaths = std::vector<RimWellPath*>( oilField->wellPathCollection()->wellPaths.begin(),
@@ -377,7 +376,7 @@ RimWellPath* RimWellPlotTools::wellPathFromWellLogFile( const RimWellLogFile* we
std::vector<RimEclipseResultCase*> RimWellPlotTools::gridCasesForWell( const QString& simWellName )
{
std::vector<RimEclipseResultCase*> cases;
const RimProject* project = RiaApplication::instance()->project();
const RimProject* project = RimProject::current();
for ( RimEclipseCase* eclCase : project->eclipseCases() )
{
@@ -400,7 +399,7 @@ std::vector<RimEclipseResultCase*> RimWellPlotTools::gridCasesForWell( const QSt
std::vector<RimEclipseResultCase*> RimWellPlotTools::rftCasesForWell( const QString& simWellName )
{
std::vector<RimEclipseResultCase*> cases;
const RimProject* project = RiaApplication::instance()->project();
const RimProject* project = RimProject::current();
for ( RimEclipseCase* eclCase : project->eclipseCases() )
{
@@ -419,7 +418,7 @@ std::vector<RimEclipseResultCase*> RimWellPlotTools::rftCasesForWell( const QStr
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCaseCollection*> RimWellPlotTools::rftEnsemblesForWell( const QString& simWellName )
{
const RimProject* project = RiaApplication::instance()->project();
const RimProject* project = RimProject::current();
std::vector<RimSummaryCaseCollection*> allSummaryCaseCollections = project->summaryGroups();
@@ -441,7 +440,7 @@ std::vector<RimSummaryCaseCollection*> RimWellPlotTools::rftEnsemblesForWell( co
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCaseCollection*> RimWellPlotTools::rftEnsembles()
{
const RimProject* project = RiaApplication::instance()->project();
const RimProject* project = RimProject::current();
std::vector<RimSummaryCaseCollection*> allSummaryCaseCollections = project->summaryGroups();
@@ -479,7 +478,7 @@ std::vector<RimObservedFmuRftData*> RimWellPlotTools::observedFmuRftDataForWell(
//--------------------------------------------------------------------------------------------------
std::vector<RimObservedFmuRftData*> RimWellPlotTools::observedFmuRftData()
{
const RimProject* project = RiaApplication::instance()->project();
const RimProject* project = RimProject::current();
RimObservedDataCollection* observedDataCollection =
project->activeOilField() ? project->activeOilField()->observedDataCollection() : nullptr;
@@ -662,7 +661,7 @@ RiaRftPltCurveDefinition RimWellPlotTools::curveDefFromCurve( const RimWellLogCu
//--------------------------------------------------------------------------------------------------
RimWellPath* RimWellPlotTools::wellPathByWellPathNameOrSimWellName( const QString& wellPathNameOrSimwellName )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimWellPath* wellPath = proj->wellPathByName( wellPathNameOrSimwellName );
return wellPath != nullptr ? wellPath : proj->wellPathFromSimWellName( wellPathNameOrSimwellName );

9
ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
View File

@@ -18,7 +18,6 @@
#include "RimWellPltPlot.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaDateStringParser.h"
#include "RiaQDateTimeTools.h"
@@ -233,7 +232,7 @@ void RimWellPltPlot::updateFormationsOnPlot() const
{
if ( plotCount() > 0 )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimWellPath* wellPath = proj->wellPathByName( m_wellPathName );
RimWellLogTrack* track = dynamic_cast<RimWellLogTrack*>( plotByIndex( 0 ) );
@@ -289,7 +288,7 @@ public:
protected:
RigEclipseWellLogExtractor* findWellLogExtractor( const QString& wellPathName, RimEclipseResultCase* eclCase )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimWellPath* wellPath = proj->wellPathByName( wellPathName );
RimWellLogPlotCollection* wellLogCollection = proj->mainPlotCollection()->wellLogPlotCollection();
RigEclipseWellLogExtractor* eclExtractor = wellLogCollection->findOrCreateExtractor( wellPath, eclCase );
@@ -903,7 +902,7 @@ void RimWellPltPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
}
else if ( changedField == &m_selectedSources )
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
RimWellPath* wellPath = project->wellPathByName( m_wellPathName() );
if ( wellPath && !wellPath->wellPathGeometry() )
{
@@ -1086,7 +1085,7 @@ void RimWellPltPlot::syncSourcesIoFieldFromGuiField()
//--------------------------------------------------------------------------------------------------
void RimWellPltPlot::calculateValueOptionsForWells( QList<caf::PdmOptionItemInfo>& options )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj != nullptr )
{

9
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@@ -18,7 +18,6 @@
#include "RimWellRftPlot.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaColorTools.h"
#include "RiaDateStringParser.h"
@@ -122,7 +121,7 @@ RimWellRftPlot::RimWellRftPlot()
CAF_PDM_InitFieldNoDefault( &m_wellPathCollection, "WellPathCollection", "Well Path Collection", "", "", "" );
m_wellPathCollection.uiCapability()->setUiHidden( true );
m_wellPathCollection.xmlCapability()->disableIO();
m_wellPathCollection = RiaApplication::instance()->project()->activeOilField()->wellPathCollection();
m_wellPathCollection = RimProject::current()->activeOilField()->wellPathCollection();
CAF_PDM_InitFieldNoDefault( &m_ensembleCurveSets, "EnsembleCurveSets", "Ensemble Curve Sets", "", "", "" );
@@ -190,7 +189,7 @@ void RimWellRftPlot::updateFormationsOnPlot() const
{
if ( plotCount() > 0 )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimWellPath* wellPath = proj->wellPathByName( m_wellPathNameOrSimWellName );
RimCase* formationNamesCase = nullptr;
@@ -996,7 +995,7 @@ std::map<QString, QStringList> RimWellRftPlot::findWellSources()
{
std::map<QString /*value*/, QStringList /*uitext*/> wellNames;
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj != nullptr )
{
@@ -1138,7 +1137,7 @@ void RimWellRftPlot::onLegendDefinitionChanged()
//--------------------------------------------------------------------------------------------------
void RimWellRftPlot::assignWellPathToExtractionCurves()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimWellPath* wellPath = proj->wellPathByName( m_wellPathNameOrSimWellName );
if ( wellPath )

1
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp
View File

@@ -17,7 +17,6 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimGridCrossPlot.h"
#include "RiaApplication.h"
#include "RiaFontCache.h"
#include "RiaPreferences.h"

1
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCollection.cpp
View File

@@ -17,7 +17,6 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimGridCrossPlotCollection.h"
#include "RiaApplication.h"
#include "RimGridCrossPlot.h"
#include "RimProject.h"

3
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
View File

@@ -18,7 +18,6 @@
#include "RimGridCrossPlotDataSet.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaLogging.h"
@@ -1287,7 +1286,7 @@ void RimGridCrossPlotDataSet::performAutoNameUpdate()
//--------------------------------------------------------------------------------------------------
void RimGridCrossPlotDataSet::setDefaults()
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( project )
{
if ( !project->eclipseCases().empty() )

2
ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp
View File

@@ -18,8 +18,6 @@
#include "RimSaturationPressurePlotCollection.h"
#include "RiaApplication.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
#include "RigEclipseResultAddress.h"

1
ApplicationCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFileItem.cpp
View File

@@ -18,7 +18,6 @@
#include "RimPlotTemplateFileItem.h"
#include "RiaApplication.h"
#include "RiaFieldHandleTools.h"
#include "RiaLogging.h"

4
ApplicationCode/ProjectDataModel/Rim3dView.cpp
View File

@@ -349,7 +349,7 @@ void Rim3dView::assignIdIfNecessary()
{
if ( m_id == -1 )
{
RiaApplication::instance()->project()->assignViewIdToView( this );
RimProject::current()->assignViewIdToView( this );
}
}
@@ -974,7 +974,7 @@ void Rim3dView::addMeasurementToModel( cvf::ModelBasicList* measureModel )
{
if ( !this->ownerCase() ) return;
RimMeasurement* measurement = RiaApplication::instance()->project()->measurement();
RimMeasurement* measurement = RimProject::current()->measurement();
if ( !measurement || measurement->pointsInDomainCoords().empty() )
{

3
ApplicationCode/ProjectDataModel/RimAdvancedSnapshotExportDefinition.cpp
View File

@@ -18,7 +18,6 @@
#include "RimAdvancedSnapshotExportDefinition.h"
#include "RiaApplication.h"
#include "RiaOptionItemFactory.h"
#include "RigActiveCellInfo.h"
@@ -90,7 +89,7 @@ QList<caf::PdmOptionItemInfo>
std::vector<Rim3dView*> views;
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimCase*> cases;
proj->allCases( cases );

5
ApplicationCode/ProjectDataModel/RimCase.cpp
View File

@@ -19,7 +19,6 @@
#include "RimCase.h"
#include "RiaApplication.h"
#include "RicfCommandObject.h"
#include "RimFormationNames.h"
@@ -192,7 +191,7 @@ QList<caf::PdmOptionItemInfo> RimCase::calculateValueOptions( const caf::PdmFiel
if ( fieldNeedingOptions == &m_activeFormationNames )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj && proj->activeOilField() && proj->activeOilField()->formationNamesCollection() )
{
for ( RimFormationNames* fnames : proj->activeOilField()->formationNamesCollection()->formationNamesList() )
@@ -217,7 +216,7 @@ void RimCase::initAfterRead()
{
if ( caseId() == -1 )
{
RiaApplication::instance()->project()->assignCaseIdToCase( this );
RimProject::current()->assignCaseIdToCase( this );
}
}

2
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -1136,7 +1136,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
//--------------------------------------------------------------------------------------------------
std::vector<RimWellPath*> RimContextCommandBuilder::allWellPaths()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
return proj->allWellPaths();
}

2
ApplicationCode/ProjectDataModel/RimDepthTrackPlot.cpp
View File

@@ -19,8 +19,6 @@
#include "RimDepthTrackPlot.h"
#include "RiaApplication.h"
#include "RigWellLogCurveData.h"
#include "RigWellPath.h"

8
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -148,7 +148,7 @@ RimEclipseCase::~RimEclipseCase()
delete m_fractureModelResults();
delete m_inputPropertyCollection;
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( project )
{
if ( project->mainPlotCollection() )
@@ -365,7 +365,7 @@ const RigVirtualPerforationTransmissibilities* RimEclipseCase::computeAndGetVirt
std::vector<RimWellPath*> visibleWellPaths;
bool anyPerforationsPresent = false;
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimWellPath*> wellPaths = proj->allWellPaths();
for ( auto w : wellPaths )
{
@@ -509,7 +509,7 @@ void RimEclipseCase::updateFormationNamesData()
// Update plots based on formations
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( project )
{
if ( project->mainPlotCollection() )
@@ -940,7 +940,7 @@ bool RimEclipseCase::openReserviorCase()
createTimeStepFormatString();
// Associate existing well paths with simulation wells
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
for ( const auto& oilField : proj->oilFields() )
{
for ( const auto& wellPath : oilField->wellPathCollection()->wellPaths() )

8
ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp
View File

@@ -20,8 +20,6 @@
#include "RimEclipseCaseCollection.h"
#include "RiaApplication.h"
#include "RigEclipseCaseData.h"
#include "RigGridManager.h"
#include "RigMainGrid.h"
@@ -80,13 +78,13 @@ RimIdenticalGridCaseGroup* RimEclipseCaseCollection::createIdenticalCaseGroupFro
CVF_ASSERT( equalGrid );
RimIdenticalGridCaseGroup* group = new RimIdenticalGridCaseGroup;
assert( RiaApplication::instance()->project() );
RiaApplication::instance()->project()->assignIdToCaseGroup( group );
assert( RimProject::current() );
RimProject::current()->assignIdToCaseGroup( group );
group->addCase( mainCase );
RimEclipseCase* createdCase = group->createAndAppendStatisticsCase();
RiaApplication::instance()->project()->assignCaseIdToCase( createdCase );
RimProject::current()->assignCaseIdToCase( createdCase );
caseGroups().push_back( group );

6
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@@ -73,7 +73,7 @@ RimEclipseResultCase::RimEclipseResultCase()
CAF_PDM_InitScriptableObject( "Eclipse Case", ":/Case48x48.png", "", "The Regular Eclipse Results Case" );
CAF_PDM_InitFieldNoDefault( &m_unitSystem, "UnitSystem", "Unit System", "", "", "" );
m_unitSystem.registerGetMethod( RiaApplication::instance()->project(), &RimProject::commonUnitSystemForAllCases );
m_unitSystem.registerGetMethod( RimProject::current(), &RimProject::commonUnitSystemForAllCases );
m_unitSystem.uiCapability()->setUiReadOnly( true );
CAF_PDM_InitFieldNoDefault( &m_flowDiagSolutions, "FlowDiagSolutions", "Flow Diagnostics Solutions", "", "", "" );
@@ -408,7 +408,7 @@ cvf::ref<RifReaderInterface> RimEclipseResultCase::createMockModel( QString mode
{
QApplication::setOverrideCursor( QCursor( Qt::ArrowCursor ) );
RimMockModelSettings* mockModelSettings = RiaApplication::instance()->project()->dialogData()->mockModelSettings();
RimMockModelSettings* mockModelSettings = RimProject::current()->dialogData()->mockModelSettings();
if ( !RiaRegressionTestRunner::instance()->isRunningRegressionTests() )
{
@@ -559,7 +559,7 @@ void RimEclipseResultCase::setCaseInfo( const QString& userDescription, const QS
this->caseUserDescription = userDescription;
setGridFileName( fileName );
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
proj->assignCaseIdToCase( this );
}

3
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@@ -20,7 +20,6 @@
#include "RimEclipseResultDefinition.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaLogging.h"
#include "RiaQDateTimeTools.h"
@@ -881,7 +880,7 @@ void RimEclipseResultDefinition::setFromEclipseResultAddress( const RigEclipseRe
if ( canonizedAddress.hasDifferenceCase() )
{
auto eclipseCases = RiaApplication::instance()->project()->eclipseCases();
auto eclipseCases = RimProject::current()->eclipseCases();
for ( RimEclipseCase* c : eclipseCases )
{
if ( c && c->caseId() == canonizedAddress.m_differenceCaseId )

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -1561,7 +1561,7 @@ void RimEclipseView::syncronizeWellsWithResults()
//--------------------------------------------------------------------------------------------------
void RimEclipseView::syncronizeLocalAnnotationsFromGlobal()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj && proj->activeOilField() )
{
RimAnnotationCollection* annotColl = proj->activeOilField()->annotationCollection();

2
ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.cpp
View File

@@ -19,8 +19,6 @@
#include "RimExtrudedCurveIntersection.h"
#include "RiaApplication.h"
#include "RigEclipseCaseData.h"
#include "RigWellPath.h"

3
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@@ -19,7 +19,6 @@
#include "RimGeoMechCase.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RiaPreferences.h"
@@ -153,7 +152,7 @@ RimGeoMechCase::~RimGeoMechCase( void )
{
geoMechViews.deleteAllChildObjects();
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( project )
{
if ( project->mainPlotCollection() )

3
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@@ -20,7 +20,6 @@
#include "RimGeoMechResultDefinition.h"
#include "RiaApplication.h"
#include "RiaDefines.h"
#include "RiaMedianCalculator.h"
@@ -442,7 +441,7 @@ void RimGeoMechResultDefinition::fieldChangedByUi( const caf::PdmFieldHandle* ch
void RimGeoMechResultDefinition::calculateNormalizationAirGapDefault()
{
RiaMedianCalculator<double> airGapCalc;
for ( auto wellPath : RiaApplication::instance()->project()->allWellPaths() )
for ( auto wellPath : RimProject::current()->allWellPaths() )
{
if ( wellPath->wellPathGeometry() )
{

1
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@@ -19,7 +19,6 @@
#include "RimGeoMechView.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RiaPreferences.h"
#include "RiaRegressionTestRunner.h"

2
ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
View File

@@ -18,8 +18,6 @@
#include "RimGridTimeHistoryCurve.h"
#include "RiaApplication.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
#include "RigFemResultAddress.h"

6
ApplicationCode/ProjectDataModel/RimGridView.cpp
View File

@@ -18,8 +18,6 @@
#include "RimGridView.h"
#include "RiaApplication.h"
#include "Rim3dOverlayInfoConfig.h"
#include "RimAnnotationInViewCollection.h"
#include "RimCellRangeFilterCollection.h"
@@ -125,7 +123,7 @@ RimGridView::RimGridView()
//--------------------------------------------------------------------------------------------------
RimGridView::~RimGridView( void )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj && this->isMasterView() )
{
@@ -605,7 +603,7 @@ void RimGridView::updateWellMeasurements()
//--------------------------------------------------------------------------------------------------
void RimGridView::updateSurfacesInViewTreeItems()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimSurfaceCollection* surfColl = proj->activeOilField()->surfaceCollection();
if ( surfColl && surfColl->surfaces().size() )

1
ApplicationCode/ProjectDataModel/RimMultiPlot.cpp
View File

@@ -18,7 +18,6 @@
#include "RimMultiPlot.h"
#include "RiaApplication.h"
#include "RimPlot.h"
#include "RimProject.h"
#include "RimSummaryTimeAxisProperties.h"

1
ApplicationCode/ProjectDataModel/RimMultiPlotCollection.cpp
View File

@@ -17,7 +17,6 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimMultiPlotCollection.h"
#include "RiaApplication.h"
#include "RimMultiPlot.h"
#include "RimProject.h"

2
ApplicationCode/ProjectDataModel/RimPlotWindow.cpp
View File

@@ -299,6 +299,6 @@ void RimPlotWindow::assignIdIfNecessary()
{
if ( m_id == -1 && isMdiWindow() )
{
RiaApplication::instance()->project()->assignPlotIdToPlotWindow( this );
RimProject::current()->assignPlotIdToPlotWindow( this );
}
}

3
ApplicationCode/ProjectDataModel/RimReloadCaseTools.cpp
View File

@@ -18,7 +18,6 @@
#include "RimReloadCaseTools.h"
#include "RiaApplication.h"
#include "RiaFractureDefines.h"
#include "RiaSummaryTools.h"
@@ -144,7 +143,7 @@ void RimReloadCaseTools::updateAll3dViews( RimEclipseCase* eclipseCase )
//--------------------------------------------------------------------------------------------------
void RimReloadCaseTools::updateAllPlots()
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( project && project->mainPlotCollection() )
{
RimWellLogPlotCollection* wellPlotCollection = project->mainPlotCollection()->wellLogPlotCollection();

2
ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp
View File

@@ -674,7 +674,7 @@ void RimSimWellInViewCollection::assignDefaultWellColors()
//--------------------------------------------------------------------------------------------------
void RimSimWellInViewCollection::updateWellAllocationPlots()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimWellAllocationPlot*> wellAllocationPlots;
proj->descendantsIncludingThisOfType( wellAllocationPlots );

5
ApplicationCode/ProjectDataModel/RimSimWellInViewTools.cpp
View File

@@ -18,7 +18,6 @@
#include "RimSimWellInViewTools.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RiaSummaryTools.h"
#include "RiaTimeHistoryCurveResampler.h"
@@ -44,7 +43,7 @@
//--------------------------------------------------------------------------------------------------
RimGridSummaryCase* RimSimWellInViewTools::gridSummaryCaseForWell( RimSimWellInView* well )
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( !project ) return nullptr;
RimSummaryCaseMainCollection* sumCaseColl =
@@ -73,7 +72,7 @@ std::vector<RimSummaryCase*> RimSimWellInViewTools::summaryCases()
{
std::vector<RimSummaryCase*> cases;
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( project )
{
RimSummaryCaseMainCollection* sumCaseColl =

3
ApplicationCode/ProjectDataModel/RimStimPlanColors.cpp
View File

@@ -18,7 +18,6 @@
#include "RimStimPlanColors.h"
#include "RiaApplication.h"
#include "RiaFractureDefines.h"
#include "RimEclipseView.h"
@@ -449,7 +448,7 @@ QString toString( const std::pair<QString, QString>& resultNameAndUnit )
//--------------------------------------------------------------------------------------------------
void setDefaultFractureResult( caf::PdmField<QString>& field )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimFractureTemplate*> stimPlanFracTemplates = proj->allFractureTemplates();

6
ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.cpp
View File

@@ -18,8 +18,6 @@
#include "RimSummaryCalculationCollection.h"
#include "RiaApplication.h"
#include "RimCalculatedSummaryCase.h"
#include "RimProject.h"
#include "RimSummaryCalculation.h"
@@ -49,7 +47,7 @@ RimSummaryCalculationCollection::RimSummaryCalculationCollection()
RimSummaryCalculation* RimSummaryCalculationCollection::addCalculation()
{
RimSummaryCalculation* calculation = new RimSummaryCalculation;
RiaApplication::instance()->project()->assignCalculationIdToCalculation( calculation );
RimProject::current()->assignCalculationIdToCalculation( calculation );
QString varName = QString( "Calculation_%1" ).arg( calculation->id() );
calculation->setDescription( varName );
@@ -162,7 +160,7 @@ void RimSummaryCalculationCollection::rebuildCaseMetaData()
{
if ( calculation->id() == -1 )
{
RiaApplication::instance()->project()->assignCalculationIdToCalculation( calculation );
RimProject::current()->assignCalculationIdToCalculation( calculation );
}
}

4
ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp
View File

@@ -201,7 +201,7 @@ void RimSummaryCalculationVariable::readDataFromApplicationStore( RiuSummaryVect
RiaApplication::instance()->cacheDataObject( "CalculatorSummaryCase" ).toString();
auto* lastUsedSummaryCase = dynamic_cast<RimSummaryCase*>(
caf::PdmReferenceHelper::objectFromReference( RiaApplication::instance()->project(),
caf::PdmReferenceHelper::objectFromReference( RimProject::current(),
lastUsedSummaryCaseString ) );
if ( lastUsedSummaryCase )
{
@@ -218,7 +218,7 @@ void RimSummaryCalculationVariable::readDataFromApplicationStore( RiuSummaryVect
void RimSummaryCalculationVariable::writeDataToApplicationStore() const
{
QString refFromProjectToObject =
caf::PdmReferenceHelper::referenceFromRootToObject( RiaApplication::instance()->project(), m_case );
caf::PdmReferenceHelper::referenceFromRootToObject( RimProject::current(), m_case );
RiaApplication::instance()->setCacheDataObject( "CalculatorSummaryCase", refFromProjectToObject );
QVariant sumAdrVar = QVariant::fromValue( m_summaryAddress->address() );

14
ApplicationCode/ProjectDataModel/RimTools.cpp
View File

@@ -20,8 +20,6 @@
#include "RimTools.h"
#include "RiaApplication.h"
#include "RimCase.h"
#include "RimEclipseCase.h"
#include "RimGeoMechCase.h"
@@ -43,12 +41,12 @@
//--------------------------------------------------------------------------------------------------
QString RimTools::getCacheRootDirectoryPathFromProject()
{
if ( !RiaApplication::instance()->project() )
if ( !RimProject::current() )
{
return QString();
}
QString projectFileName = RiaApplication::instance()->project()->fileName();
QString projectFileName = RimProject::current()->fileName();
QString cacheRootFolderPath;
QFileInfo fileInfo( projectFileName );
@@ -298,7 +296,7 @@ void RimTools::caseOptionItems( QList<caf::PdmOptionItemInfo>* options )
CVF_ASSERT( options );
if ( !options ) return;
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj )
{
std::vector<RimCase*> cases;
@@ -319,7 +317,7 @@ void RimTools::eclipseCaseOptionItems( QList<caf::PdmOptionItemInfo>* options )
CVF_ASSERT( options );
if ( !options ) return;
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj )
{
std::vector<RimCase*> cases;
@@ -344,7 +342,7 @@ void RimTools::geoMechCaseOptionItems( QList<caf::PdmOptionItemInfo>* options )
CVF_ASSERT( options );
if ( !options ) return;
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj )
{
std::vector<RimCase*> cases;
@@ -366,7 +364,7 @@ void RimTools::geoMechCaseOptionItems( QList<caf::PdmOptionItemInfo>* options )
//--------------------------------------------------------------------------------------------------
RimWellPathCollection* RimTools::wellPathCollection()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj && proj->activeOilField() )
{
return proj->activeOilField()->wellPathCollection();

2
ApplicationCode/ProjectDataModel/RimViewController.cpp
View File

@@ -111,7 +111,7 @@ QList<caf::PdmOptionItemInfo> RimViewController::calculateValueOptions( const ca
if ( fieldNeedingOptions == &m_managedView )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimGridView*> views;
proj->allNotLinkedViews( views );

2
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@@ -19,8 +19,6 @@
#include "RimViewLinker.h"
#include "RiaApplication.h"
#include "RigFemResultAddress.h"
#include "RigMainGrid.h"

1
ApplicationCode/ProjectDataModel/RimWellLogCurveCommonDataSource.cpp
View File

@@ -37,7 +37,6 @@
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
#include "RiaApplication.h"
#include "RiaSimWellBranchTools.h"
#include "cafPdmUiCheckBoxTristateEditor.h"

3
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@@ -19,7 +19,6 @@
#include "RimWellLogExtractionCurve.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RiaSimWellBranchTools.h"
@@ -614,7 +613,7 @@ void RimWellLogExtractionCurve::clearGeneratedSimWellPaths()
// Need to use this approach, and not firstAnchestor because the curve might not be inside the hierarchy when deleted.
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj && proj->mainPlotCollection() ) wellLogCollection = proj->mainPlotCollection()->wellLogPlotCollection();
if ( !wellLogCollection ) return;

2
ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp
View File

@@ -19,8 +19,6 @@
#include "RimWellLogPlot.h"
#include "RiaApplication.h"
#include "RigWellLogCurveData.h"
#include "RigWellPath.h"

7
ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp
View File

@@ -18,7 +18,6 @@
#include "RimWellLogRftCurve.h"
#include "RiaApplication.h"
#include "RiaEclipseUnitTools.h"
#include "RiaQDateTimeTools.h"
#include "RiaSimWellBranchTools.h"
@@ -445,7 +444,7 @@ void RimWellLogRftCurve::onLoadDataAndUpdate( bool updateParentPlot )
measuredDepthVector = tvDepthVector;
}
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimWellPath* wellPath = proj->wellPathByName( m_wellName );
double rkbDiff = 0.0;
@@ -758,7 +757,7 @@ RigEclipseWellLogExtractor* RimWellLogRftCurve::extractor()
RigEclipseWellLogExtractor* eclExtractor = nullptr;
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimWellPath* wellPath = proj->wellPathFromSimWellName( m_wellName() );
eclExtractor = wellLogCollection->findOrCreateExtractor( wellPath, m_eclipseResultCase );
@@ -1011,7 +1010,7 @@ std::vector<double> RimWellLogRftCurve::measuredDepthValues()
bool RimWellLogRftCurve::deriveMeasuredDepthValuesFromWellPath( const std::vector<double>& tvDepthValues,
std::vector<double>& derivedMDValues )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimWellPath* wellPath = proj->wellPathByName( m_wellName );
std::vector<double> derivedMdValues;

33
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@@ -19,7 +19,6 @@
#include "RimWellLogTrack.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaExtractionTools.h"
#include "RiaSimWellBranchTools.h"
@@ -627,7 +626,7 @@ void RimWellLogTrack::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
{
if ( m_formationTrajectoryType == WELL_PATH )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
m_formationWellPathForSourceCase = proj->wellPathFromSimWellName( m_formationSimWellName );
}
else
@@ -1930,21 +1929,21 @@ std::vector<std::pair<double, double>> RimWellLogTrack::waterAndRockRegions( Ria
}
double waterEndMD = extractor->cellIntersectionMDs().front();
double rockEndMD = extractor->cellIntersectionMDs().back();
return { { waterStartMD, waterEndMD }, { waterEndMD, rockEndMD } };
return {{waterStartMD, waterEndMD}, {waterEndMD, rockEndMD}};
}
else if ( depthType == RiaDefines::DepthTypeEnum::TRUE_VERTICAL_DEPTH )
{
double waterStartTVD = 0.0;
double waterEndTVD = extractor->cellIntersectionTVDs().front();
double rockEndTVD = extractor->cellIntersectionTVDs().back();
return { { waterStartTVD, waterEndTVD }, { waterEndTVD, rockEndTVD } };
return {{waterStartTVD, waterEndTVD}, {waterEndTVD, rockEndTVD}};
}
else if ( depthType == RiaDefines::DepthTypeEnum::TRUE_VERTICAL_DEPTH_RKB )
{
double waterStartTVDRKB = extractor->wellPathData()->rkbDiff();
double waterEndTVDRKB = extractor->cellIntersectionTVDs().front() + extractor->wellPathData()->rkbDiff();
double rockEndTVDRKB = extractor->cellIntersectionTVDs().back() + extractor->wellPathData()->rkbDiff();
return { { waterStartTVDRKB, waterEndTVDRKB }, { waterEndTVDRKB, rockEndTVDRKB } };
return {{waterStartTVDRKB, waterEndTVDRKB}, {waterEndTVDRKB, rockEndTVDRKB}};
}
return {};
}
@@ -2386,7 +2385,7 @@ void RimWellLogTrack::updateFormationNamesOnPlot()
const std::vector<std::pair<double, double>> waterAndRockIntervals =
waterAndRockRegions( plot->depthType(), extractor );
m_annotationTool->attachNamedRegions( m_plotWidget,
{ "Sea Level", "" },
{"Sea Level", ""},
xRange,
waterAndRockIntervals,
m_regionAnnotationDisplay(),
@@ -2394,7 +2393,7 @@ void RimWellLogTrack::updateFormationNamesOnPlot()
( ( 100 - m_colorShadingTransparency ) * 255 ) / 100,
m_showRegionLabels(),
RiuPlotAnnotationTool::LEFT_COLUMN,
{ Qt::SolidPattern, Qt::Dense6Pattern } );
{Qt::SolidPattern, Qt::Dense6Pattern} );
}
if ( m_formationSource == CASE )
@@ -2593,16 +2592,16 @@ void RimWellLogTrack::updateWellPathAttributesOnPlot()
}
const std::map<RiaDefines::WellPathComponentType, int> sortIndices =
{ { RiaDefines::WellPathComponentType::WELL_PATH, 0 },
{ RiaDefines::WellPathComponentType::CASING, 1 },
{ RiaDefines::WellPathComponentType::LINER, 2 },
{ RiaDefines::WellPathComponentType::PERFORATION_INTERVAL, 3 },
{ RiaDefines::WellPathComponentType::FISHBONES, 4 },
{ RiaDefines::WellPathComponentType::FRACTURE, 5 },
{ RiaDefines::WellPathComponentType::PACKER, 6 },
{ RiaDefines::WellPathComponentType::ICD, 7 },
{ RiaDefines::WellPathComponentType::AICD, 8 },
{ RiaDefines::WellPathComponentType::ICV, 9 } };
{{RiaDefines::WellPathComponentType::WELL_PATH, 0},
{RiaDefines::WellPathComponentType::CASING, 1},
{RiaDefines::WellPathComponentType::LINER, 2},
{RiaDefines::WellPathComponentType::PERFORATION_INTERVAL, 3},
{RiaDefines::WellPathComponentType::FISHBONES, 4},
{RiaDefines::WellPathComponentType::FRACTURE, 5},
{RiaDefines::WellPathComponentType::PACKER, 6},
{RiaDefines::WellPathComponentType::ICD, 7},
{RiaDefines::WellPathComponentType::AICD, 8},
{RiaDefines::WellPathComponentType::ICV, 9}};
std::stable_sort( allWellPathComponents.begin(),
allWellPathComponents.end(),

1
ApplicationCode/ProjectDataModel/RimWellMeasurementCurve.cpp
View File

@@ -37,7 +37,6 @@
#include "RiuQwtPlotCurve.h"
#include "RiuQwtPlotWidget.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "cafPdmUiTreeOrdering.h"

3
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@@ -20,7 +20,6 @@
#include "RimWellPath.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaFieldHandleTools.h"
#include "RiaSimWellBranchTools.h"
@@ -375,7 +374,7 @@ QList<caf::PdmOptionItemInfo> RimWellPath::calculateValueOptions( const caf::Pdm
if ( fieldNeedingOptions == &m_simWellName )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
// Find simulation wells already assigned to a well path
std::set<QString> associatedSimWells;

3
ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.cpp
View File

@@ -21,7 +21,6 @@
#include "WellPathCommands/PointTangentManipulator/RicWellPathGeometry3dEditor.h"
#include "WellPathCommands/RicCreateWellTargetsPickEventHandler.h"
#include "RiaApplication.h"
#include "RiaFieldHandleTools.h"
#include "RiaJCurveCalculator.h"
#include "RiaLogging.h"
@@ -551,7 +550,7 @@ void RimWellPathGeometryDef::defineObjectEditorAttribute( QString uiConfigName,
//--------------------------------------------------------------------------------------------------
void RimWellPathGeometryDef::initAfterRead()
{
if ( RiaApplication::instance()->project()->isProjectFileVersionEqualOrOlderThan( "2019.12.1" ) )
if ( RimProject::current()->isProjectFileVersionEqualOrOlderThan( "2019.12.1" ) )
{
m_useAutoGeneratedTargetAtSeaLevel = false;
}

2
ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp
View File

@@ -18,8 +18,6 @@
#include "RimAsciiDataCurve.h"
#include "RiaApplication.h"
#include "RifReaderEclipseSummary.h"
#include "RiaDefines.h"

3
ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp
View File

@@ -16,7 +16,6 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiaApplication.h"
#include "RiaQDateTimeTools.h"
#include "SummaryPlotCommands/RicNewDerivedEnsembleFeature.h"
@@ -584,7 +583,7 @@ std::vector<RimSummaryCaseCollection*> RimDerivedEnsembleCaseCollection::allEnse
{
std::vector<RimSummaryCaseCollection*> ensembles;
auto project = RiaApplication::instance()->project();
auto project = RimProject::current();
for ( auto group : project->summaryGroups() )
{

3
ApplicationCode/ProjectDataModel/Summary/RimDerivedSummaryCase.cpp
View File

@@ -18,7 +18,6 @@
#include "RimDerivedSummaryCase.h"
#include "RiaApplication.h"
#include "RiaCurveMerger.h"
#include "RiaLogging.h"
@@ -446,7 +445,7 @@ QList<caf::PdmOptionItemInfo>
{
QList<caf::PdmOptionItemInfo> options;
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
auto summaryCases = proj->allSummaryCases();
if ( fieldNeedingOptions == &m_fixedTimeStepIndex )

2
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp
View File

@@ -18,8 +18,6 @@
#include "RimEnsembleCurveFilterCollection.h"
#include "RiaApplication.h"
#include "RimEnsembleCurveFilter.h"
#include "RimEnsembleCurveSet.h"

2
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -740,7 +740,7 @@ QList<caf::PdmOptionItemInfo> RimEnsembleCurveSet::calculateValueOptions( const
if ( fieldNeedingOptions == &m_yValuesSummaryCaseCollection )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimSummaryCaseCollection*> groups = proj->summaryGroups();
for ( RimSummaryCaseCollection* group : groups )

1
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp
View File

@@ -18,7 +18,6 @@
#include "RimEnsembleCurveSetCollection.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaStdStringTools.h"

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryAddress.cpp
View File

@@ -18,8 +18,6 @@
#include "RimSummaryAddress.h"
#include "RiaApplication.h"
#include "RimProject.h"
#include "RimSummaryCalculation.h"
#include "RimSummaryCalculationCollection.h"
@@ -142,7 +140,7 @@ void RimSummaryAddress::ensureIdIsAssigned()
{
if ( m_category == RifEclipseSummaryAddress::SUMMARY_CALCULATED && m_calculationId == -1 )
{
RimSummaryCalculationCollection* calcColl = RiaApplication::instance()->project()->calculationCollection();
RimSummaryCalculationCollection* calcColl = RimProject::current()->calculationCollection();
for ( const RimSummaryCalculation* c : calcColl->calculations() )
{

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp
View File

@@ -18,7 +18,6 @@
#include "RimSummaryCase.h"
#include "RiaApplication.h"
#include "RiaSummaryTools.h"
#include "RicfCommandObject.h"
@@ -260,7 +259,7 @@ void RimSummaryCase::initAfterRead()
{
if ( m_caseId() == -1 )
{
RiaApplication::instance()->project()->assignCaseIdToSummaryCase( this );
RimProject::current()->assignCaseIdToSummaryCase( this );
}
updateOptionSensitivity();

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
View File

@@ -18,7 +18,6 @@
#include "RimSummaryCaseCollection.h"
#include "RiaApplication.h"
#include "RiaFieldHandleTools.h"
#include "RicfCommandObject.h"
@@ -813,7 +812,7 @@ void RimSummaryCaseCollection::initAfterRead()
{
if ( m_ensembleId() == -1 )
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
project->assignIdToEnsemble( this );
}

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@@ -262,7 +262,7 @@ RimSummaryCaseCollection*
if ( summaryCaseCollection->ensembleId() == -1 )
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
project->assignIdToEnsemble( summaryCaseCollection );
}
@@ -494,7 +494,7 @@ std::vector<RimSummaryCase*> RimSummaryCaseMainCollection::createSummaryCasesFro
const std::vector<RifSummaryCaseFileResultInfo>& summaryHeaderFileInfos,
bool showProgress )
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
std::vector<RimSummaryCase*> sumCases;

1
ApplicationCode/ProjectDataModel/Summary/RimSummaryCrossPlotCollection.cpp
View File

@@ -18,7 +18,6 @@
#include "RimSummaryCrossPlotCollection.h"
#include "RiaApplication.h"
#include "RimProject.h"
#include "RimSummaryCrossPlot.h"
#include "RimSummaryPlot.h"

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@@ -379,7 +379,7 @@ QList<caf::PdmOptionItemInfo> RimSummaryCurve::calculateValueOptions( const caf:
if ( fieldNeedingOptions == &m_yValuesSummaryCase || fieldNeedingOptions == &m_xValuesSummaryCase )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimSummaryCase*> cases = proj->allSummaryCases();

5
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp
View File

@@ -18,7 +18,6 @@
#include "RimSummaryCurveAppearanceCalculator.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaSummaryCurveDefinition.h"
@@ -587,7 +586,7 @@ cvf::Color3f RimSummaryCurveAppearanceCalculator::gradeColor( const cvf::Color3f
std::set<std::string> RimSummaryCurveAppearanceCalculator::getAllSummaryCaseNames()
{
std::set<std::string> summaryCaseHashes;
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimSummaryCase*> cases = proj->allSummaryCases();
for ( RimSummaryCase* rimCase : cases )
@@ -604,7 +603,7 @@ std::set<std::string> RimSummaryCurveAppearanceCalculator::getAllSummaryCaseName
std::set<std::string> RimSummaryCurveAppearanceCalculator::getAllSummaryWellNames()
{
std::set<std::string> summaryWellNames;
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimSummaryCase*> cases = proj->allSummaryCases();
for ( RimSummaryCase* rimCase : cases )

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
View File

@@ -18,7 +18,6 @@
#include "RimSummaryCurveAutoName.h"
#include "RiaApplication.h"
#include "RiaStatisticsTools.h"
#include "RifEclipseSummaryAddress.h"
@@ -204,7 +203,7 @@ QString RimSummaryCurveAutoName::buildCurveName( const RifEclipseSummaryAddress&
else if ( summaryAddress.category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED )
{
// Need to add case name for calculated summary
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimSummaryCalculationCollection* calcColl = proj->calculationCollection();
RimSummaryCalculation* calculation = calcColl->findCalculationById( summaryAddress.id() );

1
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp
View File

@@ -18,7 +18,6 @@
#include "RimSummaryCurveCollection.h"
#include "RiaApplication.h"
#include "RiaStdStringTools.h"
#include "SummaryPlotCommands/RicEditSummaryPlotFeature.h"

1
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -18,7 +18,6 @@
#include "RimSummaryPlot.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaFieldHandleTools.h"
#include "RiaSummaryCurveAnalyzer.h"

1
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp
View File

@@ -18,7 +18,6 @@
#include "RimSummaryPlotCollection.h"
#include "RiaApplication.h"
#include "RimProject.h"
#include "RimSummaryPlot.h"

5
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp
View File

@@ -18,7 +18,6 @@
#include "RimSummaryPlotFilterTextCurveSetEditor.h"
#include "RiaApplication.h"
#include "RiaGuiApplication.h"
#include "RiaLogging.h"
#include "RiaStringListSerializer.h"
@@ -492,7 +491,7 @@ void RimSummaryPlotFilterTextCurveSetEditor::appendOptionItemsForSources( QList<
bool hideSummaryCases,
bool hideEnsembles )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimOilField*> oilFields;
@@ -579,7 +578,7 @@ std::vector<SummarySource*> RimSummaryPlotFilterTextCurveSetEditor::selectedSumm
}
// Always add the summary case for calculated curves as this case is not displayed in UI
sources.push_back( RiaApplication::instance()->project()->calculationCollection()->calculationSummaryCase() );
sources.push_back( RimProject::current()->calculationCollection()->calculationSummaryCase() );
return sources;
}

8
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
View File

@@ -200,7 +200,7 @@ QList<caf::PdmOptionItemInfo>
}
else if ( fieldNeedingOptions == &m_ensemble )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
for ( auto ensemble : proj->summaryGroups() )
{
if ( ensemble->isEnsemble() )
@@ -742,7 +742,7 @@ std::vector<caf::PdmFieldHandle*> RimSummaryPlotSourceStepping::computeVisibleFi
auto sumCases = summaryCasesCurveCollection();
if ( sumCases.size() == 1 )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj->allSummaryCases().size() > 1 )
{
m_summaryCase = *( sumCases.begin() );
@@ -758,7 +758,7 @@ std::vector<caf::PdmFieldHandle*> RimSummaryPlotSourceStepping::computeVisibleFi
auto ensembleColl = ensembleCollection();
if ( ensembleColl.size() == 1 )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj->summaryGroups().size() > 1 )
{
@@ -1061,7 +1061,7 @@ std::vector<RimSummaryCase*> RimSummaryPlotSourceStepping::summaryCasesForSource
{
std::vector<RimSummaryCase*> cases;
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
for ( auto sumCase : proj->allSummaryCases() )
{
if ( sumCase->isObservedData() ) continue;

5
ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp
View File

@@ -18,7 +18,6 @@
#include "RimSurfaceCollection.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaLogging.h"
@@ -176,7 +175,7 @@ void RimSurfaceCollection::loadData()
//--------------------------------------------------------------------------------------------------
void RimSurfaceCollection::updateViews( const std::vector<RimSurface*>& surfsToReload )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<Rim3dView*> views;
proj->allViews( views );
@@ -218,7 +217,7 @@ void RimSurfaceCollection::updateViews( const std::vector<RimSurface*>& surfsToR
//--------------------------------------------------------------------------------------------------
void RimSurfaceCollection::updateViews()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimGridView*> views;
proj->allVisibleGridViews( views );

3
ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp
View File

@@ -18,7 +18,6 @@
#include "RimSurfaceInViewCollection.h"
#include "RiaApplication.h"
#include "RimGridView.h"
#include "RimIntersectionResultDefinition.h"
#include "RimOilField.h"
@@ -74,7 +73,7 @@ void RimSurfaceInViewCollection::updateFromSurfaceCollection()
// Create new entries
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimSurfaceCollection* surfColl = proj->activeOilField()->surfaceCollection();
if ( surfColl )