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

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 )