Compare commits
No commits in common. "e1b3b36e4b0c920ccbcf27ca445dcc81106b5373" and "1385482689191bf1846d2c06cbb1ca245ae59044" have entirely different histories.
e1b3b36e4b
...
1385482689
@ -63,7 +63,7 @@ GPXSee is licensed under GPL-3.0 (only). However, some 3rd party parts are using
|
|||||||
different, GPL compatible, licenses:
|
different, GPL compatible, licenses:
|
||||||
|
|
||||||
* [Oxygen icons](icons/GUI) - LGPLv3
|
* [Oxygen icons](icons/GUI) - LGPLv3
|
||||||
* [Mapbox Maki icons](icons/IMG/POI) - CC0
|
* [Mapbox Maki icons](icons/IMG) - CC0
|
||||||
* [Map Icons Collection](icons/symbols) - CC BY SA 3.0
|
* [Map Icons Collection](icons/symbols) - CC BY SA 3.0
|
||||||
* [RTree implementation](src/common/rtree.h) - Public domain
|
* [RTree implementation](src/common/rtree.h) - Public domain
|
||||||
* [Albers](src/map/proj/albersequal.cpp), [Geocentric](src/map/geocentric.cpp),
|
* [Albers](src/map/proj/albersequal.cpp), [Geocentric](src/map/geocentric.cpp),
|
||||||
|
|||||||
164
gpxsee.qrc
@ -57,93 +57,83 @@
|
|||||||
|
|
||||||
<!-- IMG map style -->
|
<!-- IMG map style -->
|
||||||
<qresource prefix="/IMG">
|
<qresource prefix="/IMG">
|
||||||
<file alias="airfield-11.png">icons/IMG/POI/airfield-11.png</file>
|
<file alias="airfield-11.png">icons/IMG/airfield-11.png</file>
|
||||||
<file alias="airport-11.png">icons/IMG/POI/airport-11.png</file>
|
<file alias="airport-11.png">icons/IMG/airport-11.png</file>
|
||||||
<file alias="amusement-park-11.png">icons/IMG/POI/amusement-park-11.png</file>
|
<file alias="amusement-park-11.png">icons/IMG/amusement-park-11.png</file>
|
||||||
<file alias="bakery-11.png">icons/IMG/POI/bakery-11.png</file>
|
<file alias="bakery-11.png">icons/IMG/bakery-11.png</file>
|
||||||
<file alias="bank-11.png">icons/IMG/POI/bank-11.png</file>
|
<file alias="bank-11.png">icons/IMG/bank-11.png</file>
|
||||||
<file alias="bar-11.png">icons/IMG/POI/bar-11.png</file>
|
<file alias="bar-11.png">icons/IMG/bar-11.png</file>
|
||||||
<file alias="bbq-11.png">icons/IMG/POI/bbq-11.png</file>
|
<file alias="bbq-11.png">icons/IMG/bbq-11.png</file>
|
||||||
<file alias="beach-11.png">icons/IMG/POI/beach-11.png</file>
|
<file alias="beach-11.png">icons/IMG/beach-11.png</file>
|
||||||
<file alias="bowling-alley-11.png">icons/IMG/POI/bowling-alley-11.png</file>
|
<file alias="bowling-alley-11.png">icons/IMG/bowling-alley-11.png</file>
|
||||||
<file alias="building-alt1-11.png">icons/IMG/POI/building-alt1-11.png</file>
|
<file alias="building-alt1-11.png">icons/IMG/building-alt1-11.png</file>
|
||||||
<file alias="bridge-11.png">icons/IMG/POI/bridge-11.png</file>
|
<file alias="bridge-11.png">icons/IMG/bridge-11.png</file>
|
||||||
<file alias="bus-11.png">icons/IMG/POI/bus-11.png</file>
|
<file alias="bus-11.png">icons/IMG/bus-11.png</file>
|
||||||
<file alias="cafe-11.png">icons/IMG/POI/cafe-11.png</file>
|
<file alias="cafe-11.png">icons/IMG/cafe-11.png</file>
|
||||||
<file alias="campsite-11.png">icons/IMG/POI/campsite-11.png</file>
|
<file alias="campsite-11.png">icons/IMG/campsite-11.png</file>
|
||||||
<file alias="car-11.png">icons/IMG/POI/car-11.png</file>
|
<file alias="car-11.png">icons/IMG/car-11.png</file>
|
||||||
<file alias="car-rental-11.png">icons/IMG/POI/car-rental-11.png</file>
|
<file alias="car-rental-11.png">icons/IMG/car-rental-11.png</file>
|
||||||
<file alias="car-repair-11.png">icons/IMG/POI/car-repair-11.png</file>
|
<file alias="car-repair-11.png">icons/IMG/car-repair-11.png</file>
|
||||||
<file alias="casino-11.png">icons/IMG/POI/casino-11.png</file>
|
<file alias="casino-11.png">icons/IMG/casino-11.png</file>
|
||||||
<file alias="cemetery-11.png">icons/IMG/POI/cemetery-11.png</file>
|
<file alias="cemetery-11.png">icons/IMG/cemetery-11.png</file>
|
||||||
<file alias="cinema-11.png">icons/IMG/POI/cinema-11.png</file>
|
<file alias="cinema-11.png">icons/IMG/cinema-11.png</file>
|
||||||
<file alias="clothing-store-11.png">icons/IMG/POI/clothing-store-11.png</file>
|
<file alias="clothing-store-11.png">icons/IMG/clothing-store-11.png</file>
|
||||||
<file alias="communications-tower-11.png">icons/IMG/POI/communications-tower-11.png</file>
|
<file alias="communications-tower-11.png">icons/IMG/communications-tower-11.png</file>
|
||||||
<file alias="convenience-11.png">icons/IMG/POI/convenience-11.png</file>
|
<file alias="convenience-11.png">icons/IMG/convenience-11.png</file>
|
||||||
<file alias="dam-11.png">icons/IMG/POI/dam-11.png</file>
|
<file alias="dam-11.png">icons/IMG/dam-11.png</file>
|
||||||
<file alias="danger-11.png">icons/IMG/POI/danger-11.png</file>
|
<file alias="danger-11.png">icons/IMG/danger-11.png</file>
|
||||||
<file alias="drinking-water-11.png">icons/IMG/POI/drinking-water-11.png</file>
|
<file alias="drinking-water-11.png">icons/IMG/drinking-water-11.png</file>
|
||||||
<file alias="fast-food-11.png">icons/IMG/POI/fast-food-11.png</file>
|
<file alias="fast-food-11.png">icons/IMG/fast-food-11.png</file>
|
||||||
<file alias="entrance-alt1-11.png">icons/IMG/POI/entrance-alt1-11.png</file>
|
<file alias="entrance-alt1-11.png">icons/IMG/entrance-alt1-11.png</file>
|
||||||
<file alias="fire-station-11.png">icons/IMG/POI/fire-station-11.png</file>
|
<file alias="fire-station-11.png">icons/IMG/fire-station-11.png</file>
|
||||||
<file alias="fitness-centre-11.png">icons/IMG/POI/fitness-centre-11.png</file>
|
<file alias="fitness-centre-11.png">icons/IMG/fitness-centre-11.png</file>
|
||||||
<file alias="fuel-11.png">icons/IMG/POI/fuel-11.png</file>
|
<file alias="fuel-11.png">icons/IMG/fuel-11.png</file>
|
||||||
<file alias="furniture-11.png">icons/IMG/POI/furniture-11.png</file>
|
<file alias="furniture-11.png">icons/IMG/furniture-11.png</file>
|
||||||
<file alias="garden-11.png">icons/IMG/POI/garden-11.png</file>
|
<file alias="garden-11.png">icons/IMG/garden-11.png</file>
|
||||||
<file alias="garden-centre-11.png">icons/IMG/POI/garden-centre-11.png</file>
|
<file alias="garden-centre-11.png">icons/IMG/garden-centre-11.png</file>
|
||||||
<file alias="golf-11.png">icons/IMG/POI/golf-11.png</file>
|
<file alias="golf-11.png">icons/IMG/golf-11.png</file>
|
||||||
<file alias="grocery-11.png">icons/IMG/POI/grocery-11.png</file>
|
<file alias="grocery-11.png">icons/IMG/grocery-11.png</file>
|
||||||
<file alias="hairdresser-11.png">icons/IMG/POI/hairdresser-11.png</file>
|
<file alias="hairdresser-11.png">icons/IMG/hairdresser-11.png</file>
|
||||||
<file alias="harbor-11.png">icons/IMG/POI/harbor-11.png</file>
|
<file alias="harbor-11.png">icons/IMG/harbor-11.png</file>
|
||||||
<file alias="hardware-11.png">icons/IMG/POI/hardware-11.png</file>
|
<file alias="hardware-11.png">icons/IMG/hardware-11.png</file>
|
||||||
<file alias="heliport-11.png">icons/IMG/POI/heliport-11.png</file>
|
<file alias="heliport-11.png">icons/IMG/heliport-11.png</file>
|
||||||
<file alias="hospital-11.png">icons/IMG/POI/hospital-11.png</file>
|
<file alias="hospital-11.png">icons/IMG/hospital-11.png</file>
|
||||||
<file alias="information-11.png">icons/IMG/POI/information-11.png</file>
|
<file alias="information-11.png">icons/IMG/information-11.png</file>
|
||||||
<file alias="landmark-11.png">icons/IMG/POI/landmark-11.png</file>
|
<file alias="landmark-11.png">icons/IMG/landmark-11.png</file>
|
||||||
<file alias="library-11.png">icons/IMG/POI/library-11.png</file>
|
<file alias="library-11.png">icons/IMG/library-11.png</file>
|
||||||
<file alias="lodging-11.png">icons/IMG/POI/lodging-11.png</file>
|
<file alias="lodging-11.png">icons/IMG/lodging-11.png</file>
|
||||||
<file alias="mountain-11.png">icons/IMG/POI/mountain-11.png</file>
|
<file alias="mountain-11.png">icons/IMG/mountain-11.png</file>
|
||||||
<file alias="museum-11.png">icons/IMG/POI/museum-11.png</file>
|
<file alias="museum-11.png">icons/IMG/museum-11.png</file>
|
||||||
<file alias="park-11.png">icons/IMG/POI/park-11.png</file>
|
<file alias="park-11.png">icons/IMG/park-11.png</file>
|
||||||
<file alias="parking-11.png">icons/IMG/POI/parking-11.png</file>
|
<file alias="parking-11.png">icons/IMG/parking-11.png</file>
|
||||||
<file alias="pharmacy-11.png">icons/IMG/POI/pharmacy-11.png</file>
|
<file alias="pharmacy-11.png">icons/IMG/pharmacy-11.png</file>
|
||||||
<file alias="picnic-site-11.png">icons/IMG/POI/picnic-site-11.png</file>
|
<file alias="picnic-site-11.png">icons/IMG/picnic-site-11.png</file>
|
||||||
<file alias="place-of-worship-11.png">icons/IMG/POI/place-of-worship-11.png</file>
|
<file alias="place-of-worship-11.png">icons/IMG/place-of-worship-11.png</file>
|
||||||
<file alias="police-11.png">icons/IMG/POI/police-11.png</file>
|
<file alias="police-11.png">icons/IMG/police-11.png</file>
|
||||||
<file alias="post-11.png">icons/IMG/POI/post-11.png</file>
|
<file alias="post-11.png">icons/IMG/post-11.png</file>
|
||||||
<file alias="religious-christian-11.png">icons/IMG/POI/religious-christian-11.png</file>
|
<file alias="religious-christian-11.png">icons/IMG/religious-christian-11.png</file>
|
||||||
<file alias="religious-jewish-11.png">icons/IMG/POI/religious-jewish-11.png</file>
|
<file alias="religious-jewish-11.png">icons/IMG/religious-jewish-11.png</file>
|
||||||
<file alias="religious-muslim-11.png">icons/IMG/POI/religious-muslim-11.png</file>
|
<file alias="religious-muslim-11.png">icons/IMG/religious-muslim-11.png</file>
|
||||||
<file alias="restaurant-11.png">icons/IMG/POI/restaurant-11.png</file>
|
<file alias="restaurant-11.png">icons/IMG/restaurant-11.png</file>
|
||||||
<file alias="restaurant-noodle-11.png">icons/IMG/POI/restaurant-noodle-11.png</file>
|
<file alias="restaurant-noodle-11.png">icons/IMG/restaurant-noodle-11.png</file>
|
||||||
<file alias="restaurant-pizza-11.png">icons/IMG/POI/restaurant-pizza-11.png</file>
|
<file alias="restaurant-pizza-11.png">icons/IMG/restaurant-pizza-11.png</file>
|
||||||
<file alias="restaurant-seafood-11.png">icons/IMG/POI/restaurant-seafood-11.png</file>
|
<file alias="restaurant-seafood-11.png">icons/IMG/restaurant-seafood-11.png</file>
|
||||||
<file alias="roadblock-11.png">icons/IMG/POI/roadblock-11.png</file>
|
<file alias="roadblock-11.png">icons/IMG/roadblock-11.png</file>
|
||||||
<file alias="school-11.png">icons/IMG/POI/school-11.png</file>
|
<file alias="school-11.png">icons/IMG/school-11.png</file>
|
||||||
<file alias="shelter-11.png">icons/IMG/POI/shelter-11.png</file>
|
<file alias="shelter-11.png">icons/IMG/shelter-11.png</file>
|
||||||
<file alias="shop-11.png">icons/IMG/POI/shop-11.png</file>
|
<file alias="shop-11.png">icons/IMG/shop-11.png</file>
|
||||||
<file alias="skiing-11.png">icons/IMG/POI/skiing-11.png</file>
|
<file alias="skiing-11.png">icons/IMG/skiing-11.png</file>
|
||||||
<file alias="soccer-11.png">icons/IMG/POI/soccer-11.png</file>
|
<file alias="soccer-11.png">icons/IMG/soccer-11.png</file>
|
||||||
<file alias="swimming-11.png">icons/IMG/POI/swimming-11.png</file>
|
<file alias="swimming-11.png">icons/IMG/swimming-11.png</file>
|
||||||
<file alias="theatre-11.png">icons/IMG/POI/theatre-11.png</file>
|
<file alias="theatre-11.png">icons/IMG/theatre-11.png</file>
|
||||||
<file alias="telephone-11.png">icons/IMG/POI/telephone-11.png</file>
|
<file alias="telephone-11.png">icons/IMG/telephone-11.png</file>
|
||||||
<file alias="toilet-11.png">icons/IMG/POI/toilet-11.png</file>
|
<file alias="toilet-11.png">icons/IMG/toilet-11.png</file>
|
||||||
<file alias="town-hall-11.png">icons/IMG/POI/town-hall-11.png</file>
|
<file alias="town-hall-11.png">icons/IMG/town-hall-11.png</file>
|
||||||
<file alias="viewpoint-11.png">icons/IMG/POI/viewpoint-11.png</file>
|
<file alias="viewpoint-11.png">icons/IMG/viewpoint-11.png</file>
|
||||||
<file alias="village-11.png">icons/IMG/POI/village-11.png</file>
|
<file alias="village-11.png">icons/IMG/village-11.png</file>
|
||||||
<file alias="waterfall-11.png">icons/IMG/POI/waterfall-11.png</file>
|
<file alias="waterfall-11.png">icons/IMG/waterfall-11.png</file>
|
||||||
<file alias="wetland-11.png">icons/IMG/POI/wetland-11.png</file>
|
<file alias="wetland-11.png">icons/IMG/wetland-11.png</file>
|
||||||
<file alias="zoo-11.png">icons/IMG/POI/zoo-11.png</file>
|
<file alias="zoo-11.png">icons/IMG/zoo-11.png</file>
|
||||||
|
|
||||||
<file alias="light-major.png">icons/IMG/marine/light-major.png</file>
|
|
||||||
<file alias="light-platform.png">icons/IMG/marine/light-platform.png</file>
|
|
||||||
<file alias="beacon.png">icons/IMG/marine/beacon.png</file>
|
|
||||||
<file alias="rock.png">icons/IMG/marine/rock.png</file>
|
|
||||||
<file alias="wreck.png">icons/IMG/marine/wreck.png</file>
|
|
||||||
<file alias="obstruction.png">icons/IMG/marine/obstruction.png</file>
|
|
||||||
<file alias="anchor-line.png">icons/IMG/marine/anchor-line.png</file>
|
|
||||||
<file alias="pipeline.png">icons/IMG/marine/pipeline.png</file>
|
|
||||||
<file alias="cable.png">icons/IMG/marine/cable.png</file>
|
|
||||||
</qresource>
|
</qresource>
|
||||||
|
|
||||||
<!-- Mapsforge rendertheme -->
|
<!-- Mapsforge rendertheme -->
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 380 B After Width: | Height: | Size: 380 B |
|
Before Width: | Height: | Size: 402 B After Width: | Height: | Size: 402 B |
|
Before Width: | Height: | Size: 428 B After Width: | Height: | Size: 428 B |
|
Before Width: | Height: | Size: 383 B After Width: | Height: | Size: 383 B |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 363 B |
|
Before Width: | Height: | Size: 374 B After Width: | Height: | Size: 374 B |
|
Before Width: | Height: | Size: 393 B After Width: | Height: | Size: 393 B |
|
Before Width: | Height: | Size: 395 B After Width: | Height: | Size: 395 B |
|
Before Width: | Height: | Size: 386 B After Width: | Height: | Size: 386 B |
|
Before Width: | Height: | Size: 365 B After Width: | Height: | Size: 365 B |
|
Before Width: | Height: | Size: 343 B After Width: | Height: | Size: 343 B |
|
Before Width: | Height: | Size: 378 B After Width: | Height: | Size: 378 B |
|
Before Width: | Height: | Size: 351 B After Width: | Height: | Size: 351 B |
|
Before Width: | Height: | Size: 366 B After Width: | Height: | Size: 366 B |
|
Before Width: | Height: | Size: 368 B After Width: | Height: | Size: 368 B |
|
Before Width: | Height: | Size: 390 B After Width: | Height: | Size: 390 B |
|
Before Width: | Height: | Size: 381 B After Width: | Height: | Size: 381 B |
|
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 369 B |
|
Before Width: | Height: | Size: 357 B After Width: | Height: | Size: 357 B |
|
Before Width: | Height: | Size: 356 B After Width: | Height: | Size: 356 B |
|
Before Width: | Height: | Size: 351 B After Width: | Height: | Size: 351 B |
|
Before Width: | Height: | Size: 402 B After Width: | Height: | Size: 402 B |
|
Before Width: | Height: | Size: 650 B After Width: | Height: | Size: 650 B |
|
Before Width: | Height: | Size: 376 B After Width: | Height: | Size: 376 B |
|
Before Width: | Height: | Size: 421 B After Width: | Height: | Size: 421 B |
|
Before Width: | Height: | Size: 367 B After Width: | Height: | Size: 367 B |
|
Before Width: | Height: | Size: 611 B After Width: | Height: | Size: 611 B |
|
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 344 B |
|
Before Width: | Height: | Size: 403 B After Width: | Height: | Size: 403 B |
|
Before Width: | Height: | Size: 326 B After Width: | Height: | Size: 326 B |
|
Before Width: | Height: | Size: 377 B After Width: | Height: | Size: 377 B |
|
Before Width: | Height: | Size: 348 B After Width: | Height: | Size: 348 B |
|
Before Width: | Height: | Size: 402 B After Width: | Height: | Size: 402 B |
|
Before Width: | Height: | Size: 352 B After Width: | Height: | Size: 352 B |
|
Before Width: | Height: | Size: 394 B After Width: | Height: | Size: 394 B |
|
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 355 B |
|
Before Width: | Height: | Size: 380 B After Width: | Height: | Size: 380 B |
|
Before Width: | Height: | Size: 404 B After Width: | Height: | Size: 404 B |
|
Before Width: | Height: | Size: 366 B After Width: | Height: | Size: 366 B |
|
Before Width: | Height: | Size: 390 B After Width: | Height: | Size: 390 B |
|
Before Width: | Height: | Size: 326 B After Width: | Height: | Size: 326 B |
|
Before Width: | Height: | Size: 359 B After Width: | Height: | Size: 359 B |
|
Before Width: | Height: | Size: 341 B After Width: | Height: | Size: 341 B |
|
Before Width: | Height: | Size: 410 B After Width: | Height: | Size: 410 B |
|
Before Width: | Height: | Size: 345 B After Width: | Height: | Size: 345 B |
|
Before Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 256 B |
|
Before Width: | Height: | Size: 175 B |
|
Before Width: | Height: | Size: 555 B |
|
Before Width: | Height: | Size: 415 B |
|
Before Width: | Height: | Size: 162 B |
|
Before Width: | Height: | Size: 139 B |
|
Before Width: | Height: | Size: 204 B |
|
Before Width: | Height: | Size: 232 B |
|
Before Width: | Height: | Size: 384 B After Width: | Height: | Size: 384 B |
|
Before Width: | Height: | Size: 366 B After Width: | Height: | Size: 366 B |
|
Before Width: | Height: | Size: 399 B After Width: | Height: | Size: 399 B |
|
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 369 B |
|
Before Width: | Height: | Size: 364 B After Width: | Height: | Size: 364 B |
|
Before Width: | Height: | Size: 377 B After Width: | Height: | Size: 377 B |
|
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 344 B |
|
Before Width: | Height: | Size: 394 B After Width: | Height: | Size: 394 B |
|
Before Width: | Height: | Size: 365 B After Width: | Height: | Size: 365 B |
|
Before Width: | Height: | Size: 311 B After Width: | Height: | Size: 311 B |
|
Before Width: | Height: | Size: 359 B After Width: | Height: | Size: 359 B |
|
Before Width: | Height: | Size: 401 B After Width: | Height: | Size: 401 B |
|
Before Width: | Height: | Size: 361 B After Width: | Height: | Size: 361 B |
|
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 396 B |
|
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 396 B |
|
Before Width: | Height: | Size: 407 B After Width: | Height: | Size: 407 B |
|
Before Width: | Height: | Size: 383 B After Width: | Height: | Size: 383 B |
|
Before Width: | Height: | Size: 333 B After Width: | Height: | Size: 333 B |
|
Before Width: | Height: | Size: 325 B After Width: | Height: | Size: 325 B |
|
Before Width: | Height: | Size: 381 B After Width: | Height: | Size: 381 B |
|
Before Width: | Height: | Size: 399 B After Width: | Height: | Size: 399 B |
|
Before Width: | Height: | Size: 397 B After Width: | Height: | Size: 397 B |
|
Before Width: | Height: | Size: 404 B After Width: | Height: | Size: 404 B |
|
Before Width: | Height: | Size: 377 B After Width: | Height: | Size: 377 B |
|
Before Width: | Height: | Size: 428 B After Width: | Height: | Size: 428 B |
|
Before Width: | Height: | Size: 407 B After Width: | Height: | Size: 407 B |
|
Before Width: | Height: | Size: 348 B After Width: | Height: | Size: 348 B |
|
Before Width: | Height: | Size: 383 B After Width: | Height: | Size: 383 B |
|
Before Width: | Height: | Size: 373 B After Width: | Height: | Size: 373 B |
|
Before Width: | Height: | Size: 392 B After Width: | Height: | Size: 392 B |
|
Before Width: | Height: | Size: 427 B After Width: | Height: | Size: 427 B |
|
Before Width: | Height: | Size: 382 B After Width: | Height: | Size: 382 B |
@ -11,8 +11,6 @@
|
|||||||
|
|
||||||
using namespace IMG;
|
using namespace IMG;
|
||||||
|
|
||||||
#define ICON_PADDING 2
|
|
||||||
|
|
||||||
#define AREA(rect) \
|
#define AREA(rect) \
|
||||||
(rect.size().width() * rect.size().height())
|
(rect.size().width() * rect.size().height())
|
||||||
|
|
||||||
@ -452,8 +450,7 @@ void RasterTile::processPoints(QList<TextItem*> &textItems)
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
TextPointItem *item = new TextPointItem(QPoint(point.coordinates.lon(),
|
TextPointItem *item = new TextPointItem(QPoint(point.coordinates.lon(),
|
||||||
point.coordinates.lat()), label, fnt, img, color, &haloColor, 0,
|
point.coordinates.lat()), label, fnt, img, color, &haloColor);
|
||||||
ICON_PADDING);
|
|
||||||
if (item->isValid() && !item->collides(textItems))
|
if (item->isValid() && !item->collides(textItems))
|
||||||
textItems.append(item);
|
textItems.append(item);
|
||||||
else
|
else
|
||||||
|
|||||||
@ -113,40 +113,25 @@ void Style::defaultPolygonStyle()
|
|||||||
_polygons[0x10c04] = _polygons[TYPE(0x51)];
|
_polygons[0x10c04] = _polygons[TYPE(0x51)];
|
||||||
_polygons[0x10c05] = _polygons[TYPE(0x52)];
|
_polygons[0x10c05] = _polygons[TYPE(0x52)];
|
||||||
|
|
||||||
// Marine stuff
|
|
||||||
_polygons[0x10101] = Polygon(QBrush("#e8e064"));
|
|
||||||
_polygons[0x10102] = Polygon(QBrush("#d98b21"));
|
|
||||||
_polygons[0x10104] = Polygon(QBrush("#ffffff"));
|
|
||||||
_polygons[0x10301] = Polygon(QBrush("#98c064"));
|
|
||||||
_polygons[0x10302] = Polygon(QBrush("#a0a0ff"));
|
|
||||||
_polygons[0x10303] = Polygon(QBrush("#b0b0ff"));
|
|
||||||
_polygons[0x10304] = Polygon(QBrush("#c0c0ff"));
|
|
||||||
_polygons[0x10409] = Polygon(QBrush("#ff4040", Qt::FDiagPattern));
|
|
||||||
_polygons[0x10503] = Polygon(QBrush("#ff4040", Qt::FDiagPattern));
|
|
||||||
_polygons[0x1060a] = Polygon(QBrush("#fcb4fc"));
|
|
||||||
|
|
||||||
// Draw order
|
// Draw order
|
||||||
_drawOrder
|
_drawOrder
|
||||||
<< TYPE(0x4b) << 0x10d01 << 0x10104 << 0x10613 << TYPE(0x4a)
|
<< TYPE(0x4b) << 0x10d01 << 0x10613 << TYPE(0x4a) << TYPE(0x01) << 0x10800
|
||||||
<< 0x10101 << 0x10102 << 0x10301 << 0x10302 << 0x10303 << 0x10304
|
<< TYPE(0x02) << 0x10801 << TYPE(0x03) << 0x10802 << TYPE(0x17) << 0x10a04
|
||||||
<< 0x10409 << 0x10503 << 0x1060a
|
<< TYPE(0x18) << 0x1090c << TYPE(0x1a) << 0x1090e << TYPE(0x28) << 0x10b01
|
||||||
<< TYPE(0x01) << 0x10800 << TYPE(0x02) << 0x10801 << TYPE(0x03) << 0x10802
|
<< TYPE(0x32) << 0x10b02 << TYPE(0x3c) << 0x10b03 << TYPE(0x3d) << 0x10b04
|
||||||
<< TYPE(0x17) << 0x10a04 << TYPE(0x18) << 0x1090c << TYPE(0x1a) << 0x1090e
|
<< TYPE(0x3e) << 0x10b05 << TYPE(0x3f) << 0x10b06 << TYPE(0x40) << 0x10b07
|
||||||
<< TYPE(0x28) << 0x10b01 << TYPE(0x32) << 0x10b02 << TYPE(0x3c) << 0x10b03
|
<< TYPE(0x41) << 0x10b08 << TYPE(0x42) << 0x10b09 << TYPE(0x43) << 0x10b0a
|
||||||
<< TYPE(0x3d) << 0x10b04 << TYPE(0x3e) << 0x10b05 << TYPE(0x3f) << 0x10b06
|
<< TYPE(0x44) << 0x10b0b << TYPE(0x46) << 0x10b0c << TYPE(0x47) << 0x10b0d
|
||||||
<< TYPE(0x40) << 0x10b07 << TYPE(0x41) << 0x10b08 << TYPE(0x42) << 0x10b09
|
<< TYPE(0x48) << 0x10b0e << TYPE(0x49) << 0x10b0f << TYPE(0x4c) << 0x10b10
|
||||||
<< TYPE(0x43) << 0x10b0a << TYPE(0x44) << 0x10b0b << TYPE(0x46) << 0x10b0c
|
<< TYPE(0x4d) << 0x10c00 << TYPE(0x4e) << 0x10c01 << TYPE(0x4f) << 0x10c02
|
||||||
<< TYPE(0x47) << 0x10b0d << TYPE(0x48) << 0x10b0e << TYPE(0x49) << 0x10b0f
|
<< TYPE(0x50) << 0x10c03 << TYPE(0x51) << 0x10c04 << TYPE(0x52) << 0x10c05
|
||||||
<< TYPE(0x4c) << 0x10b10 << TYPE(0x4d) << 0x10c00 << TYPE(0x4e) << 0x10c01
|
<< TYPE(0x14) << 0x10a01 << TYPE(0x15) << 0x10a02 << TYPE(0x16) << 0x10a03
|
||||||
<< TYPE(0x4f) << 0x10c02 << TYPE(0x50) << 0x10c03 << TYPE(0x51) << 0x10c04
|
<< TYPE(0x1e) << 0x10a05 << TYPE(0x1f) << 0x10a06 << TYPE(0x04) << 0x10901
|
||||||
<< TYPE(0x52) << 0x10c05 << TYPE(0x14) << 0x10a01 << TYPE(0x15) << 0x10a02
|
<< TYPE(0x05) << 0x10902 << TYPE(0x06) << 0x10903 << TYPE(0x07) << 0x10904
|
||||||
<< TYPE(0x16) << 0x10a03 << TYPE(0x1e) << 0x10a05 << TYPE(0x1f) << 0x10a06
|
<< TYPE(0x08) << 0x10905 << TYPE(0x09) << 0x10906 << TYPE(0x0a) << 0x10907
|
||||||
<< TYPE(0x04) << 0x10901 << TYPE(0x05) << 0x10902 << TYPE(0x06) << 0x10903
|
<< TYPE(0x0b) << 0x10908 << TYPE(0x0c) << 0x10909 << TYPE(0x0d) << 0x1090a
|
||||||
<< TYPE(0x07) << 0x10904 << TYPE(0x08) << 0x10905 << TYPE(0x09) << 0x10906
|
<< TYPE(0x0e) << 0x1090b << TYPE(0x0f) << TYPE(0x10) << TYPE(0x11)
|
||||||
<< TYPE(0x0a) << 0x10907 << TYPE(0x0b) << 0x10908 << TYPE(0x0c) << 0x10909
|
<< TYPE(0x12) << TYPE(0x19) << 0x1090d << TYPE(0x13) << 0x10900;
|
||||||
<< TYPE(0x0d) << 0x1090a << TYPE(0x0e) << 0x1090b << TYPE(0x0f)
|
|
||||||
<< TYPE(0x10) << TYPE(0x11) << TYPE(0x12) << TYPE(0x19) << 0x1090d
|
|
||||||
<< TYPE(0x13) << 0x10900;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static QImage railroad()
|
static QImage railroad()
|
||||||
@ -233,21 +218,6 @@ void Style::defaultLineStyle()
|
|||||||
_lines[0x10c02] = _lines[TYPE(0x27)];
|
_lines[0x10c02] = _lines[TYPE(0x27)];
|
||||||
//_lines[0x10c03] = _lines[TYPE(0x28)];
|
//_lines[0x10c03] = _lines[TYPE(0x28)];
|
||||||
_lines[0x10c04] = _lines[TYPE(0x29)];
|
_lines[0x10c04] = _lines[TYPE(0x29)];
|
||||||
|
|
||||||
// Marine stuff
|
|
||||||
_lines[0x10101] = Line(QPen(QColor("#000000"), 1, 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[0x10401] = Line(QImage(":/IMG/cable.png"));
|
|
||||||
_lines[0x10402] = Line(QImage(":/IMG/pipeline.png"));
|
|
||||||
_lines[0x10409] = Line(QPen(QColor("#000000"), 1, Qt::DotLine));
|
|
||||||
_lines[0x10503] = Line(QPen(QColor("#e728e7"), 1, Qt::DashLine));
|
|
||||||
_lines[0x10507] = Line(QPen(QColor("#e728e7"), 1, Qt::DashLine));
|
|
||||||
_lines[0x10601] = Line(QPen(QColor("#000000"), 1, Qt::DashLine));
|
|
||||||
_lines[0x10606] = Line(QImage(":/IMG/anchor-line.png"));
|
|
||||||
_lines[0x1060d] = Line(QPen(QColor("#eb49eb"), 1, Qt::DashLine));
|
|
||||||
_lines[0x10611] = Line(QPen(QColor("#eb49eb"), 1, Qt::DashLine));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Style::defaultPointStyle()
|
void Style::defaultPointStyle()
|
||||||
@ -481,20 +451,6 @@ void Style::defaultPointStyle()
|
|||||||
_points[0x11106] = _points[0x3006];
|
_points[0x11106] = _points[0x3006];
|
||||||
_points[0x11107] = _points[0x3007];
|
_points[0x11107] = _points[0x3007];
|
||||||
_points[0x11108] = _points[0x3008];
|
_points[0x11108] = _points[0x3008];
|
||||||
|
|
||||||
// Marine stuff
|
|
||||||
_points[0x10100] = Point(QImage(":/IMG/light-major.png"));
|
|
||||||
_points[0x10106] = Point(QImage(":/IMG/light-major.png"));
|
|
||||||
_points[0x10107] = Point(QImage(":/IMG/light-major.png"));
|
|
||||||
_points[0x10108] = Point(QImage(":/IMG/light-major.png"));
|
|
||||||
_points[0x10109] = Point(QImage(":/IMG/light-major.png"));
|
|
||||||
_points[0x1010a] = Point(QImage(":/IMG/light-major.png"));
|
|
||||||
_points[0x10206] = Point(QImage(":/IMG/beacon.png"));
|
|
||||||
_points[0x1020d] = Point(QImage(":/IMG/light-platform.png"));
|
|
||||||
_points[0x10401] = Point(QImage(":/IMG/obstruction.png"));
|
|
||||||
_points[0x10402] = Point(QImage(":/IMG/wreck.png"));
|
|
||||||
_points[0x1040a] = Point(QImage(":/IMG/rock.png"));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool readBitmap(SubFile *file, SubFile::Handle &hdl, QImage &img,
|
static bool readBitmap(SubFile *file, SubFile::Handle &hdl, QImage &img,
|
||||||
|
|||||||
@ -126,7 +126,7 @@ void RasterTile::processPointLabels(QList<TextItem*> &textItems)
|
|||||||
|
|
||||||
TextPointItem *item = new TextPointItem(
|
TextPointItem *item = new TextPointItem(
|
||||||
ll2xy(point.coordinates).toPoint(), label, font, img, color,
|
ll2xy(point.coordinates).toPoint(), label, font, img, color,
|
||||||
hColor, 0);
|
hColor, 0, false);
|
||||||
if (item->isValid() && !item->collides(textItems))
|
if (item->isValid() && !item->collides(textItems))
|
||||||
textItems.append(item);
|
textItems.append(item);
|
||||||
else
|
else
|
||||||
@ -181,7 +181,7 @@ void RasterTile::processAreaLabels(QList<TextItem*> &textItems)
|
|||||||
? centroid(path.path) : ll2xy(path.labelPos);
|
? centroid(path.path) : ll2xy(path.labelPos);
|
||||||
|
|
||||||
TextPointItem *item = new TextPointItem(pos.toPoint(), label, font, img,
|
TextPointItem *item = new TextPointItem(pos.toPoint(), label, font, img,
|
||||||
color, hColor, 0);
|
color, hColor, 0, false);
|
||||||
if (item->isValid() && _rect.contains(item->boundingRect().toRect())
|
if (item->isValid() && _rect.contains(item->boundingRect().toRect())
|
||||||
&& !item->collides(textItems))
|
&& !item->collides(textItems))
|
||||||
textItems.append(item);
|
textItems.append(item);
|
||||||
|
|||||||
@ -18,7 +18,7 @@ static void expand(QRectF &rect, int width)
|
|||||||
|
|
||||||
TextPointItem::TextPointItem(const QPoint &point, const QString *text,
|
TextPointItem::TextPointItem(const QPoint &point, const QString *text,
|
||||||
const QFont *font, const QImage *img, const QColor *color,
|
const QFont *font, const QImage *img, const QColor *color,
|
||||||
const QColor *haloColor, const QColor *bgColor, int padding)
|
const QColor *haloColor, const QColor *bgColor, bool padding)
|
||||||
: TextItem(font ? text : 0), _font(font), _img(img), _color(color),
|
: TextItem(font ? text : 0), _font(font), _img(img), _color(color),
|
||||||
_haloColor(haloColor), _bgColor(bgColor)
|
_haloColor(haloColor), _bgColor(bgColor)
|
||||||
{
|
{
|
||||||
@ -35,17 +35,18 @@ TextPointItem::TextPointItem(const QPoint &point, const QString *text,
|
|||||||
setPos(point, padding);
|
setPos(point, padding);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TextPointItem::setPos(const QPoint &point, int padding)
|
void TextPointItem::setPos(const QPoint &point, bool padding)
|
||||||
{
|
{
|
||||||
QPainterPath shape;
|
QPainterPath shape;
|
||||||
QRectF iconRect;
|
QRectF iconRect;
|
||||||
|
|
||||||
if (_img && !_img->isNull()) {
|
if (_img && !_img->isNull()) {
|
||||||
QSizeF s(_img->size() / _img->devicePixelRatioF());
|
QSizeF s(_img->size() / _img->devicePixelRatioF());
|
||||||
iconRect = QRectF(QPointF(point.x() - s.width() / 2,
|
int xOffset = padding ? s.width() : s.width() / 2;
|
||||||
point.y() - s.height()/2), s);
|
iconRect = QRectF(QPointF(point.x() - xOffset, point.y()
|
||||||
_textRect.moveTopLeft(QPointF(point.x() + s.width()/2 + padding,
|
- s.height()/2), s);
|
||||||
point.y() - _textRect.height()/2));
|
_textRect.moveTopLeft(QPointF(point.x() + s.width()/2, point.y()
|
||||||
|
- _textRect.height()/2));
|
||||||
} else
|
} else
|
||||||
_textRect.moveCenter(point);
|
_textRect.moveCenter(point);
|
||||||
|
|
||||||
|
|||||||
@ -17,7 +17,7 @@ public:
|
|||||||
TextPointItem() : TextItem(0), _font(0), _img(0) {}
|
TextPointItem() : TextItem(0), _font(0), _img(0) {}
|
||||||
TextPointItem(const QPoint &point, const QString *text, const QFont *font,
|
TextPointItem(const QPoint &point, const QString *text, const QFont *font,
|
||||||
const QImage *img, const QColor *color, const QColor *haloColor,
|
const QImage *img, const QColor *color, const QColor *haloColor,
|
||||||
const QColor *bgColor = 0, int padding = 0);
|
const QColor *bgColor = 0, bool padding = true);
|
||||||
|
|
||||||
bool isValid() const {return !_rect.isEmpty();}
|
bool isValid() const {return !_rect.isEmpty();}
|
||||||
|
|
||||||
@ -25,7 +25,7 @@ public:
|
|||||||
QPainterPath shape() const {return _shape;}
|
QPainterPath shape() const {return _shape;}
|
||||||
void paint(QPainter *painter) const;
|
void paint(QPainter *painter) const;
|
||||||
|
|
||||||
void setPos(const QPoint &point, int padding = 0);
|
void setPos(const QPoint &point, bool padding = true);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const QFont *_font;
|
const QFont *_font;
|
||||||
|
|||||||