mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-07-01 05:19:15 +02:00
Compare commits
11 Commits
12.3
...
7e89f339f4
Author | SHA1 | Date | |
---|---|---|---|
7e89f339f4 | |||
9e80319577 | |||
0596201fb2 | |||
dce078bca6 | |||
34f935462f | |||
84a592998d | |||
c114383c85 | |||
ab2f8d8350 | |||
164e59602e | |||
1b858ac4f2 | |||
0a58808017 |
2
.github/workflows/android.yml
vendored
2
.github/workflows/android.yml
vendored
@ -28,12 +28,10 @@ jobs:
|
||||
- name: Install Qt (Desktop)
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
aqtversion: '==2.1.0'
|
||||
version: '6.4.0'
|
||||
- name: Install Qt (Android)
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
aqtversion: '==2.1.0'
|
||||
version: '6.4.0'
|
||||
target: 'android'
|
||||
arch: 'android_armv7'
|
||||
|
21
.github/workflows/osx.yml
vendored
21
.github/workflows/osx.yml
vendored
@ -10,14 +10,12 @@ jobs:
|
||||
name: GPXSee Qt5 build
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Set environment variables
|
||||
run: echo "PATH=/usr/local/opt/qt@5/bin:$PATH" >> $GITHUB_ENV
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
brew update
|
||||
brew install qt5
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
version: '5.15.2'
|
||||
- name: Create localization
|
||||
run: lrelease gpxsee.pro
|
||||
- name: Configure build
|
||||
@ -36,14 +34,13 @@ jobs:
|
||||
name: GPXSee Qt6 build
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Set environment variables
|
||||
run: echo "PATH=/usr/local/opt/qt@6/bin:$PATH" >> $GITHUB_ENV
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
brew update
|
||||
brew install qt6
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
version: '6.4.3'
|
||||
modules: qtpositioning qt5compat qtserialport
|
||||
- name: Create localization
|
||||
run: lrelease gpxsee.pro
|
||||
- name: Configure build
|
||||
|
@ -345,6 +345,7 @@ FEH2010,5593,1078,9122,7019,8901,9603,0,0,0,,,,
|
||||
CIGD11,6135,1100,9122,7019,8901,9603,0,0,0,,,,
|
||||
Nepal 1981,6207,1111,9122,7015,8901,9603,293.17,726.18,245.36,,,,
|
||||
CGRS93,6311,1112,9122,7030,8901,9607,8.846,-4.394,-1.122,0.00237,0.146528,-0.130428,0.783926
|
||||
NAD83(2011),6318,1116,9122,7019,8901,9603,0,0,0,,,,
|
||||
Mexico ITRF2008,6365,1120,9122,7019,8901,9603,0,0,0,,,,
|
||||
RDN2008,6706,1132,9122,7019,8901,9603,0,0,0,,,,
|
||||
Aden 1925,6881,1135,9122,7012,8901,9603,-24,-203,268,,,,
|
||||
|
|
@ -2071,6 +2071,28 @@ SIRGAS 2000 / UTM zone 23N,6210,4674,16023,9001,9807,4400,8801,0,9102,8802,-45,9
|
||||
SIRGAS 2000 / UTM zone 24N,6211,4674,16024,9001,9807,4400,8801,0,9102,8802,-39,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
CGRS93 / Cyprus Local Transverse Mercator,6312,6311,6308,9001,9807,4400,8801,0,9102,8802,33,9102,8805,0.99995,9201,8806,200000,9001,8807,-3500000,9001,,,,,,
|
||||
Macedonia State Coordinate System zone 7,6316,3906,18277,9001,9807,4498,8801,0,9102,8802,21,9102,8805,0.9999,9201,8806,7500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 59N,6328,6318,16059,9001,9807,4400,8801,0,9102,8802,171,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 60N,6329,6318,16060,9001,9807,4400,8801,0,9102,8802,177,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 1N,6330,6318,16001,9001,9807,4400,8801,0,9102,8802,-177,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 2N,6331,6318,16002,9001,9807,4400,8801,0,9102,8802,-171,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 3N,6332,6318,16003,9001,9807,4400,8801,0,9102,8802,-165,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 4N,6333,6318,16004,9001,9807,4400,8801,0,9102,8802,-159,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 5N,6334,6318,16005,9001,9807,4400,8801,0,9102,8802,-153,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 6N,6335,6318,16006,9001,9807,4400,8801,0,9102,8802,-147,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 7N,6336,6318,16007,9001,9807,4400,8801,0,9102,8802,-141,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 8N,6337,6318,16008,9001,9807,4400,8801,0,9102,8802,-135,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 9N,6338,6318,16009,9001,9807,4400,8801,0,9102,8802,-129,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 10N,6339,6318,16010,9001,9807,4400,8801,0,9102,8802,-123,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 11N,6340,6318,16011,9001,9807,4400,8801,0,9102,8802,-117,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 12N,6341,6318,16012,9001,9807,4400,8801,0,9102,8802,-111,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 13N,6342,6318,16013,9001,9807,4400,8801,0,9102,8802,-105,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 14N,6343,6318,16014,9001,9807,4400,8801,0,9102,8802,-99,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 15N,6344,6318,16015,9001,9807,4400,8801,0,9102,8802,-93,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 16N,6345,6318,16016,9001,9807,4400,8801,0,9102,8802,-87,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 17N,6346,6318,16017,9001,9807,4400,8801,0,9102,8802,-81,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 18N,6347,6318,16018,9001,9807,4400,8801,0,9102,8802,-75,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / UTM zone 19N,6348,6318,16019,9001,9807,4400,8801,0,9102,8802,-69,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
NAD83(2011) / Conus Albers,6350,6318,5068,9001,9822,4499,8821,23,9102,8822,-96,9102,8823,29.3,9110,8824,45.3,9110,8826,0,9001,8827,0,9001,,,
|
||||
Mexico ITRF92 / LCC,6362,4483,6361,9001,9802,4500,8821,12,9102,8822,-102,9102,8823,17.5,9102,8824,29.5,9102,8826,2500000,9001,8827,0,9001,,,
|
||||
Mexico ITRF2008 / UTM zone 11N,6366,6365,16011,9001,9807,4400,8801,0,9102,8802,-117,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
Mexico ITRF2008 / UTM zone 12N,6367,6365,16012,9001,9807,4400,8801,0,9102,8802,-111,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
|
||||
|
Can't render this file because it is too large.
|
@ -190,6 +190,7 @@ void Style::pointStyle()
|
||||
_points[TYPE(I_BOYLAT)] = Point(QImage(":/marine/buoy.png"), Small);
|
||||
_points[TYPE(BOYSAW)] = Point(QImage(":/marine/buoy.png"), Small);
|
||||
_points[TYPE(BOYSPP)] = Point(QImage(":/marine/buoy.png"), Small);
|
||||
_points[TYPE(BCNCAR)] = Point(QImage(":/marine/beacon.png"), Small);
|
||||
_points[TYPE(BCNISD)] = Point(QImage(":/marine/beacon.png"), Small);
|
||||
_points[TYPE(BCNLAT)] = Point(QImage(":/marine/beacon.png"), Small);
|
||||
_points[TYPE(I_BCNLAT)] = Point(QImage(":/marine/beacon.png"), Small);
|
||||
|
@ -357,7 +357,8 @@ void RasterTile::processStreetNames(QList<TextItem*> &textItems)
|
||||
? &style.textColor() : 0;
|
||||
|
||||
TextPathItem *item = new TextPathItem(poly.points,
|
||||
&poly.label.text(), _rect, fnt, color, &haloColor);
|
||||
&poly.label.text(), _rect, fnt, color, Style::isContourLine(poly.type)
|
||||
? 0 : &haloColor);
|
||||
if (item->isValid() && !item->collides(textItems))
|
||||
textItems.append(item);
|
||||
else
|
||||
|
@ -2,6 +2,11 @@
|
||||
#include "image.h"
|
||||
|
||||
#define TILE_SIZE 256
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
|
||||
#define OPENGL_SIZE_LIMIT 536870912 /* 512MB */
|
||||
#else
|
||||
#define OPENGL_SIZE_LIMIT 134217728 /* 128MB */
|
||||
#endif
|
||||
|
||||
void Image::draw(QPainter *painter, const QRectF &rect, Map::Flags flags)
|
||||
{
|
||||
@ -11,7 +16,7 @@ void Image::draw(QPainter *painter, const QRectF &rect, Map::Flags flags)
|
||||
/* When OpenGL is used, big images are rendered incredibly slow or not at
|
||||
all using the QPainter::drawImage() function with a source rect set. So
|
||||
we have to tile the image ourself before it can be drawn. */
|
||||
if (flags & Map::OpenGL) {
|
||||
if (flags & Map::OpenGL && _img.sizeInBytes() > OPENGL_SIZE_LIMIT) {
|
||||
for (int i = sr.left()/TILE_SIZE; i <= sr.right()/TILE_SIZE; i++) {
|
||||
for (int j = sr.top()/TILE_SIZE; j <= sr.bottom()/TILE_SIZE; j++) {
|
||||
QPoint tl(i * TILE_SIZE, j * TILE_SIZE);
|
||||
|
Reference in New Issue
Block a user