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

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 )
{