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

Refactoring

Browse Source
This commit is contained in:
Martin Tůma 2025-05-18 21:50:56 +02:00
parent 7f491330b1
commit 744cfde08f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,7 @@ void RasterTile::drawPolygons(QPainter *painter,
static quint32 lineType(quint32 type, quint32 flags) static quint32 lineType(quint32 type, quint32 flags)
{ {
if (Style::isMiscLine(type)) { if (Style::isCartographicLine(type)) {
if (flags & MapData::Poly::Dashed) if (flags & MapData::Poly::Dashed)
return type | (flags & 0xFF000000) | 1<<20; return type | (flags & 0xFF000000) | 1<<20;
else else

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

@ -319,7 +319,7 @@ bool RGNFile::readClassFields(Handle &hdl, SegmentType segmentType,
if (point && Style::isLabelPoint(point->type)) if (point && Style::isLabelPoint(point->type))
point->flags |= (flags & 0xf)<<20; point->flags |= (flags & 0xf)<<20;
if (line && Style::isMarineLine(line->type)) if (line && Style::isStyledLine(line->type))
readLineInfo(hdl, flags, rs, line); readLineInfo(hdl, flags, rs, line);
return seek(hdl, off + rs); return seek(hdl, off + rs);

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

@ -142,6 +142,8 @@ public:
{return (type >= 0x1400 && type <= 0x153f);} {return (type >= 0x1400 && type <= 0x153f);}
static bool isState(quint32 type) static bool isState(quint32 type)
{return (type == TYPE(0x1e));} {return (type == TYPE(0x1e));}
static bool isMarina(quint32 type)
{return type == 0x10703;}
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)
@ -156,12 +158,10 @@ public:
{return type == 0x10500;} {return type == 0x10500;}
static bool isMarinePoint(quint32 type) static bool isMarinePoint(quint32 type)
{return type >= 0x10100 && type < 0x10a00;} {return type >= 0x10100 && type < 0x10a00;}
static bool isMarineLine(quint32 type) static bool isStyledLine(quint32 type)
{return type >= 0x10400 && type < 0x10700;} {return type >= 0x10400 && type < 0x10700;}
static bool isMiscLine(quint32 type) static bool isCartographicLine(quint32 type)
{return type == 0x10601;} {return type == 0x10601;}
static bool isMarina(quint32 type)
{return type == 0x10703;}
static bool hasColorset(quint32 type) static bool hasColorset(quint32 type)
{return (isBuoy(type) && !(type == 0x1020d || type >= 0x10216));} {return (isBuoy(type) && !(type == 0x1020d || type >= 0x10216));}