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

Extended nautical style

Browse Source
This commit is contained in:
Martin Tůma 2022-03-26 20:36:48 +01:00
parent e1b3b36e4b
commit 81fe82d05f
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gpxsee.qrc
View File

@ -137,13 +137,16 @@
<file alias="light-major.png">icons/IMG/marine/light-major.png</file> <file alias="light-major.png">icons/IMG/marine/light-major.png</file>
<file alias="light-platform.png">icons/IMG/marine/light-platform.png</file> <file alias="light-platform.png">icons/IMG/marine/light-platform.png</file>
<file alias="buoy.png">icons/IMG/marine/buoy.png</file>
<file alias="beacon.png">icons/IMG/marine/beacon.png</file> <file alias="beacon.png">icons/IMG/marine/beacon.png</file>
<file alias="rock.png">icons/IMG/marine/rock.png</file> <file alias="rock.png">icons/IMG/marine/rock.png</file>
<file alias="wreck.png">icons/IMG/marine/wreck.png</file> <file alias="wreck.png">icons/IMG/marine/wreck.png</file>
<file alias="wreck-exposed.png">icons/IMG/marine/wreck-exposed.png</file>
<file alias="obstruction.png">icons/IMG/marine/obstruction.png</file> <file alias="obstruction.png">icons/IMG/marine/obstruction.png</file>
<file alias="anchor-line.png">icons/IMG/marine/anchor-line.png</file> <file alias="anchor-line.png">icons/IMG/marine/anchor-line.png</file>
<file alias="pipeline.png">icons/IMG/marine/pipeline.png</file> <file alias="pipeline.png">icons/IMG/marine/pipeline.png</file>
<file alias="cable.png">icons/IMG/marine/cable.png</file> <file alias="cable.png">icons/IMG/marine/cable.png</file>
<file alias="anchorage.png">icons/IMG/marine/anchorage.png</file>
</qresource> </qresource>
<!-- Mapsforge rendertheme --> <!-- Mapsforge rendertheme -->

BIN
icons/IMG/marine/anchorage.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 302 B

BIN
icons/IMG/marine/buoy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 346 B

BIN
icons/IMG/marine/wreck-exposed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 385 B

11
src/map/IMG/style.cpp
View File

@ -123,13 +123,14 @@ void Style::defaultPolygonStyle()
_polygons[0x10304] = Polygon(QBrush("#c0c0ff")); _polygons[0x10304] = Polygon(QBrush("#c0c0ff"));
_polygons[0x10409] = Polygon(QBrush("#ff4040", Qt::FDiagPattern)); _polygons[0x10409] = Polygon(QBrush("#ff4040", Qt::FDiagPattern));
_polygons[0x10503] = Polygon(QBrush("#ff4040", Qt::FDiagPattern)); _polygons[0x10503] = Polygon(QBrush("#ff4040", Qt::FDiagPattern));
_polygons[0x10601] = Polygon(QBrush("#aaaaaa"));
_polygons[0x1060a] = Polygon(QBrush("#fcb4fc")); _polygons[0x1060a] = Polygon(QBrush("#fcb4fc"));
// Draw order // Draw order
_drawOrder _drawOrder
<< TYPE(0x4b) << 0x10d01 << 0x10104 << 0x10613 << TYPE(0x4a) << TYPE(0x4b) << 0x10d01 << 0x10104 << 0x10613 << TYPE(0x4a)
<< 0x10101 << 0x10102 << 0x10301 << 0x10302 << 0x10303 << 0x10304 << 0x10101 << 0x10102 << 0x10301 << 0x10302 << 0x10303 << 0x10304
<< 0x10409 << 0x10503 << 0x1060a << 0x10409 << 0x10503 << 0x10601 << 0x1060a
<< TYPE(0x01) << 0x10800 << TYPE(0x02) << 0x10801 << TYPE(0x03) << 0x10802 << TYPE(0x01) << 0x10800 << TYPE(0x02) << 0x10801 << TYPE(0x03) << 0x10802
<< TYPE(0x17) << 0x10a04 << TYPE(0x18) << 0x1090c << TYPE(0x1a) << 0x1090e << TYPE(0x17) << 0x10a04 << TYPE(0x18) << 0x1090c << TYPE(0x1a) << 0x1090e
<< TYPE(0x28) << 0x10b01 << TYPE(0x32) << 0x10b02 << TYPE(0x3c) << 0x10b03 << TYPE(0x28) << 0x10b01 << TYPE(0x32) << 0x10b02 << TYPE(0x3c) << 0x10b03
@ -244,7 +245,7 @@ void Style::defaultLineStyle()
_lines[0x10409] = Line(QPen(QColor("#000000"), 1, Qt::DotLine)); _lines[0x10409] = Line(QPen(QColor("#000000"), 1, Qt::DotLine));
_lines[0x10503] = Line(QPen(QColor("#e728e7"), 1, Qt::DashLine)); _lines[0x10503] = Line(QPen(QColor("#e728e7"), 1, Qt::DashLine));
_lines[0x10507] = Line(QPen(QColor("#e728e7"), 1, Qt::DashLine)); _lines[0x10507] = Line(QPen(QColor("#e728e7"), 1, Qt::DashLine));
_lines[0x10601] = Line(QPen(QColor("#000000"), 1, Qt::DashLine)); _lines[0x10601] = Line(QPen(QColor("#000000"), 1, Qt::SolidLine));
_lines[0x10606] = Line(QImage(":/IMG/anchor-line.png")); _lines[0x10606] = Line(QImage(":/IMG/anchor-line.png"));
_lines[0x1060d] = Line(QPen(QColor("#eb49eb"), 1, Qt::DashLine)); _lines[0x1060d] = Line(QPen(QColor("#eb49eb"), 1, Qt::DashLine));
_lines[0x10611] = Line(QPen(QColor("#eb49eb"), 1, Qt::DashLine)); _lines[0x10611] = Line(QPen(QColor("#eb49eb"), 1, Qt::DashLine));
@ -489,12 +490,16 @@ void Style::defaultPointStyle()
_points[0x10108] = Point(QImage(":/IMG/light-major.png")); _points[0x10108] = Point(QImage(":/IMG/light-major.png"));
_points[0x10109] = Point(QImage(":/IMG/light-major.png")); _points[0x10109] = Point(QImage(":/IMG/light-major.png"));
_points[0x1010a] = Point(QImage(":/IMG/light-major.png")); _points[0x1010a] = Point(QImage(":/IMG/light-major.png"));
_points[0x10200] = Point(QImage(":/IMG/buoy.png"));
_points[0x10201] = Point(QImage(":/IMG/buoy.png"));
_points[0x10206] = Point(QImage(":/IMG/beacon.png")); _points[0x10206] = Point(QImage(":/IMG/beacon.png"));
_points[0x1020b] = Point(QImage(":/IMG/buoy.png"));
_points[0x1020d] = Point(QImage(":/IMG/light-platform.png")); _points[0x1020d] = Point(QImage(":/IMG/light-platform.png"));
_points[0x10401] = Point(QImage(":/IMG/obstruction.png")); _points[0x10401] = Point(QImage(":/IMG/obstruction.png"));
_points[0x10402] = Point(QImage(":/IMG/wreck.png")); _points[0x10402] = Point(QImage(":/IMG/wreck.png"));
_points[0x10403] = Point(QImage(":/IMG/wreck-exposed.png"));
_points[0x1040a] = Point(QImage(":/IMG/rock.png")); _points[0x1040a] = Point(QImage(":/IMG/rock.png"));
_points[0x10701] = Point(QImage(":/IMG/anchorage.png"));
} }
static bool readBitmap(SubFile *file, SubFile::Handle &hdl, QImage &img, static bool readBitmap(SubFile *file, SubFile::Handle &hdl, QImage &img,