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

Yet another ENC style improvement

Browse Source
This commit is contained in:
Martin Tůma 2022-11-05 13:34:01 +01:00
parent 2b34140746
commit 4ce5dfbcf9
6 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gpxsee.qrc
View File

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

BIN
icons/map/marine/ferry-line.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 154 B

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

@ -6,6 +6,7 @@
#define CATREA 56 #define CATREA 56
#define CATWRK 71 #define CATWRK 71
#define DRVAL1 87 #define DRVAL1 87
#define ELEVAT 90
#define OBJNAM 116 #define OBJNAM 116
#define VALDCO 174 #define VALDCO 174

3
src/map/ENC/mapdata.cpp
View File

@ -388,7 +388,8 @@ MapData::Attr MapData::lineAttr(const ISO8211::Record &r, uint OBJL)
if (key == OBJNAM) if (key == OBJNAM)
label = av.at(1).toString(); label = av.at(1).toString();
if ((OBJL == DEPCNT && key == VALDCO)) if ((OBJL == DEPCNT && key == VALDCO)
|| (OBJL == LNDELV && key == ELEVAT))
label = av.at(1).toString(); label = av.at(1).toString();
} }

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

@ -28,6 +28,7 @@
#define DMPGRD 48 #define DMPGRD 48
#define DYKCON 49 #define DYKCON 49
#define FAIRWY 51 #define FAIRWY 51
#define FERYRT 53
#define HRBFAC 64 #define HRBFAC 64
#define LAKARE 69 #define LAKARE 69
#define LNDARE 71 #define LNDARE 71
@ -43,6 +44,7 @@
#define RESARE 112 #define RESARE 112
#define RIVERS 114 #define RIVERS 114
#define SLCONS 122 #define SLCONS 122
#define SLOTOP 126
#define SOUNDG 129 #define SOUNDG 129
#define TSSBND 146 #define TSSBND 146
#define TSEZNE 150 #define TSEZNE 150

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

@ -74,6 +74,12 @@ void Style::defaultLineStyle()
_lines[TYPE(DYKCON)] = Line(QPen(QColor("#333333"), 2, Qt::SolidLine)); _lines[TYPE(DYKCON)] = Line(QPen(QColor("#333333"), 2, Qt::SolidLine));
_lines[TYPE(RIVERS)] = Line(QPen(QColor("#000000"), 1, Qt::SolidLine)); _lines[TYPE(RIVERS)] = Line(QPen(QColor("#000000"), 1, Qt::SolidLine));
_lines[TYPE(TSSBND)] = Line(QPen(QColor("#eb49eb"), 2, Qt::DashLine)); _lines[TYPE(TSSBND)] = Line(QPen(QColor("#eb49eb"), 2, Qt::DashLine));
_lines[TYPE(LNDELV)] = Line(QPen(QColor("#999440"), 1, Qt::SolidLine));
_lines[TYPE(LNDELV)].setTextColor(QColor("#797420"));
_lines[TYPE(LNDELV)].setTextFontSize(Small);
_lines[TYPE(SLOTOP)] = Line(QPen(QColor("#797420"), 1, Qt::SolidLine));
_lines[TYPE(OBSTRN)] = Line(QPen(QColor("#000000"), 1.5, Qt::DotLine));
_lines[TYPE(FERYRT)] = Line(QImage(":/marine/ferry-line.png"));
} }
void Style::defaultPointStyle() void Style::defaultPointStyle()