root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-26 11:09:16 +02:00
Code Issues Projects Releases Activity

Orange and grey buoys

Browse Source
This commit is contained in:
Martin Tůma
2025-05-15 18:59:49 +02:00
parent 018ec28339
commit 10555723cd
16 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gpxsee.qrc
View File

@ -144,7 +144,9 @@
<file alias="buoy-white-green.png">icons/map/marine/buoy-white-green.png</file>
<file alias="buoy-white-red.png">icons/map/marine/buoy-white-red.png</file>
<file alias="buoy-white-yellow.png">icons/map/marine/buoy-white-yellow.png</file>
<file alias="buoy-white-orange.png">icons/map/marine/buoy-white-orange.png</file>
<file alias="buoy-white-yellow-white.png">icons/map/marine/buoy-white-yellow-white.png</file>
<file alias="buoy-white-orange-white.png">icons/map/marine/buoy-white-orange-white.png</file>
<file alias="buoy-green.png">icons/map/marine/buoy-green.png</file>
<file alias="buoy-green-white.png">icons/map/marine/buoy-green-white.png</file>
<file alias="buoy-green-white-green-white.png">icons/map/marine/buoy-green-white-green-white.png</file>
@ -172,14 +174,21 @@
<file alias="buoy-black-red-black.png">icons/map/marine/buoy-black-red-black.png</file>
<file alias="buoy-black-green.png">icons/map/marine/buoy-black-green.png</file>
<file alias="buoy-black-yellow.png">icons/map/marine/buoy-black-yellow.png</file>
<file alias="buoy-black-orange.png">icons/map/marine/buoy-black-orange.png</file>
<file alias="buoy-black-yellow-black.png">icons/map/marine/buoy-black-yellow-black.png</file>
<file alias="buoy-orange.png">icons/map/marine/buoy-orange.png</file>
<file alias="buoy-orange-white.png">icons/map/marine/buoy-orange-white.png</file>
<file alias="buoy-orange-black.png">icons/map/marine/buoy-orange-black.png</file>
<file alias="buoy-grey.png">icons/map/marine/buoy-grey.png</file>
<file alias="beacon.png">icons/map/marine/beacon.png</file>
<file alias="beacon-white.png">icons/map/marine/beacon-white.png</file>
<file alias="beacon-white-black.png">icons/map/marine/beacon-white-black.png</file>
<file alias="beacon-white-green.png">icons/map/marine/beacon-white-green.png</file>
<file alias="beacon-white-red.png">icons/map/marine/beacon-white-red.png</file>
<file alias="beacon-white-yellow.png">icons/map/marine/beacon-white-yellow.png</file>
<file alias="beacon-white-orange.png">icons/map/marine/beacon-white-orange.png</file>
<file alias="beacon-white-yellow-white.png">icons/map/marine/beacon-white-yellow-white.png</file>
<file alias="beacon-white-orange-white.png">icons/map/marine/beacon-white-orange-white.png</file>
<file alias="beacon-green.png">icons/map/marine/beacon-green.png</file>
<file alias="beacon-green-white.png">icons/map/marine/beacon-green-white.png</file>
<file alias="beacon-green-white-green-white.png">icons/map/marine/beacon-green-white-green-white.png</file>
@ -207,7 +216,12 @@
<file alias="beacon-black-red-black.png">icons/map/marine/beacon-black-red-black.png</file>
<file alias="beacon-black-green.png">icons/map/marine/beacon-black-green.png</file>
<file alias="beacon-black-yellow.png">icons/map/marine/beacon-black-yellow.png</file>
<file alias="beacon-black-orange.png">icons/map/marine/beacon-black-orange.png</file>
<file alias="beacon-black-yellow-black.png">icons/map/marine/beacon-black-yellow-black.png</file>
<file alias="beacon-orange.png">icons/map/marine/beacon-orange.png</file>
<file alias="beacon-orange-white.png">icons/map/marine/beacon-orange-white.png</file>
<file alias="beacon-orange-black.png">icons/map/marine/beacon-orange-black.png</file>
<file alias="beacon-grey.png">icons/map/marine/beacon-grey.png</file>
<file alias="spar-buoy.png">icons/map/marine/spar-buoy.png</file>
<file alias="spar-buoy-red.png">icons/map/marine/spar-buoy-red.png</file>
<file alias="spar-buoy-green.png">icons/map/marine/spar-buoy-green.png</file>

BIN
icons/map/marine/beacon-black-orange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 283 B

BIN
icons/map/marine/beacon-grey.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 283 B

BIN
icons/map/marine/beacon-orange-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 284 B

BIN
icons/map/marine/beacon-orange-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 286 B

BIN
icons/map/marine/beacon-orange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 281 B

BIN
icons/map/marine/beacon-white-orange-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 290 B

BIN
icons/map/marine/beacon-white-orange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 285 B

BIN
icons/map/marine/buoy-black-orange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 330 B

BIN
icons/map/marine/buoy-grey.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 339 B

BIN
icons/map/marine/buoy-orange-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 334 B

BIN
icons/map/marine/buoy-orange-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 348 B

BIN
icons/map/marine/buoy-orange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 336 B

BIN
icons/map/marine/buoy-white-orange-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 341 B

BIN
icons/map/marine/buoy-white-orange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 340 B

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

@ -21,25 +21,26 @@ using namespace Util;
PNT(type, 4, ":/marine/" name "-green.png", dx, dy); \
PNT(type, 5, ":/marine/" name ".png", dx, dy); \
PNT(type, 6, ":/marine/" name "-yellow.png", dx, dy); \
PNT(type, 7, ":/marine/" name ".png", dx, dy); \
PNT(type, 8, ":/marine/" name ".png", dx, dy); \
PNT(type, 9, ":/marine/" name "-yellow.png", dx, dy); \
PNT(type, 7, ":/marine/" name "-grey.png", dx, dy); \
PNT(type, 8, ":/marine/" name "-orange.png", dx, dy); \
PNT(type, 9, ":/marine/" name "-orange.png", dx, dy); \
PNT(type, 10, ":/marine/" name ".png", dx, dy); \
PNT(type, 11, ":/marine/" name "-yellow.png", dx, dy); \
PNT(type, 11, ":/marine/" name "-orange.png", dx, dy); \
PNT(type, 12, ":/marine/" name ".png", dx, dy); \
PNT(type, 13, ":/marine/" name ".png", dx, dy); \
PNT(type, COLOR2(1, 2), ":/marine/" name "-white-black.png", dx, dy); \
PNT(type, COLOR2(1, 3), ":/marine/" name "-white-red.png", dx, dy); \
PNT(type, COLOR2(1, 4), ":/marine/" name "-white-green.png", dx, dy); \
PNT(type, COLOR2(1, 6), ":/marine/" name "-white-yellow.png", dx, dy); \
PNT(type, COLOR2(1, 9), ":/marine/" name "-white-yellow.png", dx, dy); \
PNT(type, COLOR2(1, 11), ":/marine/" name "-white-yellow.png", dx, dy); \
PNT(type, COLOR2(1, 8), ":/marine/" name "-white-orange.png", dx, dy); \
PNT(type, COLOR2(1, 9), ":/marine/" name "-white-orange.png", dx, dy); \
PNT(type, COLOR2(1, 11), ":/marine/" name "-white-orange.png", dx, dy); \
PNT(type, COLOR2(2, 1), ":/marine/" name "-black-white.png", dx, dy); \
PNT(type, COLOR2(2, 3), ":/marine/" name "-black-red.png", dx, dy); \
PNT(type, COLOR2(2, 4), ":/marine/" name "-black-green.png", dx, dy); \
PNT(type, COLOR2(2, 6), ":/marine/" name "-black-yellow.png", dx, dy); \
PNT(type, COLOR2(2, 9), ":/marine/" name "-black-yellow.png", dx, dy); \
PNT(type, COLOR2(2, 11), ":/marine/" name "-black-yellow.png", dx, dy); \
PNT(type, COLOR2(2, 9), ":/marine/" name "-black-orange.png", dx, dy); \
PNT(type, COLOR2(2, 11), ":/marine/" name "-black-orange.png", dx, dy); \
PNT(type, COLOR2(3, 1), ":/marine/" name "-red-white.png", dx, dy); \
PNT(type, COLOR2(3, 2), ":/marine/" name "-red-black.png", dx, dy); \
PNT(type, COLOR2(3, 4), ":/marine/" name "-red-green.png", dx, dy); \
@ -48,14 +49,15 @@ using namespace Util;
PNT(type, COLOR2(4, 2), ":/marine/" name "-green-black.png", dx, dy); \
PNT(type, COLOR2(4, 3), ":/marine/" name "-green-red.png", dx, dy); \
PNT(type, COLOR2(6, 1), ":/marine/" name "-yellow-white.png", dx, dy); \
PNT(type, COLOR2(9, 1), ":/marine/" name "-yellow-white.png", dx, dy); \
PNT(type, COLOR2(11, 1), ":/marine/" name "-yellow-white.png", dx, dy); \
PNT(type, COLOR2(8, 1), ":/marine/" name "-orange-white.png", dx, dy); \
PNT(type, COLOR2(9, 1), ":/marine/" name "-orange-white.png", dx, dy); \
PNT(type, COLOR2(11, 1), ":/marine/" name "-orange-white.png", dx, dy); \
PNT(type, COLOR2(6, 2), ":/marine/" name "-yellow-black.png", dx, dy); \
PNT(type, COLOR2(9, 2), ":/marine/" name "-yellow-black.png", dx, dy); \
PNT(type, COLOR2(11, 2), ":/marine/" name "-yellow-black.png", dx, dy); \
PNT(type, COLOR2(9, 2), ":/marine/" name "-orange-black.png", dx, dy); \
PNT(type, COLOR2(11, 2), ":/marine/" name "-orange-black.png", dx, dy); \
PNT(type, COLOR3(1, 6, 1), ":/marine/" name "-white-yellow-white.png", dx, dy); \
PNT(type, COLOR3(1, 9, 1), ":/marine/" name "-white-yellow-white.png", dx, dy); \
PNT(type, COLOR3(1, 11, 1), ":/marine/" name "-white-yellow-white.png", dx, dy); \
PNT(type, COLOR3(1, 9, 1), ":/marine/" name "-white-orange-white.png", dx, dy); \
PNT(type, COLOR3(1, 11, 1), ":/marine/" name "-white-orange-white.png", dx, dy); \
PNT(type, COLOR3(2, 1, 2), ":/marine/" name "-black-white-black.png", dx, dy); \
PNT(type, COLOR3(2, 3, 2), ":/marine/" name "-black-red-black.png", dx, dy); \
PNT(type, COLOR3(2, 6, 2), ":/marine/" name "-black-yellow-black.png", dx, dy); \