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

Always use red for gas and blue for water

Browse Source
This commit is contained in:
Magne Sjaastad 2020-09-20 12:19:51 +02:00 committed by Gaute Lindkvist
parent f981cf2ce0
commit 1d884ae117
4 changed files with 49 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/Resources/themes/dark.qss
View File

@ -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"] {

30
ApplicationCode/Resources/themes/default.qss
View File

@ -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"] {

30
ApplicationCode/Resources/themes/light.qss
View File

@ -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"] {

11
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp
View File

@ -342,6 +342,9 @@ void RiuRelativePermeabilityPlotPanel::plotCurvesInQwt( RiaEclipseUnitTools::Uni
std::vector<QPointF> points;
std::vector<WhichYAxis> 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 )