root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-01 07:43:03 +02:00
Code Issues Projects Releases Activity

Some more missing IMG marine icons

Browse Source
This commit is contained in:
Martin Tůma 2025-05-26 23:11:00 +02:00
parent 6b3c6a7738
commit 7c4316f32a
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/IMG/rastertile.cpp
View File

@ -534,7 +534,7 @@ static Light::Color ordinaryLight(const QVector<Light> &lights)
static quint32 pointType(quint32 type, quint32 flags) static quint32 pointType(quint32 type, quint32 flags)
{ {
if (Style::hasColorset(type)) if (Style::hasColorset(type) || Style::isDHPoint(type))
return type | (flags & 0xFF000000); return type | (flags & 0xFF000000);
else if (Style::isLabelPoint(type)) else if (Style::isLabelPoint(type))
return type | (flags & 0xFFF00000); return type | (flags & 0xFFF00000);

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

@ -869,6 +869,9 @@ void Style::defaultPointStyle(qreal ratio)
_points[0x10217] = Point(QImage(":/marine/pylon.png")); _points[0x10217] = Point(QImage(":/marine/pylon.png"));
_points[0x10218] = Point(QImage(":/marine/pylon.png")); _points[0x10218] = Point(QImage(":/marine/pylon.png"));
_points[0x10300 | 29<<24] = Point(QImage(":/marine/flagstaff.png"));
_points[0x10300 | 30<<24] = Point(QImage(":/marine/monument.png"));
_points[0x10300 | 83<<24] = Point(QImage(":/marine/crane.png"));
_points[0x10304] = Point(QImage(":/marine/building.png")); _points[0x10304] = Point(QImage(":/marine/building.png"));
_points[0x10305] = Point(QImage(":/marine/chimney.png"), QPoint(0, -11)); _points[0x10305] = Point(QImage(":/marine/chimney.png"), QPoint(0, -11));
_points[0x10306] = Point(QImage(":/marine/church.png")); _points[0x10306] = Point(QImage(":/marine/church.png"));

4
src/map/IMG/style.h
View File

@ -147,7 +147,7 @@ public:
static bool isRaster(quint32 type) static bool isRaster(quint32 type)
{return (type == 0x10613);} {return (type == 0x10613);}
static bool isDepthPoint(quint32 type) static bool isDepthPoint(quint32 type)
{return (type == 0x10301);} {return (type >= 0x10301 && type <= 0x10302);}
static bool isObstructionPoint(quint32 type) static bool isObstructionPoint(quint32 type)
{return (type >= 0x10400 && type <= 0x10401);} {return (type >= 0x10400 && type <= 0x10401);}
static bool isBuoy(quint32 type) static bool isBuoy(quint32 type)
@ -156,6 +156,8 @@ public:
{return (type >= 0x10100 && type < 0x10200);} {return (type >= 0x10100 && type < 0x10200);}
static bool isLabelPoint(quint32 type) static bool isLabelPoint(quint32 type)
{return type == 0x10500;} {return type == 0x10500;}
static bool isDHPoint(quint32 type)
{return type == 0x10300;}
static bool isMarinePoint(quint32 type) static bool isMarinePoint(quint32 type)
{return type >= 0x10100 && type < 0x10a00;} {return type >= 0x10100 && type < 0x10a00;}
static bool isStyledLine(quint32 type) static bool isStyledLine(quint32 type)