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

Surface Folders

Browse Source 
* #7978 Ensemble Surface : Use collection instead of specialized class
* Review updates
This commit is contained in:
Magne Sjaastad
2021-09-13 10:16:09 +02:00
committed by GitHub
parent 41f80e7d89
commit 7b1185cec4
19 changed files with 219 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp
View File

@@ -58,9 +58,6 @@ RimSurfaceCollection::RimSurfaceCollection()
CAF_PDM_InitScriptableFieldNoDefault( &m_surfaces, "SurfacesField", "Surfaces", "", "", "" );
m_surfaces.uiCapability()->setUiTreeHidden( true );
CAF_PDM_InitScriptableFieldNoDefault( &m_ensembleSurfaces, "EnsembleSurfaces", "Ensemble Surfaces", "", "", "" );
m_ensembleSurfaces.uiCapability()->setUiTreeHidden( true );
setDeletable( true );
}
@@ -117,7 +114,7 @@ void RimSurfaceCollection::addSurface( RimSurface* surface )
//--------------------------------------------------------------------------------------------------
void RimSurfaceCollection::addEnsembleSurface( RimEnsembleSurface* ensembleSurface )
{
m_ensembleSurfaces.push_back( ensembleSurface );
addSubCollection( ensembleSurface );
}
//--------------------------------------------------------------------------------------------------
@@ -265,14 +262,6 @@ std::vector<RimSurfaceCollection*> RimSurfaceCollection::subCollections() const
return m_subCollections.childObjects();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimEnsembleSurface*> RimSurfaceCollection::ensembleSurfaces() const
{
return m_ensembleSurfaces.childObjects();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -283,9 +272,9 @@ void RimSurfaceCollection::loadData()
surf->loadDataIfRequired();
}
for ( auto ensSurf : m_ensembleSurfaces )
for ( auto subColl : m_subCollections )
{
ensSurf->loadDataAndUpdate();
subColl->loadData();
}
}
@@ -479,7 +468,7 @@ void RimSurfaceCollection::addSubCollection( RimSurfaceCollection* subcoll )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSurfaceCollection* RimSurfaceCollection::getSubCollection( const QString name )
RimSurfaceCollection* RimSurfaceCollection::getSubCollection( const QString& name ) const
{
for ( auto coll : m_subCollections )
{
@@ -489,6 +478,19 @@ RimSurfaceCollection* RimSurfaceCollection::getSubCollection( const QString name
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSurfaceCollection::deleteSubCollection( const QString& name )
{
auto coll = getSubCollection( name );
if ( coll )
{
auto index = m_subCollections.index( coll );
m_subCollections.erase( index );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -501,11 +503,6 @@ bool RimSurfaceCollection::containsSurface()
containsSurface |= coll->containsSurface();
}
for ( auto ensSurf : m_ensembleSurfaces )
{
containsSurface |= ( ensSurf->surfaces().size() > 0 );
}
return containsSurface;
}