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

Fixed build with some Qt versions

Browse Source 
+ ENC style enhancements
This commit is contained in:
Martin Tůma 2022-11-04 09:22:17 +01:00
parent f8d856b7ee
commit e8f3d028dd
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/map/ENC/mapdata.h
View File

@ -132,6 +132,7 @@ private:
}; };
struct Sounding { struct Sounding {
Sounding() : depth(NAN) {}
Sounding(const Coordinates &c, double depth) : c(c), depth(depth) {} Sounding(const Coordinates &c, double depth) : c(c), depth(depth) {}
Coordinates c; Coordinates c;

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

@ -1,6 +1,8 @@
#ifndef ENC_OBJECTS_H #ifndef ENC_OBJECTS_H
#define ENC_OBJECTS_H #define ENC_OBJECTS_H
#define AIRARE 2
#define ACHBRT 3
#define ACHARE 4 #define ACHARE 4
#define BCNCAR 5 #define BCNCAR 5
#define BCNISD 6 #define BCNISD 6

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

@ -31,14 +31,15 @@ void Style::defaultPolygonStyle()
_polygons[TYPE(LAKARE)] = Polygon(QBrush("#9fc4e1"), _polygons[TYPE(LAKARE)] = Polygon(QBrush("#9fc4e1"),
QPen(QColor("#000000"), 1)); QPen(QColor("#000000"), 1));
_polygons[TYPE(RIVERS)] = Polygon(QBrush("#9fc4e1")); _polygons[TYPE(RIVERS)] = Polygon(QBrush("#9fc4e1"));
_polygons[TYPE(AIRARE)] = Polygon(QBrush("#aaaaaa"));
_drawOrder _drawOrder
<< TYPE(M_COVR) << TYPE(LNDARE) << TYPE(BUISGL) << SUBTYPE(DEPARE, 0) << TYPE(M_COVR) << TYPE(LNDARE) << TYPE(BUISGL) << 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(BRIDGE) << TYPE(LAKARE) << TYPE(RIVERS) << TYPE(FAIRWY) << TYPE(AIRARE)
<< TYPE(SLCONS) << TYPE(PONTON) << TYPE(DMPGRD) << TYPE(OBSTRN) << TYPE(BRIDGE) << TYPE(SLCONS) << TYPE(PONTON) << TYPE(DMPGRD)
<< TYPE(ACHARE); << TYPE(OBSTRN) << TYPE(ACHARE);
} }
void Style::defaultLineStyle() void Style::defaultLineStyle()
@ -89,6 +90,7 @@ void Style::defaultPointStyle()
_points[TYPE(UWTROC)] = Point(QImage(":/IMG/rock-dangerous.png"), Small); _points[TYPE(UWTROC)] = Point(QImage(":/IMG/rock-dangerous.png"), Small);
_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"));
} }
Style::Style() Style::Style()