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

#2470 2D Intersection Views: Hide the item when no intersections are present

Browse Source
This commit is contained in:
Rebecca Cox 2018-02-15 14:37:38 +01:00
parent f909a7ea27
commit 0fece2447a
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp
View File

@ -110,6 +110,11 @@ void Rim2dIntersectionViewCollection::syncFromExistingIntersections( bool doUpda
} }
if (doUpdate) this->updateConnectedEditors(); if (doUpdate) this->updateConnectedEditors();
RimCase* rimCase = nullptr;
firstAncestorOrThisOfType(rimCase);
if (rimCase) rimCase->updateConnectedEditors();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

6
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -30,6 +30,7 @@
#include "RigMainGrid.h" #include "RigMainGrid.h"
#include "RigSimWellData.h" #include "RigSimWellData.h"
#include "Rim2dIntersectionViewCollection.h"
#include "RimCaseCollection.h" #include "RimCaseCollection.h"
#include "RimCellEdgeColors.h" #include "RimCellEdgeColors.h"
#include "RimCommandObject.h" #include "RimCommandObject.h"
@ -415,9 +416,14 @@ void RimEclipseCase::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
for (auto child : children) uiTreeOrdering.add(child); for (auto child : children) uiTreeOrdering.add(child);
if (!m_2dIntersectionViewCollection->views().empty())
{
uiTreeOrdering.add(&m_2dIntersectionViewCollection); uiTreeOrdering.add(&m_2dIntersectionViewCollection);
} }
uiTreeOrdering.skipRemainingChildren(true);
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

18
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@ -26,20 +26,21 @@
#include "RigFemPartCollection.h" #include "RigFemPartCollection.h"
#include "RigFemPartResultsCollection.h" #include "RigFemPartResultsCollection.h"
#include "RigGeoMechCaseData.h"
#include "RigFormationNames.h" #include "RigFormationNames.h"
#include "RigGeoMechCaseData.h"
#include "Rim2dIntersectionViewCollection.h"
#include "RimFormationNames.h"
#include "RimGeoMechCellColors.h"
#include "RimGeoMechPropertyFilter.h"
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimGeoMechResultDefinition.h"
#include "RimGeoMechView.h" #include "RimGeoMechView.h"
#include "RimIntersectionCollection.h" #include "RimIntersectionCollection.h"
#include "RimMainPlotCollection.h" #include "RimMainPlotCollection.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimTools.h" #include "RimTools.h"
#include "RimWellLogPlotCollection.h" #include "RimWellLogPlotCollection.h"
#include "RimFormationNames.h"
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimGeoMechCellColors.h"
#include "RimGeoMechResultDefinition.h"
#include "RimGeoMechPropertyFilter.h"
#include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiTreeOrdering.h" #include "cafPdmUiTreeOrdering.h"
@ -228,9 +229,14 @@ void RimGeoMechCase::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
for ( auto child : children ) uiTreeOrdering.add(child); for ( auto child : children ) uiTreeOrdering.add(child);
if (!m_2dIntersectionViewCollection->views().empty())
{
uiTreeOrdering.add(&m_2dIntersectionViewCollection); uiTreeOrdering.add(&m_2dIntersectionViewCollection);
} }
uiTreeOrdering.skipRemainingChildren(true);
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------