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

#3766 Hide blank grid children in GeoMech cases

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-11-27 13:39:11 +01:00
parent 70eca210bf
commit 5498c2f466
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -851,7 +851,7 @@ bool RimEclipseCase::openReserviorCase()
descendantsIncludingThisOfType(gridColls); descendantsIncludingThisOfType(gridColls);
for (RimGridCollection* gridCollection : gridColls) for (RimGridCollection* gridCollection : gridColls)
{ {
gridCollection->syncFromMainGrid(); gridCollection->syncFromMainEclipseGrid();
} }
} }

27
ApplicationCode/ProjectDataModel/RimGridCollection.cpp
View File

@ -361,9 +361,9 @@ caf::PdmFieldHandle* RimGridCollection::objectToggleField()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimGridCollection::syncFromMainGrid() void RimGridCollection::syncFromMainEclipseGrid()
{ {
auto mainGrid = this->mainGrid(); auto mainGrid = this->mainEclipseGrid();
if (mainGrid) if (mainGrid)
{ {
m_mainGrid->setName("Main Grid"); m_mainGrid->setName("Main Grid");
@ -471,14 +471,17 @@ void RimGridCollection::initAfterRead()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimGridCollection::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/) void RimGridCollection::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
{ {
uiTreeOrdering.add(m_mainGrid()); if (mainEclipseGrid())
if (hasPersistentLgrs())
{ {
uiTreeOrdering.add(m_persistentLgrs()); uiTreeOrdering.add(m_mainGrid());
} if (hasPersistentLgrs())
if (hasTemporaryLgrs()) {
{ uiTreeOrdering.add(m_persistentLgrs());
uiTreeOrdering.add(m_temporaryLgrs()); }
if (hasTemporaryLgrs())
{
uiTreeOrdering.add(m_temporaryLgrs());
}
} }
uiTreeOrdering.skipRemainingChildren(true); uiTreeOrdering.skipRemainingChildren(true);
} }
@ -486,7 +489,7 @@ void RimGridCollection::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrder
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const RigMainGrid* RimGridCollection::mainGrid() const const RigMainGrid* RimGridCollection::mainEclipseGrid() const
{ {
RimEclipseCase* eclipseCase; RimEclipseCase* eclipseCase;
firstAncestorOrThisOfType(eclipseCase); firstAncestorOrThisOfType(eclipseCase);
@ -498,7 +501,7 @@ const RigMainGrid* RimGridCollection::mainGrid() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimGridCollection::hasPersistentLgrs() const bool RimGridCollection::hasPersistentLgrs() const
{ {
auto mainGrid = this->mainGrid(); auto mainGrid = this->mainEclipseGrid();
if (!mainGrid) return false; if (!mainGrid) return false;
for (size_t i = 1; i < mainGrid->gridCount(); i++) for (size_t i = 1; i < mainGrid->gridCount(); i++)
@ -514,7 +517,7 @@ bool RimGridCollection::hasPersistentLgrs() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimGridCollection::hasTemporaryLgrs() const bool RimGridCollection::hasTemporaryLgrs() const
{ {
auto mainGrid = this->mainGrid(); auto mainGrid = this->mainEclipseGrid();
if (!mainGrid) return false; if (!mainGrid) return false;
for (size_t i = 1; i < mainGrid->gridCount(); i++) for (size_t i = 1; i < mainGrid->gridCount(); i++)

4
ApplicationCode/ProjectDataModel/RimGridCollection.h
View File

@ -103,7 +103,7 @@ public:
std::vector<size_t> indicesToVisibleGrids() const; std::vector<size_t> indicesToVisibleGrids() const;
caf::PdmFieldHandle* objectToggleField() override; caf::PdmFieldHandle* objectToggleField() override;
void syncFromMainGrid(); void syncFromMainEclipseGrid();
void setMainGridActive(bool active); void setMainGridActive(bool active);
static const QString persistentGridUiName(); static const QString persistentGridUiName();
@ -115,7 +115,7 @@ protected:
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
private: private:
const RigMainGrid* mainGrid() const; const RigMainGrid* mainEclipseGrid() const;
bool hasPersistentLgrs() const; bool hasPersistentLgrs() const;
bool hasTemporaryLgrs() const; bool hasTemporaryLgrs() const;