#1392 Improve Dark 3D-View background support

ApplicationCode/Application/Tools/CMakeLists_files.cmake

@@ -9,6 +9,7 @@ set (SOURCE_GROUP_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RiaArgumentParser.h
 ${CEE_CURRENT_LIST_DIR}RiaDateStringParser.h
 ${CEE_CURRENT_LIST_DIR}RiaColorTables.h
+${CEE_CURRENT_LIST_DIR}RiaColorTools.h
 ${CEE_CURRENT_LIST_DIR}RiaEclipseUnitTools.h
 ${CEE_CURRENT_LIST_DIR}RiaImageCompareReporter.h
 ${CEE_CURRENT_LIST_DIR}RiaImageFileCompare.h
@@ -26,6 +27,7 @@ set (SOURCE_GROUP_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RiaArgumentParser.cpp
 ${CEE_CURRENT_LIST_DIR}RiaDateStringParser.cpp
 ${CEE_CURRENT_LIST_DIR}RiaColorTables.cpp
+${CEE_CURRENT_LIST_DIR}RiaColorTools.cpp
 ${CEE_CURRENT_LIST_DIR}RiaEclipseUnitTools.cpp
 ${CEE_CURRENT_LIST_DIR}RiaImageCompareReporter.cpp
 ${CEE_CURRENT_LIST_DIR}RiaImageFileCompare.cpp

ApplicationCode/Application/Tools/RiaColorTools.cpp

@@ -0,0 +1,61 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2017     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 "RiaColorTools.h"
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RiaColorTools::isBrightnessAboveThreshold(cvf::Color3f backgroundColor)
+{
+    if (backgroundColor.r() + backgroundColor.g() + backgroundColor.b() > 1.5f)
+    {
+        return true;
+    }
+
+    return false;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+cvf::Color3f RiaColorTools::darkContrastColor()
+{
+    return cvf::Color3f::fromByteColor(10, 10, 10);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+cvf::Color3f RiaColorTools::brightContrastColor()
+{
+    return cvf::Color3f::WHITE;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+cvf::Color3f RiaColorTools::constrastColor(cvf::Color3f backgroundColor)
+{
+    if (isBrightnessAboveThreshold(backgroundColor))
+    {
+        return darkContrastColor();
+    }
+ 
+    return brightContrastColor();
+}

ApplicationCode/Application/Tools/RiaColorTools.h

@@ -0,0 +1,36 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2017     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 "cvfArray.h"
+
+
+//==================================================================================================
+///  
+///  
+//==================================================================================================
+class RiaColorTools
+{
+public:
+    static bool         isBrightnessAboveThreshold(cvf::Color3f backgroundColor);
+
+    static cvf::Color3f darkContrastColor();
+    static cvf::Color3f brightContrastColor();
+    static cvf::Color3f constrastColor(cvf::Color3f backgroundColor);
+};

ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.cpp

@@ -21,6 +21,7 @@
 #include "RivGridBoxGenerator.h"
 
 #include "RiaApplication.h"
+#include "RiaColorTools.h"
 
 #include "RivPartPriority.h"
 #include "RivPatchGenerator.h"
@@ -739,13 +740,13 @@ void RivGridBoxGenerator::updateFromBackgroundColor(const cvf::Color3f& backgrou
     float gridG = 0.0;
     float gridB = 0.0;
 
-    if (backgroundColor.r() + backgroundColor.g() + backgroundColor.b() > 1.5f)
+    if (RiaColorTools::isBrightnessAboveThreshold(backgroundColor))
     {
         gridR = backgroundColor.r() - (backgroundColor.r() * adjustmentFactor);
         gridG = backgroundColor.g() - (backgroundColor.g() * adjustmentFactor);
         gridB = backgroundColor.b() - (backgroundColor.b() * adjustmentFactor);
 
-        m_gridLegendColor = cvf::Color3f::fromByteColor(10, 10, 10);
+        m_gridLegendColor = RiaColorTools::darkContrastColor();
     }
     else
     {
@@ -753,7 +754,7 @@ void RivGridBoxGenerator::updateFromBackgroundColor(const cvf::Color3f& backgrou
         gridG = backgroundColor.g() + (1.0 - backgroundColor.g()) * adjustmentFactor;
         gridB = backgroundColor.b() + (1.0 - backgroundColor.b()) * adjustmentFactor;
 
-        m_gridLegendColor = cvf::Color3f::WHITE;
+        m_gridLegendColor = RiaColorTools::brightContrastColor();
     }
 
     m_gridColor.set(gridR, gridG, gridB);

ApplicationCode/ProjectDataModel/RimView.cpp

@@ -698,6 +698,7 @@ void RimView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QV
         if (m_viewer != nullptr)
         {
             m_viewer->mainCamera()->viewport()->setClearColor(cvf::Color4f(backgroundColor()));
+            m_viewer->updateGridBoxData();
         }
     }
     else if (changedField == &maximumFrameRate)

ApplicationCode/UserInterface/RiuViewer.cpp

@@ -22,6 +22,7 @@
 
 #include "RiaApplication.h"
 #include "RiaBaseDefs.h"
+#include "RiaColorTools.h"
 
 #include "RimCase.h"
 #include "RimProject.h"
@@ -30,6 +31,7 @@
 #include "RimViewLinker.h"
 
 #include "RivGridBoxGenerator.h"
+#include "RivTernarySaturationOverlayItem.h"
 
 #include "RiuCadNavigation.h"
 #include "RiuGeoQuestNavigation.h"
@@ -869,6 +871,12 @@ void RiuViewer::updateLegendTextAndTickMarkColor(cvf::OverlayItem* legend)
         categoryLegend->setColor(contrastColor);
         categoryLegend->setLineColor(contrastColor);
     }
+
+    RivTernarySaturationOverlayItem* ternaryItem = dynamic_cast<RivTernarySaturationOverlayItem*>(legend);
+    if (ternaryItem)
+    {
+        ternaryItem->setAxisLabelsColor(contrastColor);
+    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -899,15 +907,11 @@ void RiuViewer::updateAxisCrossTextColor()
 //--------------------------------------------------------------------------------------------------
 cvf::Color3f RiuViewer::computeContrastColor() const
 {
-    cvf::Color3f contrastColor = cvf::Color3f::WHITE;
+    cvf::Color3f contrastColor = RiaColorTools::brightContrastColor();
 
     if (m_rimView.notNull())
     {
-        cvf::Color3f backgroundColor = m_rimView->backgroundColor;
-        if (backgroundColor.r() + backgroundColor.g() + backgroundColor.b() > 1.5f)
-        {
-            contrastColor = cvf::Color3f::BLACK;
-        }
+        contrastColor = RiaColorTools::constrastColor(m_rimView->backgroundColor);
     }
     
     return contrastColor;