Merge pull request #25 from OPM/internal

Update to version 0.9.4

ApplicationCode/Application/RiaApplication.cpp

@@ -1278,6 +1278,7 @@ void RiaApplication::runRegressionTest(const QString& testRootPath)
     imageCompareReporter.generateHTMLReport(testDir.filePath(RegTestNames::reportFileName).toStdString());
 
     // Generate diff images
+    this->preferences()->resetToDefaults();
 
     for (int dirIdx = 0; dirIdx < folderList.size(); ++dirIdx)
     {

ApplicationCode/Application/RiaPreferences.cpp

@@ -38,6 +38,9 @@ RiaPreferences::RiaPreferences(void)
     octaveExecutable.setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
 
     CAF_PDM_InitField(&defaultGridLines,                "defaultGridLines", true, "Gridlines", "", "", "");
+    CAF_PDM_InitField(&defaultGridLineColors,           "defaultGridLineColors", cvf::Color3f(0.92f, 0.92f, 0.92f), "Mesh color", "", "", "");
+    CAF_PDM_InitField(&defaultFaultGridLineColors,      "defaultFaultGridLineColors", cvf::Color3f(0.08f, 0.08f, 0.08f), "Mesh color along faults", "", "", "");
+
     CAF_PDM_InitField(&defaultScaleFactorZ,             "defaultScaleFactorZ", 5, "Z scale factor", "", "", "");
 
     CAF_PDM_InitField(&useShaders,                      "useShaders", true, "Use Shaders", "", "", "");
@@ -88,9 +91,26 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
     caf::PdmUiGroup* defaultSettingsGroup = uiOrdering.addNewGroup("Default settings");
     defaultSettingsGroup->add(&defaultScaleFactorZ);
     defaultSettingsGroup->add(&defaultGridLines);
+    defaultSettingsGroup->add(&defaultGridLineColors);
+    defaultSettingsGroup->add(&defaultFaultGridLineColors);
+
 
     caf::PdmUiGroup* autoComputeGroup = uiOrdering.addNewGroup("Compute when loading new case");
     autoComputeGroup->add(&autocomputeSOIL);
     autoComputeGroup->add(&autocomputeDepthRelatedProperties);
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiaPreferences::resetToDefaults()
+{
+    std::vector<caf::PdmFieldHandle*> fields;
+    this->fields(fields);
+
+    for (size_t i = 0; i < fields.size(); ++i)
+    {
+        fields[i]->resetToDefaultValue();
+    }
+}
+

ApplicationCode/Application/RiaPreferences.h

@@ -29,6 +29,8 @@ public:
     RiaPreferences(void);
     virtual ~RiaPreferences(void);
 
+    void resetToDefaults();
+
 public: // Pdm Fields
     caf::PdmField<caf::AppEnum< RiaApplication::RINavigationPolicy > > navigationPolicy;
 
@@ -38,6 +40,8 @@ public: // Pdm Fields
 
     caf::PdmField<int>      defaultScaleFactorZ;
     caf::PdmField<bool>     defaultGridLines;
+    caf::PdmField<cvf::Color3f> defaultGridLineColors;
+    caf::PdmField<cvf::Color3f> defaultFaultGridLineColors;
 
     caf::PdmField<bool>     useShaders;
     caf::PdmField<bool>     showHud;

ApplicationCode/ModelVisualization/RivGridPartMgr.cpp

@@ -30,6 +30,8 @@
 #include "RigGridScalarDataAccess.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RiaApplication.h"
+#include "RiaPreferences.h"
 
 
 //--------------------------------------------------------------------------------------------------
@@ -144,10 +146,12 @@ void RivGridPartMgr::generatePartGeometry(cvf::StructGridGeometryGenerator& geoB
             part->setTransform(m_scaleTransform.p());
             part->updateBoundingBox();
 
+            RiaPreferences* prefs = RiaApplication::instance()->preferences();
+
             cvf::ref<cvf::Effect> eff;
             if (faultGeometry)
             {
-                caf::MeshEffectGenerator effGen(cvf::Color3f::BLACK);
+                caf::MeshEffectGenerator effGen(prefs->defaultFaultGridLineColors());
                 eff = effGen.generateEffect();
 
                 part->setEnableMask(meshFaultBit);
@@ -156,7 +160,7 @@ void RivGridPartMgr::generatePartGeometry(cvf::StructGridGeometryGenerator& geoB
             }
             else
             {
-                caf::MeshEffectGenerator effGen(cvf::Color3f::WHITE);
+                caf::MeshEffectGenerator effGen(prefs->defaultGridLineColors());
                 eff = effGen.generateEffect();
 
                 // Set priority to make sure fault lines are rendered first
@@ -205,6 +209,23 @@ void RivGridPartMgr::updateCellColor(cvf::Color4f color)
 
     m_opacityLevel = color.a();
     m_defaultColor = color.toColor3f();
+
+    // Update mesh colors as well, in case of change
+    RiaPreferences* prefs = RiaApplication::instance()->preferences();
+
+    cvf::ref<cvf::Effect> eff;
+    if (m_faultFaces.notNull())
+    {
+        caf::MeshEffectGenerator faultEffGen(prefs->defaultFaultGridLineColors());
+        eff = faultEffGen.generateEffect();
+        m_faultGridLines->setEffect(eff.p());
+    }
+    if (m_surfaceFaces.notNull())
+    {
+        caf::MeshEffectGenerator effGen(prefs->defaultGridLineColors());
+        eff = effGen.generateEffect();
+        m_surfaceGridLines->setEffect(eff.p());
+    }
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimStatisticsCase.cpp

@@ -31,6 +31,7 @@
 #include "cafPdmUiPushButtonEditor.h"
 #include "RiuMainWindow.h"
 #include "RimUiTreeModelPdm.h"
+#include "cafProgressInfo.h"
 
 namespace caf {
     template<>
@@ -481,6 +482,8 @@ void RimStatisticsCase::setWellResultsAndUpdateViews(const cvf::Collection<RigSi
     RimUiTreeModelPdm* treeModel = RiuMainWindow::instance()->uiPdmModel();
 
     this->reservoirData()->setWellResults(sourceCaseWellResults);
+    
+    caf::ProgressInfo progInfo(reservoirViews().size() + 1, "Updating Well Data for Views");
 
     // Update views
     for (size_t i = 0; i < reservoirViews().size(); i++)
@@ -492,6 +495,8 @@ void RimStatisticsCase::setWellResultsAndUpdateViews(const cvf::Collection<RigSi
         reservoirView->updateDisplayModelForWellResults();
 
         treeModel->rebuildUiSubTree(reservoirView->wellCollection());
+
+        progInfo.incrementProgress();
     }
 }
 

CMakeLists.txt

@@ -5,6 +5,7 @@ project (ResInsight)
 set (VIZ_MODULES_FOLDER_NAME VisualizationModules)
 
 
+
 # Setup the main platform defines
 #-----------------------------------------------------
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")

ResInsightVersion.cmake

@@ -1,7 +1,7 @@
 
 set(CMAKE_MAJOR_VERSION 0)
 set(CMAKE_MINOR_VERSION 9)
-set(CMAKE_PATCH_VERSION 3)
+set(CMAKE_PATCH_VERSION 4)
 
 set(PRODUCTVER ${CMAKE_MAJOR_VERSION},${CMAKE_MINOR_VERSION},0,${CMAKE_PATCH_VERSION})
 set(STRPRODUCTVER ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION})

cafProjectDataModel/cafPdmField.h

@@ -46,6 +46,8 @@ public:
     PdmFieldHandle() : m_isIOReadable(true), m_isIOWritable(true)   { m_ownerObject = NULL; m_keyword = "UNDEFINED"; }
     virtual ~PdmFieldHandle()                                       {  }
 
+    virtual void     resetToDefaultValue()                          { };                           
+
     virtual void     readFieldData(QXmlStreamReader& xmlStream)  = 0;
     virtual void     writeFieldData(QXmlStreamWriter& xmlStream) = 0;
 
@@ -119,6 +121,7 @@ public:
     
     const DataType& defaultValue() const                            { return m_defaultFieldValue; }
     void            setDefaultValue(const DataType& val)            { m_defaultFieldValue = val; }
+    virtual void    resetToDefaultValue()                           { m_fieldValue = m_defaultFieldValue; }
 
     // Gui generalized interface
     virtual QVariant    uiValue() const;