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

Merge pull request #6414 from OPM/stimplan-feature-switch-6412

Browse Source 
#6412 Hide experimental Stimplan features behind RESINSIGHT_DEVEL env…
This commit is contained in:
Kristian Bendiksen 2020-09-02 15:09:28 +02:00 committed by GitHub
commit 32167268ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -398,7 +398,10 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicNewPerforationIntervalFeature"; menuBuilder << "RicNewPerforationIntervalFeature";
menuBuilder << "RicNewFishbonesSubsFeature"; menuBuilder << "RicNewFishbonesSubsFeature";
menuBuilder << "RicNewWellPathFractureFeature"; menuBuilder << "RicNewWellPathFractureFeature";
if ( RiaApplication::enableDevelopmentFeatures() )
{
menuBuilder << "RicNewFractureModelFeature"; menuBuilder << "RicNewFractureModelFeature";
}
menuBuilder.subMenuEnd(); menuBuilder.subMenuEnd();
menuBuilder << "RicCreateTemporaryLgrFeature"; menuBuilder << "RicCreateTemporaryLgrFeature";
menuBuilder.addSeparator(); menuBuilder.addSeparator();
@ -432,20 +435,29 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicDeleteWellPathAttributeFeature"; menuBuilder << "RicDeleteWellPathAttributeFeature";
} }
else if ( dynamic_cast<RimFractureModel*>( firstUiItem ) ) else if ( dynamic_cast<RimFractureModel*>( firstUiItem ) )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{ {
menuBuilder << "RicNewFractureModelFeature"; menuBuilder << "RicNewFractureModelFeature";
menuBuilder << "RicNewFractureModelPlotFeature"; menuBuilder << "RicNewFractureModelPlotFeature";
menuBuilder << "RicImportFaciesFeature"; menuBuilder << "RicImportFaciesFeature";
menuBuilder << "RicImportElasticPropertiesFeature"; menuBuilder << "RicImportElasticPropertiesFeature";
} }
}
else if ( dynamic_cast<RimFractureModelCollection*>( firstUiItem ) ) else if ( dynamic_cast<RimFractureModelCollection*>( firstUiItem ) )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{ {
menuBuilder << "RicNewFractureModelFeature"; menuBuilder << "RicNewFractureModelFeature";
} }
}
else if ( dynamic_cast<RimFractureModelPlot*>( firstUiItem ) ) else if ( dynamic_cast<RimFractureModelPlot*>( firstUiItem ) )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{ {
menuBuilder << "RicExportFractureModelPlotToFileFeature"; menuBuilder << "RicExportFractureModelPlotToFileFeature";
} }
}
else if ( dynamic_cast<Rim3dWellLogCurveCollection*>( firstUiItem ) || else if ( dynamic_cast<Rim3dWellLogCurveCollection*>( firstUiItem ) ||
dynamic_cast<Rim3dWellLogExtractionCurve*>( firstUiItem ) || dynamic_cast<Rim3dWellLogExtractionCurve*>( firstUiItem ) ||
dynamic_cast<Rim3dWellLogFileCurve*>( firstUiItem ) || dynamic_cast<Rim3dWellLogFileCurve*>( firstUiItem ) ||
@ -1287,7 +1299,10 @@ int RimContextCommandBuilder::appendCreateCompletions( caf::CmdFeatureMenuBuilde
candidates << "RicNewValveFeature"; candidates << "RicNewValveFeature";
candidates << "RicNewFishbonesSubsFeature"; candidates << "RicNewFishbonesSubsFeature";
candidates << "RicNewWellPathFractureFeature"; candidates << "RicNewWellPathFractureFeature";
if ( RiaApplication::enableDevelopmentFeatures() )
{
candidates << "RicNewFractureModelFeature"; candidates << "RicNewFractureModelFeature";
}
candidates << "Separator"; candidates << "Separator";
candidates << "RicCreateMultipleFracturesFeature"; candidates << "RicCreateMultipleFracturesFeature";
candidates << "RicNewWellPathAttributeFeature"; candidates << "RicNewWellPathAttributeFeature";

3
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

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