Fault result : Renamed file and improved interface

ApplicationCode/Application/RiaApplication.cpp

@@ -40,7 +40,7 @@
 #include "RimOilField.h"
 #include "RimAnalysisModels.h"
 #include "RimFaultCollection.h"
-#include "RimFaultResultSlot.h"
+#include "RimFaultResultSettings.h"
 
 #include "cafCeetronNavigation.h"
 #include "cafCadNavigation.h"
@@ -650,7 +650,7 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
         riv->cellResult()->setResultVariable(RimDefines::undefinedResultName());
     }
 
-    riv->faultResult()->updateVisibility();
+    riv->faultResultSettings()->updateVisibility();
 
 
     RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel();

ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp

@@ -28,7 +28,7 @@
 #include "RimFaultCollection.h"
 #include "RigMainGrid.h"
 #include "RimReservoirView.h"
-#include "RimFaultResultSlot.h"
+#include "RimFaultResultSettings.h"
 
 
 //--------------------------------------------------------------------------------------------------
@@ -182,7 +182,7 @@ void RivReservoirFaultsPartMgr::updateColors(size_t timeStepIndex, RimResultSlot
     {
         RimFault* rimFault = faultCollection->faults[i];
 
-        if (m_reservoirView->faultResult()->visualizationMode() == RimFaultResultSlot::FAULT_COLOR)
+        if (m_reservoirView->faultResultSettings()->visualizationMode() == RimFaultResultSettings::FAULT_COLOR)
         {
             m_faultParts[i]->applySingleColorEffect();
         }

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -48,7 +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
+${CEE_CURRENT_LIST_DIR}RimFaultResultSettings.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -95,7 +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
+${CEE_CURRENT_LIST_DIR}RimFaultResultSettings.cpp
 )
 
 list(APPEND CODE_HEADER_FILES

ApplicationCode/ProjectDataModel/RimFaultResultSettings.cpp

@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimFaultResultSlot.h"
+#include "RimFaultResultSettings.h"
 
 #include "RimReservoirView.h"
 #include "RimResultSlot.h"
@@ -27,28 +27,28 @@
 namespace caf
 {
     template<>
-    void AppEnum< RimFaultResultSlot::FaultVisualizationMode >::setUp()
+    void AppEnum< RimFaultResultSettings::FaultVisualizationMode >::setUp()
     {
-        addItem(RimFaultResultSlot::FAULT_COLOR,            "FAULT_COLOR",              "Fault Colors");
+        addItem(RimFaultResultSettings::FAULT_COLOR,            "FAULT_COLOR",              "Fault Colors");
-        addItem(RimFaultResultSlot::CELL_RESULT_MAPPING,    "CELL_RESULT_MAPPING",      "Grid Cell Results");
+        addItem(RimFaultResultSettings::CELL_RESULT_MAPPING,    "CELL_RESULT_MAPPING",      "Grid Cell Results");
-        addItem(RimFaultResultSlot::CUSTOM_RESULT_MAPPING,  "CUSTOM_RESULT_MAPPING",    "Custom Cell Results");
+        addItem(RimFaultResultSettings::CUSTOM_RESULT_MAPPING,  "CUSTOM_RESULT_MAPPING",    "Custom Cell Results");
-        setDefault(RimFaultResultSlot::CELL_RESULT_MAPPING);
+        setDefault(RimFaultResultSettings::CELL_RESULT_MAPPING);
     }
 }
 
-CAF_PDM_SOURCE_INIT(RimFaultResultSlot, "RimFaultResultSlot");
+CAF_PDM_SOURCE_INIT(RimFaultResultSettings, "RimFaultResultSlot");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimFaultResultSlot::RimFaultResultSlot()
+RimFaultResultSettings::RimFaultResultSettings()
 {
     CAF_PDM_InitObject("Fault Result Slot", "", "", "");
 
-    CAF_PDM_InitField(&visualizationMode, "VisualizationMode", caf::AppEnum<RimFaultResultSlot::FaultVisualizationMode>(RimFaultResultSlot::CELL_RESULT_MAPPING), "Fault Color Mapping", "", "", "");
+    CAF_PDM_InitField(&visualizationMode, "VisualizationMode", caf::AppEnum<RimFaultResultSettings::FaultVisualizationMode>(RimFaultResultSettings::CELL_RESULT_MAPPING), "Fault Color Mapping", "", "", "");
 
-     CAF_PDM_InitFieldNoDefault(&m_customResultSlot, "CustomResultSlot", "Custom Fault Cell Result", ":/CellResult.png", "", "");
+     CAF_PDM_InitFieldNoDefault(&m_customFaultResult, "CustomResultSlot", "Custom Fault Result", ":/CellResult.png", "", "");
-     m_customResultSlot = new RimResultSlot();
+     m_customFaultResult = new RimResultSlot();
 
      updateVisibility();
 }
@@ -56,23 +56,23 @@ RimFaultResultSlot::RimFaultResultSlot()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimFaultResultSlot::~RimFaultResultSlot()
+RimFaultResultSettings::~RimFaultResultSettings()
 {
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimFaultResultSlot::setReservoirView(RimReservoirView* ownerReservoirView)
+void RimFaultResultSettings::setReservoirView(RimReservoirView* ownerReservoirView)
 {
     m_reservoirView = ownerReservoirView;
-    m_customResultSlot->setReservoirView(ownerReservoirView);
+    m_customFaultResult->setReservoirView(ownerReservoirView);
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimFaultResultSlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimFaultResultSettings::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
     if (changedField == &visualizationMode)
     {
@@ -87,7 +87,7 @@ void RimFaultResultSlot::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimFaultResultSlot::initAfterRead()
+void RimFaultResultSettings::initAfterRead()
 {
     updateVisibility();
 }
@@ -95,28 +95,28 @@ void RimFaultResultSlot::initAfterRead()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimFaultResultSlot::updateVisibility()
+void RimFaultResultSettings::updateVisibility()
 {
     if (this->visualizationMode() == FAULT_COLOR || this->visualizationMode() == CELL_RESULT_MAPPING)
     {
-        this->m_customResultSlot.setUiHidden(true);
+        this->m_customFaultResult.setUiHidden(true);
-        this->m_customResultSlot.setUiChildrenHidden(true);
+        this->m_customFaultResult.setUiChildrenHidden(true);
     }
     else
     {
-        this->m_customResultSlot.setUiHidden(false);
+        this->m_customFaultResult.setUiHidden(false);
-        this->m_customResultSlot.setUiChildrenHidden(false);
+        this->m_customFaultResult.setUiChildrenHidden(false);
     }
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimResultSlot* RimFaultResultSlot::customResultSlot()
+RimResultSlot* RimFaultResultSettings::customFaultResult()
 {
     if (this->visualizationMode() == CUSTOM_RESULT_MAPPING)
     {
-        return this->m_customResultSlot();
+        return this->m_customFaultResult();
     }
 
     return NULL;

ApplicationCode/ProjectDataModel/RimFaultResultSettings.h

@@ -29,7 +29,7 @@ class RimReservoirView;
 ///  
 ///  
 //==================================================================================================
-class RimFaultResultSlot : public caf::PdmObject
+class RimFaultResultSettings : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
 public:
@@ -41,23 +41,22 @@ public:
     };
 
 public:
-    RimFaultResultSlot();
+    RimFaultResultSettings();
-    virtual ~RimFaultResultSlot();
+    virtual ~RimFaultResultSettings();
     
     void setReservoirView(RimReservoirView* ownerReservoirView);
 
     caf::PdmField< caf::AppEnum< FaultVisualizationMode > >     visualizationMode;
 
-    RimResultSlot* customResultSlot();
+    RimResultSlot*  customFaultResult();
-    void updateVisibility();
+    void            updateVisibility();
 
 protected:
     virtual void    initAfterRead();
     virtual void    fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
 
 private:
-    caf::PdmField<RimResultSlot*>                               m_customResultSlot;
+    caf::PdmField<RimResultSlot*>       m_customFaultResult;
-
+    caf::PdmPointer<RimReservoirView>   m_reservoirView;
-    caf::PdmPointer<RimReservoirView>                           m_reservoirView;
 };
 

ApplicationCode/ProjectDataModel/RimReservoirView.cpp

@@ -28,7 +28,7 @@
 #include "RimCellPropertyFilterCollection.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimFaultCollection.h"
-#include "RimFaultResultSlot.h"
+#include "RimFaultResultSettings.h"
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimResultSlot.h"
@@ -102,8 +102,8 @@ RimReservoirView::RimReservoirView()
     CAF_PDM_InitFieldNoDefault(&cellEdgeResult,  "GridCellEdgeResult", "Cell Edge Result", ":/EdgeResult_1.png", "", "");
     cellEdgeResult = new RimCellEdgeResultSlot();
 
-    CAF_PDM_InitFieldNoDefault(&faultResult,  "GridCellFaultResult", "Fault Result", ":/CellResult.png", "", "");
+    CAF_PDM_InitFieldNoDefault(&faultResultSettings,  "FaultResultSettings", "Fault Result Settings", ":/CellResult.png", "", "");
-    faultResult = new RimFaultResultSlot();
+    faultResultSettings = new RimFaultResultSettings();
 
     CAF_PDM_InitFieldNoDefault(&overlayInfoConfig,  "OverlayInfoConfig", "Info Box", "", "", "");
     overlayInfoConfig = new Rim3dOverlayInfoConfig();
@@ -165,7 +165,7 @@ RimReservoirView::RimReservoirView()
     this->cellEdgeResult()->legendConfig()->setPosition(cvf::Vec2ui(10, 320));
     this->cellEdgeResult()->legendConfig()->setColorRangeMode(RimLegendConfig::PINK_WHITE);
 
-    this->faultResult()->setReservoirView(this);
+    this->faultResultSettings()->setReservoirView(this);
 
     m_reservoirGridPartManager = new RivReservoirViewPartMgr(this);
 
@@ -180,7 +180,7 @@ RimReservoirView::RimReservoirView()
 //--------------------------------------------------------------------------------------------------
 RimReservoirView::~RimReservoirView()
 {
-    delete this->faultResult();
+    delete this->faultResultSettings();
     delete this->cellResult();
     delete this->cellEdgeResult();
     delete this->overlayInfoConfig();
@@ -967,7 +967,7 @@ void RimReservoirView::loadDataAndUpdate()
 //--------------------------------------------------------------------------------------------------
 void RimReservoirView::initAfterRead()
 {
-    this->faultResult()->setReservoirView(this);
+    this->faultResultSettings()->setReservoirView(this);
     this->cellResult()->setReservoirView(this);
     this->cellEdgeResult()->setReservoirView(this);
     this->rangeFilterCollection()->setReservoirView(this);
@@ -1388,9 +1388,10 @@ void RimReservoirView::updateLegends()
     CVF_ASSERT(results);
 
     updateMinMaxValuesAndAddLegendToView(QString("Cell Results: \n"), this->cellResult(), results);
-    if (this->faultResult()->customResultSlot())
+    if (this->faultResultSettings()->visualizationMode() == RimFaultResultSettings::CUSTOM_RESULT_MAPPING)
     {
-        updateMinMaxValuesAndAddLegendToView(QString("Fault Results: \n"), this->faultResult()->customResultSlot(), results);
+        CVF_ASSERT(this->faultResultSettings()->customFaultResult());
+        updateMinMaxValuesAndAddLegendToView(QString("Fault Results: \n"), this->faultResultSettings()->customFaultResult(), results);
     }
 
     if (this->cellEdgeResult()->hasResult())
@@ -2051,8 +2052,12 @@ void RimReservoirView::updateFaultColors()
     // Update all fault geometry
     std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometriesToRecolor = visibleFaultGeometryTypes();
 
-    RimResultSlot* resultSlot = this->faultResult()->customResultSlot();
+    RimResultSlot* resultSlot = NULL;
-    if (!resultSlot)
+    if (this->faultResultSettings()->visualizationMode() == RimFaultResultSettings::CUSTOM_RESULT_MAPPING)
+    {
+        resultSlot = this->faultResultSettings()->customFaultResult();
+    }
+    else
     {
         resultSlot = this->cellResult();
     }
@@ -2093,11 +2098,11 @@ bool RimReservoirView::isTimeStepDependentDataVisible() const
 
     if (this->cellResult()->isTernarySaturationSelected()) return true;
     
-    if (this->faultResult->customResultSlot())
+    if (this->faultResultSettings->customFaultResult())
     {
-        if (this->faultResult->customResultSlot()->hasDynamicResult()) return true;
+        if (this->faultResultSettings->customFaultResult()->hasDynamicResult()) return true;
 
-        if (this->faultResult->customResultSlot()->isTernarySaturationSelected()) return true;
+        if (this->faultResultSettings->customFaultResult()->isTernarySaturationSelected()) return true;
     }
 
     return false;

ApplicationCode/ProjectDataModel/RimReservoirView.h

@@ -44,7 +44,7 @@ class RimCellPropertyFilterCollection;
 class RimCellRangeFilter;
 class RimCellRangeFilterCollection;
 class RimFaultCollection;
-class RimFaultResultSlot;
+class RimFaultResultSettings;
 class RimReservoirCellResultsStorage;
 class RimReservoirCellResultsStorage;
 class RimResultSlot;
@@ -98,7 +98,7 @@ public:
 
     caf::PdmField<RimResultSlot*>                       cellResult;
     caf::PdmField<RimCellEdgeResultSlot*>               cellEdgeResult;
-    caf::PdmField<RimFaultResultSlot*>                  faultResult;
+    caf::PdmField<RimFaultResultSettings*>                  faultResultSettings;
 
     caf::PdmField<RimCellRangeFilterCollection*>        rangeFilterCollection;
     caf::PdmField<RimCellPropertyFilterCollection*>     propertyFilterCollection;