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

Added missing deviation dolphin symbol

Browse Source
This commit is contained in:
Martin Tůma 2024-06-12 08:47:50 +02:00
parent 76f10c233a
commit d3a3734e71
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gpxsee.qrc
View File

@ -165,6 +165,7 @@
<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>
<file alias="flagstaff.png">icons/map/marine/flagstaff.png</file> <file alias="flagstaff.png">icons/map/marine/flagstaff.png</file>
<file alias="deviation-dolphin.png">icons/map/marine/deviation-dolphin.png</file>
</qresource> </qresource>
<!-- Mapsforge rendertheme --> <!-- Mapsforge rendertheme -->

BIN
icons/map/marine/deviation-dolphin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 224 B

8
src/map/ENC/rastertile.cpp
View File

@ -265,6 +265,7 @@ void RasterTile::processPoints(QList<MapData::Point> &points,
{ {
PointSet lightsSet, signalsSet; PointSet lightsSet, signalsSet;
int i; int i;
QSet<uint> set;
std::sort(points.begin(), points.end()); std::sort(points.begin(), points.end());
@ -294,8 +295,10 @@ void RasterTile::processPoints(QList<MapData::Point> &points,
? &style.haloColor() : 0; ? &style.haloColor() : 0;
double rotate = angle(point.type(), point.param()); double rotate = angle(point.type(), point.param());
if ((!label || !fnt) && !img) if ((!label || !fnt) && !img) {
set.insert(point.type());
continue; continue;
}
QPoint offset = img ? style.offset() : QPoint(0, 0); QPoint offset = img ? style.offset() : QPoint(0, 0);
@ -312,6 +315,9 @@ void RasterTile::processPoints(QList<MapData::Point> &points,
} else } else
delete item; delete item;
} }
for (auto i = set.cbegin(), end = set.cend(); i != end; ++i)
qDebug() << (*i>>16) << (*i & 0xFFFF);
} }
void RasterTile::processLines(const QList<MapData::Line> &lines, void RasterTile::processLines(const QList<MapData::Line> &lines,

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

@ -272,6 +272,8 @@ void Style::pointStyle(qreal ratio)
_points[TYPE(OFSPLF)] = Point(QImage(":/marine/platform.png")); _points[TYPE(OFSPLF)] = Point(QImage(":/marine/platform.png"));
_points[TYPE(PILPNT)] = Point(QImage(":/marine/pile.png"), Small); _points[TYPE(PILPNT)] = Point(QImage(":/marine/pile.png"), Small);
_points[SUBTYPE(MORFAC, 1)] = Point(QImage(":/marine/pile.png"), Small); _points[SUBTYPE(MORFAC, 1)] = Point(QImage(":/marine/pile.png"), Small);
_points[SUBTYPE(MORFAC, 2)] = Point(QImage(":/marine/deviation-dolphin.png"),
Small, QPoint(0, -6));
_points[SUBTYPE(MORFAC, 3)] = Point(QImage(":/marine/pile.png"), Small); _points[SUBTYPE(MORFAC, 3)] = Point(QImage(":/marine/pile.png"), Small);
_points[SUBTYPE(MORFAC, 5)] = Point(QImage(":/marine/pile.png"), Small); _points[SUBTYPE(MORFAC, 5)] = Point(QImage(":/marine/pile.png"), Small);
_points[SUBTYPE(MORFAC, 7)] = Point(QImage(":/marine/mooring-buoy.png"), _points[SUBTYPE(MORFAC, 7)] = Point(QImage(":/marine/mooring-buoy.png"),