#1043 - pre-proto - Added command feature for adding a new fracture definition

ApplicationCode/Commands/CMakeLists_files.cmake

@@ -38,6 +38,8 @@ ${CEE_CURRENT_LIST_DIR}RicExportFaultsFeature.h
 ${CEE_CURRENT_LIST_DIR}RicExportMultipleSnapshotsFeature.h
 
 ${CEE_CURRENT_LIST_DIR}RicNewSimWellFractureFeature.h
+${CEE_CURRENT_LIST_DIR}RicNewFractureDefinitionFeature.h
+
 
 
 # General delete of any object in a child array field
@@ -79,6 +81,8 @@ ${CEE_CURRENT_LIST_DIR}RicExportFaultsFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicExportMultipleSnapshotsFeature.cpp
 
 ${CEE_CURRENT_LIST_DIR}RicNewSimWellFractureFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicNewFractureDefinitionFeature.cpp
+
 
 
 # General delete of any object in a child array field

ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp

@@ -0,0 +1,81 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2016-     Statoil ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RicNewFractureDefinitionFeature.h"
+
+#include "RiaApplication.h"
+
+#include "RimOilField.h"
+#include "RimFractureDefinition.h"
+#include "RimFractureDefinitionCollection.h"
+#include "RimProject.h"
+
+#include "cafSelectionManager.h"
+
+#include "cvfAssert.h"
+
+#include "QAction.h"
+
+
+CAF_CMD_SOURCE_INIT(RicNewFractureDefinitionFeature, "RicNewFractureDefinitionFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicNewFractureDefinitionFeature::onActionTriggered(bool isChecked)
+{
+
+    RimProject* project = RiaApplication::instance()->project();
+    CVF_ASSERT(project);
+
+    RimOilField* oilfield = project->activeOilField();
+    if (oilfield == nullptr) return;
+
+    RimFractureDefinitionCollection* fracDefColl = oilfield->fractureDefinitionCollection();
+
+
+    if (fracDefColl)
+    {
+        RimFractureDefinition* fractureDef = new RimFractureDefinition();
+        fracDefColl->fractureDefinitions.push_back(fractureDef);
+        
+        fracDefColl->updateConnectedEditors();
+
+    }
+    
+
+
+
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicNewFractureDefinitionFeature::setupActionLook(QAction* actionToSetup)
+{
+//    actionToSetup->setIcon(QIcon(":/CrossSection16x16.png"));
+    actionToSetup->setText("New Fracture Definition");
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicNewFractureDefinitionFeature::isCommandEnabled()
+{
+    return true;
+}

ApplicationCode/Commands/RicNewFractureDefinitionFeature.h

@@ -0,0 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2016-     Statoil ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "cafCmdFeature.h"
+
+#include <vector>
+
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicNewFractureDefinitionFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+protected:
+
+    virtual void onActionTriggered(bool isChecked) override;
+    virtual void setupActionLook(QAction* actionToSetup) override;
+    virtual bool isCommandEnabled() override;
+
+ 
+};

ApplicationCode/Commands/RicNewSimWellFractureFeature.cpp

@@ -19,27 +19,17 @@
 #include "RicNewSimWellFractureFeature.h"
 
 #include "RiaApplication.h"
-//  
-// #include "RimMainPlotCollection.h"
-// #include "RimOilField.h"
-#include "RimProject.h"
+
+#include "RimOilField.h"
+#include "RimFracture.h"
 #include "RimFractureCollection.h"
-// #include "RimSummaryCaseCollection.h"
-// #include "RimSummaryCurve.h"
-// #include "RimSummaryPlot.h"
-// #include "RimSummaryPlotCollection.h"
-// 
-// #include "RiuMainPlotWindow.h"
-// 
-// #include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h"
-// 
+#include "RimProject.h"
+ 
 #include "cafSelectionManager.h"
 
 #include "cvfAssert.h"
 
-#include <QAction>
-#include "RimOilField.h"
-#include "RimFracture.h"
+#include "QAction.h"
 
 
 CAF_CMD_SOURCE_INIT(RicNewSimWellFractureFeature, "RicNewSimWellFractureFeature");

ApplicationCode/Commands/RicNewSimWellFractureFeature.h

@@ -22,7 +22,6 @@
 
 #include <vector>
 
-// class RimSummaryPlot;
 
 //==================================================================================================
 /// 
@@ -37,8 +36,4 @@ protected:
     virtual bool isCommandEnabled() override;
 
 
-
-private:
- 
-//    RimSummaryPlot* selectedSummaryPlot() const;
 };

ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp

@@ -37,6 +37,8 @@
 #include "RimEclipseWell.h"
 #include "RimFormationNames.h"
 #include "RimFormationNamesCollection.h"
+#include "RimFractureCollection.h"
+#include "RimFractureDefinitionCollection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechPropertyFilter.h"
 #include "RimGeoMechPropertyFilterCollection.h"
@@ -59,7 +61,6 @@
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 
-#include "RimFractureCollection.h"
 
 #include "ToggleCommands/RicToggleItemsFeatureImpl.h"
 
@@ -357,7 +358,10 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
         {
             commandIds << "RicNewSimWellFractureFeature";
         }
-
+        else if (dynamic_cast<RimFractureDefinitionCollection*>(uiItem))
+        {
+            commandIds << "RicNewFractureDefinitionFeature";
+        }
 
 
         if (dynamic_cast<RimView*>(uiItem))

ApplicationCode/ProjectDataModel/RimFractureDefinition.cpp

@@ -46,13 +46,15 @@ RimFractureDefinition::RimFractureDefinition(void)
 {
     CAF_PDM_InitObject("Fracture definition", "", "", "");
 
-    CAF_PDM_InitField(&halfLength,   "HalfLength",   650.0f,  "Fracture Halflength X_f", "", "", "");
-    CAF_PDM_InitField(&height,       "Height",       75.0f,   "Fracture Height", "", "", "");
-    CAF_PDM_InitField(&orientation,  "Orientation",  caf::AppEnum<FracOrientationEnum>(TRANSVERSE_WELL_PATH), "Fracture orientation", "", "", "");
-    CAF_PDM_InitField(&width,        "Width",        1.0f,    "Fracture Width", "", "", "");
+    CAF_PDM_InitField(&name,        "UserDescription",  QString("Fracture Definition Name"), "Name", "", "", "");
 
-    CAF_PDM_InitField(&skinFactor,   "SkinFactor",   1.0f,    "Fracture Skin Factor", "", "", "");
-    CAF_PDM_InitField(&permeability, "Permeability", 22000.f,"Fracture Permeability", "", "", "");
+    CAF_PDM_InitField(&halfLength,  "HalfLength",       650.0f,  "Fracture Halflength X_f", "", "", "");
+    CAF_PDM_InitField(&height,      "Height",           75.0f,   "Fracture Height", "", "", "");
+    CAF_PDM_InitField(&width,       "Width",            1.0f,    "Fracture Width", "", "", "");
+    CAF_PDM_InitField(&orientation, "Orientation",      caf::AppEnum<FracOrientationEnum>(TRANSVERSE_WELL_PATH), "Fracture orientation", "", "", "");
+
+    CAF_PDM_InitField(&skinFactor,  "SkinFactor",       1.0f,    "Fracture Skin Factor", "", "", "");
+    CAF_PDM_InitField(&permeability,"Permeability",     22000.f, "Fracture Permeability", "", "", "");
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -61,3 +63,25 @@ RimFractureDefinition::RimFractureDefinition(void)
 RimFractureDefinition::~RimFractureDefinition()
 {
 }
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimFractureDefinition::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+{
+    uiOrdering.add(&name);
+
+    caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Fracture geometry definition");
+    geometryGroup->add(&halfLength);
+    geometryGroup->add(&height);
+    geometryGroup->add(&width);
+    geometryGroup->add(&orientation);
+
+
+    caf::PdmUiGroup* group = uiOrdering.addNewGroup("Fracture definition");
+    group->add(&permeability);
+    group->add(&skinFactor);
+
+
+}

ApplicationCode/ProjectDataModel/RimFractureDefinition.h

@@ -35,6 +35,8 @@ public:
     RimFractureDefinition(void);
     virtual ~RimFractureDefinition(void);
     
+    caf::PdmField<QString>   name;
+
     caf::PdmField<float>     halfLength;
     caf::PdmField<float>     height;
     caf::PdmField<float>     width;
@@ -51,5 +53,8 @@ public:
     caf::PdmField<float>     skinFactor;
     caf::PdmField<float>     permeability;
 
+protected:
+
+    virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
 
 };

ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.cpp

@@ -36,7 +36,7 @@ RimFractureDefinitionCollection::RimFractureDefinitionCollection(void)
     CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", "");
     
     CAF_PDM_InitFieldNoDefault(&fractureDefinitions, "Fracture Definitions", "", "", "", "");
-
+    fractureDefinitions.uiCapability()->setUiHidden(true);
 }
 
 //--------------------------------------------------------------------------------------------------