1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-03-16 19:47:45 +01:00

Compare commits

...

3 Commits

Author SHA1 Message Date
ac5f4cafeb Code cleanup 2022-11-17 13:26:45 +01:00
ccb0364e76 Some more missing ENC objects 2022-11-17 13:05:38 +01:00
414bdead17 Docks render style 2022-11-17 10:37:05 +01:00
5 changed files with 18 additions and 4 deletions

View File

@ -172,6 +172,7 @@
<file alias="chimney.png">icons/map/marine/chimney.png</file>
<file alias="platform.png">icons/map/marine/platform.png</file>
<file alias="ferry-line.png">icons/map/marine/ferry-line.png</file>
<file alias="dw-route-line.png">icons/map/marine/dw-route-line.png</file>
</qresource>
<!-- Mapsforge rendertheme -->

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@ -451,7 +451,7 @@ MapData::Attr MapData::lineAttr(const ISO8211::Record &r, uint OBJL)
if ((OBJL == DEPCNT && key == VALDCO)
|| (OBJL == LNDELV && key == ELEVAT))
label = QString::fromLatin1(av.at(1).toByteArray());
if (OBJL == RECTRC && key == CATTRK)
if ((OBJL == RECTRC || OBJL == RCRTCL) && key == CATTRK)
subtype = av.at(1).toByteArray().toUInt();
}

View File

@ -24,13 +24,16 @@
#define CANALS 23
#define COALNE 30
#define DAMCON 38
#define DWRTPT 41
#define DEPARE 42
#define DEPCNT 43
#define DRGARE 46
#define DRYDOC 47
#define DMPGRD 48
#define DYKCON 49
#define FAIRWY 51
#define FERYRT 53
#define FLODOC 57
#define GATCON 61
#define HRBFAC 64
#define LAKARE 69
@ -48,6 +51,7 @@
#define PRCARE 96
#define PYLONS 98
#define RAILWY 106
#define RCRTCL 108
#define RECTRC 109
#define RESARE 112
#define RIVERS 114

View File

@ -36,6 +36,7 @@ void Style::defaultPolygonStyle()
_polygons[TYPE(OBSTRN)] = Polygon(Qt::NoBrush, QPen(QColor("#000000"), 1.5,
Qt::DotLine));
_polygons[TYPE(PONTON)] = Polygon(QBrush("#333333"));
_polygons[TYPE(DRYDOC)] = Polygon(QBrush("#333333"));
_polygons[TYPE(SLCONS)] = Polygon(Qt::NoBrush, QPen(QColor("#333333"), 1.5,
Qt::DashLine));
_polygons[TYPE(LAKARE)] = Polygon(QBrush("#9fc4e1"),
@ -58,8 +59,13 @@ void Style::defaultPolygonStyle()
Qt::BDiagPattern));
_polygons[TYPE(DAMCON)] = Polygon(QBrush("#d98b21"), QPen(QColor("#000000"),
1));
_polygons[TYPE(DRYDOC)] = Polygon(QBrush("#ebab54"), QPen(QColor("#000000"),
1));
_polygons[TYPE(PYLONS)] = Polygon(QBrush("#a58140"), QPen(QColor("#000000"),
1));
_polygons[TYPE(FLODOC)] = Polygon(QBrush("#333333"), QPen(QColor("#000000"),
1));
_polygons[TYPE(DWRTPT)] = Polygon(QImage(":/marine/dw-route-line"));
_drawOrder
<< TYPE(M_COVR) << TYPE(LNDARE) << SUBTYPE(DEPARE, 0)
@ -68,9 +74,10 @@ void Style::defaultPolygonStyle()
<< SUBTYPE(DEPARE, 6) << TYPE(LAKARE) << TYPE(CANALS) << TYPE(DYKCON)
<< TYPE(RIVERS) << TYPE(DRGARE) << TYPE(FAIRWY) << TYPE(BUAARE)
<< TYPE(BUISGL) << TYPE(AIRARE) << TYPE(BRIDGE) << TYPE(SLCONS)
<< TYPE(PONTON) << TYPE(DMPGRD) << TYPE(TSEZNE) << TYPE(OBSTRN)
<< SUBTYPE(ACHARE, 1) << SUBTYPE(RESARE, 9) << SUBTYPE(RESARE, 2)
<< TYPE(PRCARE) << TYPE(DAMCON) << TYPE(PYLONS);
<< TYPE(PONTON) << TYPE(FLODOC) << TYPE(DRYDOC) << TYPE(DAMCON)
<< TYPE(PYLONS) << TYPE(DMPGRD) << TYPE(TSEZNE) << TYPE(OBSTRN)
<< TYPE(DWRTPT) << SUBTYPE(ACHARE, 1) << SUBTYPE(RESARE, 9)
<< SUBTYPE(RESARE, 2) << TYPE(PRCARE);
}
void Style::defaultLineStyle()
@ -103,6 +110,8 @@ void Style::defaultLineStyle()
_lines[TYPE(TSELNE)] = Line(QPen(QColor("#80fcb4fc"), 4, Qt::SolidLine));
_lines[SUBTYPE(RECTRC, 1)] = Line(QPen(QColor("#000000"), 0, Qt::SolidLine));
_lines[SUBTYPE(RECTRC, 2)] = Line(QPen(QColor("#000000"), 0, Qt::DashLine));
_lines[SUBTYPE(RCRTCL, 1)] = Line(QPen(QColor("#eb49eb"), 0, Qt::SolidLine));
_lines[SUBTYPE(RCRTCL, 2)] = Line(QPen(QColor("#eb49eb"), 0, Qt::DashLine));
_lines[TYPE(FAIRWY)] = Line(QPen(QColor("#888888"), 1, Qt::DashDotDotLine));
_lines[TYPE(BERTHS)] = Line(QPen(QColor("#333333"), 2));
}