mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-02-16 07:40:49 +01:00
Compare commits
3 Commits
9464bbc13f
...
d214819298
| Author | SHA1 | Date | |
|---|---|---|---|
| d214819298 | |||
| 2073be193f | |||
| 52e0d921da |
2
.github/workflows/osx.yml
vendored
2
.github/workflows/osx.yml
vendored
@ -40,7 +40,7 @@ jobs:
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
version: '6.6.1'
|
||||
modules: qtpositioning qtserialport
|
||||
modules: qtpositioning qtserialport qtimageformats
|
||||
- name: Create localization
|
||||
run: lrelease gpxsee.pro
|
||||
- name: Configure build
|
||||
|
||||
@ -16,10 +16,12 @@
|
||||
<qresource prefix="/POI">
|
||||
<file alias="airfield-11.svg">icons/map/POI/airfield-11.svg</file>
|
||||
<file alias="airport-11.svg">icons/map/POI/airport-11.svg</file>
|
||||
<file alias="alcohol-shop-11.svg">icons/map/POI/alcohol-shop-11.svg</file>
|
||||
<file alias="amusement-park-11.svg">icons/map/POI/amusement-park-11.svg</file>
|
||||
<file alias="bakery-11.svg">icons/map/POI/bakery-11.svg</file>
|
||||
<file alias="bank-11.svg">icons/map/POI/bank-11.svg</file>
|
||||
<file alias="bar-11.svg">icons/map/POI/bar-11.svg</file>
|
||||
<file alias="barrier-11.svg">icons/map/POI/barrier-11.svg</file>
|
||||
<file alias="bbq-11.svg">icons/map/POI/bbq-11.svg</file>
|
||||
<file alias="beach-11.svg">icons/map/POI/beach-11.svg</file>
|
||||
<file alias="bowling-alley-11.svg">icons/map/POI/bowling-alley-11.svg</file>
|
||||
@ -88,6 +90,7 @@
|
||||
<file alias="town-hall-11.svg">icons/map/POI/town-hall-11.svg</file>
|
||||
<file alias="viewpoint-11.svg">icons/map/POI/viewpoint-11.svg</file>
|
||||
<file alias="village-11.svg">icons/map/POI/village-11.svg</file>
|
||||
<file alias="volcano-11.svg">icons/map/POI/volcano-11.svg</file>
|
||||
<file alias="waterfall-11.svg">icons/map/POI/waterfall-11.svg</file>
|
||||
<file alias="wetland-11.svg">icons/map/POI/wetland-11.svg</file>
|
||||
<file alias="zoo-11.svg">icons/map/POI/zoo-11.svg</file>
|
||||
|
||||
4
icons/map/POI/alcohol-shop-11.svg
Normal file
4
icons/map/POI/alcohol-shop-11.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg version="1.1" id="alcohol-shop-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
|
||||
<path d="M7,4v2.5c0.0018,0.6341,0.4021,1.1986,1,1.41V10H7.5C7.2239,10,7,10.2239,7,10.5S7.2239,11,7.5,11h2
	c0.2761,0,0.5-0.2239,0.5-0.5S9.7761,10,9.5,10H9V7.91c0.5979-0.2114,0.9982-0.7759,1-1.41V4H7z M9.5,6.5c0,0.5523-0.4477,1-1,1
	s-1-0.4477-1-1v-2h2V6.5z M4.21,2.85V2.5c0.1961,0,0.355-0.1589,0.355-0.355S4.4061,1.79,4.21,1.79V1.44
	c0.0001-0.1933-0.1566-0.3501-0.3499-0.3501c-0.0034,0-0.0068,0-0.0101,0.0001H3.14C2.9468,1.0845,2.7857,1.2366,2.7801,1.4299
	C2.78,1.4332,2.78,1.4366,2.78,1.44v0.35c-0.1961,0-0.355,0.1589-0.355,0.355S2.5839,2.5,2.78,2.5v0.35C2.79,3.87,1,5,1,6v4.25
	c-0.0056,0.3866,0.3033,0.7044,0.6899,0.71c0.0067,0.0001,0.0134,0.0001,0.0201,0h3.58c0.3628-0.0329,0.6561-0.3097,0.71-0.67V6
	C6,5.09,4.21,3.81,4.21,2.85z M3.5,9C2.6716,9,2,8.3284,2,7.5S2.6716,6,3.5,6S5,6.6716,5,7.5S4.3284,9,3.5,9z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.0 KiB |
4
icons/map/POI/barrier-11.svg
Normal file
4
icons/map/POI/barrier-11.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="barrier-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
|
||||
<path d="M9.5,2h-8a.5.5,0,0,0-.5.5v4a.5.5,0,0,0,.5.5H2V9.5a.5.5,0,0,0,1,0V9H8v.5a.5.5,0,0,0,1,0V7h.5a.5.5,0,0,0,.5-.5v-4A.5.5,0,0,0,9.5,2ZM2,3H3.5l3,3h-2L2,3.5ZM2,6V4.5L3.5,6ZM3,8V7H8V8ZM9,6H7.5l-3-3h2L9,5.5ZM9,4.5,7.5,3H9Z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 374 B |
4
icons/map/POI/volcano-11.svg
Normal file
4
icons/map/POI/volcano-11.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg version="1.1" id="volcano-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
|
||||
<path id="rect3338" d="M3,1l1.5,3h2L8,3V2L6,3V1H5.5L5,2.5L3.5,1H3z M3.5215,5l-2.498,4.1602C0.8007,9.5296,1.0679,9.9999,1.5,10h8
	c0.4321-0.0001,0.6993-0.4704,0.4766-0.8398L7.4785,5H7v0.5C7,5.777,6.777,6,6.5,6S6,5.777,6,5.5C6,5.2239,5.7761,5,5.5,5
	S5,5.2239,5,5.5v2C5,7.777,4.777,8,4.5,8S4,7.777,4,7.5V5H3.5215z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 496 B |
@ -23,9 +23,9 @@ using namespace IMG;
|
||||
static const QColor textColor(Qt::black);
|
||||
static const QColor haloColor(Qt::white);
|
||||
static const QColor shieldColor(Qt::white);
|
||||
static const QColor shieldBgColor1("#dd3e3e");
|
||||
static const QColor shieldBgColor2("#379947");
|
||||
static const QColor shieldBgColor3("#4a7fc1");
|
||||
static const QColor shieldBgColor1(0xdd, 0x3e, 0x3e);
|
||||
static const QColor shieldBgColor2(0x37, 0x99, 0x47);
|
||||
static const QColor shieldBgColor3(0x4a, 0x7f, 0xc1);
|
||||
|
||||
static const QColor *shieldBgColor(Shield::Type type)
|
||||
{
|
||||
|
||||
@ -153,7 +153,7 @@ static QImage railroad(qreal ratio)
|
||||
{
|
||||
QImage img(16 * ratio, 4 * ratio, QImage::Format_ARGB32_Premultiplied);
|
||||
img.setDevicePixelRatio(ratio);
|
||||
img.fill(QColor("#717171"));
|
||||
img.fill(QColor(0x71, 0x71, 0x71));
|
||||
QPainter p(&img);
|
||||
p.setPen(QPen(Qt::white, 2));
|
||||
p.drawLine(9, 2, 15, 2);
|
||||
@ -163,63 +163,69 @@ static QImage railroad(qreal ratio)
|
||||
|
||||
void Style::defaultPolygonStyle()
|
||||
{
|
||||
_polygons[TYPE(0x01)] = Polygon(QBrush("#dfd3b5"));
|
||||
_polygons[TYPE(0x02)] = Polygon(QBrush("#dfd3b5"));
|
||||
_polygons[TYPE(0x03)] = Polygon(QBrush("#dfd3b5"));
|
||||
_polygons[TYPE(0x04)] = Polygon(QBrush("#ff4040", Qt::BDiagPattern));
|
||||
_polygons[TYPE(0x05)] = Polygon(QBrush("#d6d4ce"));
|
||||
_polygons[TYPE(0x06)] = Polygon(QBrush("#d6d4ce"));
|
||||
_polygons[TYPE(0x07)] = Polygon(QBrush("#d6d4ce"));
|
||||
_polygons[TYPE(0x08)] = Polygon(QBrush("#d6d4ce"));
|
||||
_polygons[TYPE(0x09)] = Polygon(QBrush("#d6d4ce"));
|
||||
_polygons[TYPE(0x0a)] = Polygon(QBrush("#d6d4ce"));
|
||||
_polygons[TYPE(0x0b)] = Polygon(QBrush("#d6d4ce"));
|
||||
_polygons[TYPE(0x0c)] = Polygon(QBrush("#d6d4ce"));
|
||||
_polygons[TYPE(0x0d)] = Polygon(QBrush("#f8e3be"));
|
||||
_polygons[TYPE(0x0e)] = Polygon(QBrush("#ffffff"));
|
||||
_polygons[TYPE(0x0f)] = Polygon(QBrush("#e6e2d9"));
|
||||
_polygons[TYPE(0x10)] = Polygon(QBrush("#e6e2d9"));
|
||||
_polygons[TYPE(0x11)] = Polygon(QBrush("#e6e2d9"));
|
||||
_polygons[TYPE(0x12)] = Polygon(QBrush("#e6e2d9"));
|
||||
_polygons[TYPE(0x13)] = Polygon(QBrush("#dbd0b6"),
|
||||
QPen(QColor("#cdccc4"), 1));
|
||||
_polygons[TYPE(0x14)] = Polygon(QBrush("#cadfaf"));
|
||||
_polygons[TYPE(0x15)] = Polygon(QBrush("#cadfaf"));
|
||||
_polygons[TYPE(0x16)] = Polygon(QBrush(QColor("#9ac269"),
|
||||
_polygons[TYPE(0x01)] = Polygon(QBrush(QColor(0xdf, 0xd3, 0xb5)));
|
||||
_polygons[TYPE(0x02)] = Polygon(QBrush(QColor(0xdf, 0xd3, 0xb5)));
|
||||
_polygons[TYPE(0x03)] = Polygon(QBrush(QColor(0xdf, 0xd3, 0xb5)));
|
||||
_polygons[TYPE(0x04)] = Polygon(QBrush(QColor(0xff, 0x40, 0x40),
|
||||
Qt::BDiagPattern));
|
||||
_polygons[TYPE(0x17)] = Polygon(QBrush("#e4efcf"));
|
||||
_polygons[TYPE(0x18)] = Polygon(QBrush("#e3edc6"));
|
||||
_polygons[TYPE(0x19)] = Polygon(QBrush("#e3edc6"), QPen("#c9d3a5"));
|
||||
_polygons[TYPE(0x1a)] = Polygon(QBrush("#000000", Qt::Dense6Pattern),
|
||||
QPen(QColor("#cdccc4"), 1));
|
||||
_polygons[TYPE(0x1e)] = Polygon(QBrush(QColor("#9ac269"),
|
||||
_polygons[TYPE(0x05)] = Polygon(QBrush(QColor(0xd6, 0xd4, 0xce)));
|
||||
_polygons[TYPE(0x06)] = Polygon(QBrush(QColor(0xd6, 0xd4, 0xce)));
|
||||
_polygons[TYPE(0x07)] = Polygon(QBrush(QColor(0xd6, 0xd4, 0xce)));
|
||||
_polygons[TYPE(0x08)] = Polygon(QBrush(QColor(0xd6, 0xd4, 0xce)));
|
||||
_polygons[TYPE(0x09)] = Polygon(QBrush(QColor(0xd6, 0xd4, 0xce)));
|
||||
_polygons[TYPE(0x0a)] = Polygon(QBrush(QColor(0xd6, 0xd4, 0xce)));
|
||||
_polygons[TYPE(0x0b)] = Polygon(QBrush(QColor(0xd6, 0xd4, 0xce)));
|
||||
_polygons[TYPE(0x0c)] = Polygon(QBrush(QColor(0xd6, 0xd4, 0xce)));
|
||||
_polygons[TYPE(0x0d)] = Polygon(QBrush(QColor(0xf8, 0xe3, 0xbe)));
|
||||
_polygons[TYPE(0x0e)] = Polygon(QBrush(QColor(0xff, 0xff, 0xff)));
|
||||
_polygons[TYPE(0x0f)] = Polygon(QBrush(QColor(0xe6, 0xe2, 0xd9)));
|
||||
_polygons[TYPE(0x10)] = Polygon(QBrush(QColor(0xe6, 0xe2, 0xd9)));
|
||||
_polygons[TYPE(0x11)] = Polygon(QBrush(QColor(0xe6, 0xe2, 0xd9)));
|
||||
_polygons[TYPE(0x12)] = Polygon(QBrush(QColor(0xe6, 0xe2, 0xd9)));
|
||||
_polygons[TYPE(0x13)] = Polygon(QBrush(QColor(0xdb, 0xd0, 0xb6)),
|
||||
QPen(QColor(0xcd, 0xcc, 0xc4), 1));
|
||||
_polygons[TYPE(0x14)] = Polygon(QBrush(QColor(0xca, 0xdf, 0xaf)));
|
||||
_polygons[TYPE(0x15)] = Polygon(QBrush(QColor(0xca, 0xdf, 0xaf)));
|
||||
_polygons[TYPE(0x16)] = Polygon(QBrush(QColor(0x9a, 0xc2, 0x69),
|
||||
Qt::BDiagPattern));
|
||||
_polygons[TYPE(0x1f)] = Polygon(QBrush(QColor("#9ac269"),
|
||||
_polygons[TYPE(0x17)] = Polygon(QBrush(QColor(0xe4, 0xef, 0xcf)));
|
||||
_polygons[TYPE(0x18)] = Polygon(QBrush(QColor(0xe3, 0xed, 0xc6)));
|
||||
_polygons[TYPE(0x19)] = Polygon(QBrush(QColor(0xe3, 0xed, 0xc6)),
|
||||
QPen(QColor(0xc9, 0xd3, 0xa5)));
|
||||
_polygons[TYPE(0x1a)] = Polygon(QBrush(QColor(0, 0, 0), Qt::Dense6Pattern),
|
||||
QPen(QColor(0xcd, 0xcc, 0xc4), 1));
|
||||
_polygons[TYPE(0x1e)] = Polygon(QBrush(QColor(0x9a, 0xc2, 0x69),
|
||||
Qt::BDiagPattern));
|
||||
_polygons[TYPE(0x28)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x32)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x3c)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x3d)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x3e)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x3f)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x40)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x41)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x42)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x43)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x44)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x46)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x47)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x48)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x49)] = Polygon(QBrush("#9fc4e1"));
|
||||
_polygons[TYPE(0x4a)] = Polygon(QBrush("#f1f0e5"), QPen("#f1f0e5"));
|
||||
_polygons[TYPE(0x4b)] = Polygon(QBrush("#f1f0e5"), QPen("#f1f0e5"));
|
||||
_polygons[TYPE(0x4c)] = Polygon(QBrush("#9fc4e1", Qt::Dense6Pattern));
|
||||
_polygons[TYPE(0x4d)] = Polygon(QBrush("#ddf1fd"));
|
||||
_polygons[TYPE(0x4e)] = Polygon(QBrush("#f8f8f8"));
|
||||
_polygons[TYPE(0x4f)] = Polygon(QBrush("#e4efcf"));
|
||||
_polygons[TYPE(0x50)] = Polygon(QBrush("#cadfaf"));
|
||||
_polygons[TYPE(0x51)] = Polygon(QBrush("#9fc4e1", Qt::Dense4Pattern));
|
||||
_polygons[TYPE(0x52)] = Polygon(QBrush("#cadfaf"));
|
||||
_polygons[TYPE(0x1f)] = Polygon(QBrush(QColor(0x9a, 0xc2, 0x69),
|
||||
Qt::BDiagPattern));
|
||||
_polygons[TYPE(0x28)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x32)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x3c)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x3d)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x3e)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x3f)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x40)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x41)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x42)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x43)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x44)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x46)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x47)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x48)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x49)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1)));
|
||||
_polygons[TYPE(0x4a)] = Polygon(QBrush(QColor(0xf1, 0xf0, 0xe5)),
|
||||
QPen(QColor(0xf1, 0xf0, 0xe5)));
|
||||
_polygons[TYPE(0x4b)] = Polygon(QBrush(QColor(0xf1, 0xf0, 0xe5)),
|
||||
QPen(QColor(0xf1, 0xf0, 0xe5)));
|
||||
_polygons[TYPE(0x4c)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1),
|
||||
Qt::Dense6Pattern));
|
||||
_polygons[TYPE(0x4d)] = Polygon(QBrush(QColor(0xdd, 0xf1, 0xfd)));
|
||||
_polygons[TYPE(0x4e)] = Polygon(QBrush(QColor(0xf8, 0xf8, 0xf8)));
|
||||
_polygons[TYPE(0x4f)] = Polygon(QBrush(QColor(0xe4, 0xef, 0xcf)));
|
||||
_polygons[TYPE(0x50)] = Polygon(QBrush(QColor(0xca, 0xdf, 0xaf)));
|
||||
_polygons[TYPE(0x51)] = Polygon(QBrush(QColor(0x9f, 0xc4, 0xe1),
|
||||
Qt::Dense4Pattern));
|
||||
_polygons[TYPE(0x52)] = Polygon(QBrush(QColor(0xca, 0xdf, 0xaf)));
|
||||
|
||||
// NT types
|
||||
_polygons[0x10800] = _polygons[TYPE(0x01)];
|
||||
@ -271,20 +277,22 @@ void Style::defaultPolygonStyle()
|
||||
_polygons[0x10c05] = _polygons[TYPE(0x52)];
|
||||
|
||||
// Marine stuff
|
||||
_polygons[0x10101] = Polygon(QBrush("#e8e064"));
|
||||
_polygons[0x10102] = Polygon(QBrush("#d98b21"));
|
||||
_polygons[0x10104] = Polygon(QBrush("#ffffff"));
|
||||
_polygons[0x10105] = Polygon(QBrush("#a58140"));
|
||||
_polygons[0x10301] = Polygon(QBrush("#98c064"));
|
||||
_polygons[0x10302] = Polygon(QBrush("#a0a0ff"));
|
||||
_polygons[0x10303] = Polygon(QBrush("#b0b0ff"));
|
||||
_polygons[0x10304] = Polygon(QBrush("#c0c0ff"));
|
||||
_polygons[0x10305] = Polygon(QBrush("#c0d0ff"));
|
||||
_polygons[0x10306] = Polygon(QBrush("#c0e0ff"));
|
||||
_polygons[0x10409] = Polygon(QBrush("#ff4040", Qt::FDiagPattern));
|
||||
_polygons[0x10503] = Polygon(QBrush("#ff4040", Qt::FDiagPattern));
|
||||
_polygons[0x10601] = Polygon(QBrush("#aaaaaa"));
|
||||
_polygons[0x1060a] = Polygon(QBrush("#fcb4fc"));
|
||||
_polygons[0x10101] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64)));
|
||||
_polygons[0x10102] = Polygon(QBrush(QColor(0xd9, 0x8b, 0x21)));
|
||||
_polygons[0x10104] = Polygon(QBrush(QColor(0xff, 0xff, 0xff)));
|
||||
_polygons[0x10105] = Polygon(QBrush(QColor(0xa5, 0x81, 0x40)));
|
||||
_polygons[0x10301] = Polygon(QBrush(QColor(0x98, 0xc0, 0x64)));
|
||||
_polygons[0x10302] = Polygon(QBrush(QColor(0xa0, 0xa0, 0xff)));
|
||||
_polygons[0x10303] = Polygon(QBrush(QColor(0xb0, 0xb0, 0xff)));
|
||||
_polygons[0x10304] = Polygon(QBrush(QColor(0xc0, 0xc0, 0xff)));
|
||||
_polygons[0x10305] = Polygon(QBrush(QColor(0xc0, 0xd0, 0xff)));
|
||||
_polygons[0x10306] = Polygon(QBrush(QColor(0xc0, 0xe0, 0xff)));
|
||||
_polygons[0x10409] = Polygon(QBrush(QColor(0xff, 0x40, 0x40),
|
||||
Qt::FDiagPattern));
|
||||
_polygons[0x10503] = Polygon(QBrush(QColor(0xff, 0x40, 0x40),
|
||||
Qt::FDiagPattern));
|
||||
_polygons[0x10601] = Polygon(QBrush(QColor(0xaa, 0xaa, 0xaa)));
|
||||
_polygons[0x1060a] = Polygon(QBrush(QColor(0xfc, 0xb4, 0xfc)));
|
||||
|
||||
// Draw order
|
||||
_drawOrder
|
||||
@ -312,60 +320,72 @@ void Style::defaultPolygonStyle()
|
||||
|
||||
void Style::defaultLineStyle(qreal ratio)
|
||||
{
|
||||
_lines[TYPE(0x01)] = Line(QPen(QColor("#9bd772"), 2, Qt::SolidLine),
|
||||
QPen(QColor("#72a35a"), 6, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
|
||||
_lines[TYPE(0x02)] = Line(QPen(QColor("#ffcc78"), 2, Qt::SolidLine),
|
||||
QPen(QColor("#e8a541"), 6, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
|
||||
_lines[TYPE(0x03)] = Line(QPen(QColor("#ffcc78"), 2, Qt::SolidLine),
|
||||
QPen(QColor("#e8a541"), 6, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
|
||||
_lines[TYPE(0x04)] = Line(QPen(QColor("#faef75"), 3, Qt::SolidLine),
|
||||
QPen(QColor("#dbd27b"), 5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
|
||||
_lines[TYPE(0x05)] = Line(QPen(QColor("#ffffff"), 3, Qt::SolidLine),
|
||||
QPen(QColor("#d5cdc0"), 5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
|
||||
_lines[TYPE(0x06)] = Line(QPen(QColor("#ffffff"), 3, Qt::SolidLine),
|
||||
QPen(QColor("#d5cdc0"), 5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
|
||||
_lines[TYPE(0x07)] = Line(QPen(QColor("#ffffff"), 2, Qt::SolidLine),
|
||||
QPen(QColor("#d5cdc0"), 4, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
|
||||
_lines[TYPE(0x08)] = Line(QPen(QColor("#faef75"), 3, Qt::SolidLine),
|
||||
QPen(QColor("#dbd27b"), 5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
|
||||
_lines[TYPE(0x09)] = Line(QPen(QColor("#ffcc78"), 2, Qt::SolidLine),
|
||||
QPen(QColor("#e8a541"), 6, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
|
||||
_lines[TYPE(0x0a)] = Line(QPen(QColor("#aba083"), 1, Qt::DashLine));
|
||||
_lines[TYPE(0x0b)] = Line(QPen(QColor("#ffcc78"), 2, Qt::SolidLine),
|
||||
QPen(QColor("#e8a541"), 6, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
|
||||
_lines[TYPE(0x0c)] = Line(QPen(QColor("#ffffff"), 3, Qt::SolidLine),
|
||||
QPen(QColor("#d5cdc0"), 5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
|
||||
_lines[TYPE(0x01)] = Line(QPen(QColor(0x9b, 0xd7, 0x72), 2, Qt::SolidLine),
|
||||
QPen(QColor(0x72, 0xa, 0x35a), 6, Qt::SolidLine, Qt::RoundCap,
|
||||
Qt::RoundJoin));
|
||||
_lines[TYPE(0x02)] = Line(QPen(QColor(0xff, 0xcc, 0x78), 2, Qt::SolidLine),
|
||||
QPen(QColor(0xe8, 0xa5, 0x41), 6, Qt::SolidLine, Qt::RoundCap,
|
||||
Qt::RoundJoin));
|
||||
_lines[TYPE(0x03)] = Line(QPen(QColor(0xff, 0xcc, 0x78), 2, Qt::SolidLine),
|
||||
QPen(QColor(0xe8, 0xa5, 0x41), 6, Qt::SolidLine, Qt::RoundCap,
|
||||
Qt::RoundJoin));
|
||||
_lines[TYPE(0x04)] = Line(QPen(QColor(0xfa, 0xef, 0x75), 3, Qt::SolidLine),
|
||||
QPen(QColor(0xdb, 0xd2, 0x7b), 5, Qt::SolidLine, Qt::RoundCap,
|
||||
Qt::RoundJoin));
|
||||
_lines[TYPE(0x05)] = Line(QPen(QColor(0xff, 0xff, 0xff), 3, Qt::SolidLine),
|
||||
QPen(QColor(0xd5, 0xcd, 0xc0), 5, Qt::SolidLine, Qt::RoundCap,
|
||||
Qt::RoundJoin));
|
||||
_lines[TYPE(0x06)] = Line(QPen(QColor(0xff, 0xff, 0xff), 3, Qt::SolidLine),
|
||||
QPen(QColor(0xd5, 0xcd, 0xc0), 5, Qt::SolidLine, Qt::RoundCap,
|
||||
Qt::RoundJoin));
|
||||
_lines[TYPE(0x07)] = Line(QPen(QColor(0xff, 0xff, 0xff), 2, Qt::SolidLine),
|
||||
QPen(QColor(0xd5, 0xcd, 0xc0), 4, Qt::SolidLine, Qt::RoundCap,
|
||||
Qt::RoundJoin));
|
||||
_lines[TYPE(0x08)] = Line(QPen(QColor(0xfa, 0xef, 0x75), 3, Qt::SolidLine),
|
||||
QPen(QColor(0xdb, 0xd2, 0x7b), 5, Qt::SolidLine, Qt::RoundCap,
|
||||
Qt::RoundJoin));
|
||||
_lines[TYPE(0x09)] = Line(QPen(QColor(0xff, 0xcc, 0x78), 2, Qt::SolidLine),
|
||||
QPen(QColor(0xe8, 0xa5, 0x41), 6, Qt::SolidLine, Qt::RoundCap,
|
||||
Qt::RoundJoin));
|
||||
_lines[TYPE(0x0a)] = Line(QPen(QColor(0xab, 0xa0, 0x83), 1, Qt::DashLine));
|
||||
_lines[TYPE(0x0b)] = Line(QPen(QColor(0xff, 0xcc, 0x78), 2, Qt::SolidLine),
|
||||
QPen(QColor(0xe8, 0xa5, 0x41), 6, Qt::SolidLine, Qt::RoundCap,
|
||||
Qt::RoundJoin));
|
||||
_lines[TYPE(0x0c)] = Line(QPen(QColor(0xff, 0xff, 0xff), 3, Qt::SolidLine),
|
||||
QPen(QColor(0xd5, 0xcd, 0xc0), 5, Qt::SolidLine, Qt::RoundCap,
|
||||
Qt::RoundJoin));
|
||||
_lines[TYPE(0x14)] = Line(railroad(ratio));
|
||||
_lines[TYPE(0x16)] = Line(QPen(QColor("#aba083"), 1, Qt::DotLine));
|
||||
_lines[TYPE(0x18)] = Line(QPen(QColor("#9fc4e1"), 2, Qt::SolidLine));
|
||||
_lines[TYPE(0x18)].setTextColor(QColor("#9fc4e1"));
|
||||
//_lines[TYPE(0x1a)] = Line(QPen(QColor("#7697b7"), 1, Qt::DashLine));
|
||||
_lines[TYPE(0x1b)] = Line(QPen(QColor("#7697b7"), 1, Qt::DashLine));
|
||||
_lines[TYPE(0x1c)] = Line(QPen(QColor("#505145"), 1, Qt::DashLine));
|
||||
_lines[TYPE(0x1e)] = Line(QPen(QColor("#505145"), 2, Qt::DashDotLine));
|
||||
_lines[TYPE(0x1f)] = Line(QPen(QColor("#9fc4e1"), 3, Qt::SolidLine));
|
||||
_lines[TYPE(0x1f)].setTextColor(QColor("#9fc4e1"));
|
||||
_lines[TYPE(0x20)] = Line(QPen(QColor("#cfcfcf"), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x16)] = Line(QPen(QColor(0xab, 0xa0, 0x83), 1, Qt::DotLine));
|
||||
_lines[TYPE(0x18)] = Line(QPen(QColor(0x9f, 0xc4, 0xe1), 2, Qt::SolidLine));
|
||||
_lines[TYPE(0x18)].setTextColor(QColor(0x9f, 0xc4, 0xe1));
|
||||
//_lines[TYPE(0x1a)] = Line(QPen(QColor(0x76, 0x97, 0xb7), 1, Qt::DashLine));
|
||||
_lines[TYPE(0x1b)] = Line(QPen(QColor(0x76, 0x97, 0xb7), 1, Qt::DashLine));
|
||||
_lines[TYPE(0x1c)] = Line(QPen(QColor(0x50, 0x51, 0x45), 1, Qt::DashLine));
|
||||
_lines[TYPE(0x1e)] = Line(QPen(QColor(0x50, 0x51, 0x45), 2, Qt::DashDotLine));
|
||||
_lines[TYPE(0x1f)] = Line(QPen(QColor(0x9f, 0xc4, 0xe1), 3, Qt::SolidLine));
|
||||
_lines[TYPE(0x1f)].setTextColor(QColor(0x9f, 0xc4, 0xe1));
|
||||
_lines[TYPE(0x20)] = Line(QPen(QColor(0xcf, 0xcf, 0xcf), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x20)].setTextFontSize(None);
|
||||
_lines[TYPE(0x21)] = Line(QPen(QColor("#bfbfbf"), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x21)].setTextColor(QColor("#666666"));
|
||||
_lines[TYPE(0x21)] = Line(QPen(QColor(0xbf, 0xbf, 0xbf), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x21)].setTextColor(QColor(0x66, 0x66, 0x66));
|
||||
_lines[TYPE(0x21)].setTextFontSize(Small);
|
||||
_lines[TYPE(0x22)] = Line(QPen(QColor("#afafaf"), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x22)].setTextColor(QColor("#666666"));
|
||||
_lines[TYPE(0x22)] = Line(QPen(QColor(0xaf, 0xaf, 0xaf), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x22)].setTextColor(QColor(0x66, 0x66, 0x66));
|
||||
_lines[TYPE(0x22)].setTextFontSize(Small);
|
||||
_lines[TYPE(0x23)] = Line(QPen(QColor("#55aaff"), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x23)] = Line(QPen(QColor(0x55, 0xaa, 0xff), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x23)].setTextFontSize(None);
|
||||
_lines[TYPE(0x24)] = Line(QPen(QColor("#659aef"), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x24)].setTextColor(QColor("#558adf"));
|
||||
_lines[TYPE(0x24)] = Line(QPen(QColor(0x65, 0x9a, 0xef), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x24)].setTextColor(QColor(0x55, 0x8a, 0xdf));
|
||||
_lines[TYPE(0x24)].setTextFontSize(Small);
|
||||
_lines[TYPE(0x25)] = Line(QPen(QColor("#558adf"), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x25)].setTextColor(QColor("#558adf"));
|
||||
_lines[TYPE(0x25)] = Line(QPen(QColor(0x55, 0x8a, 0xdf), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x25)].setTextColor(QColor(0x55, 0x8a, 0xdf));
|
||||
_lines[TYPE(0x25)].setTextFontSize(Small);
|
||||
_lines[TYPE(0x26)] = Line(QPen(QColor("#9fc4e1"), 2, Qt::DotLine));
|
||||
_lines[TYPE(0x27)] = Line(QPen(QColor("#ffffff"), 4, Qt::SolidLine),
|
||||
QPen(QColor("#d5cdc0"), 5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
|
||||
//_lines[TYPE(0x28)] = Line(QPen(QColor("#5a5a5a"), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x29)] = Line(QPen(QColor("#5a5a5a"), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x26)] = Line(QPen(QColor(0x9f, 0xc4, 0xe1), 2, Qt::DotLine));
|
||||
_lines[TYPE(0x27)] = Line(QPen(QColor(0xff, 0xff, 0xff), 4, Qt::SolidLine),
|
||||
QPen(QColor(0xd5, 0xcd, 0xc0), 5, Qt::SolidLine, Qt::RoundCap,
|
||||
Qt::RoundJoin));
|
||||
//_lines[TYPE(0x28)] = Line(QPen(QColor(0x5a, 0x5a, 0x5a"), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x29)] = Line(QPen(QColor(0x5a, 0x5a, 0x5a), 1, Qt::SolidLine));
|
||||
_lines[TYPE(0x29)].setTextFontSize(None);
|
||||
|
||||
// NT types
|
||||
@ -385,40 +405,40 @@ void Style::defaultLineStyle(qreal ratio)
|
||||
_lines[0x10c04] = _lines[TYPE(0x29)];
|
||||
|
||||
// Marine stuff
|
||||
_lines[0x10101] = Line(QPen(QColor("#000000"), 1, Qt::SolidLine));
|
||||
_lines[0x10101] = Line(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
|
||||
_lines[0x10106] = Line(QImage(":/marine/cable-line.png"));
|
||||
_lines[0x10107] = Line(QPen(QColor("#a58140"), 3, Qt::SolidLine));
|
||||
_lines[0x10108] = Line(QPen(QColor("#000000"), 1, Qt::SolidLine));
|
||||
_lines[0x10301] = Line(QPen(QColor("#0e1087"), 1, Qt::SolidLine));
|
||||
_lines[0x10307] = Line(QPen(QColor("#05620e"), 1, Qt::SolidLine));
|
||||
_lines[0x10107] = Line(QPen(QColor(0xa5, 0x81, 0x40), 3, Qt::SolidLine));
|
||||
_lines[0x10108] = Line(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
|
||||
_lines[0x10301] = Line(QPen(QColor(0x0e, 0x10, 0x87), 1, Qt::SolidLine));
|
||||
_lines[0x10307] = Line(QPen(QColor(0x05, 0x62, 0x0e), 1, Qt::SolidLine));
|
||||
_lines[0x10401] = Line(QImage(":/marine/cable.png"));
|
||||
_lines[0x10402] = Line(QImage(":/marine/pipeline.png"));
|
||||
_lines[0x10404] = Line(QImage(":/marine/fishing-farm-line.png"));
|
||||
_lines[0x10405] = Line(QImage(":/marine/pipeline-area-line.png"));
|
||||
_lines[0x10406] = Line(QImage(":/marine/cable-area-line.png"));
|
||||
_lines[0x10409] = Line(QPen(QColor("#000000"), 1, Qt::DotLine));
|
||||
_lines[0x10409] = Line(QPen(QColor(0, 0, 0), 1, Qt::DotLine));
|
||||
_lines[0x10501] = Line(QImage(":/marine/noanchor-line.png"));
|
||||
_lines[0x10503] = Line(QPen(QColor("#e728e7"), 1, Qt::DashLine));
|
||||
_lines[0x10503] = Line(QPen(QColor(0xe7, 0x28, 0xe7), 1, Qt::DashLine));
|
||||
_lines[0x10505] = Line(QImage(":/marine/safety-zone-line.png"));
|
||||
_lines[0x10507] = Line(QPen(QColor("#e728e7"), 1, Qt::DashLine));
|
||||
_lines[0x10601] = Line(QPen(QColor("#000000"), 1, Qt::SolidLine));
|
||||
_lines[0x10603] = Line(QPen(QColor("#e728e7"), 2, Qt::DashDotLine));
|
||||
_lines[0x10507] = Line(QPen(QColor(0xe7, 0x28, 0xe7), 1, Qt::DashLine));
|
||||
_lines[0x10601] = Line(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
|
||||
_lines[0x10603] = Line(QPen(QColor(0xe7, 0x28, 0xe7), 2, Qt::DashDotLine));
|
||||
_lines[0x10606] = Line(QImage(":/marine/anchor-line.png"));
|
||||
_lines[0x1060c] = Line(QPen(QColor("#e728e7"), 1, Qt::SolidLine));
|
||||
_lines[0x1060d] = Line(QPen(QColor("#eb49eb"), 1, Qt::DashLine));
|
||||
_lines[0x10611] = Line(QPen(QColor("#eb49eb"), 1, Qt::DashLine));
|
||||
_lines[0x1060c] = Line(QPen(QColor(0xe7, 0x28, 0xe7), 1, Qt::SolidLine));
|
||||
_lines[0x1060d] = Line(QPen(QColor(0xeb, 0x49, 0xeb), 1, Qt::DashLine));
|
||||
_lines[0x10611] = Line(QPen(QColor(0xeb, 0x49, 0xeb), 1, Qt::DashLine));
|
||||
}
|
||||
|
||||
void Style::defaultPointStyle(qreal ratio)
|
||||
{
|
||||
// Countries
|
||||
_points[TYPE(0x14)].setTextColor(QColor("#505145"));
|
||||
_points[TYPE(0x14)].setTextColor(QColor(0x50, 0x51, 0x45));
|
||||
_points[TYPE(0x14)].setTextFontSize(Small);
|
||||
_points[TYPE(0x15)].setTextColor(QColor("#505145"));
|
||||
_points[TYPE(0x15)].setTextColor(QColor(0x50, 0x51, 0x45));
|
||||
_points[TYPE(0x15)].setTextFontSize(Small);
|
||||
|
||||
// Regions
|
||||
_points[TYPE(0x1e)].setTextColor(QColor("#505145"));
|
||||
_points[TYPE(0x1e)].setTextColor(QColor(0x50, 0x51, 0x45));
|
||||
_points[TYPE(0x1e)].setTextFontSize(ExtraSmall);
|
||||
_points[TYPE(0x28)].setTextFontSize(Small);
|
||||
|
||||
@ -453,11 +473,12 @@ void Style::defaultPointStyle(qreal ratio)
|
||||
_points[0x2b02] = Point(svg2img(":/POI/lodging-11.svg", ratio));
|
||||
_points[0x2b03] = Point(svg2img(":/POI/campsite-11.svg", ratio));
|
||||
_points[0x2b04] = Point(svg2img(":/POI/village-11.svg", ratio));
|
||||
_points[0x2b05] = Point(svg2img(":/POI/campsite-11.svg", ratio));
|
||||
_points[0x2b06] = Point(svg2img(":/POI/shelter-11.svg", ratio));
|
||||
|
||||
_points[0x2c01] = Point(svg2img(":/POI/amusement-park-11.svg", ratio));
|
||||
_points[0x2c02] = Point(svg2img(":/POI/museum-11.svg", ratio));
|
||||
_points[0x2c03] = Point(svg2img(":/POI/library-11-11.svg", ratio));
|
||||
_points[0x2c03] = Point(svg2img(":/POI/library-11.svg", ratio));
|
||||
_points[0x2c04] = Point(svg2img(":/POI/landmark-11.svg", ratio));
|
||||
_points[0x2c05] = Point(svg2img(":/POI/school-11.svg", ratio));
|
||||
_points[0x2c06] = Point(svg2img(":/POI/garden-11.svg", ratio));
|
||||
@ -465,6 +486,7 @@ void Style::defaultPointStyle(qreal ratio)
|
||||
_points[0x2c08] = Point(svg2img(":/POI/soccer-11.svg", ratio));
|
||||
_points[0x2c0a] = Point(svg2img(":/POI/bar-11.svg", ratio));
|
||||
_points[0x2c0b] = Point(svg2img(":/POI/place-of-worship-11.svg", ratio));
|
||||
_points[0x2c0c] = Point(svg2img(":/POI/volcano-11.svg", ratio));
|
||||
_points[0x2c0d] = Point(svg2img(":/POI/religious-muslim-11.svg", ratio));
|
||||
_points[0x2c0e] = Point(svg2img(":/POI/religious-christian-11.svg", ratio));
|
||||
_points[0x2c10] = Point(svg2img(":/POI/religious-jewish-11.svg", ratio));
|
||||
@ -488,6 +510,7 @@ void Style::defaultPointStyle(qreal ratio)
|
||||
_points[0x2e09] = Point(svg2img(":/POI/furniture-11.svg", ratio));
|
||||
_points[0x2e0a] = Point(svg2img(":/POI/shop-11.svg", ratio));
|
||||
_points[0x2e0c] = Point(svg2img(":/POI/shop-11.svg", ratio));
|
||||
_points[0x2e13] = Point(svg2img(":/POI/alcohol-shop-11.svg", ratio));
|
||||
|
||||
_points[0x2f01] = Point(svg2img(":/POI/fuel-11.svg", ratio));
|
||||
_points[0x2f02] = Point(svg2img(":/POI/car-rental-11.svg", ratio));
|
||||
@ -513,6 +536,8 @@ void Style::defaultPointStyle(qreal ratio)
|
||||
_points[0x3006] = Point(svg2img(":/POI/entrance-alt1-11.svg", ratio));
|
||||
_points[0x3007] = Point(svg2img(":/POI/town-hall-11.svg", ratio));
|
||||
_points[0x3008] = Point(svg2img(":/POI/fire-station-11.svg", ratio));
|
||||
_points[0x3200] = Point(svg2img(":/POI/barrier-11.svg", ratio));
|
||||
_points[0x3200].setTextFontSize(None);
|
||||
|
||||
_points[0x4000] = Point(svg2img(":/POI/golf-11.svg", ratio));
|
||||
_points[0x4300] = Point(svg2img(":/POI/harbor-11.svg", ratio));
|
||||
@ -587,6 +612,7 @@ void Style::defaultPointStyle(qreal ratio)
|
||||
_points[0x10c02] = _points[0x2b02];
|
||||
_points[0x10c03] = _points[0x2b03];
|
||||
_points[0x10c04] = _points[0x2b04];
|
||||
_points[0x10c05] = _points[0x2b05];
|
||||
_points[0x10d01] = _points[0x2c01];
|
||||
_points[0x10d02] = _points[0x2c02];
|
||||
_points[0x10d03] = _points[0x2c03];
|
||||
@ -597,6 +623,7 @@ void Style::defaultPointStyle(qreal ratio)
|
||||
_points[0x10d08] = _points[0x2c08];
|
||||
_points[0x10d0a] = _points[0x2c0a];
|
||||
_points[0x10d0b] = _points[0x2c0b];
|
||||
_points[0x10d0c] = _points[0x2c0c];
|
||||
_points[0x10d0d] = _points[0x2c0d];
|
||||
_points[0x10d0e] = _points[0x2c0e];
|
||||
_points[0x10d10] = _points[0x2c10];
|
||||
@ -619,6 +646,7 @@ void Style::defaultPointStyle(qreal ratio)
|
||||
_points[0x10f08] = _points[0x2e08];
|
||||
_points[0x10f09] = _points[0x2e09];
|
||||
_points[0x10f0a] = _points[0x2e0a];
|
||||
_points[0x10f13] = _points[0x2e13];
|
||||
_points[0x11001] = _points[0x2f01];
|
||||
_points[0x11002] = _points[0x2f02];
|
||||
_points[0x11003] = _points[0x2f03];
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user