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 "#7754 Hide experimental StimPlan Model features behind RESINSIGHT_DEVEL"

Browse Source 
This reverts commit 1322bae6b6.
This commit is contained in:
Kristian Bendiksen 2021-06-16 11:48:36 +02:00 committed by Magne Sjaastad
parent 8a2def774a
commit da166bd7b9
3 changed files with 11 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationLibCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp
View File

@ -18,8 +18,6 @@
#include "RimCompletionTemplateCollection.h"
#include "RiaApplication.h"
#include "RimEnsembleFractureStatisticsCollection.h"
#include "RimFractureTemplateCollection.h"
#include "RimStimPlanModelTemplateCollection.h"
@ -148,15 +146,9 @@ void RimCompletionTemplateCollection::defineUiTreeOrdering( caf::PdmUiTreeOrderi
QString uiConfigName /*= ""*/ )
{
uiTreeOrdering.add( m_fractureTemplates );
if ( RiaApplication::enableDevelopmentFeatures() )
{
uiTreeOrdering.add( m_stimPlanModelTemplates );
}
uiTreeOrdering.add( m_stimPlanModelTemplates );
uiTreeOrdering.add( m_valveTemplates );
if ( RiaApplication::enableDevelopmentFeatures() )
{
uiTreeOrdering.add( m_fractureGroupStatisticsCollection );
}
uiTreeOrdering.add( m_fractureGroupStatisticsCollection );
uiTreeOrdering.skipRemainingChildren( true );
}

29
ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -413,10 +413,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicNewWellPathFractureFeature";
menuBuilder.subMenuEnd();
menuBuilder << "RicCreateTemporaryLgrFeature";
if ( RiaApplication::enableDevelopmentFeatures() )
{
menuBuilder << "RicNewStimPlanModelFeature";
}
menuBuilder << "RicNewStimPlanModelFeature";
menuBuilder.addSeparator();
appendExportCompletions( menuBuilder );
}
@ -447,12 +444,9 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
}
else if ( dynamic_cast<RimStimPlanModel*>( firstUiItem ) )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{
menuBuilder << "RicNewStimPlanModelFeature";
menuBuilder << "RicNewStimPlanModelPlotFeature";
menuBuilder << "RicExportStimPlanModelToFileFeature";
}
menuBuilder << "RicNewStimPlanModelFeature";
menuBuilder << "RicNewStimPlanModelPlotFeature";
menuBuilder << "RicExportStimPlanModelToFileFeature";
}
else if ( dynamic_cast<RimPressureTable*>( firstUiItem ) )
{
@ -460,10 +454,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
}
else if ( dynamic_cast<RimStimPlanModelCollection*>( firstUiItem ) )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{
menuBuilder << "RicNewStimPlanModelFeature";
}
menuBuilder << "RicNewStimPlanModelFeature";
}
else if ( dynamic_cast<Rim3dWellLogCurveCollection*>( firstUiItem ) ||
dynamic_cast<Rim3dWellLogExtractionCurve*>( firstUiItem ) ||
@ -923,10 +914,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
}
else if ( dynamic_cast<RimStimPlanModelTemplateCollection*>( firstUiItem ) )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{
menuBuilder << "RicNewStimPlanModelTemplateFeature";
}
menuBuilder << "RicNewStimPlanModelTemplateFeature";
}
else if ( dynamic_cast<RimFractureTemplateCollection*>( firstUiItem ) )
{
@ -1379,10 +1367,7 @@ int RimContextCommandBuilder::appendCreateCompletions( caf::CmdFeatureMenuBuilde
candidates << "RicNewWellPathAttributeFeature";
candidates << "Separator";
candidates << "RicCreateTemporaryLgrFeature";
if ( RiaApplication::enableDevelopmentFeatures() )
{
candidates << "RicNewStimPlanModelFeature";
}
candidates << "RicNewStimPlanModelFeature";
return appendSubMenuWithCommands( menuBuilder,
candidates,

12
ApplicationLibCode/ProjectDataModel/RimProject.cpp
View File

@ -1474,10 +1474,7 @@ void RimProject::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, Q
if ( mainPlotCollection->stimPlanModelPlotCollection() )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{
itemCollection->add( mainPlotCollection->stimPlanModelPlotCollection() );
}
itemCollection->add( mainPlotCollection->stimPlanModelPlotCollection() );
}
if ( mainPlotCollection->vfpPlotCollection() )
@ -1493,12 +1490,7 @@ void RimProject::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, Q
statisticsItemCollection->add( mainPlotCollection->gridStatisticsPlotCollection() );
if ( mainPlotCollection->ensembleFractureStatisticsPlotCollection() )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{
statisticsItemCollection->add( mainPlotCollection->ensembleFractureStatisticsPlotCollection() );
}
}
statisticsItemCollection->add( mainPlotCollection->ensembleFractureStatisticsPlotCollection() );
}
#endif
}