From e4c79d7275d4a1e2d57b3cdb32ccb1ab1dffe22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 16 Nov 2022 22:51:16 +0100 Subject: [PATCH] Added missing dams and pylons rendering --- src/map/ENC/objects.h | 2 ++ src/map/ENC/style.cpp | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/map/ENC/objects.h b/src/map/ENC/objects.h index 0474b9d8..f4509790 100644 --- a/src/map/ENC/objects.h +++ b/src/map/ENC/objects.h @@ -22,6 +22,7 @@ #define CBLSUB 22 #define CANALS 23 #define COALNE 30 +#define DAMCON 38 #define DEPARE 42 #define DEPCNT 43 #define DRGARE 46 @@ -44,6 +45,7 @@ #define PIPSOL 94 #define PONTON 95 #define PRCARE 96 +#define PYLONS 98 #define RAILWY 106 #define RECTRC 109 #define RESARE 112 diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index 73a4fdfd..083a5ba2 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -56,6 +56,10 @@ void Style::defaultPolygonStyle() _polygons[SUBTYPE(ACHARE, 1)] = Polygon(QImage(":/marine/anchor-line.png")); _polygons[TYPE(PRCARE)] = Polygon(QBrush(QColor("#eb49eb"), Qt::BDiagPattern)); + _polygons[TYPE(DAMCON)] = Polygon(QBrush("#d98b21"), QPen(QColor("#000000"), + 1)); + _polygons[TYPE(PYLONS)] = Polygon(QBrush("#a58140"), QPen(QColor("#000000"), + 1)); _drawOrder << TYPE(M_COVR) << TYPE(LNDARE) << SUBTYPE(DEPARE, 0) @@ -66,7 +70,7 @@ void Style::defaultPolygonStyle() << 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(PRCARE) << TYPE(DAMCON) << TYPE(PYLONS); } void Style::defaultLineStyle()