diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp index 4019860dad..a41b7d44ee 100644 --- a/ApplicationCode/Application/RiaPreferences.cpp +++ b/ApplicationCode/Application/RiaPreferences.cpp @@ -237,6 +237,9 @@ RiaPreferences::RiaPreferences( void ) CAF_PDM_InitField( &m_showLegendBackground, "showLegendBackground", true, "Show Box around Legends", "", "", "" ); m_showLegendBackground.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + CAF_PDM_InitField( &m_enableFaultsByDefault, "enableFaultsByDefault", true, "Enable Faults By Default", "", "", "" ); + m_enableFaultsByDefault.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + CAF_PDM_InitFieldNoDefault( &lastUsedProjectFileName, "lastUsedProjectFileName", "Last Used Project File", "", "", "" ); lastUsedProjectFileName.uiCapability()->setUiHidden( true ); @@ -435,7 +438,8 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field, field == &showLasCurveWithoutTvdWarning || field == &holoLensDisableCertificateVerification || field == &m_showProjectChangedDialog || field == &m_searchPlotTemplateFoldersRecursively || field == &m_showLegendBackground || field == &m_showSummaryTimeAsLongString || - field == &m_showViewIdInProjectTree || field == &m_useMultipleThreadsWhenLoadingSummaryData ) + field == &m_showViewIdInProjectTree || field == &m_useMultipleThreadsWhenLoadingSummaryData || + field == &m_enableFaultsByDefault ) { caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast( attribute ); if ( myAttr ) @@ -483,6 +487,7 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& viewsGroup->add( &m_navigationPolicy ); viewsGroup->add( &m_defaultScaleFactorZ ); viewsGroup->add( &m_showLegendBackground ); + viewsGroup->add( &m_enableFaultsByDefault ); caf::PdmUiGroup* otherGroup = uiOrdering.addNewGroup( "Other" ); otherGroup->add( &ssihubAddress ); @@ -1027,3 +1032,11 @@ bool RiaPreferences::showLegendBackground() const { return m_showLegendBackground(); } + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool RiaPreferences::enableFaultsByDefault() const +{ + return m_enableFaultsByDefault; +} diff --git a/ApplicationCode/Application/RiaPreferences.h b/ApplicationCode/Application/RiaPreferences.h index 27d5440c39..f408f6794b 100644 --- a/ApplicationCode/Application/RiaPreferences.h +++ b/ApplicationCode/Application/RiaPreferences.h @@ -71,6 +71,8 @@ public: typedef caf::AppEnum PageSizeEnum; typedef caf::AppEnum PageOrientationEnum; + bool enableFaultsByDefault() const; + public: RiaPreferences( void ); ~RiaPreferences( void ) override; @@ -212,6 +214,7 @@ private: caf::PdmField> m_navigationPolicy; caf::PdmField m_defaultScaleFactorZ; caf::PdmField m_showLegendBackground; + caf::PdmField m_enableFaultsByDefault; QStringList m_tabNames; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp index 198173cd35..b84c4c4741 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp @@ -48,6 +48,7 @@ #include "RimEclipsePropertyFilterCollection.h" #include "RimEclipseStatisticsCase.h" #include "RimEclipseView.h" +#include "RimFaultInViewCollection.h" #include "RimFormationNames.h" #include "RimGridCollection.h" #include "RimIntersectionCollection.h" @@ -288,11 +289,14 @@ RimEclipseView* RimEclipseCase::createAndAddReservoirView() { rimEclipseView->cellResult()->setResultType( RiaDefines::DYNAMIC_NATIVE ); - if ( RiaApplication::instance()->preferences()->loadAndShowSoil ) + auto prefs = RiaApplication::instance()->preferences(); + if ( prefs->loadAndShowSoil ) { rimEclipseView->cellResult()->setResultVariable( "SOIL" ); } + rimEclipseView->faultCollection()->showFaultCollection = prefs->enableFaultsByDefault(); + rimEclipseView->hasUserRequestedAnimation = true; rimEclipseView->cellEdgeResult()->setResultVariable( "MULT" );