root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 03:35:53 +01:00
Code Issues Projects Releases Activity

Improved ENC render style

Browse Source
This commit is contained in:
Martin Tůma 2022-11-05 09:47:13 +01:00
parent 8ef1aa0f40
commit 0dee97dc54
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gpxsee.qrc
View File

@ -167,6 +167,7 @@
<file alias="mooring-buoy.png">icons/IMG/marine/mooring-buoy.png</file> <file alias="mooring-buoy.png">icons/IMG/marine/mooring-buoy.png</file>
<file alias="tower.png">icons/IMG/marine/tower.png</file> <file alias="tower.png">icons/IMG/marine/tower.png</file>
<file alias="chimney.png">icons/IMG/marine/chimney.png</file> <file alias="chimney.png">icons/IMG/marine/chimney.png</file>
<file alias="platform.png">icons/IMG/marine/platform.png</file>
</qresource> </qresource>
<!-- Mapsforge rendertheme --> <!-- Mapsforge rendertheme -->

BIN
icons/IMG/marine/platform.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 161 B

3
src/map/ENC/objects.h
View File

@ -20,9 +20,11 @@
#define BOYSPP 19 #define BOYSPP 19
#define CBLOHD 21 #define CBLOHD 21
#define CBLSUB 22 #define CBLSUB 22
#define CANALS 23
#define COALNE 30 #define COALNE 30
#define DEPARE 42 #define DEPARE 42
#define DEPCNT 43 #define DEPCNT 43
#define DRGARE 46
#define DMPGRD 48 #define DMPGRD 48
#define DYKCON 49 #define DYKCON 49
#define FAIRWY 51 #define FAIRWY 51
@ -34,6 +36,7 @@
#define LIGHTS 75 #define LIGHTS 75
#define NAVLNE 85 #define NAVLNE 85
#define OBSTRN 86 #define OBSTRN 86
#define OFSPLF 87
#define PILPNT 90 #define PILPNT 90
#define PIPSOL 94 #define PIPSOL 94
#define PONTON 95 #define PONTON 95

21
src/map/ENC/style.cpp
View File

@ -10,7 +10,9 @@ void Style::defaultPolygonStyle()
{ {
_polygons[TYPE(M_COVR)] = Polygon(QBrush("#ffffff")); _polygons[TYPE(M_COVR)] = Polygon(QBrush("#ffffff"));
_polygons[TYPE(LNDARE)] = Polygon(QBrush("#e8e064")); _polygons[TYPE(LNDARE)] = Polygon(QBrush("#e8e064"));
_polygons[TYPE(BUISGL)] = Polygon(QBrush("#d98b21")); _polygons[TYPE(BUAARE)] = Polygon(QBrush("#d98b21"));
_polygons[TYPE(BUISGL)] = Polygon(QBrush("#d98b21"),
QPen(QColor("#966118"), 1.5));
_polygons[TYPE(BRIDGE)] = Polygon(QBrush("#a58140")); _polygons[TYPE(BRIDGE)] = Polygon(QBrush("#a58140"));
_polygons[SUBTYPE(DEPARE, 0)] = Polygon(QBrush("#98c064")); _polygons[SUBTYPE(DEPARE, 0)] = Polygon(QBrush("#98c064"));
_polygons[SUBTYPE(DEPARE, 1)] = Polygon(QBrush("#a0a0ff")); _polygons[SUBTYPE(DEPARE, 1)] = Polygon(QBrush("#a0a0ff"));
@ -32,19 +34,27 @@ void Style::defaultPolygonStyle()
Qt::DashDotLine)); Qt::DashDotLine));
_polygons[TYPE(LAKARE)] = Polygon(QBrush("#9fc4e1"), _polygons[TYPE(LAKARE)] = Polygon(QBrush("#9fc4e1"),
QPen(QColor("#000000"), 1)); QPen(QColor("#000000"), 1));
_polygons[TYPE(CANALS)] = Polygon(QBrush("#9fc4e1"),
QPen(QColor("#000000"), 1));
_polygons[TYPE(RIVERS)] = Polygon(QBrush("#9fc4e1")); _polygons[TYPE(RIVERS)] = Polygon(QBrush("#9fc4e1"));
_polygons[TYPE(DYKCON)] = Polygon(QBrush(QColor("#9fc4e1"),
Qt::Dense4Pattern), QPen(QColor("#000000"), 1));
_polygons[TYPE(AIRARE)] = Polygon(QBrush("#333333")); _polygons[TYPE(AIRARE)] = Polygon(QBrush("#333333"));
_polygons[SUBTYPE(RESARE, 9)] = Polygon(QBrush(QColor("#ff0000"), _polygons[SUBTYPE(RESARE, 9)] = Polygon(QBrush(QColor("#ff0000"),
Qt::BDiagPattern), QPen(QColor("#ff0000"), 1)); Qt::BDiagPattern), QPen(QColor("#ff0000"), 1));
_polygons[TYPE(TSEZNE)] = Polygon(QBrush("#80fcb4fc")); _polygons[TYPE(TSEZNE)] = Polygon(QBrush("#80fcb4fc"));
_polygons[TYPE(DRGARE)] = Polygon(QBrush(QColor("#a0a0ff"),
Qt::Dense4Pattern));
_drawOrder _drawOrder
<< TYPE(M_COVR) << TYPE(LNDARE) << TYPE(BUISGL) << SUBTYPE(DEPARE, 0) << TYPE(M_COVR) << TYPE(LNDARE) << SUBTYPE(DEPARE, 0)
<< SUBTYPE(DEPARE, 1) << SUBTYPE(DEPARE, 2) << SUBTYPE(DEPARE, 3) << SUBTYPE(DEPARE, 1) << SUBTYPE(DEPARE, 2) << SUBTYPE(DEPARE, 3)
<< SUBTYPE(DEPARE, 4) << SUBTYPE(DEPARE, 5) << SUBTYPE(DEPARE, 6) << SUBTYPE(DEPARE, 4) << SUBTYPE(DEPARE, 5) << SUBTYPE(DEPARE, 6)
<< TYPE(LAKARE) << TYPE(RIVERS) << TYPE(FAIRWY) << TYPE(AIRARE) << TYPE(LAKARE) << TYPE(CANALS) << TYPE(DYKCON) << TYPE(RIVERS)
<< TYPE(BRIDGE) << TYPE(SLCONS) << TYPE(PONTON) << TYPE(DMPGRD) << TYPE(DRGARE) << TYPE(FAIRWY) << TYPE(BUAARE) << TYPE(BUISGL)
<< TYPE(TSEZNE) << TYPE(OBSTRN) << TYPE(ACHARE) << SUBTYPE(RESARE, 9); << TYPE(AIRARE) << TYPE(BRIDGE) << TYPE(SLCONS) << TYPE(PONTON)
<< TYPE(DMPGRD) << TYPE(TSEZNE) << TYPE(OBSTRN) << TYPE(ACHARE)
<< SUBTYPE(RESARE, 9);
} }
void Style::defaultLineStyle() void Style::defaultLineStyle()
@ -97,6 +107,7 @@ void Style::defaultPointStyle()
_points[SUBTYPE(HRBFAC, 5)] = Point(QImage(":/IMG/yacht-harbor.png")); _points[SUBTYPE(HRBFAC, 5)] = Point(QImage(":/IMG/yacht-harbor.png"));
_points[TYPE(PILPNT)] = Point(QImage(":/IMG/pile.png"), Small); _points[TYPE(PILPNT)] = Point(QImage(":/IMG/pile.png"), Small);
_points[TYPE(ACHBRT)] = Point(QImage(":/IMG/anchorage.png")); _points[TYPE(ACHBRT)] = Point(QImage(":/IMG/anchorage.png"));
_points[TYPE(OFSPLF)] = Point(QImage(":/IMG/platform.png"));
} }
Style::Style() Style::Style()