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

Change API for PdmObjectHandle and PdmFieldHandle

Browse Source 
* Refactor interface to PdmObjectHandle and PdmFieldHandle
Return objects instead of passing in structures as parameters

* Add nodiscard to several functions
* Remove redundant this->
* Rename to ptrReferencedObjectsByType
This commit is contained in:
Magne Sjaastad
2023-05-12 21:41:34 +02:00
committed by GitHub
parent 37e29a0f68
commit 0c90f67dcc
510 changed files with 1651 additions and 3111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/ProjectDataModelCommands/RimcIntersection.cpp
View File

@@ -221,8 +221,7 @@ caf::PdmObjectHandle* RimcExtrudedCurveIntersection_geometry::execute()
}
{
RimEclipseView* eclView = nullptr;
intersection->firstAncestorOfType( eclView );
auto eclView = intersection->firstAncestorOfType<RimEclipseView>();
if ( eclView && eclView->eclipseCase() )
{
auto offset = eclView->eclipseCase()->displayModelOffset();
@@ -305,8 +304,7 @@ caf::PdmObjectHandle* RimcExtrudedCurveIntersection_geometryResult::execute()
auto geoGenerator = RimcExtrudedCurveIntersection_geometry::createGeometryGenerator( intersection, m_geometryType() );
if ( geoGenerator && geoGenerator->isAnyGeometryPresent() )
{
RimEclipseView* eclView = nullptr;
intersection->firstAncestorOfType( eclView );
auto eclView = intersection->firstAncestorOfType<RimEclipseView>();
if ( !eclView )
{
RiaLogging::error( "No Eclipse view found. Extraction of intersection result is only supported for "

3
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.cpp
View File

@@ -54,8 +54,7 @@ caf::PdmObjectHandle* RimcStimPlanModelCollection_appendStimPlanModel::execute()
RimStimPlanModelCollection* stimPlanModelCollection = self<RimStimPlanModelCollection>();
if ( m_wellPath )
{
RimWellPathCollection* wellPathCollection = nullptr;
stimPlanModelCollection->firstAncestorOrThisOfTypeAsserted( wellPathCollection );
auto wellPathCollection = stimPlanModelCollection->firstAncestorOrThisOfTypeAsserted<RimWellPathCollection>();
stimPlanModel = RicNewStimPlanModelFeature::addStimPlanModel( m_wellPath, wellPathCollection );
}

2
ApplicationLibCode/ProjectDataModelCommands/RimcSummaryPlotCollection.cpp
View File

@@ -69,7 +69,7 @@ caf::PdmObjectHandle* RimcSummaryPlotCollection_newSummaryPlot::execute()
}
if ( !m_summaryCases.empty() )
{
std::vector<RimSummaryCase*> summaryCases = m_summaryCases.ptrReferencedObjects();
std::vector<RimSummaryCase*> summaryCases = m_summaryCases.ptrReferencedObjectsByType();
if ( !addressStrings.empty() )
{
newPlot = RicSummaryPlotFeatureImpl::createSummaryPlotForCases( summaryCases, addressStrings );