OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-25 14:40:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: migrate five collections to caf::PdmObjectCollection<T>

Browse Source 
RimEnsembleFileSetCollection, RimJobCollection, RimQuickAccessCollection,
RimRefinementRegionCollection and RimFractureTemplateCollection now inherit
from the templated caf::PdmObjectCollection<T> base, reusing the shared
add/insert/delete/items plumbing introduced for RimValveTemplateCollection.

XML field keywords are preserved on every collection so existing project
files continue to load.
This commit is contained in:
Kristian Bendiksen committed 2026-05-11 13:42:13 +02:00
1 parent 8f4008db0f
commit ddd413cb0b
10 files changed
+59 -96
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/RimRefinementRegionCollection.cpp
+9 -12
View File
@@ -40,7 +40,7 @@ RimRefinementRegionCollection::RimRefinementRegionCollection()
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Show Regions in 3D View" );
m_isActive.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_regions, "Regions", "Regions" );
CAF_PDM_InitFieldNoDefault( &m_items, "Regions", "Regions" );
}
//--------------------------------------------------------------------------------------------------
@@ -56,7 +56,7 @@ bool RimRefinementRegionCollection::isActive() const
//--------------------------------------------------------------------------------------------------
bool RimRefinementRegionCollection::shouldBeVisibleInTree() const
{
return !m_regions.empty();
return !isEmpty();
}
//--------------------------------------------------------------------------------------------------
@@ -64,7 +64,7 @@ bool RimRefinementRegionCollection::shouldBeVisibleInTree() const
//--------------------------------------------------------------------------------------------------
std::vector<RimRefinementRegion*> RimRefinementRegionCollection::regions() const
{
return m_regions.childrenByType();
return items();
}
//--------------------------------------------------------------------------------------------------
@@ -73,7 +73,7 @@ std::vector<RimRefinementRegion*> RimRefinementRegionCollection::regions() const
std::vector<RimRefinementRegion*> RimRefinementRegionCollection::activeRegions() const
{
std::vector<RimRefinementRegion*> result;
for ( auto r : m_regions )
for ( auto r : m_items )
{
if ( r && r->isActive() ) result.push_back( r );
}
@@ -86,15 +86,14 @@ std::vector<RimRefinementRegion*> RimRefinementRegionCollection::activeRegions()
RimRefinementRegion* RimRefinementRegionCollection::addNewRegion( RimEclipseCase* eclipseCase )
{
auto* region = new RimRefinementRegion();
region->setRegionName( QString( "Region %1" ).arg( m_regions.size() + 1 ) );
m_regions.push_back( region );
region->setRegionName( QString( "Region %1" ).arg( count() + 1 ) );
addItem( region );
// Defaults depend on the case's grid; set after the region is inserted into the tree so
// that view/case ancestor lookups work inside the region.
region->setDefaultsFromCase( eclipseCase );
updateConnectedEditors();
// Visibility of this collection in the parent view's tree depends on m_regions being non-empty,
// Visibility of this collection in the parent view's tree depends on m_items being non-empty,
// so refresh the parent so the folder appears when the first region is added.
if ( auto* view = firstAncestorOrThisOfType<Rim3dView>() ) view->updateConnectedEditors();
return region;
@@ -105,7 +104,7 @@ RimRefinementRegion* RimRefinementRegionCollection::addNewRegion( RimEclipseCase
//--------------------------------------------------------------------------------------------------
void RimRefinementRegionCollection::addRegion( RimRefinementRegion* region )
{
if ( region ) m_regions.push_back( region );
addItem( region );
}
//--------------------------------------------------------------------------------------------------
@@ -114,9 +113,7 @@ void RimRefinementRegionCollection::addRegion( RimRefinementRegion* region )
void RimRefinementRegionCollection::removeRegion( RimRefinementRegion* region )
{
if ( !region ) return;
m_regions.removeChild( region );
delete region;
updateConnectedEditors();
deleteItem( region );
if ( auto* view = firstAncestorOrThisOfType<Rim3dView>() ) view->updateConnectedEditors();
}