root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 03:35:53 +01:00
Code Issues Projects Releases Activity

Two-way radio reporting points

Browse Source
This commit is contained in:
Martin Tůma 2023-09-03 10:59:43 +02:00
parent f85634af3f
commit 0f26114f5d
5 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gpxsee.qrc
View File

@ -207,6 +207,7 @@
<file alias="fog-signal.png">icons/map/marine/fog-signal.png</file> <file alias="fog-signal.png">icons/map/marine/fog-signal.png</file>
<file alias="construction.png">icons/map/marine/construction.png</file> <file alias="construction.png">icons/map/marine/construction.png</file>
<file alias="radio-call.png">icons/map/marine/radio-call.png</file> <file alias="radio-call.png">icons/map/marine/radio-call.png</file>
<file alias="radio-call-2w.png">icons/map/marine/radio-call-2w.png</file>
<file alias="current.png">icons/map/marine/current.png</file> <file alias="current.png">icons/map/marine/current.png</file>
<file alias="rescue-station.png">icons/map/marine/rescue-station.png</file> <file alias="rescue-station.png">icons/map/marine/rescue-station.png</file>
<file alias="windmill.png">icons/map/marine/windmill.png</file> <file alias="windmill.png">icons/map/marine/windmill.png</file>

BIN
icons/map/marine/radio-call-2w.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 219 B

1
src/map/ENC/attributes.h
View File

@ -22,6 +22,7 @@
#define OBJNAM 116 #define OBJNAM 116
#define ORIENT 117 #define ORIENT 117
#define RESTRN 131 #define RESTRN 131
#define TRAFIC 172
#define VALDCO 174 #define VALDCO 174
#define WATLEV 187 #define WATLEV 187

4
src/map/ENC/mapdata.cpp
View File

@ -550,7 +550,9 @@ MapData::Attr MapData::pointAttr(const ISO8211::Record &r, uint OBJL)
|| (OBJL == BUISGL && key == FUNCTN) || (OBJL == BUISGL && key == FUNCTN)
|| (OBJL == WATTUR && key == CATWAT) || (OBJL == WATTUR && key == CATWAT)
|| (OBJL == SISTAT && key == CATSIT) || (OBJL == SISTAT && key == CATSIT)
|| (OBJL == I_SISTAT && key == I_CATSIT)) || (OBJL == I_SISTAT && key == I_CATSIT)
|| (OBJL == RDOCAL && key == TRAFIC)
|| (OBJL == I_RDOCAL && key == TRAFIC))
subtype = av.at(1).toByteArray().toUInt(); subtype = av.at(1).toByteArray().toUInt();
else if (OBJL == I_DISMAR && key == CATDIS) else if (OBJL == I_DISMAR && key == CATDIS)
subtype |= av.at(1).toByteArray().toUInt(); subtype |= av.at(1).toByteArray().toUInt();

20
src/map/ENC/style.cpp
View File

@ -258,10 +258,22 @@ void Style::pointStyle()
_points[TYPE(I_TRNBSN)] = Point(QImage(":/marine/turning-basin.png")); _points[TYPE(I_TRNBSN)] = Point(QImage(":/marine/turning-basin.png"));
_points[TYPE(I_TRNBSN)].setTextColor(QColor("#eb49eb")); _points[TYPE(I_TRNBSN)].setTextColor(QColor("#eb49eb"));
_points[TYPE(I_WTWGAG)] = Point(QImage(":/marine/gauge.png"), Small); _points[TYPE(I_WTWGAG)] = Point(QImage(":/marine/gauge.png"), Small);
_points[TYPE(RDOCAL)] = Point(QImage(":/marine/radio-call.png")); _points[SUBTYPE(RDOCAL, 1)] = Point(QImage(":/marine/radio-call.png"));
_points[TYPE(RDOCAL)].setTextColor(QColor("#eb49eb")); _points[SUBTYPE(RDOCAL, 2)] = Point(QImage(":/marine/radio-call.png"));
_points[TYPE(I_RDOCAL)] = Point(QImage(":/marine/radio-call.png")); _points[SUBTYPE(RDOCAL, 3)] = Point(QImage(":/marine/radio-call.png"));
_points[TYPE(I_RDOCAL)].setTextColor(QColor("#eb49eb")); _points[SUBTYPE(RDOCAL, 4)] = Point(QImage(":/marine/radio-call-2w.png"));
_points[SUBTYPE(RDOCAL, 1)].setTextColor(QColor("#eb49eb"));
_points[SUBTYPE(RDOCAL, 2)].setTextColor(QColor("#eb49eb"));
_points[SUBTYPE(RDOCAL, 3)].setTextColor(QColor("#eb49eb"));
_points[SUBTYPE(RDOCAL, 4)].setTextColor(QColor("#eb49eb"));
_points[SUBTYPE(I_RDOCAL, 1)] = Point(QImage(":/marine/radio-call.png"));
_points[SUBTYPE(I_RDOCAL, 2)] = Point(QImage(":/marine/radio-call.png"));
_points[SUBTYPE(I_RDOCAL, 3)] = Point(QImage(":/marine/radio-call.png"));
_points[SUBTYPE(I_RDOCAL, 4)] = Point(QImage(":/marine/radio-call-2w.png"));
_points[SUBTYPE(I_RDOCAL, 1)].setTextColor(QColor("#eb49eb"));
_points[SUBTYPE(I_RDOCAL, 2)].setTextColor(QColor("#eb49eb"));
_points[SUBTYPE(I_RDOCAL, 3)].setTextColor(QColor("#eb49eb"));
_points[SUBTYPE(I_RDOCAL, 4)].setTextColor(QColor("#eb49eb"));
_points[TYPE(PYLONS)] = Point(QImage(":/marine/pylon.png")); _points[TYPE(PYLONS)] = Point(QImage(":/marine/pylon.png"));
_points[SUBTYPE(I_BERTHS, 6)] = Point(QImage(":/marine/fleeting-area.png")); _points[SUBTYPE(I_BERTHS, 6)] = Point(QImage(":/marine/fleeting-area.png"));
_points[SUBTYPE(WATTUR, 1)] = Point(QImage(":/marine/breakers.png")); _points[SUBTYPE(WATTUR, 1)] = Point(QImage(":/marine/breakers.png"));