From 1d884ae1174f6255ebc2e0be71a4bd347995ff9d Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Sun, 20 Sep 2020 12:19:51 +0200 Subject: [PATCH] Always use red for gas and blue for water --- ApplicationCode/Resources/themes/dark.qss | 24 +++++++-------- ApplicationCode/Resources/themes/default.qss | 30 +++++++++---------- ApplicationCode/Resources/themes/light.qss | 30 +++++++++---------- .../RiuRelativePermeabilityPlotPanel.cpp | 11 ++++--- 4 files changed, 49 insertions(+), 46 deletions(-) diff --git a/ApplicationCode/Resources/themes/dark.qss b/ApplicationCode/Resources/themes/dark.qss index 98803c00fe..fe3c8a7fd7 100644 --- a/ApplicationCode/Resources/themes/dark.qss +++ b/ApplicationCode/Resources/themes/dark.qss @@ -46,23 +46,23 @@ QwtPlot["PvtPlot"]::curve["Auxiliary"] { } QwtPlot["PvtPlot"]::curve["Oil"] { - line-color: $primaryColor; - symbol-color: $primaryColor; + line-color: $curveColorOil; + symbol-color: $curveColorOil; } QwtPlot["PvtPlot"]::curve["Gas"] { - line-color: $secondaryColor; - symbol-color: $secondaryColor; + line-color: $curveColorGas; + symbol-color: $curveColorGas; } QwtPlot["RelPermPlot"]::curve["KRW"] { - line-color: $primaryColor; - symbol-color: $primaryColor; + line-color: $curveColorWater; + symbol-color: $curveColorWater; } QwtPlot["RelPermPlot"]::curve["KROW"] { - line-color: $secondaryColor; - symbol-color: $secondaryColor; + line-color: $curveColorWater; + symbol-color: $curveColorWater; } QwtPlot["RelPermPlot"]::curve["PCOW"] { @@ -71,13 +71,13 @@ QwtPlot["RelPermPlot"]::curve["PCOW"] { } QwtPlot["RelPermPlot"]::curve["KRG"] { - line-color: $quaternaryColor; - symbol-color: $quaternaryColor; + line-color: $curveColorGas; + symbol-color: $curveColorGas; } QwtPlot["RelPermPlot"]::curve["KROG"] { - line-color: $quinaryColor; - symbol-color: $quinaryColor; + line-color: $curveColorGas; + symbol-color: $curveColorGas; } QwtPlot["RelPermPlot"]::curve["PCOG"] { diff --git a/ApplicationCode/Resources/themes/default.qss b/ApplicationCode/Resources/themes/default.qss index 297abea655..20bde3c3fb 100644 --- a/ApplicationCode/Resources/themes/default.qss +++ b/ApplicationCode/Resources/themes/default.qss @@ -12,9 +12,9 @@ $quaternaryColor: #36b27e; // Quaternary color $quinaryColor: #0ce5d5; // Quinary color $senaryColor: #a54ce5; // Senary color $borderColor: #394046; // Main border color -$curveColorGas: #a91210; // Curve color for gas plot -$curveColorOil: #7ba700; // Curve color for oil plot -$curveColorWater: #3e7aa7; // Curve color for water plot +$curveColorGas: #c80000; // Curve color for gas plot +$curveColorOil: #00c800; // Curve color for oil plot +$curveColorWater: #0000c8; // Curve color for water plot $markerColor: #141719; // Marker color $lineMarkerColor: #eeeeee; // Color of line marker $plotGridColor: #394046; // Plot grid color @@ -38,23 +38,23 @@ QwtPlot["PvtPlot"]::curve["Auxiliary"] { } QwtPlot["PvtPlot"]::curve["Oil"] { - line-color: $primaryColor; - symbol-color: $primaryColor; + line-color: $curveColorOil; + symbol-color: $curveColorOil; } QwtPlot["PvtPlot"]::curve["Gas"] { - line-color: $secondaryColor; - symbol-color: $secondaryColor; + line-color: $curveColorGas; + symbol-color: $curveColorGas; } QwtPlot["RelPermPlot"]::curve["KRW"] { - line-color: $primaryColor; - symbol-color: $primaryColor; + line-color: $curveColorWater; + symbol-color: $curveColorWater; } QwtPlot["RelPermPlot"]::curve["KROW"] { - line-color: $secondaryColor; - symbol-color: $secondaryColor; + line-color: $curveColorWater; + symbol-color: $curveColorWater; } QwtPlot["RelPermPlot"]::curve["PCOW"] { @@ -63,13 +63,13 @@ QwtPlot["RelPermPlot"]::curve["PCOW"] { } QwtPlot["RelPermPlot"]::curve["KRG"] { - line-color: $quaternaryColor; - symbol-color: $quaternaryColor; + line-color: $curveColorGas; + symbol-color: $curveColorGas; } QwtPlot["RelPermPlot"]::curve["KROG"] { - line-color: $quinaryColor; - symbol-color: $quinaryColor; + line-color: $curveColorGas; + symbol-color: $curveColorGas; } QwtPlot["RelPermPlot"]::curve["PCOG"] { diff --git a/ApplicationCode/Resources/themes/light.qss b/ApplicationCode/Resources/themes/light.qss index 02d6eb7b20..36a0c20f2f 100644 --- a/ApplicationCode/Resources/themes/light.qss +++ b/ApplicationCode/Resources/themes/light.qss @@ -12,9 +12,9 @@ $quaternaryColor: #36b27e; // Quaternary color $quinaryColor: #0ce5d5; // Quinary color $senaryColor: #a54ce5; // Senary color $borderColor: #cccccc; // Main border color -$curveColorGas: #a91210; // Curve color for gas plot -$curveColorOil: #7ba700; // Curve color for oil plot -$curveColorWater: #3e7aa7; // Curve color for water plot +$curveColorGas: #c80000; // Curve color for gas plot +$curveColorOil: #00c800; // Curve color for oil plot +$curveColorWater: #0000c8; // Curve color for water plot $markerColor: #141719; // Marker color $lineMarkerColor: #018fa3; // Color of line marker $plotGridColor: #394046; // Plot grid color @@ -45,23 +45,23 @@ QwtPlot["PvtPlot"]::curve["Auxiliary"] { } QwtPlot["PvtPlot"]::curve["Oil"] { - line-color: $primaryColor; - symbol-color: $primaryColor; + line-color: $curveColorOil; + symbol-color: $curveColorOil; } QwtPlot["PvtPlot"]::curve["Gas"] { - line-color: $secondaryColor; - symbol-color: $secondaryColor; + line-color: $curveColorGas; + symbol-color: $curveColorGas; } QwtPlot["RelPermPlot"]::curve["KRW"] { - line-color: $primaryColor; - symbol-color: $primaryColor; + line-color: $curveColorWater; + symbol-color: $curveColorWater; } QwtPlot["RelPermPlot"]::curve["KROW"] { - line-color: $secondaryColor; - symbol-color: $secondaryColor; + line-color: $curveColorWater; + symbol-color: $curveColorWater; } QwtPlot["RelPermPlot"]::curve["PCOW"] { @@ -70,13 +70,13 @@ QwtPlot["RelPermPlot"]::curve["PCOW"] { } QwtPlot["RelPermPlot"]::curve["KRG"] { - line-color: $quaternaryColor; - symbol-color: $quaternaryColor; + line-color: $curveColorGas; + symbol-color: $curveColorGas; } QwtPlot["RelPermPlot"]::curve["KROG"] { - line-color: $quinaryColor; - symbol-color: $quinaryColor; + line-color: $curveColorGas; + symbol-color: $curveColorGas; } QwtPlot["RelPermPlot"]::curve["PCOG"] { diff --git a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp b/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp index 00f0204cab..221a5d91e1 100644 --- a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp +++ b/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp @@ -342,6 +342,9 @@ void RiuRelativePermeabilityPlotPanel::plotCurvesInQwt( RiaEclipseUnitTools::Uni std::vector points; std::vector axes; + const QColor waterColor = RiuGuiTheme::getColorByVariableName( "curveColorWater" ); + const QColor gasColor = RiuGuiTheme::getColorByVariableName( "curveColorGas" ); + bool shouldEnableRightYAxis = false; for ( size_t i = 0; i < curveArr.size(); i++ ) @@ -427,7 +430,7 @@ void RiuRelativePermeabilityPlotPanel::plotCurvesInQwt( RiaEclipseUnitTools::Uni { addCurveConstSaturationIntersectionMarker( curve, swat, - RiuGuiTheme::getColorByVariableName( "markerColor" ), + waterColor, plotOnWhichYAxis, plot, myPlotMarkers, @@ -443,7 +446,7 @@ void RiuRelativePermeabilityPlotPanel::plotCurvesInQwt( RiaEclipseUnitTools::Uni { addCurveConstSaturationIntersectionMarker( curve, sgas, - RiuGuiTheme::getColorByVariableName( "markerColor" ), + gasColor, plotOnWhichYAxis, plot, myPlotMarkers, @@ -460,11 +463,11 @@ void RiuRelativePermeabilityPlotPanel::plotCurvesInQwt( RiaEclipseUnitTools::Uni // Add vertical marker lines to indicate cell SWAT and/or SGAS saturations if ( swat != HUGE_VAL ) { - addVerticalSaturationMarkerLine( swat, "SWAT", RiuGuiTheme::getColorByVariableName( "markerColor" ), plot, myPlotMarkers ); + addVerticalSaturationMarkerLine( swat, "SWAT", waterColor, plot, myPlotMarkers ); } if ( sgas != HUGE_VAL ) { - addVerticalSaturationMarkerLine( sgas, "SGAS", RiuGuiTheme::getColorByVariableName( "markerColor" ), plot, myPlotMarkers ); + addVerticalSaturationMarkerLine( sgas, "SGAS", gasColor, plot, myPlotMarkers ); } if ( logScaleLeftAxis )