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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.cpp
View File

@ -56,7 +56,7 @@ RiaCompletionTypeCalculationScheduler* RiaCompletionTypeCalculationScheduler::in
void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAndRedrawAllViews()
{
std::vector<RimEclipseCase*> eclipseCases =
RiaApplication::instance()->project()->activeOilField()->analysisModels->cases().childObjects();
RimProject::current()->activeOilField()->analysisModels->cases().childObjects();
scheduleRecalculateCompletionTypeAndRedrawAllViews( eclipseCases );
}

3
ApplicationCode/Application/RiaMemoryCleanup.cpp
View File

@ -18,7 +18,6 @@
#include "RiaMemoryCleanup.h"
#include "RiaApplication.h"
#include "RigCaseCellResultsData.h"
#include "RigFemPartResultsCollection.h"
#include "RigFemResultAddress.h"
@ -217,7 +216,7 @@ QList<caf::PdmOptionItemInfo> RiaMemoryCleanup::calculateValueOptions( const caf
QList<caf::PdmOptionItemInfo> options;
if ( fieldNeedingOptions == &m_case )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj )
{
std::vector<RimEclipseCase*> eclipseCases = proj->eclipseCases();

1
ApplicationCode/Application/RiaPreferences.h
View File

@ -21,7 +21,6 @@
#pragma once
#include "RiaApplication.h"
#include "RiaDefines.h"
#include "RiaFontCache.h"
#include "RiaGuiApplication.h"

2
ApplicationCode/Application/Tools/RiaArgumentParser.cpp
View File

@ -17,7 +17,7 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RiaArgumentParser.h"
#include "RiaApplication.h"
#include "RiaBaseDefs.h"
#include "RiaImportEclipseCaseTools.h"
#include "RiaLogging.h"

4
ApplicationCode/Application/Tools/RiaExtractionTools.cpp
View File

@ -18,8 +18,6 @@
#include "RiaExtractionTools.h"
#include "RiaApplication.h"
#include "RigWellPath.h"
#include "RimEclipseCase.h"
#include "RimMainPlotCollection.h"
@ -84,7 +82,7 @@ RigEclipseWellLogExtractor* RiaExtractionTools::findOrCreateSimWellExtractor( co
//--------------------------------------------------------------------------------------------------
RimWellLogPlotCollection* RiaExtractionTools::wellLogPlotCollection()
{
auto proj = RiaApplication::instance()->project();
auto proj = RimProject::current();
if ( !proj ) return nullptr;
auto plotCollection = proj->mainPlotCollection();

10
ApplicationCode/Application/Tools/RiaSummaryTools.cpp
View File

@ -18,8 +18,6 @@
#include "RiaSummaryTools.h"
#include "RiaApplication.h"
#include "RifEclipseSummaryAddress.h"
#include "RimMainPlotCollection.h"
@ -43,7 +41,7 @@
//--------------------------------------------------------------------------------------------------
RimSummaryPlotCollection* RiaSummaryTools::summaryPlotCollection()
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
return project->mainPlotCollection()->summaryPlotCollection();
}
@ -53,7 +51,7 @@ RimSummaryPlotCollection* RiaSummaryTools::summaryPlotCollection()
//--------------------------------------------------------------------------------------------------
RimSummaryCrossPlotCollection* RiaSummaryTools::summaryCrossPlotCollection()
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
return project->mainPlotCollection()->summaryCrossPlotCollection();
}
@ -63,7 +61,7 @@ RimSummaryCrossPlotCollection* RiaSummaryTools::summaryCrossPlotCollection()
//--------------------------------------------------------------------------------------------------
RimSummaryCaseMainCollection* RiaSummaryTools::summaryCaseMainCollection()
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
RimSummaryCaseMainCollection* summaryCaseMainCollection = project->activeOilField()->summaryCaseMainCollection();
CVF_ASSERT( summaryCaseMainCollection );
return summaryCaseMainCollection;
@ -197,7 +195,7 @@ void RiaSummaryTools::getSummaryCasesAndAddressesForCalculation( int
std::vector<RimSummaryCase*>& cases,
std::vector<RifEclipseSummaryAddress>& addresses )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimSummaryCalculationCollection* calculationColl = proj->calculationCollection();
if ( !calculationColl ) return;

6
ApplicationCode/Application/Tools/RiaWellNameComparer.cpp
View File

@ -18,8 +18,6 @@
#include "RiaWellNameComparer.h"
#include "RiaApplication.h"
#include "RimProject.h"
#include "RimWellPath.h"
@ -30,7 +28,7 @@
//==================================================================================================
QString RiaWellNameComparer::tryFindMatchingSimWellName( QString searchName )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
const std::vector<QString>& simWellNames = proj->simulationWellNames();
if ( searchName.isEmpty() || simWellNames.empty() ) return QString();
@ -44,7 +42,7 @@ QString RiaWellNameComparer::tryFindMatchingSimWellName( QString searchName )
//--------------------------------------------------------------------------------------------------
QString RiaWellNameComparer::tryFindMatchingWellPath( QString wellName )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
const std::vector<RimWellPath*>& wellPaths = proj->allWellPaths();
if ( wellName.isEmpty() || wellPaths.empty() ) return QString();

9
ApplicationCode/CommandFileInterface/RicfApplicationTools.cpp
View File

@ -18,7 +18,6 @@
#include "RicfApplicationTools.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RiaWellNameComparer.h"
@ -39,7 +38,7 @@ std::vector<RimWellPath*> RicfApplicationTools::wellPathsFromNames( const QStrin
QStringList* wellsNotFound )
{
std::vector<RimWellPath*> wellPaths;
auto allWellPaths = RiaApplication::instance()->project()->allWellPaths();
auto allWellPaths = RimProject::current()->allWellPaths();
if ( !wellPathNames.empty() )
{
@ -98,7 +97,7 @@ QStringList RicfApplicationTools::toQStringList( const std::vector<QString>& v )
//--------------------------------------------------------------------------------------------------
RimEclipseCase* RicfApplicationTools::caseFromId( int caseId )
{
auto eclipseCases = RiaApplication::instance()->project()->eclipseCases();
auto eclipseCases = RimProject::current()->eclipseCases();
if ( caseId < 0 )
{
if ( !eclipseCases.empty() ) return eclipseCases.front();
@ -118,7 +117,7 @@ RimEclipseCase* RicfApplicationTools::caseFromId( int caseId )
//--------------------------------------------------------------------------------------------------
RimEclipseView* RicfApplicationTools::viewFromCaseIdAndViewName( int caseId, const QString& viewName )
{
for ( RimEclipseCase* c : RiaApplication::instance()->project()->eclipseCases() )
for ( RimEclipseCase* c : RimProject::current()->eclipseCases() )
{
if ( c->caseId() == caseId )
{
@ -140,7 +139,7 @@ RimEclipseView* RicfApplicationTools::viewFromCaseIdAndViewName( int caseId, con
//--------------------------------------------------------------------------------------------------
RimEclipseView* RicfApplicationTools::viewFromCaseIdAndViewId( int caseId, int viewId )
{
for ( RimEclipseCase* c : RiaApplication::instance()->project()->eclipseCases() )
for ( RimEclipseCase* c : RimProject::current()->eclipseCases() )
{
if ( c->caseId() == caseId )
{

3
ApplicationCode/CommandFileInterface/RicfCloneView.cpp
View File

@ -1,6 +1,5 @@
#include "RicfCloneView.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RicfCreateView.h"
@ -34,7 +33,7 @@ RicfCloneView::RicfCloneView()
//--------------------------------------------------------------------------------------------------
caf::PdmScriptResponse RicfCloneView::execute()
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
std::vector<Rim3dView*> allViews;
project->descendantsIncludingThisOfType( allViews );

7
ApplicationCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp
View File

@ -27,7 +27,6 @@
#include "RimOilField.h"
#include "RimProject.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "cafPdmFieldIOScriptability.h"
@ -54,8 +53,7 @@ caf::PdmScriptResponse RicfComputeCaseGroupStatistics::execute()
if ( m_groupId() >= 0 )
{
for ( RimIdenticalGridCaseGroup* group :
RiaApplication::instance()->project()->activeOilField()->analysisModels()->caseGroups )
for ( RimIdenticalGridCaseGroup* group : RimProject::current()->activeOilField()->analysisModels()->caseGroups )
{
for ( RimEclipseCase* c : group->statisticsCaseCollection->reservoirs )
{
@ -67,8 +65,7 @@ caf::PdmScriptResponse RicfComputeCaseGroupStatistics::execute()
for ( int caseId : caseIds )
{
bool foundCase = false;
for ( RimIdenticalGridCaseGroup* group :
RiaApplication::instance()->project()->activeOilField()->analysisModels()->caseGroups )
for ( RimIdenticalGridCaseGroup* group : RimProject::current()->activeOilField()->analysisModels()->caseGroups )
{
for ( RimEclipseCase* c : group->statisticsCaseCollection->reservoirs )
{

3
ApplicationCode/CommandFileInterface/RicfCreateLgrForCompletions.cpp
View File

@ -33,7 +33,6 @@
#include "RimProject.h"
#include "RimWellPath.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RiaWellNameComparer.h"
@ -93,7 +92,7 @@ caf::PdmScriptResponse RicfCreateLgrForCompletions::execute()
RimEclipseCase* eclipseCase = nullptr;
{
for ( RimEclipseCase* c : RiaApplication::instance()->project()->activeOilField()->analysisModels->cases() )
for ( RimEclipseCase* c : RimProject::current()->activeOilField()->analysisModels->cases() )
{
if ( c->caseId() == m_caseId() )
{

5
ApplicationCode/CommandFileInterface/RicfCreateMultipleFractures.cpp
View File

@ -33,7 +33,6 @@
#include "RimProject.h"
#include "RimWellPath.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RiaWellNameComparer.h"
@ -83,7 +82,7 @@ caf::PdmScriptResponse RicfCreateMultipleFractures::execute()
{
using TOOLS = RicfApplicationTools;
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
RiuCreateMultipleFractionsUi* settings = project->dialogData()->multipleFractionsData();
// Get case and fracture template
@ -184,7 +183,7 @@ bool RicfCreateMultipleFractures::validateArguments() const
//--------------------------------------------------------------------------------------------------
RimFractureTemplate* RicfCreateMultipleFractures::fractureTemplateFromId( int templateId ) const
{
for ( RimFractureTemplate* t : RiaApplication::instance()->project()->allFractureTemplates() )
for ( RimFractureTemplate* t : RimProject::current()->allFractureTemplates() )
{
if ( t->id() == templateId ) return t;
}

4
ApplicationCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp
View File

@ -49,7 +49,7 @@ caf::PdmScriptResponse RicfCreateSaturationPressurePlots::execute()
std::vector<int> caseIds = m_caseIds();
if ( caseIds.empty() )
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( project )
{
auto eclipeCases = project->eclipseCases();
@ -67,7 +67,7 @@ caf::PdmScriptResponse RicfCreateSaturationPressurePlots::execute()
return caf::PdmScriptResponse( caf::PdmScriptResponse::COMMAND_ERROR, error );
}
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( !project )
{
QString error( "No project loaded" );

3
ApplicationCode/CommandFileInterface/RicfCreateStatisticsCase.cpp
View File

@ -24,7 +24,6 @@
#include "RimIdenticalGridCaseGroup.h"
#include "RimProject.h"
#include "RiaApplication.h"
#include "Riu3DMainWindowTools.h"
#include "cafPdmFieldIOScriptability.h"
@ -58,7 +57,7 @@ RicfCreateStatisticsCase::RicfCreateStatisticsCase()
//--------------------------------------------------------------------------------------------------
caf::PdmScriptResponse RicfCreateStatisticsCase::execute()
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
std::vector<RimIdenticalGridCaseGroup*> gridCaseGroups;
project->descendantsIncludingThisOfType( gridCaseGroups );

3
ApplicationCode/CommandFileInterface/RicfCreateView.cpp
View File

@ -1,6 +1,5 @@
#include "RicfCreateView.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "Rim3dView.h"
@ -43,7 +42,7 @@ RicfCreateView::RicfCreateView()
//--------------------------------------------------------------------------------------------------
caf::PdmScriptResponse RicfCreateView::execute()
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
std::vector<RimCase*> allCases;
project->allCases( allCases );

3
ApplicationCode/CommandFileInterface/RicfCreateWellBoreStabilityPlotFeature.cpp
View File

@ -17,7 +17,6 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RicfCreateWellBoreStabilityPlotFeature.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "WellLogCommands/RicNewWellBoreStabilityPlotFeature.h"
@ -63,7 +62,7 @@ RicfCreateWellBoreStabilityPlotFeature::RicfCreateWellBoreStabilityPlotFeature()
//--------------------------------------------------------------------------------------------------
caf::PdmScriptResponse RicfCreateWellBoreStabilityPlotFeature::execute()
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
std::vector<RimGeoMechCase*> geoMechCases;
project->descendantsIncludingThisOfType( geoMechCases );

2
ApplicationCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp
View File

@ -89,7 +89,7 @@ caf::PdmScriptResponse RicfExportFlowCharacteristics::execute()
}
RimFlowPlotCollection* flowPlotColl =
RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection();
RimProject::current()->mainPlotCollection->flowPlotCollection();
if ( flowPlotColl )
{
RimFlowCharacteristicsPlot* plot = flowPlotColl->defaultFlowCharacteristicsPlot();

2
ApplicationCode/CommandFileInterface/RicfExportMsw.cpp
View File

@ -89,7 +89,7 @@ caf::PdmScriptResponse RicfExportMsw::execute()
exportSettings.includeFractures = m_includeFractures;
exportSettings.fileSplit = m_fileSplit;
RimWellPath* wellPath = RiaApplication::instance()->project()->wellPathByName( m_wellPathName );
RimWellPath* wellPath = RimProject::current()->wellPathByName( m_wellPathName );
if ( !wellPath )
{
QString error = QString( "exportMsw: Could not find well path with name %1" ).arg( m_wellPathName() );

1
ApplicationCode/CommandFileInterface/RicfExportProperty.cpp
View File

@ -18,7 +18,6 @@
#include "RicfExportProperty.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "ExportCommands/RicEclipseCellResultToFileImpl.h"

1
ApplicationCode/CommandFileInterface/RicfExportPropertyInViews.cpp
View File

@ -20,7 +20,6 @@
#include "ExportCommands/RicEclipseCellResultToFileImpl.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RicfApplicationTools.h"

2
ApplicationCode/CommandFileInterface/RicfExportSimWellFractureCompletions.cpp
View File

@ -80,7 +80,7 @@ caf::PdmScriptResponse RicfExportSimWellFractureCompletions::execute()
{
using TOOLS = RicfApplicationTools;
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
RicExportCompletionDataSettingsUi* exportSettings = project->dialogData()->exportCompletionData();
exportSettings->timeStep = m_timeStep;

3
ApplicationCode/CommandFileInterface/RicfExportWellLogPlotData.cpp
View File

@ -17,7 +17,6 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RicfExportWellLogPlotData.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "ExportCommands/RicExportToLasFileFeature.h"
@ -83,7 +82,7 @@ caf::PdmScriptResponse RicfExportWellLogPlotData::execute()
if ( QFileInfo::exists( m_folder ) )
{
std::vector<RimWellLogPlot*> plots;
RiaApplication::instance()->project()->descendantsIncludingThisOfType( plots );
RimProject::current()->descendantsIncludingThisOfType( plots );
RicfExportWellLogPlotDataResult* result = new RicfExportWellLogPlotDataResult;
for ( RimWellLogPlot* plot : plots )

6
ApplicationCode/CommandFileInterface/RicfExportWellPathCompletions.cpp
View File

@ -119,7 +119,7 @@ caf::PdmScriptResponse RicfExportWellPathCompletions::execute()
{
using TOOLS = RicfApplicationTools;
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
RicExportCompletionDataSettingsUi* exportSettings = project->dialogData()->exportCompletionData();
if ( m_timeStep < 0 )
@ -171,7 +171,7 @@ caf::PdmScriptResponse RicfExportWellPathCompletions::execute()
std::vector<RimWellPath*> wellPaths;
if ( m_wellPathNames().empty() )
{
for ( auto wellPath : RiaApplication::instance()->project()->activeOilField()->wellPathCollection->wellPaths() )
for ( auto wellPath : RimProject::current()->activeOilField()->wellPathCollection->wellPaths() )
{
if ( wellPath->showWellPath() )
{
@ -184,7 +184,7 @@ caf::PdmScriptResponse RicfExportWellPathCompletions::execute()
for ( const QString& wellPathName : m_wellPathNames() )
{
RimWellPath* wellPath =
RiaApplication::instance()->project()->activeOilField()->wellPathCollection->wellPathByName( wellPathName );
RimProject::current()->activeOilField()->wellPathCollection->wellPathByName( wellPathName );
if ( wellPath )
{
wellPaths.push_back( wellPath );

3
ApplicationCode/CommandFileInterface/RicfImportFormationNames.cpp
View File

@ -17,7 +17,6 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RicfImportFormationNames.h"
#include "RiaApplication.h"
#include "RicImportFormationNamesFeature.h"
#include "RimCase.h"
@ -68,7 +67,7 @@ caf::PdmScriptResponse RicfImportFormationNames::execute()
{
bool foundCase = false;
std::vector<RimCase*> cases;
RiaApplication::instance()->project()->allCases( cases );
RimProject::current()->allCases( cases );
for ( RimCase* rimCase : cases )
{
if ( rimCase->caseId() == m_applyToCaseId() )

2
ApplicationCode/CommandFileInterface/RicfRunOctaveScript.cpp
View File

@ -53,7 +53,7 @@ caf::PdmScriptResponse RicfRunOctaveScript::execute()
std::vector<int> caseIds = m_caseIds();
if ( caseIds.empty() )
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( project )
{
auto eclipeCases = project->eclipseCases();

3
ApplicationCode/CommandFileInterface/RicfScaleFractureTemplate.cpp
View File

@ -19,7 +19,6 @@
#include "RicfScaleFractureTemplate.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RimFractureTemplate.h"
@ -60,7 +59,7 @@ caf::PdmScriptResponse RicfScaleFractureTemplate::execute()
return caf::PdmScriptResponse( caf::PdmScriptResponse::COMMAND_ERROR, error );
}
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( !project )
{

1
ApplicationCode/CommandFileInterface/RicfSetExportFolder.cpp
View File

@ -18,7 +18,6 @@
#include "RicfSetExportFolder.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "cafPdmFieldIOScriptability.h"

3
ApplicationCode/CommandFileInterface/RicfSetFractureContainment.cpp
View File

@ -19,7 +19,6 @@
#include "RicfSetFractureContainment.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RimFractureTemplate.h"
@ -52,7 +51,7 @@ caf::PdmScriptResponse RicfSetFractureContainment::execute()
return caf::PdmScriptResponse( caf::PdmScriptResponse::COMMAND_ERROR, error );
}
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( !project )
{

3
ApplicationCode/CommandFileInterface/RicfSetTimeStep.cpp
View File

@ -24,7 +24,6 @@
#include "RimOilField.h"
#include "RimProject.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "cafPdmFieldIOScriptability.h"
@ -74,7 +73,7 @@ caf::PdmScriptResponse RicfSetTimeStep::execute()
std::vector<RimCase*> allCases;
{
RiaApplication::instance()->project()->allCases( allCases );
RimProject::current()->allCases( allCases );
bool foundCase = false;
for ( RimCase* c : allCases )

3
ApplicationCode/Commands/AnnotationCommands/RicCreateReachCircleAnnotationFeature.cpp
View File

@ -18,7 +18,6 @@
#include "RicCreateReachCircleAnnotationFeature.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RimAnnotationCollection.h"
@ -84,7 +83,7 @@ void RicCreateReachCircleAnnotationFeature::setupActionLook( QAction* actionToSe
//--------------------------------------------------------------------------------------------------
RimAnnotationCollection* RicCreateReachCircleAnnotationFeature::annotationCollection() const
{
auto project = RiaApplication::instance()->project();
auto project = RimProject::current();
auto oilField = project->activeOilField();
return oilField ? oilField->annotationCollection() : nullptr;
}

2
ApplicationCode/Commands/AnnotationCommands/RicCreateTextAnnotationFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicCreateTextAnnotationFeature.h"
#include "RiaApplication.h"
#include "RimAnnotationCollection.h"
#include "RimAnnotationGroupCollection.h"
#include "RimAnnotationInViewCollection.h"

3
ApplicationCode/Commands/AnnotationCommands/RicCreateUserDefinedPolylinesAnnotationFeature.cpp
View File

@ -18,7 +18,6 @@
#include "RicCreateUserDefinedPolylinesAnnotationFeature.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RimAnnotationCollection.h"
@ -85,7 +84,7 @@ void RicCreateUserDefinedPolylinesAnnotationFeature::setupActionLook( QAction* a
//--------------------------------------------------------------------------------------------------
RimAnnotationCollection* RicCreateUserDefinedPolylinesAnnotationFeature::annotationCollection() const
{
auto project = RiaApplication::instance()->project();
auto project = RimProject::current();
auto oilField = project->activeOilField();
return oilField ? oilField->annotationCollection() : nullptr;
}

2
ApplicationCode/Commands/AnnotationCommands/RicDeleteAnnotationFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicDeleteAnnotationFeature.h"
#include "RiaApplication.h"
#include "RimAnnotationCollection.h"
#include "RimAnnotationInViewCollection.h"
#include "RimOilField.h"

2
ApplicationCode/Commands/AnnotationCommands/RicImportPolylinesAnnotationFeature.cpp
View File

@ -67,7 +67,7 @@ void RicImportPolylinesAnnotationFeature::onActionTriggered( bool isChecked )
// Find or create the AnnotationsCollection
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimAnnotationCollection* annotColl = proj->activeOilField()->annotationCollection();
if ( !annotColl )

1
ApplicationCode/Commands/ApplicationCommands/RicOpenLastUsedFileFeature.cpp
View File

@ -18,7 +18,6 @@
#include "RicOpenLastUsedFileFeature.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RiuMainWindow.h"

3
ApplicationCode/Commands/ApplicationCommands/RicSaveProjectNoGlobalPathsFeature.cpp
View File

@ -18,7 +18,6 @@
#include "RicSaveProjectNoGlobalPathsFeature.h"
#include "RiaApplication.h"
#include "RimProject.h"
#include <QAction>
@ -39,7 +38,7 @@ bool RicSaveProjectNoGlobalPathsFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicSaveProjectNoGlobalPathsFeature::onActionTriggered( bool isChecked )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj )
{
proj->writeFile();

2
ApplicationCode/Commands/ApplicationCommands/RicShowMainWindowFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicShowMainWindowFeature.h"
#include "RiaApplication.h"
#include "RiuMainWindow.h"
#include <QAction>

1
ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.cpp
View File

@ -18,7 +18,6 @@
#include "RicExportFishbonesLateralsFeature.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "ExportCommands/RicExportSelectedWellPathsFeature.h"

1
ApplicationCode/Commands/CompletionCommands/RicNewValveFeature.cpp
View File

@ -1,7 +1,6 @@
#include "RicNewValveFeature.h"
#include "Riu3DMainWindowTools.h"
#include "RiaApplication.h"
#include "RimPerforationInterval.h"
#include "RimProject.h"
#include "RimWellPathCollection.h"

6
ApplicationCode/Commands/CompletionCommands/RicNewValveTemplateFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicNewValveTemplateFeature.h"
#include "RiaApplication.h"
#include "RimEclipseView.h"
#include "RimOilField.h"
#include "RimProject.h"
@ -51,7 +49,7 @@ void RicNewValveTemplateFeature::selectValveTemplateAndUpdate( RimValveTemplate*
templateCollection->updateConnectedEditors();
}
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
std::vector<Rim3dView*> views;
project->allVisibleViews( views );
@ -82,7 +80,7 @@ void RicNewValveTemplateFeature::createNewValveTemplateForValveAndUpdate( RimWel
//--------------------------------------------------------------------------------------------------
RimValveTemplate* RicNewValveTemplateFeature::createNewValveTemplate()
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
CVF_ASSERT( project );
RimOilField* oilfield = project->activeOilField();

2
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp
View File

@ -16,8 +16,6 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiaApplication.h"
#include "RicExportCompletionDataSettingsUi.h"
#include "RicExportFractureCompletionsImpl.h"

4
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsForTemporaryLgrsFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicExportCompletionsForTemporaryLgrsFeature.h"
#include "RiaApplication.h"
#include "RicWellPathExportCompletionDataFeature.h"
#include "RigMainGrid.h"
@ -102,7 +100,7 @@ std::vector<RimWellPath*> RicExportCompletionsForTemporaryLgrsFeature::wellPaths
}
}
auto project = RiaApplication::instance()->project();
auto project = RimProject::current();
for ( const auto& wellPathName : wellPathNames )
{
auto wellPath = project->wellPathByName( wellPathName );

4
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsForVisibleWellPathsFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicExportCompletionsForVisibleWellPathsFeature.h"
#include "RiaApplication.h"
#include "RicWellPathExportCompletionDataFeature.h"
#include "RiuPlotMainWindow.h"
@ -143,7 +141,7 @@ std::vector<RimWellPath*> RicExportCompletionsForVisibleWellPathsFeature::visibl
{
// No well path or well path collection selected
auto allWellPaths = RiaApplication::instance()->project()->allWellPaths();
auto allWellPaths = RimProject::current()->allWellPaths();
for ( const auto& w : allWellPaths )
{
if ( w->showWellPath() )

3
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionsFileTools.cpp
View File

@ -18,7 +18,6 @@
#include "RicWellPathExportCompletionsFileTools.h"
#include "RiaApplication.h"
#include "RiaFilePathTools.h"
#include "RiaLogging.h"
@ -85,7 +84,7 @@ std::shared_ptr<QFile> RicWellPathExportCompletionsFileTools::openFileForExport(
//--------------------------------------------------------------------------------------------------
const RimWellPath* RicWellPathExportCompletionsFileTools::findWellPathFromExportName( const QString& wellNameForExport )
{
auto allWellPaths = RiaApplication::instance()->project()->allWellPaths();
auto allWellPaths = RimProject::current()->allWellPaths();
for ( const auto wellPath : allWellPaths )
{

3
ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureTextReportFeatureImpl.cpp
View File

@ -18,7 +18,6 @@
#include "RicWellPathFractureTextReportFeatureImpl.h"
#include "RiaApplication.h"
#include "RiaRegressionTestRunner.h"
#include "RicExportFractureCompletionsImpl.h"
@ -85,7 +84,7 @@ QString RicWellPathFractureTextReportFeatureImpl::wellPathFractureReport(
std::vector<RimEllipseFractureTemplate*> ellipseTemplates;
{
auto proj = RiaApplication::instance()->project();
auto proj = RimProject::current();
auto fractureTemplates = proj->activeOilField()->fractureDefinitionCollection()->fractureTemplates();
std::set<QString> usedFractureTemplateNames;

3
ApplicationCode/Commands/EclipseCommands/RicEclipseCaseNewGroupExec.cpp
View File

@ -26,7 +26,6 @@
#include "RimOilField.h"
#include "RimProject.h"
#include "RiaApplication.h"
#include "Riu3DMainWindowTools.h"
//--------------------------------------------------------------------------------------------------
@ -57,7 +56,7 @@ QString RicEclipseCaseNewGroupExec::name()
//--------------------------------------------------------------------------------------------------
void RicEclipseCaseNewGroupExec::redo()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
CVF_ASSERT( proj );
RimEclipseCaseCollection* analysisModels = proj->activeOilField() ? proj->activeOilField()->analysisModels() : nullptr;

1
ApplicationCode/Commands/EclipseCommands/RicImportInputEclipseCaseFeature.cpp
View File

@ -19,7 +19,6 @@
#include "RicImportInputEclipseCaseFeature.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RiaPorosityModel.h"

3
ApplicationCode/Commands/EclipseCommands/RicNewStatisticsCaseFeature.cpp
View File

@ -25,7 +25,6 @@
#include "RimIdenticalGridCaseGroup.h"
#include "RimProject.h"
#include "RiaApplication.h"
#include "Riu3DMainWindowTools.h"
#include "cafSelectionManager.h"
@ -113,7 +112,7 @@ RimEclipseStatisticsCase* RicNewStatisticsCaseFeature::addStatisticalCalculation
if ( caseGroup )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimEclipseStatisticsCase* createdObject = caseGroup->createAndAppendStatisticsCase();
proj->assignCaseIdToCase( createdObject );

4
ApplicationCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp
View File

@ -57,7 +57,7 @@ CAF_CMD_SOURCE_INIT( RicAdvancedSnapshotExportFeature, "RicAdvancedSnapshotExpor
//--------------------------------------------------------------------------------------------------
bool RicAdvancedSnapshotExportFeature::isCommandEnabled()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
return proj;
}
@ -69,7 +69,7 @@ void RicAdvancedSnapshotExportFeature::onActionTriggered( bool isChecked )
{
this->disableModelChangeContribution();
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj )
{

7
ApplicationCode/Commands/ExportCommands/RicExportCarfin.cpp
View File

@ -18,7 +18,6 @@
#include "RicExportCarfin.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RicCellRangeUi.h"
@ -60,9 +59,9 @@ void RicExportCarfin::onActionTriggered( bool isChecked )
RimEclipseCase* rimCase = RicExportCarfin::selectedCase();
CVF_ASSERT( rimCase );
QString exportCarfinDataAsString = RiaApplication::instance()->project()->dialogData()->exportCarfinDataAsString();
QString exportCarfinDataAsString = RimProject::current()->dialogData()->exportCarfinDataAsString();
RicExportCarfinUi* exportCarfinObject = RiaApplication::instance()->project()->dialogData()->exportCarfin();
RicExportCarfinUi* exportCarfinObject = RimProject::current()->dialogData()->exportCarfin();
exportCarfinObject->setCase( rimCase );
@ -122,7 +121,7 @@ void RicExportCarfin::onActionTriggered( bool isChecked )
}
else
{
RiaApplication::instance()->project()->dialogData()->setExportCarfinDataFromString( exportCarfinDataAsString );
RimProject::current()->dialogData()->setExportCarfinDataFromString( exportCarfinDataAsString );
}
}

2
ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.cpp
View File

@ -71,7 +71,7 @@ void RicExportEclipseSectorModelFeature::openDialogAndExecuteCommand( RimEclipse
std::tie( min, max ) = getVisibleCellRange( view, cellVisibility );
RicExportEclipseSectorModelUi* exportSettings =
RiaApplication::instance()->project()->dialogData()->exportSectorModelUi();
RimProject::current()->dialogData()->exportSectorModelUi();
exportSettings->setCaseData( caseData, min, max );
exportSettings->applyBoundaryDefaults();

2
ApplicationCode/Commands/ExportCommands/RicExportSelectedWellPathsFeature.cpp
View File

@ -117,7 +117,7 @@ void RicExportSelectedWellPathsFeature::writeWellPathGeometryToStream( QTextStre
if ( writeProjectInfo )
{
formatter.comment( "Project: " + RiaApplication::instance()->project()->fileName );
formatter.comment( "Project: " + RimProject::current()->fileName );
stream << endl;
}

1
ApplicationCode/Commands/ExportCommands/RicExportVisibleWellPathsFeature.cpp
View File

@ -18,7 +18,6 @@
#include "RicExportVisibleWellPathsFeature.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "CompletionExportCommands/RicExportCompletionsForVisibleWellPathsFeature.h"

1
ApplicationCode/Commands/ExportCommands/RicExportWellPathsUi.cpp
View File

@ -18,7 +18,6 @@
#include "RicExportWellPathsUi.h"
#include "RiaApplication.h"
#include "RiaOptionItemFactory.h"
#include "RimCase.h"

2
ApplicationCode/Commands/ExportCommands/RicSnapshotAllViewsToFileFeature.cpp
View File

@ -75,7 +75,7 @@ void RicSnapshotAllViewsToFileFeature::exportSnapshotOfViewsIntoFolder( const QS
int caseId /*= -1*/,
int viewId /*= -1*/ )
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( project == nullptr ) return;

12
ApplicationCode/Commands/FlowCommands/RicAddStoredFlowCharacteristicsPlotFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicAddStoredFlowCharacteristicsPlotFeature.h"
#include "RiaApplication.h"
#include "RimFlowCharacteristicsPlot.h"
#include "RimFlowPlotCollection.h"
#include "RimMainPlotCollection.h"
@ -40,10 +38,9 @@ CAF_CMD_SOURCE_INIT( RicAddStoredFlowCharacteristicsPlotFeature, "RicAddStoredFl
//--------------------------------------------------------------------------------------------------
bool RicAddStoredFlowCharacteristicsPlotFeature::isCommandEnabled()
{
if ( RiaApplication::instance()->project() )
if ( RimProject::current() )
{
RimFlowPlotCollection* flowPlotColl =
RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection();
RimFlowPlotCollection* flowPlotColl = RimProject::current()->mainPlotCollection->flowPlotCollection();
if ( flowPlotColl )
{
RimFlowCharacteristicsPlot* flowCharacteristicsPlot =
@ -64,10 +61,9 @@ bool RicAddStoredFlowCharacteristicsPlotFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicAddStoredFlowCharacteristicsPlotFeature::onActionTriggered( bool isChecked )
{
if ( RiaApplication::instance()->project() )
if ( RimProject::current() )
{
RimFlowPlotCollection* flowPlotColl =
RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection();
RimFlowPlotCollection* flowPlotColl = RimProject::current()->mainPlotCollection->flowPlotCollection();
if ( flowPlotColl )
{
RimFlowCharacteristicsPlot* sourceObject =

12
ApplicationCode/Commands/FlowCommands/RicAddStoredWellAllocationPlotFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicAddStoredWellAllocationPlotFeature.h"
#include "RiaApplication.h"
#include "RimFlowPlotCollection.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"
@ -40,10 +38,9 @@ CAF_CMD_SOURCE_INIT( RicAddStoredWellAllocationPlotFeature, "RicAddStoredWellAll
//--------------------------------------------------------------------------------------------------
bool RicAddStoredWellAllocationPlotFeature::isCommandEnabled()
{
if ( RiaApplication::instance()->project() )
if ( RimProject::current() )
{
RimFlowPlotCollection* flowPlotColl =
RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection();
RimFlowPlotCollection* flowPlotColl = RimProject::current()->mainPlotCollection->flowPlotCollection();
if ( flowPlotColl )
{
RimWellAllocationPlot* wellAllocationPlot =
@ -64,10 +61,9 @@ bool RicAddStoredWellAllocationPlotFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicAddStoredWellAllocationPlotFeature::onActionTriggered( bool isChecked )
{
if ( RiaApplication::instance()->project() )
if ( RimProject::current() )
{
RimFlowPlotCollection* flowPlotColl =
RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection();
RimFlowPlotCollection* flowPlotColl = RimProject::current()->mainPlotCollection->flowPlotCollection();
if ( flowPlotColl )
{
RimWellAllocationPlot* sourceObject =

2
ApplicationCode/Commands/FlowCommands/RicPlotProductionRateFeature.cpp
View File

@ -74,7 +74,7 @@ bool RicPlotProductionRateFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicPlotProductionRateFeature::onActionTriggered( bool isChecked )
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
CAF_ASSERT( project );
RimSummaryCaseMainCollection* sumCaseColl =

2
ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp
View File

@ -18,8 +18,6 @@
#include "RicShowContributingWellsFeatureImpl.h"
#include "RiaApplication.h"
#include "RicSelectOrCreateViewFeatureImpl.h"
#include "RigFlowDiagResultAddress.h"

4
ApplicationCode/Commands/FlowCommands/RicShowCumulativePhasePlotFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicShowCumulativePhasePlotFeature.h"
#include "RiaApplication.h"
#include "RimEclipseResultCase.h"
#include "RimEclipseView.h"
#include "RimFlowPlotCollection.h"
@ -74,7 +72,7 @@ void RicShowCumulativePhasePlotFeature::onActionTriggered( bool isChecked )
}
}
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( !proj ) return;
RimFlowPlotCollection* flowPlotColl = proj->mainPlotCollection()->flowPlotCollection();

4
ApplicationCode/Commands/FlowCommands/RicShowFlowCharacteristicsPlotFeature.cpp
View File

@ -86,10 +86,10 @@ void RicShowFlowCharacteristicsPlotFeature::onActionTriggered( bool isChecked )
}
}
if ( RiaApplication::instance()->project() )
if ( RimProject::current() )
{
RimFlowPlotCollection* flowPlotColl =
RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection();
RimProject::current()->mainPlotCollection->flowPlotCollection();
if ( flowPlotColl )
{
RiuPlotMainWindowTools::showPlotMainWindow();

4
ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.cpp
View File

@ -103,10 +103,10 @@ void RicShowWellAllocationPlotFeature::onActionTriggered( bool isChecked )
else
return;
if ( RiaApplication::instance()->project() )
if ( RimProject::current() )
{
RimFlowPlotCollection* flowPlotColl =
RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection();
RimProject::current()->mainPlotCollection->flowPlotCollection();
if ( flowPlotColl )
{
flowPlotColl->defaultWellAllocPlot()->setFromSimulationWell( simWell );

1
ApplicationCode/Commands/FractureCommands/RicConvertAllFractureTemplatesToFieldFeature.cpp
View File

@ -18,7 +18,6 @@
#include "RicConvertAllFractureTemplatesToFieldFeature.h"
#include "RiaApplication.h"
#include "RiaEclipseUnitTools.h"
#include "Rim3dView.h"

1
ApplicationCode/Commands/FractureCommands/RicConvertAllFractureTemplatesToMetricFeature.cpp
View File

@ -18,7 +18,6 @@
#include "RicConvertAllFractureTemplatesToMetricFeature.h"
#include "RiaApplication.h"
#include "RiaEclipseUnitTools.h"
#include "Rim3dView.h"

1
ApplicationCode/Commands/FractureCommands/RicCreateDuplicateTemplateInOtherUnitSystemFeature.cpp
View File

@ -18,7 +18,6 @@
#include "RicCreateDuplicateTemplateInOtherUnitSystemFeature.h"
#include "RiaApplication.h"
#include "RiaEclipseUnitTools.h"
#include "RicNewEllipseFractureTemplateFeature.h"

4
ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.cpp
View File

@ -18,8 +18,6 @@
#include "RicCreateMultipleFracturesOptionItemUi.h"
#include "RiaApplication.h"
#include "RicCreateMultipleFracturesUi.h"
#include "RimFractureTemplate.h"
#include "RimFractureTemplateCollection.h"
@ -132,7 +130,7 @@ QList<caf::PdmOptionItemInfo>
{
QList<caf::PdmOptionItemInfo> options;
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
CVF_ASSERT( proj );
if ( fieldNeedingOptions == &m_fractureTemplate )

4
ApplicationCode/Commands/FractureCommands/RicFractureNameGenerator.cpp
View File

@ -18,8 +18,6 @@
#include "RicFractureNameGenerator.h"
#include "RiaApplication.h"
#include "RimFracture.h"
#include "RimOilField.h"
#include "RimProject.h"
@ -30,7 +28,7 @@
QString RicFractureNameGenerator::nameForNewFracture()
{
std::vector<RimFracture*> oldFractures;
RiaApplication::instance()->project()->activeOilField()->descendantsIncludingThisOfType( oldFractures );
RimProject::current()->activeOilField()->descendantsIncludingThisOfType( oldFractures );
size_t fractureNum = oldFractures.size();

6
ApplicationCode/Commands/FractureCommands/RicNewEllipseFractureTemplateFeature.cpp
View File

@ -19,8 +19,6 @@
#include "RicNewEllipseFractureTemplateFeature.h"
#include "RiaApplication.h"
#include "RimEclipseView.h"
#include "RimEllipseFractureTemplate.h"
#include "RimFractureTemplateCollection.h"
@ -59,7 +57,7 @@ void RicNewEllipseFractureTemplateFeature::selectFractureTemplateAndUpdate( RimF
fractureTemplate->firstAncestorOrThisOfTypeAsserted( templateCollection );
templateCollection->updateConnectedEditors();
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
project->scheduleCreateDisplayModelAndRedrawAllViews();
@ -71,7 +69,7 @@ void RicNewEllipseFractureTemplateFeature::selectFractureTemplateAndUpdate( RimF
//--------------------------------------------------------------------------------------------------
RimEllipseFractureTemplate* RicNewEllipseFractureTemplateFeature::createNewTemplate()
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
CVF_ASSERT( project );
RimOilField* oilfield = project->activeOilField();

5
ApplicationCode/Commands/FractureCommands/RicNewOptionItemFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicNewOptionItemFeature.h"
#include "RiaApplication.h"
#include "RicCreateMultipleFracturesOptionItemUi.h"
#include "RicCreateMultipleFracturesUi.h"
@ -55,8 +53,7 @@ void RicNewOptionItemFeature::setupActionLook( QAction* actionToSetup )
//--------------------------------------------------------------------------------------------------
void RicNewOptionItemFeature::onActionTriggered( bool isChecked )
{
RiuCreateMultipleFractionsUi* multipleFractionUi =
RiaApplication::instance()->project()->dialogData()->multipleFractionsData();
RiuCreateMultipleFractionsUi* multipleFractionUi = RimProject::current()->dialogData()->multipleFractionsData();
RicCreateMultipleFracturesOptionItemUi* selectedOptionItem = nullptr;
{

4
ApplicationCode/Commands/FractureCommands/RicNewSimWellFractureAtPosFeature.cpp
View File

@ -51,7 +51,7 @@ CAF_CMD_SOURCE_INIT( RicNewSimWellFractureAtPosFeature, "RicNewSimWellFractureAt
//--------------------------------------------------------------------------------------------------
void RicNewSimWellFractureAtPosFeature::onActionTriggered( bool isChecked )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj->allFractureTemplates().empty() ) return;
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
@ -136,7 +136,7 @@ void RicNewSimWellFractureAtPosFeature::setupActionLook( QAction* actionToSetup
//--------------------------------------------------------------------------------------------------
bool RicNewSimWellFractureAtPosFeature::isCommandEnabled()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj->allFractureTemplates().empty() ) return false;
auto objHandle = caf::SelectionManager::instance()->selectedItemOfType<caf::PdmObjectHandle>();

4
ApplicationCode/Commands/FractureCommands/RicNewSimWellFractureFeature.cpp
View File

@ -51,7 +51,7 @@ CAF_CMD_SOURCE_INIT( RicNewSimWellFractureFeature, "RicNewSimWellFractureFeature
//--------------------------------------------------------------------------------------------------
void RicNewSimWellFractureFeature::onActionTriggered( bool isChecked )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj->allFractureTemplates().empty() ) return;
auto objHandle = caf::SelectionManager::instance()->selectedItemOfType<caf::PdmObjectHandle>();
@ -120,7 +120,7 @@ void RicNewSimWellFractureFeature::setupActionLook( QAction* actionToSetup )
//--------------------------------------------------------------------------------------------------
bool RicNewSimWellFractureFeature::isCommandEnabled()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj->allFractureTemplates().empty() ) return false;
auto objHandle = caf::SelectionManager::instance()->selectedItemOfType<caf::PdmObjectHandle>();

4
ApplicationCode/Commands/FractureCommands/RicNewStimPlanFractureTemplateFeature.cpp
View File

@ -65,7 +65,7 @@ void RicNewStimPlanFractureTemplateFeature::selectFractureTemplateAndUpdate( Rim
fractureTemplate->firstAncestorOrThisOfTypeAsserted( templateCollection );
templateCollection->updateConnectedEditors();
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
project->scheduleCreateDisplayModelAndRedrawAllViews();
Riu3DMainWindowTools::selectAsCurrentItem( fractureTemplate );
@ -85,7 +85,7 @@ std::vector<RimStimPlanFractureTemplate*> RicNewStimPlanFractureTemplateFeature:
if ( fileNames.isEmpty() ) return std::vector<RimStimPlanFractureTemplate*>();
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
CVF_ASSERT( project );
RimOilField* oilfield = project->activeOilField();

2
ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureAtPosFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicNewWellPathFractureAtPosFeature.h"
#include "RiaApplication.h"
#include "RicNewWellPathFractureFeature.h"
#include "RimProject.h"

2
ApplicationCode/Commands/GridCrossPlotCommands/RicCreateGridCrossPlotFeature.cpp
View File

@ -50,7 +50,7 @@ bool RicCreateGridCrossPlotFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicCreateGridCrossPlotFeature::onActionTriggered( bool isChecked )
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
RimGridCrossPlotCollection* collection =
caf::SelectionManager::instance()->selectedItemAncestorOfType<RimGridCrossPlotCollection>();
if ( !collection )

4
ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.cpp
View File

@ -59,7 +59,7 @@ std::vector<RimSaturationPressurePlot*>
return plots;
}
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
RimSaturationPressurePlotCollection* collection = project->mainPlotCollection()->saturationPressurePlotCollection();
@ -124,7 +124,7 @@ bool RicCreateSaturationPressurePlotsFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicCreateSaturationPressurePlotsFeature::onActionTriggered( bool isChecked )
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
RimSaturationPressurePlotCollection* collection = project->mainPlotCollection()->saturationPressurePlotCollection();

3
ApplicationCode/Commands/HoloLensCommands/RicHoloLensCreateSessionUi.cpp
View File

@ -18,7 +18,6 @@
#include "RicHoloLensCreateSessionUi.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RiaOptionItemFactory.h"
@ -27,6 +26,8 @@
#include "cafPdmSettings.h"
#include "cafPdmUiOrdering.h"
#include "cvfAssert.h"
CAF_PDM_SOURCE_INIT( RicHoloLensCreateSessionUi, "RicHoloLensCreateSessionUi" );
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportToFolderFeature.cpp
View File

@ -57,7 +57,7 @@ void RicHoloLensExportToFolderFeature::onActionTriggered( bool isChecked )
RimGridView* activeView = RiaApplication::instance()->activeGridView();
RicHoloLensExportToFolderUi* featureUi =
RiaApplication::instance()->project()->dialogData()->holoLensExportToFolderData();
RimProject::current()->dialogData()->holoLensExportToFolderData();
featureUi->setViewForExport( activeView );
caf::PdmUiPropertyViewDialog propertyDialog( nullptr,

3
ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportToFolderUi.cpp
View File

@ -18,7 +18,6 @@
#include "RicHoloLensExportToFolderUi.h"
#include "RiaApplication.h"
#include "RiaOptionItemFactory.h"
#include "RimCase.h"
@ -78,7 +77,7 @@ QList<caf::PdmOptionItemInfo>
if ( fieldNeedingOptions == &m_viewForExport )
{
std::vector<RimGridView*> visibleViews;
RiaApplication::instance()->project()->allVisibleGridViews( visibleViews );
RimProject::current()->allVisibleGridViews( visibleViews );
for ( RimGridView* v : visibleViews )
{

2
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxXSliceFeature.cpp
View File

@ -20,8 +20,6 @@
#include "RicIntersectionFeatureImpl.h"
#include "RiaApplication.h"
#include "RimBoxIntersection.h"
#include "RimCase.h"
#include "RimGridView.h"

2
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxYSliceFeature.cpp
View File

@ -20,8 +20,6 @@
#include "RicIntersectionFeatureImpl.h"
#include "RiaApplication.h"
#include "RimBoxIntersection.h"
#include "RimCase.h"
#include "RimGridView.h"

2
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxZSliceFeature.cpp
View File

@ -20,8 +20,6 @@
#include "RicIntersectionFeatureImpl.h"
#include "RiaApplication.h"
#include "RimBoxIntersection.h"
#include "RimCase.h"
#include "RimGridView.h"

2
ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp
View File

@ -85,7 +85,7 @@ void RicMeasurementPickEventHandler::enablePolyLineMode( bool polyLineModeEnable
//--------------------------------------------------------------------------------------------------
bool RicMeasurementPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eventObject )
{
RimMeasurement* measurement = RiaApplication::instance()->project()->measurement();
RimMeasurement* measurement = RimProject::current()->measurement();
if ( measurement && measurement->measurementMode() )
{

2
ApplicationCode/Commands/OctaveScriptCommands/RicRefreshScriptsFeature.cpp
View File

@ -58,7 +58,7 @@ void RicRefreshScriptsFeature::setupActionLook( QAction* actionToSetup )
//--------------------------------------------------------------------------------------------------
void RicRefreshScriptsFeature::refreshScriptFolders()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RiaPreferences* prefs = RiaApplication::instance()->preferences();
proj->setScriptDirectories( prefs->scriptDirectories() );

4
ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteEclipseCasesFeature.cpp
View File

@ -19,8 +19,6 @@
#include "RicPasteEclipseCasesFeature.h"
#include "RiaApplication.h"
#include "RicPasteFeatureImpl.h"
#include "RigGridManager.h"
@ -106,7 +104,7 @@ void RicPasteEclipseCasesFeature::setupActionLook( QAction* actionToSetup )
void RicPasteEclipseCasesFeature::addCasesToGridCaseGroup( caf::PdmObjectGroup& objectGroup,
RimIdenticalGridCaseGroup* gridCaseGroup )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
CVF_ASSERT( proj );
std::vector<RimEclipseResultCase*> resultCases;

2
ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteEclipseViewsFeature.cpp
View File

@ -19,8 +19,6 @@
#include "RicPasteEclipseViewsFeature.h"
#include "RiaApplication.h"
#include "Riu3DMainWindowTools.h"
#include "RicPasteFeatureImpl.h"

4
ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteFeatureImpl.cpp
View File

@ -19,8 +19,6 @@
#include "RicPasteFeatureImpl.h"
#include "RiaApplication.h"
#include "RimCaseCollection.h"
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
@ -44,7 +42,7 @@
void RicPasteFeatureImpl::populateObjectGroupFromReferences( const std::vector<QString>& referenceList,
caf::PdmObjectGroup* objectGroup )
{
caf::PdmObjectHandle* referenceRoot = RiaApplication::instance()->project();
caf::PdmObjectHandle* referenceRoot = RimProject::current();
for ( size_t i = 0; i < referenceList.size(); i++ )
{

2
ApplicationCode/Commands/PlotTemplateCommands/RicReloadPlotTemplatesFeature.cpp
View File

@ -33,7 +33,7 @@ CAF_CMD_SOURCE_INIT( RicReloadPlotTemplatesFeature, "RicReloadPlotTemplatesFeatu
//--------------------------------------------------------------------------------------------------
void RicReloadPlotTemplatesFeature::rebuildFromDisc()
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RiaPreferences* prefs = RiaApplication::instance()->preferences();
proj->setPlotTemplateFolders( prefs->plotTemplateFolders() );

3
ApplicationCode/Commands/PlotTemplateCommands/RicSelectPlotTemplateUi.cpp
View File

@ -18,7 +18,6 @@
#include "RicSelectPlotTemplateUi.h"
#include "RiaApplication.h"
#include "RiaSummaryTools.h"
#include "PlotTemplates/RimPlotTemplateFileItem.h"
@ -74,7 +73,7 @@ QList<caf::PdmOptionItemInfo>
if ( fieldNeedingOptions == &m_selectedPlotTemplates )
{
auto plotTemplateRoot = RiaApplication::instance()->project()->rootPlotTemlateItem();
auto plotTemplateRoot = RimProject::current()->rootPlotTemlateItem();
RimPlotTemplateFolderItem::appendOptionItemsForPlotTemplates( options, plotTemplateRoot );
}

2
ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp
View File

@ -92,7 +92,7 @@ void RicSummaryPlotTemplateTools::appendSummaryPlotToPlotCollection(
if ( selectedSummaryCases.empty() && selectedEnsembles.empty() ) return;
RimSummaryPlotCollection* plotColl =
RiaApplication::instance()->project()->mainPlotCollection()->summaryPlotCollection();
RimProject::current()->mainPlotCollection()->summaryPlotCollection();
plotColl->summaryPlots.push_back( summaryPlot );
summaryPlot->resolveReferencesRecursively();

10
ApplicationCode/Commands/RicCloseCaseFeature.cpp
View File

@ -19,8 +19,6 @@
#include "RicCloseCaseFeature.h"
#include "RiaApplication.h"
#include "RimAdvancedSnapshotExportDefinition.h"
#include "RimCaseCollection.h"
#include "RimEclipseCase.h"
@ -129,7 +127,7 @@ void RicCloseCaseFeature::removeCaseFromAllGroups( RimEclipseCase* eclipseCase )
{
CVF_ASSERT( eclipseCase );
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimOilField* activeOilField = proj ? proj->activeOilField() : nullptr;
RimEclipseCaseCollection* analysisModels = ( activeOilField ) ? activeOilField->analysisModels() : nullptr;
if ( analysisModels )
@ -190,7 +188,7 @@ void RicCloseCaseFeature::deleteEclipseCase( RimEclipseCase* eclipseCase )
RimEclipseResultCase* resultCase = dynamic_cast<RimEclipseResultCase*>( eclipseCase );
if ( resultCase )
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
RimSummaryCaseMainCollection* sumCaseColl =
project->activeOilField() ? project->activeOilField()->summaryCaseMainCollection() : nullptr;
if ( sumCaseColl )
@ -207,7 +205,7 @@ void RicCloseCaseFeature::deleteEclipseCase( RimEclipseCase* eclipseCase )
delete eclipseCase;
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
std::vector<RimCase*> cases;
project->allCases( cases );
@ -233,7 +231,7 @@ void RicCloseCaseFeature::deleteGeoMechCase( RimGeoMechCase* geoMechCase )
{
CVF_ASSERT( geoMechCase );
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimOilField* activeOilField = proj ? proj->activeOilField() : nullptr;
RimGeoMechModels* models = ( activeOilField ) ? activeOilField->geoMechModels() : nullptr;
if ( models )

3
ApplicationCode/Commands/RicCloseObservedDataFeature.cpp
View File

@ -18,7 +18,6 @@
#include "RicCloseObservedDataFeature.h"
#include "RiaApplication.h"
#include "RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
@ -77,7 +76,7 @@ void RicCloseObservedDataFeature::deleteObservedSummaryData( const std::vector<R
//--------------------------------------------------------------------------------------------------
void RicCloseObservedDataFeature::deleteObservedRmuRftData( const std::vector<RimObservedFmuRftData*>& data )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimRftPlotCollection* rftPlotColl = proj->mainPlotCollection()->rftPlotCollection();
for ( RimObservedFmuRftData* observedData : data )

1
ApplicationCode/Commands/RicConvertGroupToEnsembleFeature.cpp
View File

@ -18,7 +18,6 @@
#include "RicConvertGroupToEnsembleFeature.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RicCreateSummaryCaseCollectionFeature.h"

2
ApplicationCode/Commands/RicCreateSummaryCaseCollectionFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicCreateSummaryCaseCollectionFeature.h"
#include "RiaApplication.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"

4
ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp
View File

@ -120,10 +120,10 @@ void RicCreateTemporaryLgrFeature::updateViews( RimEclipseCase* eclipseCase )
app->clearAllSelections();
deleteAllCachedData( eclipseCase );
RiaApplication::instance()->project()->mainPlotCollection()->deleteAllCachedData();
RimProject::current()->mainPlotCollection()->deleteAllCachedData();
computeCachedData( eclipseCase );
RiaApplication::instance()->project()->mainPlotCollection()->wellLogPlotCollection()->reloadAllPlots();
RimProject::current()->mainPlotCollection()->wellLogPlotCollection()->reloadAllPlots();
for ( const auto& v : eclipseCase->views() )
{

4
ApplicationCode/Commands/RicCreateUserDefinedPolylinesAnnotationFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicCreateUserDefinedPolylinesAnnotationFeature.h"
#include "RiaApplication.h"
#include "RimAnnotationCollection.h"
#include "RimAnnotationInViewCollection.h"
#include "RimOilField.h"
@ -74,7 +72,7 @@ void RicCreateUserDefinedPolylinesAnnotationFeature::setupActionLook( QAction* a
//--------------------------------------------------------------------------------------------------
RimAnnotationCollection* RicCreateUserDefinedPolylinesAnnotationFeature::annotationCollection() const
{
auto project = RiaApplication::instance()->project();
auto project = RimProject::current();
auto oilField = project->activeOilField();
return oilField ? oilField->annotationCollection() : nullptr;
}

2
ApplicationCode/Commands/RicDeleteSummaryCaseCollectionFeature.cpp
View File

@ -18,8 +18,6 @@
#include "RicDeleteSummaryCaseCollectionFeature.h"
#include "RiaApplication.h"
#include "RiaSummaryTools.h"
#include "RimDerivedEnsembleCaseCollection.h"

2
ApplicationCode/Commands/RicExportContourMapToTextUi.cpp
View File

@ -1,7 +1,5 @@
#include "RicExportContourMapToTextUi.h"
#include "RiaApplication.h"
#include "cafPdmUiFilePathEditor.h"
CAF_PDM_SOURCE_INIT( RicExportContourMapToTextUi, "RicExportContourMapToTextUi" );

2
ApplicationCode/Commands/RicGridStatisticsDialog.cpp
View File

@ -21,8 +21,6 @@
#include "ExportCommands/RicSnapshotViewToClipboardFeature.h"
#include "ExportCommands/RicSnapshotViewToFileFeature.h"
#include "RiaApplication.h"
#include "Rim3dOverlayInfoConfig.h"
#include "RimEclipseView.h"

2
ApplicationCode/Commands/RicImportEnsembleFeature.cpp
View File

@ -108,7 +108,7 @@ void RicImportEnsembleFeature::setupActionLook( QAction* actionToSetup )
//--------------------------------------------------------------------------------------------------
QString RicImportEnsembleFeature::askForEnsembleName()
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
std::vector<RimSummaryCaseCollection*> groups = project->summaryGroups();
int ensembleCount = std::count_if( groups.begin(), groups.end(), []( RimSummaryCaseCollection* group ) {
return group->isEnsemble();

4
ApplicationCode/Commands/RicImportFormationNamesFeature.cpp
View File

@ -45,7 +45,7 @@ CAF_CMD_SOURCE_INIT( RicImportFormationNamesFeature, "RicImportFormationNamesFea
//--------------------------------------------------------------------------------------------------
RimFormationNames* RicImportFormationNamesFeature::importFormationFiles( const QStringList& fileNames )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimFormationNamesCollection* fomNameColl = proj->activeOilField()->formationNamesCollection();
if ( !fomNameColl )
{
@ -97,7 +97,7 @@ void RicImportFormationNamesFeature::onActionTriggered( bool isChecked )
if ( formationName )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimCase*> cases;
proj->allCases( cases );

Some files were not shown because too many files have changed in this diff Show More