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

Compare commits

..

No commits in common. "e4c79d7275d4a1e2d57b3cdb32ccb1ab1dffe22b" and "650776454526a1f6de14674067cae6f43efe08d4" have entirely different histories.

3 changed files with 10 additions and 16 deletions

View File

@ -420,14 +420,14 @@ MapData::Attr MapData::pointAttr(const ISO8211::Record &r, uint OBJL)
uint key = av.at(0).toUInt(); uint key = av.at(0).toUInt();
if (key == OBJNAM) if (key == OBJNAM)
label = QString::fromLatin1(av.at(1).toByteArray()); label = av.at(1).toString();
if ((OBJL == HRBFAC && key == CATHAF) if ((OBJL == HRBFAC && key == CATHAF)
|| (OBJL == LNDMRK && key == CATLMK) || (OBJL == LNDMRK && key == CATLMK)
|| (OBJL == WRECKS && key == CATWRK) || (OBJL == WRECKS && key == CATWRK)
|| (OBJL == MORFAC && key == CATMOR) || (OBJL == MORFAC && key == CATMOR)
|| (OBJL == UWTROC && key == WATLEV) || (OBJL == UWTROC && key == WATLEV)
|| (OBJL == BUAARE && key == CATBUA)) || (OBJL == BUAARE && key == CATBUA))
subtype = av.at(1).toByteArray().toUInt(); subtype = av.at(1).toString().toUInt();
} }
return Attr(subtype, label); return Attr(subtype, label);
@ -447,12 +447,12 @@ MapData::Attr MapData::lineAttr(const ISO8211::Record &r, uint OBJL)
uint key = av.at(0).toUInt(); uint key = av.at(0).toUInt();
if (key == OBJNAM) if (key == OBJNAM)
label = QString::fromLatin1(av.at(1).toByteArray()); label = av.at(1).toString();
if ((OBJL == DEPCNT && key == VALDCO) if ((OBJL == DEPCNT && key == VALDCO)
|| (OBJL == LNDELV && key == ELEVAT)) || (OBJL == LNDELV && key == ELEVAT))
label = QString::fromLatin1(av.at(1).toByteArray()); label = av.at(1).toString();
if (OBJL == RECTRC && key == CATTRK) if (OBJL == RECTRC && key == CATTRK)
subtype = av.at(1).toByteArray().toUInt(); subtype = av.at(1).toString().toUInt();
} }
return Attr(subtype, label); return Attr(subtype, label);
@ -472,15 +472,15 @@ MapData::Attr MapData::polyAttr(const ISO8211::Record &r, uint OBJL)
uint key = av.at(0).toUInt(); uint key = av.at(0).toUInt();
if (OBJL == DEPARE && key == DRVAL1) if (OBJL == DEPARE && key == DRVAL1)
subtype = depthLevel(av.at(1).toByteArray()); subtype = depthLevel(av.at(1).toString());
else if ((OBJL == RESARE && key == CATREA) else if ((OBJL == RESARE && key == CATREA)
|| (OBJL == ACHARE && key == CATACH)) || (OBJL == ACHARE && key == CATACH))
subtype = av.at(1).toByteArray().toUInt(); subtype = av.at(1).toString().toUInt();
else if (OBJL == RESARE && key == RESTRN) { else if (OBJL == RESARE && key == RESTRN) {
if (av.at(1).toByteArray().toUInt() == 1) if (av.at(1).toString().toUInt() == 1)
subtype = 2; subtype = 2;
} else if (OBJL == TSSLPT && key == ORIENT) { } else if (OBJL == TSSLPT && key == ORIENT) {
double angle = av.at(1).toByteArray().toDouble(); double angle = av.at(1).toString().toDouble();
subtype = (uint)(angle * 10); subtype = (uint)(angle * 10);
} }
} }

View File

@ -22,7 +22,6 @@
#define CBLSUB 22 #define CBLSUB 22
#define CANALS 23 #define CANALS 23
#define COALNE 30 #define COALNE 30
#define DAMCON 38
#define DEPARE 42 #define DEPARE 42
#define DEPCNT 43 #define DEPCNT 43
#define DRGARE 46 #define DRGARE 46
@ -45,7 +44,6 @@
#define PIPSOL 94 #define PIPSOL 94
#define PONTON 95 #define PONTON 95
#define PRCARE 96 #define PRCARE 96
#define PYLONS 98
#define RAILWY 106 #define RAILWY 106
#define RECTRC 109 #define RECTRC 109
#define RESARE 112 #define RESARE 112

View File

@ -56,10 +56,6 @@ void Style::defaultPolygonStyle()
_polygons[SUBTYPE(ACHARE, 1)] = Polygon(QImage(":/marine/anchor-line.png")); _polygons[SUBTYPE(ACHARE, 1)] = Polygon(QImage(":/marine/anchor-line.png"));
_polygons[TYPE(PRCARE)] = Polygon(QBrush(QColor("#eb49eb"), _polygons[TYPE(PRCARE)] = Polygon(QBrush(QColor("#eb49eb"),
Qt::BDiagPattern)); Qt::BDiagPattern));
_polygons[TYPE(DAMCON)] = Polygon(QBrush("#d98b21"), QPen(QColor("#000000"),
1));
_polygons[TYPE(PYLONS)] = Polygon(QBrush("#a58140"), QPen(QColor("#000000"),
1));
_drawOrder _drawOrder
<< TYPE(M_COVR) << TYPE(LNDARE) << SUBTYPE(DEPARE, 0) << TYPE(M_COVR) << TYPE(LNDARE) << SUBTYPE(DEPARE, 0)
@ -70,7 +66,7 @@ void Style::defaultPolygonStyle()
<< TYPE(BUISGL) << TYPE(AIRARE) << TYPE(BRIDGE) << TYPE(SLCONS) << TYPE(BUISGL) << TYPE(AIRARE) << TYPE(BRIDGE) << TYPE(SLCONS)
<< TYPE(PONTON) << TYPE(DMPGRD) << TYPE(TSEZNE) << TYPE(OBSTRN) << TYPE(PONTON) << TYPE(DMPGRD) << TYPE(TSEZNE) << TYPE(OBSTRN)
<< SUBTYPE(ACHARE, 1) << SUBTYPE(RESARE, 9) << SUBTYPE(RESARE, 2) << SUBTYPE(ACHARE, 1) << SUBTYPE(RESARE, 9) << SUBTYPE(RESARE, 2)
<< TYPE(PRCARE) << TYPE(DAMCON) << TYPE(PYLONS); << TYPE(PRCARE);
} }
void Style::defaultLineStyle() void Style::defaultLineStyle()