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

20
ApplicationLibCode/Commands/WellLogCommands/RicWellLogFileCloseFeature.cpp
View File

@@ -55,9 +55,7 @@ void RicWellLogFileCloseFeature::onActionTriggered( bool isChecked )
for ( const auto& wellLogFile : objects )
{
RimWellPath* parentWellPath;
wellLogFile->firstAncestorOrThisOfType( parentWellPath );
RimWellPath* parentWellPath = wellLogFile->firstAncestorOrThisOfType<RimWellPath>();
if ( parentWellPath )
{
std::set<RimViewWindow*> referringPlots = referringWellLogPlots( wellLogFile );
@@ -90,21 +88,15 @@ void RicWellLogFileCloseFeature::setupActionLook( QAction* actionToSetup )
std::set<RimViewWindow*> RicWellLogFileCloseFeature::referringWellLogPlots( const RimWellLogFile* wellLogFile )
{
// Remove all curves displaying data from the specified wellLogFile
std::vector<caf::PdmObjectHandle*> referringObjects;
wellLogFile->objectsWithReferringPtrFields( referringObjects );
std::vector<caf::PdmObjectHandle*> referringObjects = wellLogFile->objectsWithReferringPtrFields();
std::set<RimViewWindow*> plots;
for ( const auto& obj : referringObjects )
{
RimWellAllocationPlot* allocationPlot;
RimWellPltPlot* pltPlot;
RimWellRftPlot* rftPlot;
RimWellLogPlot* wellLogPlot;
obj->firstAncestorOrThisOfType( allocationPlot );
obj->firstAncestorOrThisOfType( pltPlot );
obj->firstAncestorOrThisOfType( rftPlot );
obj->firstAncestorOrThisOfType( wellLogPlot );
RimWellAllocationPlot* allocationPlot = obj->firstAncestorOrThisOfType<RimWellAllocationPlot>();
RimWellPltPlot* pltPlot = obj->firstAncestorOrThisOfType<RimWellPltPlot>();
RimWellRftPlot* rftPlot = obj->firstAncestorOrThisOfType<RimWellRftPlot>();
RimWellLogPlot* wellLogPlot = obj->firstAncestorOrThisOfType<RimWellLogPlot>();
RimViewWindow* plot = allocationPlot ? dynamic_cast<RimViewWindow*>( allocationPlot )
: pltPlot ? dynamic_cast<RimViewWindow*>( pltPlot )