mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-07-22 14:54:24 +02:00
Compare commits
12 Commits
12.2
...
048198dfe1
Author | SHA1 | Date | |
---|---|---|---|
048198dfe1 | |||
a50fa28c08 | |||
152f17f15a | |||
873db27768 | |||
62f3343f75 | |||
07581f027b | |||
b3767e85e1 | |||
4fdeb3169f | |||
18836107af | |||
630fef2143 | |||
00c8d70eab | |||
426490ef4d |
@ -1,4 +1,4 @@
|
||||
version: 12.2.{build}
|
||||
version: 12.3.{build}
|
||||
|
||||
configuration:
|
||||
- Release
|
||||
|
@ -3,7 +3,7 @@ unix:!macx:!android {
|
||||
} else {
|
||||
TARGET = GPXSee
|
||||
}
|
||||
VERSION = 12.2
|
||||
VERSION = 12.3
|
||||
|
||||
QT += core \
|
||||
gui \
|
||||
|
@ -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"/>
|
||||
|
@ -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"/>
|
||||
|
@ -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"/>
|
||||
|
@ -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"/>
|
||||
|
@ -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"/>
|
||||
|
@ -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"
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -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"}}
|
||||
};
|
||||
|
@ -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
|
||||
|
@ -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])
|
||||
|
@ -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));
|
||||
|
@ -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);
|
||||
|
Reference in New Issue
Block a user