root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-08 03:03:02 +02:00
Code Issues Projects Releases Activity

Compare commits

base: root:cebe4cde692f11b734904d759394f0f7b4ea1fdb
Branches Tags
root:master
root:android-latest
root:gh-pages
root:13.44
root:13.43
root:13.42
root:13.41
root:13.40
root:13.39
root:13.38
root:13.37
root:13.36
root:13.35
root:13.34
root:13.33
root:13.32
root:13.31
root:13.30
root:13.29
root:13.28
root:13.27
root:13.26
root:13.25
root:13.24
root:13.23
root:13.22
root:13.21
root:13.20
root:13.19
root:13.18
root:13.17
root:13.16
root:13.15
root:13.14
root:13.13
root:13.12
root:13.11
root:13.10
root:13.9
root:13.8
root:13.7
root:13.6
root:13.5
root:13.4
root:13.3
root:13.2
root:13.1
root:13.0
root:12.4
root:12.3
root:12.2
root:12.1
root:12.0
root:11.12
root:11.11
root:11.10
root:11.9
root:11.8
root:11.7
root:11.6
root:11.5
root:11.4
root:11.3
root:11.2
root:11.1
root:11.0
root:10.7
root:10.6
root:10.5
root:10.4
root:10.3
root:10.2
root:10.1
root:10.0
root:9.12
root:9.11
root:9.10
root:9.9
root:9.8
root:9.7
root:9.6
root:9.5
root:9.4
root:9.3
root:9.2
root:9.1
root:9.0
root:8.9
root:8.8
root:8.7
root:8.6
root:8.5
root:8.4
root:8.3
root:8.2
root:8.1
root:8.0
root:7.38
root:7.37
root:7.36
root:7.35
root:7.34
root:7.33
root:7.32
root:7.31
root:7.30
root:7.29
root:7.28
root:7.27
root:7.26
root:7.25
root:7.24
root:7.23
root:7.22
root:7.21
root:7.20
root:7.19
root:7.18
root:7.17
root:7.16
root:7.15
root:7.14
root:7.13
root:7.12
root:7.11
root:7.10
root:7.9
root:7.8
root:7.7
root:7.6
root:7.5
root:7.4
root:7.3
root:7.2
root:7.1
root:7.0
root:6.3
root:6.2
root:6.1
root:6.0
root:5.18
root:5.17
root:5.16
root:5.15
root:5.14
root:5.13
root:5.12
root:5.11
root:5.10
root:5.9
root:5.8
root:5.7
root:5.6
root:5.5
root:5.4
root:5.3
root:5.2
root:5.1
root:5.0
root:4.19
root:4.18
root:4.17
root:4.16
root:4.15
root:4.14
root:4.13
root:4.12
root:4.11
root:4.10
root:4.9
root:4.8
root:4.7
root:4.6
root:4.5
root:4.4
root:4.3
root:4.2
root:4.1
root:4.0
root:3.10
root:3.9
root:3.8
root:3.7
root:3.6
root:3.5
root:3.4
root:3.3
root:3.2
root:3.1
root:3.0
root:2.20
root:2.19
root:2.18
root:2.17
root:2.16
root:2.15
root:2.14
root:2.13
root:2.12
root:2.11
root:2.10
root:2.9
root:2.8
root:2.7
root:2.6
root:2.5
root:2.4
root:2.3
root:2.2
root:2.1
root:2.0
root:1.1
root:1.0
..
compare: root:53ace440c58c68cef2e30c0a34b3b2409d135667
Branches Tags
root:android-latest
root:gh-pages
root:master
root:13.44
root:13.43
root:13.42
root:13.41
root:13.40
root:13.39
root:13.38
root:13.37
root:13.36
root:13.35
root:13.34
root:13.33
root:13.32
root:13.31
root:13.30
root:13.29
root:13.28
root:13.27
root:13.26
root:13.25
root:13.24
root:13.23
root:13.22
root:13.21
root:13.20
root:13.19
root:13.18
root:13.17
root:13.16
root:13.15
root:13.14
root:13.13
root:13.12
root:13.11
root:13.10
root:13.9
root:13.8
root:13.7
root:13.6
root:13.5
root:13.4
root:13.3
root:13.2
root:13.1
root:13.0
root:12.4
root:12.3
root:12.2
root:12.1
root:12.0
root:11.12
root:11.11
root:11.10
root:11.9
root:11.8
root:11.7
root:11.6
root:11.5
root:11.4
root:11.3
root:11.2
root:11.1
root:11.0
root:10.7
root:10.6
root:10.5
root:10.4
root:10.3
root:10.2
root:10.1
root:10.0
root:9.12
root:9.11
root:9.10
root:9.9
root:9.8
root:9.7
root:9.6
root:9.5
root:9.4
root:9.3
root:9.2
root:9.1
root:9.0
root:8.9
root:8.8
root:8.7
root:8.6
root:8.5
root:8.4
root:8.3
root:8.2
root:8.1
root:8.0
root:7.38
root:7.37
root:7.36
root:7.35
root:7.34
root:7.33
root:7.32
root:7.31
root:7.30
root:7.29
root:7.28
root:7.27
root:7.26
root:7.25
root:7.24
root:7.23
root:7.22
root:7.21
root:7.20
root:7.19
root:7.18
root:7.17
root:7.16
root:7.15
root:7.14
root:7.13
root:7.12
root:7.11
root:7.10
root:7.9
root:7.8
root:7.7
root:7.6
root:7.5
root:7.4
root:7.3
root:7.2
root:7.1
root:7.0
root:6.3
root:6.2
root:6.1
root:6.0
root:5.18
root:5.17
root:5.16
root:5.15
root:5.14
root:5.13
root:5.12
root:5.11
root:5.10
root:5.9
root:5.8
root:5.7
root:5.6
root:5.5
root:5.4
root:5.3
root:5.2
root:5.1
root:5.0
root:4.19
root:4.18
root:4.17
root:4.16
root:4.15
root:4.14
root:4.13
root:4.12
root:4.11
root:4.10
root:4.9
root:4.8
root:4.7
root:4.6
root:4.5
root:4.4
root:4.3
root:4.2
root:4.1
root:4.0
root:3.10
root:3.9
root:3.8
root:3.7
root:3.6
root:3.5
root:3.4
root:3.3
root:3.2
root:3.1
root:3.0
root:2.20
root:2.19
root:2.18
root:2.17
root:2.16
root:2.15
root:2.14
root:2.13
root:2.12
root:2.11
root:2.10
root:2.9
root:2.8
root:2.7
root:2.6
root:2.5
root:2.4
root:2.3
root:2.2
root:2.1
root:2.0
root:1.1
root:1.0

No commits in common. "cebe4cde692f11b734904d759394f0f7b4ea1fdb" and "53ace440c58c68cef2e30c0a34b3b2409d135667" have entirely different histories.
cebe4cde69 ... 53ace440c5

1 changed files with 20 additions and 31 deletions
Show Stats Expand all files Collapse all files

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

@ -128,36 +128,25 @@ void Style::polygonStyle()
_polygons[TYPE(HULKES)] = Polygon(QBrush(QColor(0x33, 0x33, 0x33)));
_polygons[TYPE(I_HULKES)] = Polygon(QBrush(QColor(0x33, 0x33, 0x33)));
_polygons[TYPE(DRYDOC)] = Polygon(QBrush(QColor(0x33, 0x33, 0x33)));
_polygons[TYPE(SLCONS)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64)),
QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 1)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64),
Qt::Dense4Pattern), QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 2)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64),
Qt::Dense4Pattern), QPen(QColor(0, 0, 0), 2, Qt::DashLine));
_polygons[SUBTYPE(SLCONS, 3)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64)),
QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 4)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64)),
QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 5)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64)),
QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 6)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64)),
QPen(QColor(0, 0, 0), 2));
_polygons[TYPE(SLCONS)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 1)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 2)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0),
2, Qt::DashLine));
_polygons[SUBTYPE(SLCONS, 3)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 4)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 5)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 6)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 7)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0),
2, Qt::DashLine));
_polygons[SUBTYPE(SLCONS, 8)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64),
Qt::Dense4Pattern), QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 9)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64),
Qt::Dense4Pattern), QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 10)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64)),
QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 11)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64)),
QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 12)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64)),
QPen(QColor(0, 0, 0), 2, Qt::DashLine));
_polygons[SUBTYPE(SLCONS, 13)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64)),
QPen(QColor(0, 0, 0), 2, Qt::DashLine));
_polygons[SUBTYPE(SLCONS, 14)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64)),
QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 8)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 9)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 10)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 11)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 12)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0),
2, Qt::DashLine));
_polygons[SUBTYPE(SLCONS, 13)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0),
2, Qt::DashLine));
_polygons[SUBTYPE(SLCONS, 14)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 15)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0), 2));
_polygons[SUBTYPE(SLCONS, 16)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0),
2, Qt::DashLine));
@ -300,9 +289,9 @@ void Style::polygonStyle()
<< TYPE(BUAARE) << TYPE(BUISGL) << TYPE(SILTNK) << TYPE(AIRARE)
<< TYPE(BRIDGE) << TYPE(I_BRIDGE) << TYPE(TUNNEL) << TYPE(I_TERMNL)
<< TYPE(SLCONS) << SUBTYPE(SLCONS, 1) << SUBTYPE(SLCONS, 2)
<< SUBTYPE(SLCONS, 8) << SUBTYPE(SLCONS, 9) << SUBTYPE(SLCONS, 3)
<< SUBTYPE(SLCONS, 4) << SUBTYPE(SLCONS, 5) << SUBTYPE(SLCONS, 6)
<< SUBTYPE(SLCONS, 7) << SUBTYPE(SLCONS, 10) << SUBTYPE(SLCONS, 11)
<< SUBTYPE(SLCONS, 3) << SUBTYPE(SLCONS, 4) << SUBTYPE(SLCONS, 5)
<< SUBTYPE(SLCONS, 6) << SUBTYPE(SLCONS, 7) << SUBTYPE(SLCONS, 8)
<< SUBTYPE(SLCONS, 9) << SUBTYPE(SLCONS, 10) << SUBTYPE(SLCONS, 11)
<< SUBTYPE(SLCONS, 12) << SUBTYPE(SLCONS, 13) << SUBTYPE(SLCONS, 14)
<< SUBTYPE(SLCONS, 15) << SUBTYPE(SLCONS, 16) << TYPE(I_SLCONS)
<< SUBTYPE(I_SLCONS, 1) << SUBTYPE(I_SLCONS, 2) << SUBTYPE(I_SLCONS, 3)