diff --git a/ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp b/ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp index f9086a442f..4761a287ee 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp @@ -22,6 +22,7 @@ #include "RimEclipseCase.h" #include "RimEclipseCellColors.h" #include "RimEclipseView.h" +#include "RimFaultInViewCollection.h" #include "RiuMainWindow.h" @@ -121,6 +122,13 @@ void RimEclipseFaultColors::defineUiOrdering( QString uiConfigName, caf::PdmUiOr { caf::PdmUiGroup* group1 = uiOrdering.addNewGroup( "Result" ); m_customFaultResultColors->uiOrdering( uiConfigName, *group1 ); + + RimEclipseView* eclipseView = nullptr; + this->firstAncestorOfType( eclipseView ); + if ( eclipseView ) + { + eclipseView->faultCollection()->uiOrderingFaults( uiConfigName, uiOrdering ); + } } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index 183e152cd0..6072791393 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -1100,6 +1100,7 @@ QString RimEclipseView::createAutoName() const void RimEclipseView::onUpdateDisplayModelVisibility() { faultCollection()->updateConnectedEditors(); + m_faultResultSettings->updateConnectedEditors(); // This is required to update the read-only state of simulation wells // when a range filter is manipulated and visible simulation wells might change diff --git a/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.cpp b/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.cpp index ee8d220188..f563f20e46 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.cpp @@ -348,7 +348,7 @@ bool RimFaultInViewCollection::isGridVisualizationMode() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFaultInViewCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) +void RimFaultInViewCollection::uiOrderingFaults( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { bool isGridVizMode = isGridVisualizationMode(); @@ -356,6 +356,23 @@ void RimFaultInViewCollection::defineUiOrdering( QString uiConfigName, caf::PdmU showFaultFaces.uiCapability()->setUiReadOnly( isGridVizMode ); showOppositeFaultFaces.uiCapability()->setUiReadOnly( isGridVizMode ); + caf::PdmUiGroup* ffviz = uiOrdering.addNewGroup( "Fault Face Visibility" ); + ffviz->setCollapsedByDefault( true ); + ffviz->add( &showFaultFaces ); + ffviz->add( &showOppositeFaultFaces ); + ffviz->add( &faultResult ); + + caf::PdmUiGroup* nncViz = uiOrdering.addNewGroup( "NNC Visibility" ); + nncViz->setCollapsedByDefault( true ); + nncViz->add( &showNNCs ); + nncViz->add( &hideNncsWhenNoResultIsAvailable ); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimFaultInViewCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) +{ caf::PdmUiGroup* labs = uiOrdering.addNewGroup( "Fault Labels" ); labs->add( &showFaultLabel ); labs->add( &faultLabelColor ); @@ -363,14 +380,7 @@ void RimFaultInViewCollection::defineUiOrdering( QString uiConfigName, caf::PdmU caf::PdmUiGroup* adv = uiOrdering.addNewGroup( "Fault Options" ); adv->add( &m_showFaultsOutsideFilters ); - caf::PdmUiGroup* ffviz = uiOrdering.addNewGroup( "Fault Face Visibility" ); - ffviz->add( &showFaultFaces ); - ffviz->add( &showOppositeFaultFaces ); - ffviz->add( &faultResult ); - - caf::PdmUiGroup* nncViz = uiOrdering.addNewGroup( "NNC Visibility" ); - nncViz->add( &showNNCs ); - nncViz->add( &hideNncsWhenNoResultIsAvailable ); + uiOrderingFaults( uiConfigName, uiOrdering ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.h b/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.h index f1cc93fe41..54c33644da 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.h +++ b/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.h @@ -79,6 +79,8 @@ public: caf::PdmChildField noCommonAreaNnncCollection; + void uiOrderingFaults( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ); + private: void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue,