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

Fixes #6520.

Browse Source
This commit is contained in:
rubenthoms 2020-09-18 14:43:15 +02:00 committed by Magne Sjaastad
parent 7aa0f33811
commit 409db46ab3
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimGridView.cpp
View File

@ -551,7 +551,7 @@ void RimGridView::updateSurfacesInViewTreeItems()
RimProject* proj = RimProject::current(); RimProject* proj = RimProject::current();
RimSurfaceCollection* surfColl = proj->activeOilField()->surfaceCollection(); RimSurfaceCollection* surfColl = proj->activeOilField()->surfaceCollection();
if ( surfColl && surfColl->surfaces().size() ) if ( surfColl && surfColl->containsSurface() )
{ {
if ( !m_surfaceCollection() ) if ( !m_surfaceCollection() )
{ {

14
ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp
View File

@ -432,3 +432,17 @@ RimSurfaceCollection* RimSurfaceCollection::getSubCollection( const QString name
return nullptr; return nullptr;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSurfaceCollection::containsSurface()
{
bool containsSurface = ( surfaces().size() > 0 );
for ( auto coll : m_subCollections )
{
containsSurface |= coll->containsSurface();
}
return containsSurface;
}

2
ApplicationCode/ProjectDataModel/Surfaces/RimSurfaceCollection.h
View File

@ -44,6 +44,8 @@ public:
void addSubCollection( RimSurfaceCollection* collection ); void addSubCollection( RimSurfaceCollection* collection );
RimSurfaceCollection* getSubCollection( const QString name ); RimSurfaceCollection* getSubCollection( const QString name );
bool containsSurface();
void reloadSurfaces( std::vector<RimSurface*> surfaces ); void reloadSurfaces( std::vector<RimSurface*> surfaces );
void removeSurface( RimSurface* surface ); void removeSurface( RimSurface* surface );