Faults: Added fault result mapping management

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -48,6 +48,7 @@ ${CEE_CURRENT_LIST_DIR}RimFault.h
 ${CEE_CURRENT_LIST_DIR}RimFaultCollection.h
 ${CEE_CURRENT_LIST_DIR}RimMockModelSettings.h
 ${CEE_CURRENT_LIST_DIR}RimTernaryLegendConfig.h
+${CEE_CURRENT_LIST_DIR}RimFaultResultSlot.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -94,6 +95,7 @@ ${CEE_CURRENT_LIST_DIR}RimFault.cpp
 ${CEE_CURRENT_LIST_DIR}RimFaultCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimMockModelSettings.cpp
 ${CEE_CURRENT_LIST_DIR}RimTernaryLegendConfig.cpp
+${CEE_CURRENT_LIST_DIR}RimFaultResultSlot.cpp
 )
 
 list(APPEND CODE_HEADER_FILES

ApplicationCode/ProjectDataModel/RimFaultResultSlot.cpp

@@ -0,0 +1,53 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
+// 
+//  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 "RimFaultResultSlot.h"
+
+
+namespace caf
+{
+    template<>
+    void AppEnum< RimFaultResultSlot::FaultVisualizationMode >::setUp()
+    {
+        addItem(RimFaultResultSlot::FAULT_COLOR,            "FAULT_COLOR",              "Fault Colors");
+        addItem(RimFaultResultSlot::CELL_RESULT_MAPPING,    "CELL_RESULT_MAPPING",      "Grid Cell Results");
+        addItem(RimFaultResultSlot::CUSTOM_RESULT_MAPPING,  "CUSTOM_RESULT_MAPPING",    "Custom Cell Results");
+        setDefault(RimFaultResultSlot::CELL_RESULT_MAPPING);
+    }
+}
+
+CAF_PDM_SOURCE_INIT(RimFaultResultSlot, "RimFaultResultSlot");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimFaultResultSlot::RimFaultResultSlot()
+{
+    CAF_PDM_InitObject("Fault Result Slot", "", "", "");
+
+    CAF_PDM_InitField(&visualizationMode, "VisualizationMode", caf::AppEnum<RimFaultResultSlot::FaultVisualizationMode>(RimFaultResultSlot::CELL_RESULT_MAPPING), "Fault Color Mapping", "", "", "");
+
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimFaultResultSlot::~RimFaultResultSlot()
+{
+}
+

ApplicationCode/ProjectDataModel/RimFaultResultSlot.h

@@ -0,0 +1,47 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
+// 
+//  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 "cafAppEnum.h"
+#include "cafPdmField.h"
+#include "cafPdmObject.h"
+
+//==================================================================================================
+///  
+///  
+//==================================================================================================
+class RimFaultResultSlot :  public caf::PdmObject
+{
+    CAF_PDM_HEADER_INIT;
+public:
+    enum FaultVisualizationMode
+    {
+        FAULT_COLOR,
+        CELL_RESULT_MAPPING,
+        CUSTOM_RESULT_MAPPING
+    };
+
+public:
+    RimFaultResultSlot();
+    virtual ~RimFaultResultSlot();
+
+private:
+    caf::PdmField< caf::AppEnum< FaultVisualizationMode > > visualizationMode;
+};
+

ApplicationCode/ProjectDataModel/RimReservoirView.cpp

@@ -28,6 +28,7 @@
 #include "RimCellPropertyFilterCollection.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimFaultCollection.h"
+#include "RimFaultResultSlot.h"
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimResultSlot.h"
@@ -101,6 +102,11 @@ RimReservoirView::RimReservoirView()
     CAF_PDM_InitFieldNoDefault(&cellEdgeResult,  "GridCellEdgeResult", "Cell Edge Result", ":/EdgeResult_1.png", "", "");
     cellEdgeResult = new RimCellEdgeResultSlot();
 
+    CAF_PDM_InitFieldNoDefault(&cellFaultResult,  "GridCellFaultResult", "Fault Cell Result", ":/CellResult.png", "", "");
+    cellFaultResult = new RimFaultResultSlot();
+    cellFaultResult.setUiHidden(true);
+
+
     CAF_PDM_InitFieldNoDefault(&overlayInfoConfig,  "OverlayInfoConfig", "Info Box", "", "", "");
     overlayInfoConfig = new Rim3dOverlayInfoConfig();
     overlayInfoConfig->setReservoirView(this);

ApplicationCode/ProjectDataModel/RimReservoirView.h

@@ -43,6 +43,7 @@ class RimCellPropertyFilterCollection;
 class RimCellRangeFilter;
 class RimCellRangeFilterCollection;
 class RimFaultCollection;
+class RimFaultResultSlot;
 class RimReservoirCellResultsStorage;
 class RimReservoirCellResultsStorage;
 class RimResultSlot;
@@ -96,6 +97,7 @@ public:
 
     caf::PdmField<RimResultSlot*>                       cellResult;
     caf::PdmField<RimCellEdgeResultSlot*>               cellEdgeResult;
+    caf::PdmField<RimFaultResultSlot*>                  cellFaultResult;
 
     caf::PdmField<RimCellRangeFilterCollection*>        rangeFilterCollection;
     caf::PdmField<RimCellPropertyFilterCollection*>     propertyFilterCollection;