1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-22 14:54:24 +02:00

Compare commits

...

12 Commits

Author SHA1 Message Date
048198dfe1 Removed duplicit map error debug output 2023-03-18 10:11:11 +01:00
a50fa28c08 Properly chceck for GCS/PCS files 2023-03-18 09:51:07 +01:00
152f17f15a Do not try to load the style when it does not exist 2023-03-18 09:04:55 +01:00
873db27768 Version++ 2023-03-16 23:42:57 +01:00
62f3343f75 Render international border lines 2023-03-16 21:37:27 +01:00
07581f027b Fixed header length check 2023-03-16 20:58:28 +01:00
b3767e85e1 Added missing nmea serial port baudrate setting 2023-03-16 02:03:40 +01:00
4fdeb3169f Translated using Weblate (Esperanto)
Currently translated at 93.1% (435 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/
2023-03-12 23:00:19 +01:00
18836107af Translated using Weblate (Ukrainian)
Currently translated at 99.5% (465 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2023-03-12 23:00:19 +01:00
630fef2143 Translated using Weblate (Russian)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
2023-03-12 23:00:19 +01:00
00c8d70eab Translated using Weblate (Finnish)
Currently translated at 97.4% (455 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
2023-03-12 23:00:18 +01:00
426490ef4d Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2023-03-07 01:50:18 +01:00
15 changed files with 23 additions and 20 deletions

View File

@ -1,4 +1,4 @@
version: 12.2.{build}
version: 12.3.{build}
configuration:
- Release

View File

@ -3,7 +3,7 @@ unix:!macx:!android {
} else {
TARGET = GPXSee
}
VERSION = 12.2
VERSION = 12.3
QT += core \
gui \

View File

@ -1912,7 +1912,7 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="749"/>
<source>DEM cache size:</source>
<translation type="unfinished"></translation>
<translation>DEM-kaŝmemora grandeco:</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="769"/>

View File

@ -1912,7 +1912,7 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="749"/>
<source>DEM cache size:</source>
<translation type="unfinished"></translation>
<translation>DEM-välimuistin koko:</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="769"/>

View File

@ -1913,7 +1913,7 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="749"/>
<source>DEM cache size:</source>
<translation type="unfinished"></translation>
<translation>Размер кэша DEM:</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="769"/>

View File

@ -1913,7 +1913,7 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="749"/>
<source>DEM cache size:</source>
<translation type="unfinished"></translation>
<translation>Розмір кешу DEM:</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="769"/>

View File

@ -1911,7 +1911,7 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="749"/>
<source>DEM cache size:</source>
<translation type="unfinished"></translation>
<translation>DEM </translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="769"/>

View File

@ -37,7 +37,7 @@ Unicode true
; The name of the installer
Name "GPXSee"
; Program version
!define VERSION "12.2"
!define VERSION "12.3"
; The file to write
OutFile "GPXSee-${VERSION}_x64.exe"

View File

@ -7,6 +7,7 @@
#include <QLibraryInfo>
#include <QSurfaceFormat>
#include <QImageReader>
#include <QFileInfo>
#ifdef Q_OS_ANDROID
#include <QCoreApplication>
#include <QJniObject>
@ -154,10 +155,13 @@ void App::loadDatums()
QString ellipsoidsFile(ProgramPaths::ellipsoidsFile());
QString gcsFile(ProgramPaths::gcsFile());
if (ellipsoidsFile.isNull())
if (!QFileInfo::exists(ellipsoidsFile)) {
qWarning("No ellipsoids file found.");
if (gcsFile.isNull())
ellipsoidsFile = QString();
} if (!QFileInfo::exists(gcsFile)) {
qWarning("No GCS file found.");
gcsFile = QString();
}
if (!ellipsoidsFile.isNull() && !gcsFile.isNull()) {
Ellipsoid::loadList(ellipsoidsFile);
@ -170,8 +174,9 @@ void App::loadPCSs()
{
QString pcsFile(ProgramPaths::pcsFile());
if (pcsFile.isNull())
if (!QFileInfo::exists(pcsFile)) {
qWarning("No PCS file found.");
else
qWarning("Maps based on a projection different from EPSG:3857 won't work.");
} else
PCS::loadList(pcsFile);
}

View File

@ -137,11 +137,8 @@ TreeNode<MapAction*> GUI::createMapActionsNode(const TreeNode<Map*> &node)
MapAction *a = new MapAction(map, _mapsActionGroup);
connect(a, &MapAction::loaded, this, &GUI::mapInitialized);
tree.addItem(a);
} else {
qWarning("%s: %s", qPrintable(map->path()),
qPrintable(map->errorString()));
} else
delete map;
}
}
return tree;

View File

@ -3,7 +3,7 @@
#include "pluginparameters.h"
static const QMap<QString, QStringList> pluginParams = {
{"nmea", {"nmea.source"}},
{"nmea", {"nmea.source", "nmea.baudrate"}},
{"serialnmea", {"serialnmea.serial_port"}},
{"geoclue2", {"desktopId"}}
};

View File

@ -1,3 +1,4 @@
#include <QFileInfo>
#include "common/programpaths.h"
#include "vectortile.h"
#include "style.h"
@ -76,7 +77,7 @@ void MapData::load()
_style = new Style(_typ);
else {
QString typFile(ProgramPaths::typFile());
if (!typFile.isEmpty()) {
if (QFileInfo::exists(typFile)) {
SubFile typ(&typFile);
_style = new Style(&typ);
} else

View File

@ -217,7 +217,7 @@ bool RGNFile::load(Handle &hdl)
&& readUInt32(hdl, _base.size)))
return false;
if (hdrLen >= 0x68) {
if (hdrLen >= 0x71) {
if (!(readUInt32(hdl, _polygons.offset) && readUInt32(hdl, _polygons.size)
&& seek(hdl, _gmpOffset + 0x29) && readUInt32(hdl, _polygonsGblFlags)
&& readUInt32(hdl, _polygonsLclFlags[0])

View File

@ -392,6 +392,7 @@ void Style::defaultLineStyle()
_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[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));

View File

@ -80,7 +80,6 @@ Map *MapList::loadFile(const QString &path, const Projection &proj, bool *isDir)
errors.append(it.key() + ": " + map->errorString());
++it;
}
} else {
for (it = _parsers.begin(); it != _parsers.end(); it++) {
map = it.value()(path, proj, isDir);