diff --git a/.appveyor.yml b/.appveyor.yml index 3ea711bf..1080c331 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: 13.44.{build} +version: 13.45.{build} configuration: - Release @@ -10,10 +10,12 @@ environment: NSISDIR: C:\Program Files (x86)\NSIS JOMDIR: C:\Qt\Tools\QtCreator\bin\jom matrix: - - QTDIR: C:\Qt\5.15\msvc2019_64 + - job_name: Qt5 + QTDIR: C:\Qt\5.15\msvc2019_64 OPENSSLDIR: C:\OpenSSL-v111-Win64\bin NSISDEF: /DOPENSSL /DANGLE - - QTDIR: C:\Qt\6.8\msvc2022_64 + - job_name: Qt6 + QTDIR: C:\Qt\6.8\msvc2022_64 NSISDEF: /DQT6 install: @@ -27,9 +29,12 @@ build_script: qmake gpxsee.pro jom release +after_build: +- cmd: |- md installer copy release\GPXSee.exe installer windeployqt --release installer\GPXSee.exe + curl -L -o installer\imageformats\pbf4.dll https://ci.appveyor.com/api/projects/tumic0/QtPBFImagePlugin/artifacts/release/pbf4.dll?job=%APPVEYOR_JOB_NAME% copy pkg\windows\gpxsee64.nsi installer xcopy data\CRS installer\CRS /i xcopy data\maps installer\maps /i @@ -38,7 +43,6 @@ build_script: copy licence.txt installer IF DEFINED OPENSSLDIR (copy %OPENSSLDIR%\libcrypto-*-x64.dll installer) IF DEFINED OPENSSLDIR (copy %OPENSSLDIR%\libssl-*-x64.dll installer) - makensis.exe %NSISDEF% installer\gpxsee64.nsi artifacts: diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 927c4294..8ec1a073 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -38,10 +38,26 @@ jobs: modules: qtimageformats qtpositioning qtserialport qt5compat - name: Install Android OpenSSL run: git clone https://github.com/KDAB/android_openssl.git + - name: Get latest QtPBFImagePlugin run-id + id: runid + run: echo "runid=$(gh run list --repo tumic0/QtPBFImagePlugin --workflow 'Android' --limit 1 --json databaseId -q '.[0].databaseId')" >> $GITHUB_OUTPUT + env: + GH_TOKEN: ${{ github.token }} + - name: Create the plugins dir + run: mkdir plugins + - name: Download QtPBFImagePlugin + uses: actions/download-artifact@v4 + with: + name: libplugins_imageformats_libpbf_arm64-v8a.so + github-token: ${{ github.token }} + repository: tumic0/QtPBFImagePlugin + path: plugins + merge-multiple: true + run-id: ${{steps.runid.outputs.runid}} - name: Create localization run: lrelease gpxsee.pro - name: Configure build - run: qmake gpxsee.pro OPENSSL_PATH=android_openssl + run: qmake gpxsee.pro OPENSSL_PATH=android_openssl ANDROID_EXTRA_PLUGINS=${{ github.workspace }}/plugins - name: Build project run: make -j4 apk - name: Upload artifacts diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 2423406b..f33036d8 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -15,7 +15,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.8.2' + version: '6.9.1' modules: qtpositioning qtserialport qtimageformats - name: Create localization run: lrelease gpxsee.pro @@ -23,6 +23,20 @@ jobs: run: qmake gpxsee.pro QMAKE_APPLE_DEVICE_ARCHS="x86_64h arm64" - name: Build project run: make -j3 + - name: Get latest QtPBFImagePlugin run-id + id: runid + run: echo "runid=$(gh run list --repo tumic0/QtPBFImagePlugin --workflow 'OS X' --limit 1 --json databaseId -q '.[0].databaseId')" >> $GITHUB_OUTPUT + env: + GH_TOKEN: ${{ github.token }} + - name: Download QtPBFImagePlugin + uses: actions/download-artifact@v4 + with: + name: libpbf.dylib + github-token: ${{ github.token }} + repository: tumic0/QtPBFImagePlugin + path: GPXSee.app/Contents/Plugins/imageformats + merge-multiple: true + run-id: ${{steps.runid.outputs.runid}} - name: Create DMG run: macdeployqt GPXSee.app -dmg -appstore-compliant - name: Upload artifacts diff --git a/data/style/style.xml b/data/style/style.xml index 644d2bd9..0db0aa9b 100644 --- a/data/style/style.xml +++ b/data/style/style.xml @@ -42,7 +42,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -198,13 +198,13 @@ - + - + @@ -214,17 +214,17 @@ - + - + - + diff --git a/gpxsee.pro b/gpxsee.pro index 1725a55d..e8376b67 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -3,7 +3,7 @@ unix:!macx:!android { } else { TARGET = GPXSee } -VERSION = 13.44 +VERSION = 13.45 QT += core \ gui \ diff --git a/lang/gpxsee_ca.ts b/lang/gpxsee_ca.ts index 75825144..3e7d1387 100644 --- a/lang/gpxsee_ca.ts +++ b/lang/gpxsee_ca.ts @@ -579,7 +579,7 @@ Legend - + Llegenda diff --git a/lang/gpxsee_lv.ts b/lang/gpxsee_lv.ts new file mode 100644 index 00000000..9dbf3a54 --- /dev/null +++ b/lang/gpxsee_lv.ts @@ -0,0 +1,2681 @@ + + + + + AuthenticationWidget + + + Username: + + + + + Password: + + + + + CadenceGraph + + + rpm + + + + + + Cadence + + + + + Avg + + + + + Max + + + + + Average + + + + + Maximum + + + + + CadenceGraphItem + + + Maximum + + + + + + rpm + + + + + Average + + + + + Data + + + Supported files + + + + + CSV files + + + + + CUP files + + + + + FIT files + + + + + GeoJSON files + + + + + GPI files + + + + + GPX files + + + + + IGC files + + + + + ITN files + + + + + JPEG images + + + + + KML files + + + + + LOC files + + + + + NMEA files + + + + + ONmove files + + + + + OV2 files + + + + + OziExplorer files + + + + + SLF files + + + + + SML files + + + + + TCX files + + + + + 70mai GPS log files + + + + + VKX files + + + + + VTK files + + + + + TwoNav files + + + + + GPSDump files + + + + + All files + + + + + DirSelectWidget + + + System default + + + + + Select directory + + + + + ElevationGraph + + + + Elevation + + + + + Up + Use an Unicode arrow (U+2197) when there is no abbreviation or extremly short term for "Up" in your language + + + + + Down + Use an Unicode arrow (U+2198) when there is no abbreviation or extremly short term for "Down" in your language + + + + + Max + Use an abbreviation or a extremly short term + + + + + Min + Use an abbreviation or a extremly short term + + + + + Ascent + + + + + Descent + + + + + Maximum + + + + + Minimum + + + + + m + + + + + ft + + + + + ElevationGraphItem + + + m + + + + + ft + + + + + Ascent + + + + + Descent + + + + + Maximum + + + + + Minimum + + + + + FileSelectWidget + + + + Select file + + + + + No output file selected. + + + + + %1 is a directory. + + + + + %1 is not writable. + + + + + Format + + + + + ft + + + + + + mi + + + + + + nmi + + + + + + m + + + + + + km + + + + + GUI + + + Quit + + + + + + + Paths + + + + + + + Keyboard controls + + + + + + About GPXSee + + + + + Open... + + + + + Open directory... + + + + + Print... + + + + + Export to PDF... + + + + + Export to PNG... + + + + + Close + + + + + Reload + + + + + Statistics... + + + + + Clear list + + + + + Load POI file... + + + + + Select all files + + + + + Unselect all files + + + + + Overlap POIs + + + + + Show POI icons + + + + + Show POI labels + + + + + Show POIs + + + + + Show map + + + + + Load map... + + + + + Load map directory... + + + + + Clear tile cache + + + + + + + Next map + + + + + Show cursor coordinates + + + + + All + + + + + Raster only + + + + + Vector only + + + + + Show position + + + + + Follow position + + + + + Show coordinates + + + + + Show motion info + + + + + Show tracks + + + + + Show routes + + + + + Show waypoints + + + + + Show areas + + + + + Waypoint icons + + + + + Waypoint labels + + + + + Route waypoints + + + + + km/mi markers + + + + + Legend + + + + + Do not show + + + + + Marker only + + + + + Date/time + + + + + Coordinates + + + + + Use styles + + + + + Download data DEM + + + + + Download map DEM + + + + + Show local DEM tiles + + + + + Show hillshading + + + + + Show graphs + + + + + + + Distance + + + + + + + + Time + + + + + Show grid + + + + + Show slider info + + + + + Show tabs + + + + + Show toolbars + + + + + Total time + + + + + + + Moving time + + + + + Metric + + + + + Imperial + + + + + Nautical + + + + + Decimal degrees (DD) + + + + + Degrees and decimal minutes (DMM) + + + + + Degrees, minutes, seconds (DMS) + + + + + Fullscreen mode + + + + + Options... + + + + + Next + + + + + Previous + + + + + Last + + + + + First + + + + + &File + + + + + Open recent + + + + + &Map + + + + + Layers + + + + + &Graph + + + + + &Data + + + + + Position info + + + + + &POI + + + + + DEM + + + + + Position + + + + + &Settings + + + + + Units + + + + + Coordinates format + + + + + &Help + + + + + File + + + + + Show + + + + + Navigation + + + + + + Version %1 + + + + + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. + + + + + Next file + + + + + Previous file + + + + + First file + + + + + Last file + + + + + Append file + + + + + Next/Previous + + + + + Toggle graph type + + + + + Toggle time type + + + + + Toggle position info + + + + + Previous map + + + + + Zoom in + + + + + Zoom out + + + + + Digital zoom + + + + + Zoom + + + + + Copy coordinates + + + + + Left Click + + + + + + Map directory: + + + + + + POI directory: + + + + + + CRS directory: + + + + + + DEM directory: + + + + + + Styles directory: + + + + + + Symbols directory: + + + + + + Tile cache directory: + + + + + + Open file + + + + + Open directory + + + + + Error loading geo URI: + + + + + + + + Don't show again + + + + + Error loading data file: + + + + + + Line: %1 + + + + + + Open POI file + + + + + Error loading POI file: + + + + + + Tracks + + + + + + Routes + + + + + + Waypoints + + + + + + Areas + + + + + + + + Date + + + + + + + Statistics + + + + + Name + + + + + + Open map file + + + + + + + + Error loading map: + + + + + Select map directory + + + + + Clear "%1" tile cache? + + + + + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. + + + + + Download %n DEM tiles? + + + + + + + + + Could not download all required DEM files. + + + + + No local DEM tiles found. + + + + + No files loaded + + + + + %n files + + + + + + + + + GearRatioGraph + + + + Gear ratio + + + + + Top + + + + + Min + + + + + Max + + + + + Most used + + + + + Minimum + + + + + Maximum + + + + + GearRatioGraphItem + + + Minimum + + + + + Maximum + + + + + Most used + + + + + GraphView + + + Data not available + + + + + + Distance + + + + + + ft + + + + + mi + + + + + nmi + + + + + m + + + + + km + + + + + s + + + + + min + + + + + h + + + + + Time + + + + + HeartRateGraph + + + bpm + + + + + + Heart rate + + + + + Avg + + + + + Max + + + + + Average + + + + + Maximum + + + + + HeartRateGraphItem + + + Maximum + + + + + + bpm + + + + + Average + + + + + MapItem + + + Name + + + + + File + + + + + MapList + + + Supported files + + + + + Electronic Navigational Charts + + + + + AlpineQuest maps + + + + + GEMF maps + + + + + Garmin IMG maps + + + + + Garmin JNX maps + + + + + BSB nautical charts + + + + + KMZ maps + + + + + Mapsforge maps + + + + + OziExplorer maps + + + + + MBTiles maps + + + + + Orux maps + + + + + QuickChart maps + + + + + TwoNav maps + + + + + Osmdroid SQLite maps + + + + + Locus/OsmAnd/RMaps SQLite maps + + + + + TrekBuddy maps/atlases + + + + + GeoTIFF images + + + + + World-file georeferenced images + + + + + Online map sources + + + + + All files + + + + + MotionInfoItem + + + kn + + + + + mi/h + + + + + km/h + + + + + ft/min + + + + + m/min + + + + + OptionsDialog + + + Select the proper coordinate reference system (CRS) of maps without a CRS definition (JNX, KMZ and World file maps). + + + + + Select the desired projection of vector maps (IMG, Mapsforge and ENC maps). The projection must be valid for the whole map area. + + + + + + High-Resolution + + + + + Standard + + + + + Non-HiDPI maps are loaded as HiDPI maps. The map is sharp but map objects are small/hard to read. + + + + + Non-HiDPI maps are loaded such as they are. Map objects have the expected size but the map is blurry. + + + + + Input + + + + + Output + + + + + Input: + + + + + Output: + + + + + Projection + + + + + HiDPI display mode + + + + + + + + + + + px + + + + + + Use anti-aliasing + + + + + Track width: + + + + + Track style: + + + + + Route width: + + + + + Route style: + + + + + Area border width: + + + + + Area border style: + + + + + Area fill opacity: + + + + + + Base color: + + + + + + Palette shift: + + + + + + + Width: + + + + + + + Style: + + + + + Tracks + + + + + Routes + + + + + + + Opacity: + + + + + Areas + + + + + Waypoint color: + + + + + Waypoint size: + + + + + POI color: + + + + + POI size: + + + + + + Color: + + + + + + Size: + + + + + Waypoints + + + + + POIs + + + + + + Line width: + + + + + + Slider color: + + + + + Info background + + + + + Background color: + + + + + Crosshair color: + + + + + Info color: + + + + + Paths + + + + + Points + + + + + + Graphs + + + + + Map + + + + + Moving average window size + + + + + Eliminate GPS outliers + + + + + + Smoothing + + + + + + + Elevation: + + + + + + + Speed: + + + + + + Heart rate: + + + + + + Cadence: + + + + + + Power: + + + + + Detect pauses + + + + + Automatic + + + + + + Custom + + + + + mi/h + + + + + kn + + + + + km/h + + + + + + s + + + + + Computed from distance/time + + + + + Recorded by device + + + + + Show secondary speed + + + + + GPS data + + + + + DEM data + + + + + Show secondary elevation + + + + + UTC + + + + + + + System + + + + + Use segments + + + + + Time zone: + + + + + Speed + + + + + Elevation + + + + + Time zone + + + + + Detection: + + + + + Minimal speed: + + + + + Minimal duration: + + + + + Sources + + + + + Filtering + + + + + Pause detection + + + + + mi + + + + + nmi + + + + + km + + + + + Radius: + + + + + + POI + + + + + Use HTTP authentication + + + + + Use $lat and $lon for NYY/SYY and EXXX/WXXX in the URL. + + + + + + URL: + + + + + Lightening: + + + + + Blur radius: + + + + + Azimuth: + + + + + Altitude: + + + + + Z Factor: + + + + + + Source + + + + + Hillshading + + + + + Plugin: + + + + + WYSIWYG + + + + + The printed area is approximately the display area. The map zoom level does not change. + + + + + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. + + + + + Name + + + + + Date + + + + + Distance + + + + + Time + + + + + Moving time + + + + + Item count (>1) + + + + + Separate graph page + + + + + Print mode + + + + + Header + + + + + Use OpenGL + + + + + Enable HTTP/2 + + + + + + MB + + + + + + Image cache size: + + + + + + DEM cache size: + + + + + + Connection timeout: + + + + + Select the initial paths of the file open dialogues. Leave the field empty for the system default. + + + + + Data: + + + + + Maps: + + + + + POI: + + + + + Initial paths + + + + + Appearance + + + + + Maps + + + + + Data + + + + + DEM + + + + + Position + + + + + Print & Export + + + + + Options + + + + + PDFExportDialog + + + PDF files + + + + + All files + + + + + Portrait + + + + + Landscape + + + + + cm + + + + + in + + + + + Page Setup + + + + + Page size: + + + + + Resolution: + + + + + Orientation: + + + + + Margins: + + + + + File: + + + + + Output file + + + + + Export + + + + + Export to PDF + + + + + Error + + + + + PNGExportDialog + + + PNG files + + + + + All files + + + + + + + px + + + + + Use anti-aliasing + + + + + Image Setup + + + + + Image width: + + + + + Image height: + + + + + Margins: + + + + + File: + + + + + Output file + + + + + Export + + + + + Export to PNG + + + + + Error + + + + + PolygonItem + + + Name + + + + + Description + + + + + PowerGraph + + + W + + + + + + Power + + + + + Avg + + + + + Max + + + + + Average + + + + + Maximum + + + + + PowerGraphItem + + + Maximum + + + + + + W + + + + + Average + + + + + RouteItem + + + Name + + + + + Description + + + + + Comment + + + + + Distance + + + + + Links + + + + + File + + + + + ScaleItem + + + mi + + + + + + ft + + + + + nmi + + + + + km + + + + + m + + + + + SpeedGraph + + + + Speed + + + + + min/km + + + + + min/mi + + + + + min/nmi + + + + + Avg + + + + + Max + + + + + Average + + + + + Maximum + + + + + Pace + + + + + kn + + + + + mi/h + + + + + km/h + + + + + SpeedGraphItem + + + mi/h + + + + + kn + + + + + km/h + + + + + min/km + + + + + min/mi + + + + + min/nmi + + + + + Maximum + + + + + Average + + + + + Pace + + + + + TemperatureGraph + + + + Temperature + + + + + Avg + + + + + Min + + + + + Max + + + + + Average + + + + + Minimum + + + + + Maximum + + + + + C + + + + + F + + + + + TemperatureGraphItem + + + C + + + + + F + + + + + Average + + + + + Maximum + + + + + Minimum + + + + + TrackItem + + + Name + + + + + Description + + + + + Comment + + + + + Distance + + + + + Total time + + + + + Moving time + + + + + Date + + + + + Links + + + + + File + + + + + WaypointItem + + + Name + + + + + Coordinates + + + + + Elevation + + + + + Date + + + + + Description + + + + + Comment + + + + + Symbol + + + + + Address + + + + + Phone + + + + + Links + + + + diff --git a/lang/gpxsee_nb.ts b/lang/gpxsee_nb.ts index 16d95d21..60f9ee19 100644 --- a/lang/gpxsee_nb.ts +++ b/lang/gpxsee_nb.ts @@ -172,12 +172,12 @@ VKX files - + VKX-filer VTK files - + VTK-filer @@ -579,7 +579,7 @@ Legend - + Forklaring diff --git a/lang/gpxsee_tr.ts b/lang/gpxsee_tr.ts index 84bcfeed..9ac9ef40 100644 --- a/lang/gpxsee_tr.ts +++ b/lang/gpxsee_tr.ts @@ -172,12 +172,12 @@ VKX files - + VKX dosyaları VTK files - + VTK dosyaları diff --git a/lang/gpxsee_zh_CN.ts b/lang/gpxsee_zh_CN.ts index 59c0767d..3fcbba35 100644 --- a/lang/gpxsee_zh_CN.ts +++ b/lang/gpxsee_zh_CN.ts @@ -579,7 +579,7 @@ Legend - + 图例 diff --git a/pkg/windows/gpxsee64.nsi b/pkg/windows/gpxsee64.nsi index d3b1be56..43bcc419 100644 --- a/pkg/windows/gpxsee64.nsi +++ b/pkg/windows/gpxsee64.nsi @@ -49,7 +49,7 @@ Unicode true ; The name of the installer Name "GPXSee" ; Program version -!define VERSION "13.44" +!define VERSION "13.45" ; The file to write OutFile "GPXSee-${VERSION}_x64.exe" diff --git a/src/GUI/settings.cpp b/src/GUI/settings.cpp index eeb6d98c..c4a33d49 100644 --- a/src/GUI/settings.cpp +++ b/src/GUI/settings.cpp @@ -250,12 +250,12 @@ SETTING(demURL, "demURL", DEM_TILES_URL ); SETTING(demAuthentication, "demAuthentication", false ); SETTING(demUsername, "demUsername", "" ); SETTING(demPassword, "demPassword", "" ); -SETTING(hillshadingAlpha, "hillshadingAlpha", 102 ); -SETTING(hillshadingLightening,"hillshadingLightening", 0.2 ); +SETTING(hillshadingAlpha, "hillshadingAlpha", 85 ); +SETTING(hillshadingLightening,"hillshadingLightening", 0.25 ); SETTING(hillshadingBlur, "hillshadingBlur", 3 ); SETTING(hillshadingAzimuth, "hillshadingAzimuth", 315 ); SETTING(hillshadingAltitude, "hillshadingAltitude", 45 ); -SETTING(hillshadingZFactor, "hillshadingZFactor", 0.6 ); +SETTING(hillshadingZFactor, "hillshadingZFactor", 0.8 ); SETTING(useOpenGL, "useOpenGL", false ); SETTING(enableHTTP2, "enableHTTP2", true ); SETTING(pixmapCache, "pixmapCache", PIXMAP_CACHE ); diff --git a/src/map/IMG/rastertile.cpp b/src/map/IMG/rastertile.cpp index 4c898d25..ffcf4f29 100644 --- a/src/map/IMG/rastertile.cpp +++ b/src/map/IMG/rastertile.cpp @@ -652,7 +652,7 @@ MatrixD RasterTile::elevation(int extend) const void RasterTile::drawHillShading(QPainter *painter) const { - if (_hillShading && _zoom >= 18 && _zoom <= 24) { + if (_hillShading && _zoom >= 17 && _zoom <= 24) { if (HillShading::blur()) { MatrixD dem(Filter::blur(elevation(HillShading::blur() + 1), HillShading::blur()));