mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Give oxygen a proper colour in the tankbar

Browse source 
Oxygen should be representad by its own solid green colour not the yellow/green of nitrox.

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Joakim Bygdell 2015-01-05 20:24:34 +01:00 • committed by Dirk Hohndel
parent 88d806f218
commit 4b98d17800
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
qt-ui/profile/tankitem.cpp
View file

@ -23,6 +23,7 @@ TankItem::TankItem(QObject *parent) :
nitroxGradient.setColorAt(0.5, yellow); nitroxGradient.setColorAt(0.5, yellow);
nitroxGradient.setColorAt(1.0, yellow); nitroxGradient.setColorAt(1.0, yellow);
nitrox = nitroxGradient; nitrox = nitroxGradient;
oxygen = green;
QLinearGradient trimixGradient(QPointF(0, 0), QPointF(0, height)); QLinearGradient trimixGradient(QPointF(0, 0), QPointF(0, height));
trimixGradient.setColorAt(0.0, green); trimixGradient.setColorAt(0.0, green);
trimixGradient.setColorAt(0.49, green); trimixGradient.setColorAt(0.49, green);
@ -63,6 +64,8 @@ void TankItem::createBar(qreal x, qreal w, struct gasmix *gas)
rect->setBrush(air); rect->setBrush(air);
else if (gas->he.permille) else if (gas->he.permille)
rect->setBrush(trimix); rect->setBrush(trimix);
else if (gas->o2.permille == 1000)
rect->setBrush(oxygen);
else else
rect->setBrush(nitrox); rect->setBrush(nitrox);
rect->setPen(QPen(QBrush(), 0.0)); // get rid of the thick line around the rectangle rect->setPen(QPen(QBrush(), 0.0)); // get rid of the thick line around the rectangle

2
qt-ui/profile/tankitem.h
View file

@ -33,7 +33,7 @@ private:
struct plot_data *pInfoEntry; struct plot_data *pInfoEntry;
int pInfoNr; int pInfoNr;
qreal yPos, height; qreal yPos, height;
QBrush air, nitrox, trimix; QBrush air, nitrox, oxygen, trimix;
QList<QGraphicsRectItem *> rects; QList<QGraphicsRectItem *> rects;
}; };