mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-06-01 07:43:03 +02:00
Refactoring
This commit is contained in:
parent
7f491330b1
commit
744cfde08f
@ -188,7 +188,7 @@ void RasterTile::drawPolygons(QPainter *painter,
|
||||
|
||||
static quint32 lineType(quint32 type, quint32 flags)
|
||||
{
|
||||
if (Style::isMiscLine(type)) {
|
||||
if (Style::isCartographicLine(type)) {
|
||||
if (flags & MapData::Poly::Dashed)
|
||||
return type | (flags & 0xFF000000) | 1<<20;
|
||||
else
|
||||
|
@ -319,7 +319,7 @@ bool RGNFile::readClassFields(Handle &hdl, SegmentType segmentType,
|
||||
if (point && Style::isLabelPoint(point->type))
|
||||
point->flags |= (flags & 0xf)<<20;
|
||||
|
||||
if (line && Style::isMarineLine(line->type))
|
||||
if (line && Style::isStyledLine(line->type))
|
||||
readLineInfo(hdl, flags, rs, line);
|
||||
|
||||
return seek(hdl, off + rs);
|
||||
|
@ -142,6 +142,8 @@ public:
|
||||
{return (type >= 0x1400 && type <= 0x153f);}
|
||||
static bool isState(quint32 type)
|
||||
{return (type == TYPE(0x1e));}
|
||||
static bool isMarina(quint32 type)
|
||||
{return type == 0x10703;}
|
||||
static bool isRaster(quint32 type)
|
||||
{return (type == 0x10613);}
|
||||
static bool isDepthPoint(quint32 type)
|
||||
@ -156,12 +158,10 @@ public:
|
||||
{return type == 0x10500;}
|
||||
static bool isMarinePoint(quint32 type)
|
||||
{return type >= 0x10100 && type < 0x10a00;}
|
||||
static bool isMarineLine(quint32 type)
|
||||
static bool isStyledLine(quint32 type)
|
||||
{return type >= 0x10400 && type < 0x10700;}
|
||||
static bool isMiscLine(quint32 type)
|
||||
static bool isCartographicLine(quint32 type)
|
||||
{return type == 0x10601;}
|
||||
static bool isMarina(quint32 type)
|
||||
{return type == 0x10703;}
|
||||
|
||||
static bool hasColorset(quint32 type)
|
||||
{return (isBuoy(type) && !(type == 0x1020d || type >= 0x10216));}
|
||||
|
Loading…
x
Reference in New Issue
Block a user