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 "Fracture Model Template: Hide new features behind experimental flag"

Browse Source 
This reverts commit 03ae6e5ee4.
This commit is contained in:
Kristian Bendiksen
2020-10-21 11:42:57 +02:00
parent 899fa64e75
commit f09dad2fb9
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp
View File

@@ -18,8 +18,6 @@
#include "RimCompletionTemplateCollection.h"
#include "RiaApplication.h"
#include "RimFractureModelTemplateCollection.h"
#include "RimFractureTemplateCollection.h"
#include "RimValveTemplateCollection.h"
@@ -128,10 +126,7 @@ void RimCompletionTemplateCollection::defineUiTreeOrdering( caf::PdmUiTreeOrderi
QString uiConfigName /*= ""*/ )
{
uiTreeOrdering.add( m_fractureTemplates );
if ( RiaApplication::enableDevelopmentFeatures() )
{
uiTreeOrdering.add( m_fractureModelTemplates );
}
uiTreeOrdering.add( m_fractureModelTemplates );
uiTreeOrdering.add( m_valveTemplates );
uiTreeOrdering.skipRemainingChildren( true );
}

5
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -888,10 +888,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
}
else if ( dynamic_cast<RimFractureModelTemplateCollection*>( firstUiItem ) )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{
menuBuilder << "RicNewFractureModelTemplateFeature";
}
menuBuilder << "RicNewFractureModelTemplateFeature";
}
else if ( dynamic_cast<RimFractureTemplateCollection*>( firstUiItem ) )
{