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

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

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

15
ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -413,10 +413,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicNewWellPathFractureFeature"; menuBuilder << "RicNewWellPathFractureFeature";
menuBuilder.subMenuEnd(); menuBuilder.subMenuEnd();
menuBuilder << "RicCreateTemporaryLgrFeature"; menuBuilder << "RicCreateTemporaryLgrFeature";
if ( RiaApplication::enableDevelopmentFeatures() )
{
menuBuilder << "RicNewStimPlanModelFeature"; menuBuilder << "RicNewStimPlanModelFeature";
}
menuBuilder.addSeparator(); menuBuilder.addSeparator();
appendExportCompletions( menuBuilder ); appendExportCompletions( menuBuilder );
} }
@ -446,25 +443,19 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicDeleteWellPathAttributeFeature"; menuBuilder << "RicDeleteWellPathAttributeFeature";
} }
else if ( dynamic_cast<RimStimPlanModel*>( firstUiItem ) ) else if ( dynamic_cast<RimStimPlanModel*>( firstUiItem ) )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{ {
menuBuilder << "RicNewStimPlanModelFeature"; menuBuilder << "RicNewStimPlanModelFeature";
menuBuilder << "RicNewStimPlanModelPlotFeature"; menuBuilder << "RicNewStimPlanModelPlotFeature";
menuBuilder << "RicExportStimPlanModelToFileFeature"; menuBuilder << "RicExportStimPlanModelToFileFeature";
} }
}
else if ( dynamic_cast<RimPressureTable*>( firstUiItem ) ) else if ( dynamic_cast<RimPressureTable*>( firstUiItem ) )
{ {
menuBuilder << "RicNewPressureTableItemFeature"; menuBuilder << "RicNewPressureTableItemFeature";
} }
else if ( dynamic_cast<RimStimPlanModelCollection*>( firstUiItem ) ) else if ( dynamic_cast<RimStimPlanModelCollection*>( firstUiItem ) )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{ {
menuBuilder << "RicNewStimPlanModelFeature"; menuBuilder << "RicNewStimPlanModelFeature";
} }
}
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 ) ||
@ -922,12 +913,9 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicImportElasticPropertiesFeature"; menuBuilder << "RicImportElasticPropertiesFeature";
} }
else if ( dynamic_cast<RimStimPlanModelTemplateCollection*>( firstUiItem ) ) else if ( dynamic_cast<RimStimPlanModelTemplateCollection*>( firstUiItem ) )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{ {
menuBuilder << "RicNewStimPlanModelTemplateFeature"; menuBuilder << "RicNewStimPlanModelTemplateFeature";
} }
}
else if ( dynamic_cast<RimFractureTemplateCollection*>( firstUiItem ) ) else if ( dynamic_cast<RimFractureTemplateCollection*>( firstUiItem ) )
{ {
menuBuilder << "RicPasteEllipseFractureFeature"; menuBuilder << "RicPasteEllipseFractureFeature";
@ -1379,10 +1367,7 @@ int RimContextCommandBuilder::appendCreateCompletions( caf::CmdFeatureMenuBuilde
candidates << "RicNewWellPathAttributeFeature"; candidates << "RicNewWellPathAttributeFeature";
candidates << "Separator"; candidates << "Separator";
candidates << "RicCreateTemporaryLgrFeature"; candidates << "RicCreateTemporaryLgrFeature";
if ( RiaApplication::enableDevelopmentFeatures() )
{
candidates << "RicNewStimPlanModelFeature"; candidates << "RicNewStimPlanModelFeature";
}
return appendSubMenuWithCommands( menuBuilder, return appendSubMenuWithCommands( menuBuilder,
candidates, candidates,

8
ApplicationLibCode/ProjectDataModel/RimProject.cpp
View File

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