OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1392 Improve Dark 3D-View background support

Browse Source
This commit is contained in:
Rebecca Cox
2017-11-07 15:08:28 +01:00
parent a920f16def
commit f3b7f0abd6
6 changed files with 114 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.cpp
View File

@@ -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);