From 4718caed9aee82a6db4da37e12538e926e7c485d Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Mon, 21 Aug 2017 20:44:28 +0200
Subject: [PATCH] #1794 Put all fracture command ids inside ifdefs

---
 .../RimContextCommandBuilder.cpp              | 19 ++++++++++++++-----
 .../UserInterface/RiuViewerCommands.cpp       |  4 ++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
index f522cdfa8d..ddf93829e2 100644
--- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
+++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
@@ -40,10 +40,6 @@
 #include "RimFlowCharacteristicsPlot.h"
 #include "RimFormationNames.h"
 #include "RimFormationNamesCollection.h"
-#include "RimEllipseFractureTemplate.h"
-#include "RimStimPlanFractureTemplate.h"
-#include "RimFractureTemplateCollection.h"
-#include "RimFractureTemplate.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechPropertyFilter.h"
 #include "RimGeoMechPropertyFilterCollection.h"
@@ -53,7 +49,6 @@
 #include "RimIntersectionBox.h"
 #include "RimIntersectionCollection.h"
 #include "RimScriptCollection.h"
-#include "RimSimWellFracture.h"
 #include "RimSummaryCase.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryCurveFilter.h"
@@ -69,8 +64,16 @@
 #include "RimWellLogTrack.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
+
+#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
+#include "RimEllipseFractureTemplate.h"
+#include "RimStimPlanFractureTemplate.h"
+#include "RimFractureTemplateCollection.h"
+#include "RimFractureTemplate.h"
+#include "RimSimWellFracture.h"
 #include "RimWellPathFracture.h"
 #include "RimWellPathFractureCollection.h"
+#endif // USE_PROTOTYPE_FEATURE_FRACTURES
 
 #include "ToggleCommands/RicToggleItemsFeatureImpl.h"
 
@@ -372,6 +375,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
         {
             commandIds << "RicShowFlowCharacteristicsPlotFeature";
         }
+#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
         else if (dynamic_cast<RimSimWellFracture*>(uiItem))
         {
             commandIds << "RicNewSimWellFractureFeature";
@@ -392,6 +396,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
             commandIds << "Separator";
             commandIds << "RicConvertFractureTemplateUnitFeature";
         }
+#endif // USE_PROTOTYPE_FEATURE_FRACTURES
 
 
         if (dynamic_cast<RimView*>(uiItem))
@@ -435,7 +440,9 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
         commandIds << "RicExportCarfin";
 
         // Fracture commands
+#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
         commandIds << "RicNewWellPathFractureFeature";
+#endif // USE_PROTOTYPE_FEATURE_FRACTURES
 
         // Work in progress -- End
 
@@ -488,8 +495,10 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
             commandIds << "RicEclipseWellShowSpheresFeature";
             commandIds << "RicEclipseWellShowWellCellsFeature";
             commandIds << "RicEclipseWellShowWellCellFenceFeature";
+#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
             commandIds << "Separator";
             commandIds << "RicNewSimWellFractureFeature";
+#endif // USE_PROTOTYPE_FEATURE_FRACTURES
         }
     }
 
diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp
index 3ef73c6987..fbda17b2b6 100644
--- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp
+++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp
@@ -296,7 +296,9 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
                 RiuSelectionItem* selItem = new RiuWellPathSelectionItem(wellPathSourceInfo, trueVerticalDepth, measuredDepth);
                 RiuSelectionManager::instance()->setSelectedItem(selItem, RiuSelectionManager::RUI_TEMPORARY);
                  
+#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
                 commandIds << "RicNewWellPathFractureAtPosFeature";
+#endif // USE_PROTOTYPE_FEATURE_FRACTURES
 
 
                 //TODO: Update so these also use RiuWellPathSelectionItem 
@@ -331,7 +333,9 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
                 RiuSelectionItem* selItem = new RiuSimWellSelectionItem(eclipseWellSourceInfo->well(), m_currentPickPositionInDomainCoords, eclipseWellSourceInfo->branchIndex());
                 RiuSelectionManager::instance()->setSelectedItem(selItem, RiuSelectionManager::RUI_TEMPORARY);
                 commandIds << "RicPlotProductionRateFeature";
+#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
                 commandIds << "RicNewSimWellFractureAtPosFeature";
+#endif // USE_PROTOTYPE_FEATURE_FRACTURES
             }
         }