Merged down changes from Resinsight dev branch

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -44,6 +44,8 @@ ${CEE_CURRENT_LIST_DIR}RimStatisticsCaseEvaluator.h
 ${CEE_CURRENT_LIST_DIR}RimMimeData.h
 ${CEE_CURRENT_LIST_DIR}RimCommandObject.h
 ${CEE_CURRENT_LIST_DIR}RimTools.h
+${CEE_CURRENT_LIST_DIR}RimFault.h
+${CEE_CURRENT_LIST_DIR}RimFaultCollection.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -86,6 +88,8 @@ ${CEE_CURRENT_LIST_DIR}RimStatisticsCaseEvaluator.cpp
 ${CEE_CURRENT_LIST_DIR}RimMimeData.cpp
 ${CEE_CURRENT_LIST_DIR}RimCommandObject.cpp
 ${CEE_CURRENT_LIST_DIR}RimTools.cpp
+${CEE_CURRENT_LIST_DIR}RimFault.cpp
+${CEE_CURRENT_LIST_DIR}RimFaultCollection.cpp
 )
 
 list(APPEND CODE_HEADER_FILES

ApplicationCode/ProjectDataModel/RimFault.cpp

@@ -0,0 +1,126 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) Statoil ASA, Ceetron Solutions 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 "RimFault.h"
+
+#include "RigFault.h"
+
+#include "RimReservoirView.h"
+#include "RimResultSlot.h"
+#include "RimCellEdgeResultSlot.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimWellCollection.h"
+
+CAF_PDM_SOURCE_INIT(RimFault, "Fault");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimFault::RimFault()
+{
+    CAF_PDM_InitObject("RimFault", ":/draw_style_faults_24x24.png", "", "");
+
+    CAF_PDM_InitFieldNoDefault(&name,       "FaultName",             "Name", "", "", "");
+    name.setUiHidden(true);
+    name.setUiReadOnly(true);
+
+    CAF_PDM_InitField(&showFault,         "ShowFault",      true, "Show fault", "", "", "");
+    showFault.setUiHidden(true);
+
+    CAF_PDM_InitField(&showFaultLabel,         "ShowFaultLabel",      true, "Show fault label", "", "", "");
+
+    CAF_PDM_InitField(&showFaultColor,  "ShowFaultColor",      true, "Show fault color", "", "", "");
+    CAF_PDM_InitField(&faultColor,       "Color",        cvf::Color3f(0.588f, 0.588f, 0.804f), "Fault color", "", "", "");
+
+
+    m_rigFault = NULL;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimFault::~RimFault()
+{
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+caf::PdmFieldHandle* RimFault::userDescriptionField()
+{
+    return &name;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimFault::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+{
+    if (&showFault == changedField)
+    {
+        this->updateUiIconFromState(showFault);
+
+        RimReservoirView* reservoirView = NULL;
+        this->firstAncestorOfType(reservoirView);
+
+        if (reservoirView) 
+        {
+            reservoirView->scheduleCreateDisplayModelAndRedraw();
+        }
+    }
+
+    if (&faultColor == changedField)
+    {
+        RimReservoirView* reservoirView = NULL;
+        this->firstAncestorOfType(reservoirView);
+
+        if (reservoirView) 
+        {
+            reservoirView->scheduleCreateDisplayModelAndRedraw();
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+caf::PdmFieldHandle* RimFault::objectToggleField()
+{
+    return &showFault;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimFault::setFaultGeometry(const RigFault* faultGeometry)
+{
+    m_rigFault = faultGeometry;
+
+    this->name = faultGeometry->name();
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+const RigFault* RimFault::faultGeometry() const
+{
+    return m_rigFault;
+}
+

ApplicationCode/ProjectDataModel/RimFault.h

@@ -0,0 +1,62 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) Statoil ASA, Ceetron Solutions 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 "cafPdmField.h"
+#include "cafPdmObject.h"
+#include "cafPdmPointer.h"
+
+#include "cvfBase.h"
+#include "cvfColor3.h"
+#include "cafPdmFieldCvfColor.h"
+
+class RigFault;
+
+//==================================================================================================
+///  
+///  
+//==================================================================================================
+class RimFault : public caf::PdmObject
+{
+    CAF_PDM_HEADER_INIT;
+public:
+
+    RimFault();
+    virtual ~RimFault();
+
+    void                                setFaultGeometry(const RigFault* faultGeometry);
+    const RigFault*                     faultGeometry() const;
+    
+    virtual caf::PdmFieldHandle*        userDescriptionField();
+    virtual caf::PdmFieldHandle*        objectToggleField();
+
+    virtual void                        fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
+
+    caf::PdmField<bool>                 showFault;
+
+    caf::PdmField<QString>              name;
+    caf::PdmField<bool>                 showFaultLabel;
+
+    caf::PdmField<bool>                 showFaultColor;
+    caf::PdmField<cvf::Color3f>         faultColor;
+
+
+private:
+    const RigFault*                           m_rigFault;
+};

ApplicationCode/ProjectDataModel/RimFaultCollection.cpp

@@ -0,0 +1,165 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) Statoil ASA, Ceetron Solutions 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 "RimFaultCollection.h"
+
+#include "cafAppEnum.h"
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "RimReservoirView.h"
+
+#include "RimResultSlot.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "RimWellCollection.h"
+
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RiaApplication.h"
+#include "RiaPreferences.h"
+
+#include "RimCase.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RigCaseData.h"
+#include "RivColorTableArray.h"
+
+
+
+CAF_PDM_SOURCE_INIT(RimFaultCollection, "Faults");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimFaultCollection::RimFaultCollection()
+{
+    CAF_PDM_InitObject("Faults", ":/draw_style_faults_24x24.png", "", "");
+
+    CAF_PDM_InitField(&showFaultCollection,              "Active",        true,   "Active", "", "", "");
+    showFaultCollection.setUiHidden(true);
+
+    CAF_PDM_InitField(&showGeometryDetectedFaults,       "ShowGeometryDetectedFaults",    true,   "Show geometry detected faults", "", "", "");
+
+    CAF_PDM_InitField(&showFaultLabel,       "ShowFaultLabel",    true,   "Show fault labels", "", "", "");
+    cvf::Color3f defWellLabelColor = RiaApplication::instance()->preferences()->defaultWellLabelColor();
+    CAF_PDM_InitField(&faultLabelColor,      "FaultLabelColor",   defWellLabelColor, "Fault label color",  "", "", "");
+
+    CAF_PDM_InitFieldNoDefault(&faults, "Faults", "Faults",  "", "", "");
+
+    m_reservoirView = NULL;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimFaultCollection::~RimFaultCollection()
+{
+   faults.deleteAllChildObjects();
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimFaultCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+{
+    if (&showFaultCollection == changedField)
+    {
+        this->updateUiIconFromState(showFaultCollection);
+
+        if (m_reservoirView) 
+        {
+            m_reservoirView->scheduleCreateDisplayModelAndRedraw();
+        }
+    }
+
+    if (&showGeometryDetectedFaults == changedField)
+    {
+        if (m_reservoirView) 
+        {
+            m_reservoirView->scheduleCreateDisplayModelAndRedraw();
+        }
+    }
+
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimFaultCollection::setReservoirView(RimReservoirView* ownerReservoirView)
+{
+    m_reservoirView = ownerReservoirView;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+caf::PdmFieldHandle* RimFaultCollection::objectToggleField()
+{
+    return &showFaultCollection;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimFault* RimFaultCollection::findFaultByName(QString name)
+{
+    for (size_t i = 0; i < this->faults().size(); ++i)
+    {
+        if (this->faults()[i]->name() == name)
+        {
+            return this->faults()[i];
+        }
+    }
+    return NULL;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimFaultCollection::syncronizeFaults()
+{
+    if (!(m_reservoirView && m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData()) ) return;
+
+    cvf::ref<cvf::Color3fArray> partColors = RivColorTableArray::colorTableArray();
+
+    const cvf::Collection<RigFault> rigFaults = m_reservoirView->eclipseCase()->reservoirData()->mainGrid()->faults();
+
+    std::vector<caf::PdmPointer<RimFault> > newFaults;
+
+    // Find corresponding fault from data model, or create a new
+
+    for (size_t fIdx = 0; fIdx < rigFaults.size(); ++fIdx)
+    {
+        RimFault* rimFault = this->findFaultByName(rigFaults[fIdx]->name());
+
+        if (!rimFault)
+        {
+            rimFault = new RimFault();
+            rimFault->faultColor = partColors->get(fIdx % partColors->size());
+        }
+
+        rimFault->setFaultGeometry(rigFaults[fIdx].p());
+
+        newFaults.push_back(rimFault);
+    }
+
+    this->faults().clear();
+    this->faults().insert(0, newFaults);
+}
+

ApplicationCode/ProjectDataModel/RimFaultCollection.h

@@ -0,0 +1,68 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) Statoil ASA, Ceetron Solutions 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 "cafPdmField.h"
+#include "cafPdmObject.h"
+#include "cafPdmPointer.h"
+#include "cafAppEnum.h"
+#include <QString>
+
+#include "cvfBase.h"
+#include "cvfColor3.h"
+
+#include "RimFault.h"
+
+class RimReservoirView;
+
+
+//==================================================================================================
+///  
+///  
+//==================================================================================================
+class RimFaultCollection : public caf::PdmObject
+{
+    CAF_PDM_HEADER_INIT;
+public:
+
+    RimFaultCollection();
+    virtual ~RimFaultCollection();
+
+    void                                setReservoirView(RimReservoirView* ownerReservoirView);
+    void                                syncronizeFaults();
+
+    caf::PdmField<bool>                 showGeometryDetectedFaults;
+
+    caf::PdmField<bool>                 showFaultLabel;
+    caf::PdmField<cvf::Color3f>         faultLabelColor;
+
+    caf::PdmField<bool>                 showFaultCollection;
+
+    caf::PdmPointersField<RimFault*>    faults;
+
+    virtual void                        fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
+    virtual caf::PdmFieldHandle*        objectToggleField();
+
+private:
+    RimFault*                           findFaultByName(QString name);
+
+private:
+    RimReservoirView* m_reservoirView;
+
+};

ApplicationCode/ProjectDataModel/RimInputCase.cpp

@@ -262,7 +262,9 @@ void RimInputCase::loadAndSyncronizeInputProperties()
 
         if (isExistingFile)
         {
-            std::vector< RifKeywordAndFilePos > fileKeywords = RifEclipseInputFileTools::findKeywordsOnFile(filenames[i]);
+            std::vector< RifKeywordAndFilePos > fileKeywords;
+            RifEclipseInputFileTools::findKeywordsOnFile(filenames[i], fileKeywords);
+
             for_all(fileKeywords, fkIt) fileKeywordSet.insert(fileKeywords[fkIt].keyword);
         }
 

ApplicationCode/ProjectDataModel/RimReservoirView.cpp

@@ -73,6 +73,7 @@
 
 #include <limits.h>
 #include "cafCeetronPlusNavigation.h"
+#include "RimFaultCollection.h"
 
 namespace caf {
 
@@ -99,11 +100,6 @@ void caf::AppEnum< RimReservoirView::SurfaceModeType >::setUp()
 
 
 
-const cvf::uint surfaceBit      = 0x00000001;
-const cvf::uint meshSurfaceBit  = 0x00000002;
-const cvf::uint faultBit        = 0x00000004;
-const cvf::uint meshFaultBit    = 0x00000008;
-
 
 CAF_PDM_SOURCE_INIT(RimReservoirView, "ReservoirView");
 //--------------------------------------------------------------------------------------------------
@@ -145,6 +141,9 @@ RimReservoirView::RimReservoirView()
     CAF_PDM_InitFieldNoDefault(&wellCollection, "WellCollection", "Simulation Wells", "", "", "");
     wellCollection = new RimWellCollection;
 
+    CAF_PDM_InitFieldNoDefault(&faultCollection, "FaultCollection", "Faults", "", "", "");
+    faultCollection = new RimFaultCollection;
+
     CAF_PDM_InitFieldNoDefault(&rangeFilterCollection, "RangeFilters", "Range Filters",         "", "", "");
     rangeFilterCollection = new RimCellRangeFilterCollection();
     rangeFilterCollection->setReservoirView(this);
@@ -198,6 +197,7 @@ RimReservoirView::~RimReservoirView()
     delete rangeFilterCollection();
     delete propertyFilterCollection();
     delete wellCollection();
+    delete faultCollection();
 
     if (m_viewer)
     {
@@ -890,6 +890,9 @@ void RimReservoirView::loadDataAndUpdate()
 
     this->propertyFilterCollection()->loadAndInitializePropertyFilters();
 
+    this->faultCollection()->setReservoirView(this);
+    this->faultCollection()->syncronizeFaults();
+
     m_reservoirGridPartManager->clearGeometryCache();
 
     syncronizeWellsWithResults();
@@ -1104,30 +1107,35 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex,
 void RimReservoirView::updateDisplayModelVisibility()
 {
     if (m_viewer.isNull()) return;
+
+    const cvf::uint uintSurfaceBit      = surfaceBit;
+    const cvf::uint uintMeshSurfaceBit  = meshSurfaceBit;
+    const cvf::uint uintFaultBit        = faultBit;
+    const cvf::uint uintMeshFaultBit    = meshFaultBit;
  
     // Initialize the mask to show everything except the the bits controlled here
-    unsigned int mask = 0xffffffff & ~surfaceBit & ~faultBit & ~meshSurfaceBit & ~meshFaultBit ;
+    unsigned int mask = 0xffffffff & ~uintSurfaceBit & ~uintFaultBit & ~uintMeshSurfaceBit & ~uintMeshFaultBit ;
 
     // Then turn the appropriate bits on according to the user settings
 
     if (surfaceMode == SURFACE)
     {
-         mask |= surfaceBit;
-         mask |= faultBit;
+         mask |= uintSurfaceBit;
+         mask |= uintFaultBit;
     }
     else if (surfaceMode == FAULTS)
     {
-        mask |= faultBit;
+        mask |= uintFaultBit;
     }
 
     if (meshMode == FULL_MESH)
     {
-        mask |= meshSurfaceBit;
-        mask |= meshFaultBit;
+        mask |= uintMeshSurfaceBit;
+        mask |= uintMeshFaultBit;
     }
     else if (meshMode == FAULTS_MESH)
     {
-        mask |= meshFaultBit;
+        mask |= uintMeshFaultBit;
     }
 
     m_viewer->setEnableMask(mask);

ApplicationCode/ProjectDataModel/RimReservoirView.h

@@ -30,6 +30,8 @@
 #include <QPointer>
 #include <QString>
 
+#include "RimFaultCollection.h"
+
 class RimCase;
 class RimResultSlot;
 class RimCellEdgeResultSlot;
@@ -49,6 +51,7 @@ class RiuViewer;
 class RigGridBase;
 class RigGridCellFaceVisibilityFilter;
 class RimReservoirCellResultsStorage;
+
 namespace cvf
 {
     class Transform;
@@ -56,14 +59,15 @@ namespace cvf
     class ModelBasicList;
 }
 
-enum ViewState
+enum PartRenderMaskEnum
 {
-    GEOMETRY_ONLY,
-    STATIC_RESULT,
-    DYNAMIC_RESULT,
-    CELL_FACE_COMBINED_RESULT
+    surfaceBit      = 0x00000001,
+    meshSurfaceBit  = 0x00000002,
+    faultBit        = 0x00000004,
+    meshFaultBit    = 0x00000008,
 };
 
+
 //==================================================================================================
 ///  
 ///  
@@ -99,6 +103,8 @@ public:
 
     caf::PdmField<RimWellCollection*>                   wellCollection;
 
+    caf::PdmField<RimFaultCollection*>                  faultCollection;
+
     caf::PdmField<Rim3dOverlayInfoConfig*>              overlayInfoConfig;
 
     // Visualization setup fields