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

Use helper function to get polygon collection

Browse Source
This commit is contained in:
Magne Sjaastad
2025-02-20 07:44:33 +01:00
parent 0b6578bcb2
commit 1273e98bce
8 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp
View File

@@ -25,12 +25,11 @@
#include "RimAnnotationInViewCollection.h"
#include "RimAnnotationLineAppearance.h"
#include "RimGridView.h"
#include "RimOilField.h"
#include "RimPolylineTarget.h"
#include "RimPolylinesFromFileAnnotation.h"
#include "RimProject.h"
#include "RimReachCircleAnnotation.h"
#include "RimTextAnnotation.h"
#include "RimTools.h"
#include "RimUserDefinedPolylinesAnnotation.h"
#include "Polygons/RimPolygon.h"
@@ -79,7 +78,7 @@ RimAnnotationCollection::~RimAnnotationCollection()
//--------------------------------------------------------------------------------------------------
void RimAnnotationCollection::initAfterRead()
{
auto polycoll = RimProject::current()->activeOilField()->polygonCollection();
auto polycoll = RimTools::polygonCollection();
for ( auto oldPolyObj : m_userDefinedPolylineAnnotations_OBSOLETE->annotations() )
{

5
ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp
View File

@@ -24,9 +24,9 @@
#include "RimCellFilter.h"
#include "RimCellIndexFilter.h"
#include "RimCellRangeFilter.h"
#include "RimOilField.h"
#include "RimPolygonFilter.h"
#include "RimProject.h"
#include "RimTools.h"
#include "RimUserDefinedFilter.h"
#include "RimUserDefinedIndexFilter.h"
#include "RimViewController.h"
@@ -144,8 +144,7 @@ void RimCellFilterCollection::appendMenuItems( caf::CmdFeatureMenuBuilder& menuB
menuBuilder.subMenuStart( "Polygon Filter", QIcon( ":/CellFilter_Polygon.png" ) );
{
auto project = RimProject::current();
auto polygonCollection = project->activeOilField()->polygonCollection();
auto polygonCollection = RimTools::polygonCollection();
for ( auto p : polygonCollection->allPolygons() )
{
if ( !p ) continue;

8
ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp
View File

@@ -44,8 +44,6 @@
#include "RimEclipseCaseEnsemble.h"
#include "RimEclipseContourMapProjection.h"
#include "RimEclipseResultDefinition.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimSimWellInViewCollection.h"
#include "RimStatisticsContourMapProjection.h"
#include "RimStatisticsContourMapView.h"
@@ -213,8 +211,7 @@ void RimStatisticsContourMap::defineUiOrdering( QString uiConfigName, caf::PdmUi
if ( m_enableFormationFilter ) formationGrp->add( &m_selectedFormations );
}
RimProject* proj = RimProject::current();
if ( auto polygonCollection = proj->activeOilField()->polygonCollection().p() )
if ( auto polygonCollection = RimTools::polygonCollection() )
{
if ( !polygonCollection->allPolygons().empty() )
{
@@ -389,8 +386,7 @@ QList<caf::PdmOptionItemInfo> RimStatisticsContourMap::calculateValueOptions( co
}
else if ( &m_selectedPolygons == fieldNeedingOptions )
{
RimProject* proj = RimProject::current();
if ( auto polygonCollection = proj->activeOilField()->polygonCollection().p() )
if ( auto polygonCollection = RimTools::polygonCollection() )
{
for ( auto p : polygonCollection->allPolygons() )
{

6
ApplicationLibCode/ProjectDataModel/RimTools.cpp
View File

@@ -558,8 +558,7 @@ RimWellPath* RimTools::firstWellPath()
//--------------------------------------------------------------------------------------------------
RimSurfaceCollection* RimTools::surfaceCollection()
{
RimProject* proj = RimProject::current();
return proj->activeOilField()->surfaceCollection();
return RimProject::current()->activeOilField()->surfaceCollection();
}
//--------------------------------------------------------------------------------------------------
@@ -567,8 +566,7 @@ RimSurfaceCollection* RimTools::surfaceCollection()
//--------------------------------------------------------------------------------------------------
RimPolygonCollection* RimTools::polygonCollection()
{
RimProject* proj = RimProject::current();
return proj->activeOilField()->polygonCollection();
return RimProject::current()->activeOilField()->polygonCollection();
}
//--------------------------------------------------------------------------------------------------