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

14
ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp
View File

@@ -80,11 +80,8 @@ caf::PdmFieldHandle* RimSurfaceInViewCollection::userDescriptionField()
//--------------------------------------------------------------------------------------------------
void RimSurfaceInViewCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ )
{
RimGridView* gridView = nullptr;
this->firstAncestorOfType( gridView );
RimSurfaceInViewCollection* surfViewColl = nullptr;
this->firstAncestorOfType( surfViewColl );
auto gridView = firstAncestorOfType<RimGridView>();
auto surfViewColl = firstAncestorOfType<RimSurfaceInViewCollection>();
if ( gridView && !surfViewColl )
{
@@ -136,7 +133,7 @@ void RimSurfaceInViewCollection::updateAllViewItems()
void RimSurfaceInViewCollection::syncCollectionsWithView()
{
// check that we have surface in view collections for all sub-collections
std::vector<RimSurfaceInViewCollection*> colls = m_collectionsInView.children();
std::vector<RimSurfaceInViewCollection*> colls = m_collectionsInView.childrenByType();
for ( auto surfcoll : colls )
{
@@ -187,7 +184,7 @@ void RimSurfaceInViewCollection::syncSurfacesWithView()
{
// Delete surfaceInView without any real Surface connection
std::vector<RimSurfaceInView*> surfsInView = m_surfacesInView.children();
std::vector<RimSurfaceInView*> surfsInView = m_surfacesInView.childrenByType();
for ( auto surf : surfsInView )
{
@@ -314,8 +311,7 @@ void RimSurfaceInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* ch
if ( changedField == &m_isChecked )
{
RimGridView* ownerView;
this->firstAncestorOrThisOfTypeAsserted( ownerView );
auto ownerView = firstAncestorOrThisOfTypeAsserted<RimGridView>();
ownerView->scheduleCreateDisplayModelAndRedraw();
}
}