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

Revert "#6412 Hide experimental Stimplan features behind RESINSIGHT_DEVEL env var."

Browse Source 
This reverts commit ae18dc8898.
This commit is contained in:
Kristian Bendiksen
2020-10-21 11:48:40 +02:00
parent f09dad2fb9
commit 9a1397ecbc
2 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -403,10 +403,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicNewPerforationIntervalFeature";
menuBuilder << "RicNewFishbonesSubsFeature";
menuBuilder << "RicNewWellPathFractureFeature";
if ( RiaApplication::enableDevelopmentFeatures() )
{
menuBuilder << "RicNewFractureModelFeature";
}
menuBuilder.subMenuEnd();
menuBuilder << "RicCreateTemporaryLgrFeature";
menuBuilder.addSeparator();
@@ -440,21 +437,15 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicDeleteWellPathAttributeFeature";
}
else if ( dynamic_cast<RimFractureModel*>( firstUiItem ) )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{
menuBuilder << "RicNewFractureModelFeature";
menuBuilder << "RicNewFractureModelPlotFeature";
menuBuilder << "RicExportFractureModelToFileFeature";
}
}
else if ( dynamic_cast<RimFractureModelCollection*>( firstUiItem ) )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{
menuBuilder << "RicNewFractureModelFeature";
}
}
else if ( dynamic_cast<Rim3dWellLogCurveCollection*>( firstUiItem ) ||
dynamic_cast<Rim3dWellLogExtractionCurve*>( firstUiItem ) ||
dynamic_cast<Rim3dWellLogFileCurve*>( firstUiItem ) ||
@@ -1312,10 +1303,7 @@ int RimContextCommandBuilder::appendCreateCompletions( caf::CmdFeatureMenuBuilde
candidates << "RicNewValveFeature";
candidates << "RicNewFishbonesSubsFeature";
candidates << "RicNewWellPathFractureFeature";
if ( RiaApplication::enableDevelopmentFeatures() )
{
candidates << "RicNewFractureModelFeature";
}
candidates << "Separator";
candidates << "RicCreateMultipleFracturesFeature";
candidates << "RicNewWellPathAttributeFeature";

3
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@@ -1450,13 +1450,10 @@ void RimProject::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, Q
}
if ( mainPlotCollection->fractureModelPlotCollection() )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{
itemCollection->add( mainPlotCollection->fractureModelPlotCollection() );
}
}
}
uiTreeOrdering.add( scriptCollection() );
}