mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-03-14 02:57:45 +01:00
Distinguish white/yellow lights on ENC charts
This commit is contained in:
parent
7cf957a48d
commit
6c80d89c89
@ -482,6 +482,7 @@ Style::Style(qreal ratio)
|
|||||||
_lightRed = QImage(":/marine/light-red.png");
|
_lightRed = QImage(":/marine/light-red.png");
|
||||||
_lightGreen = QImage(":/marine/light-green.png");
|
_lightGreen = QImage(":/marine/light-green.png");
|
||||||
_lightYellow = QImage(":/marine/light-yellow.png");
|
_lightYellow = QImage(":/marine/light-yellow.png");
|
||||||
|
_lightWhite = QImage(":/marine/light-white.png");
|
||||||
_lightOffset = QPoint(11, 11);
|
_lightOffset = QPoint(11, 11);
|
||||||
_signal = QImage(":/marine/fog-signal.png");
|
_signal = QImage(":/marine/fog-signal.png");
|
||||||
_signalOffset = QPoint(-9, 9);
|
_signalOffset = QPoint(-9, 9);
|
||||||
@ -541,6 +542,7 @@ const QImage *Style::light(Color color) const
|
|||||||
case Green:
|
case Green:
|
||||||
return &_lightGreen;
|
return &_lightGreen;
|
||||||
case White:
|
case White:
|
||||||
|
return &_lightWhite;
|
||||||
case Yellow:
|
case Yellow:
|
||||||
case Amber:
|
case Amber:
|
||||||
case Orange:
|
case Orange:
|
||||||
@ -558,6 +560,7 @@ QColor Style::color(Style::Color c)
|
|||||||
case Green:
|
case Green:
|
||||||
return Qt::green;
|
return Qt::green;
|
||||||
case White:
|
case White:
|
||||||
|
return Qt::white;
|
||||||
case Yellow:
|
case Yellow:
|
||||||
case Amber:
|
case Amber:
|
||||||
case Orange:
|
case Orange:
|
||||||
|
@ -121,7 +121,7 @@ private:
|
|||||||
|
|
||||||
/* Fonts and images must be initialized after QGuiApplication! */
|
/* Fonts and images must be initialized after QGuiApplication! */
|
||||||
QFont _small, _normal, _large;
|
QFont _small, _normal, _large;
|
||||||
QImage _light, _lightRed, _lightGreen, _lightYellow, _signal;
|
QImage _light, _lightRed, _lightGreen, _lightYellow, _lightWhite, _signal;
|
||||||
QPoint _lightOffset, _signalOffset;
|
QPoint _lightOffset, _signalOffset;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user