diff --git a/ApplicationLibCode/Application/RiaExperimentalFeatures.cpp b/ApplicationLibCode/Application/RiaExperimentalFeatures.cpp index bb7c2cad70..b6782c509f 100644 --- a/ApplicationLibCode/Application/RiaExperimentalFeatures.cpp +++ b/ApplicationLibCode/Application/RiaExperimentalFeatures.cpp @@ -29,7 +29,10 @@ const std::vector& RiaExperimentalFeatures::av // // Example: // { "my-feature", "My Feature", "Short description of what it does." }, - static const std::vector features = {}; + static const std::vector features = { + { "osdu-well-logs", "OSDU Well Logs", "Enable import of well logs from OSDU." }, + { "undo-redo-view", "Undo/Redo View", "Show the command undo/redo history view." }, + }; return features; } diff --git a/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp index 83d87b57b7..e13113fe47 100644 --- a/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -21,6 +21,7 @@ #include "QuickAccess/RimFieldQuickAccess.h" #include "RiaApplication.h" +#include "RiaPreferencesSystem.h" #include "ContourMap/RimEclipseContourMapViewCollection.h" #include "Formations/RimFormationNames.h" @@ -1408,8 +1409,8 @@ int RimContextCommandBuilder::appendImportMenu( caf::CmdFeatureMenuBuilder& menu candidates << "RicReloadWellPathFormationNamesFeature"; // Import of well logs from OSDU is disabled by default. The quality of well log data from OSDU is not sufficient for effective - // use. The environment variable RESINSIGHT_DEVEL must be set to enable this feature. - if ( addOsduImportMenuItem && RiaApplication::enableDevelopmentFeatures() ) + // use. Enable the "OSDU Well Logs" experimental feature (Preferences -> System) to enable this menu item. + if ( addOsduImportMenuItem && RiaPreferencesSystem::current()->isFeatureEnabled( "osdu-well-logs" ) ) { candidates << "RicImportWellLogOsduFeature"; } diff --git a/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp b/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp index ce84c9bca5..4d00129ad4 100644 --- a/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp +++ b/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp @@ -21,6 +21,7 @@ #include "RiaApplication.h" #include "RiaDefines.h" #include "RiaPreferences.h" +#include "RiaPreferencesSystem.h" #include "RiaRegressionTestRunner.h" #include "RiaVersionInfo.h" @@ -71,7 +72,7 @@ RiuMainWindowBase::RiuMainWindowBase() m_dockManager = new ads::CDockManager( this ); m_dockManager->setStyleSheet( "" ); - if ( RiaPreferences::current()->useUndoRedo() && RiaApplication::enableDevelopmentFeatures() ) + if ( RiaPreferences::current()->useUndoRedo() && RiaPreferencesSystem::current()->isFeatureEnabled( "undo-redo-view" ) ) { m_undoView = new QUndoView( this ); }