diff --git a/ApplicationLibCode/Application/RiaDefines.cpp b/ApplicationLibCode/Application/RiaDefines.cpp index 82640c21d0..ec48f9dcdc 100644 --- a/ApplicationLibCode/Application/RiaDefines.cpp +++ b/ApplicationLibCode/Application/RiaDefines.cpp @@ -374,3 +374,11 @@ std::vector RiaDefines::viewScaleOptions() { return { 0.005, 0.01, 0.05, 0.1, 0.2, 0.5, 1.0, 2.0, 3.0, 4.0, 5.0, 10.0, 15.0, 20.0, 50.0 }; } + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaDefines::betaFeaturePostfix() +{ + return " [BETA]"; +} diff --git a/ApplicationLibCode/Application/RiaDefines.h b/ApplicationLibCode/Application/RiaDefines.h index 95ae5705ea..1bcd51c4f3 100644 --- a/ApplicationLibCode/Application/RiaDefines.h +++ b/ApplicationLibCode/Application/RiaDefines.h @@ -252,6 +252,8 @@ enum class ItemIn3dView ALL = 0b00000011 }; +QString betaFeaturePostfix(); + }; // namespace RiaDefines // Activate bit mask operators at global scope diff --git a/ApplicationLibCode/Commands/OsduImportCommands/RicWellPathsImportOsduFeature.cpp b/ApplicationLibCode/Commands/OsduImportCommands/RicWellPathsImportOsduFeature.cpp index 03ae6290dd..58854cd9da 100644 --- a/ApplicationLibCode/Commands/OsduImportCommands/RicWellPathsImportOsduFeature.cpp +++ b/ApplicationLibCode/Commands/OsduImportCommands/RicWellPathsImportOsduFeature.cpp @@ -21,6 +21,7 @@ #include "Cloud/RiaOsduConnector.h" #include "RiaApplication.h" #include "RiaColorTables.h" +#include "RiaDefines.h" #include "RiaGuiApplication.h" #include "RiaLogging.h" #include "RiaPreferences.h" @@ -82,7 +83,7 @@ void RicWellPathsImportOsduFeature::onActionTriggered( bool isChecked ) caf::ProgressInfo progress( importedWells.size(), "Importing wells from OSDU", false, true ); int colorIndex = 0; std::vector newWells; - for ( auto w : importedWells ) + for ( const auto& w : importedWells ) { auto wellPath = new RimOsduWellPath; wellPath->setName( w.name ); @@ -118,6 +119,6 @@ void RicWellPathsImportOsduFeature::onActionTriggered( bool isChecked ) //-------------------------------------------------------------------------------------------------- void RicWellPathsImportOsduFeature::setupActionLook( QAction* actionToSetup ) { - actionToSetup->setText( "Import Well Paths from &OSDU" ); + actionToSetup->setText( "Import Well Paths from &OSDU" + RiaDefines::betaFeaturePostfix() ); actionToSetup->setIcon( QIcon( ":/WellCollection.png" ) ); } diff --git a/ApplicationLibCode/Commands/RicImportWellLogOsduFeature.cpp b/ApplicationLibCode/Commands/RicImportWellLogOsduFeature.cpp index a0b2c0f111..183329b25d 100644 --- a/ApplicationLibCode/Commands/RicImportWellLogOsduFeature.cpp +++ b/ApplicationLibCode/Commands/RicImportWellLogOsduFeature.cpp @@ -19,6 +19,7 @@ #include "RicImportWellLogOsduFeature.h" #include "Cloud/RiaOsduConnector.h" +#include "RiaDefines.h" #include "RiaGuiApplication.h" #include "RiaLogging.h" #include "RiaPreferences.h" @@ -118,5 +119,5 @@ void RicImportWellLogOsduFeature::onActionTriggered( bool isChecked ) void RicImportWellLogOsduFeature::setupActionLook( QAction* actionToSetup ) { actionToSetup->setIcon( QIcon( ":/LasFile16x16.png" ) ); - actionToSetup->setText( "Import Well Log From OSDU" ); + actionToSetup->setText( "Import Well Log From OSDU" + RiaDefines::betaFeaturePostfix() ); } diff --git a/ApplicationLibCode/Commands/Sumo/RicCreateSumoEnsembleFeature.cpp b/ApplicationLibCode/Commands/Sumo/RicCreateSumoEnsembleFeature.cpp index 957cda5e7e..26a4e8d235 100644 --- a/ApplicationLibCode/Commands/Sumo/RicCreateSumoEnsembleFeature.cpp +++ b/ApplicationLibCode/Commands/Sumo/RicCreateSumoEnsembleFeature.cpp @@ -18,6 +18,7 @@ #include "RicCreateSumoEnsembleFeature.h" +#include "RiaDefines.h" #include "RiaSummaryTools.h" #include "PlotBuilderCommands/RicSummaryPlotBuilder.h" @@ -57,6 +58,6 @@ void RicCreateSumoEnsembleFeature::onActionTriggered( bool isChecked ) //-------------------------------------------------------------------------------------------------- void RicCreateSumoEnsembleFeature::setupActionLook( QAction* actionToSetup ) { - actionToSetup->setText( "Create Sumo Ensemble" ); + actionToSetup->setText( "Create Sumo Ensemble" + RiaDefines::betaFeaturePostfix() ); actionToSetup->setIcon( QIcon( ":/SummaryEnsemble.svg" ) ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp index c706f9f0e3..5323aaf512 100644 --- a/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -1475,7 +1475,12 @@ int RimContextCommandBuilder::appendImportMenu( caf::CmdFeatureMenuBuilder& menu candidates << "RicImportWellLogCsvFileFeature"; candidates << "RicReloadWellPathFormationNamesFeature"; - if ( addOsduImportMenuItem ) candidates << "RicImportWellLogOsduFeature"; + // 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() ) + { + candidates << "RicImportWellLogOsduFeature"; + } return appendSubMenuWithCommands( menuBuilder, candidates, "Import", QIcon(), addSeparatorBeforeMenu ); }