mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-04-21 04:39:10 +02:00
Compare commits
No commits in common. "048198dfe10a20a3f73867edb510f4e1869bba7b" and "152f17f15a39d3f72c917d3d08bc7898aecd3b0d" have entirely different histories.
048198dfe1
...
152f17f15a
@ -7,7 +7,6 @@
|
|||||||
#include <QLibraryInfo>
|
#include <QLibraryInfo>
|
||||||
#include <QSurfaceFormat>
|
#include <QSurfaceFormat>
|
||||||
#include <QImageReader>
|
#include <QImageReader>
|
||||||
#include <QFileInfo>
|
|
||||||
#ifdef Q_OS_ANDROID
|
#ifdef Q_OS_ANDROID
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include <QJniObject>
|
#include <QJniObject>
|
||||||
@ -155,13 +154,10 @@ void App::loadDatums()
|
|||||||
QString ellipsoidsFile(ProgramPaths::ellipsoidsFile());
|
QString ellipsoidsFile(ProgramPaths::ellipsoidsFile());
|
||||||
QString gcsFile(ProgramPaths::gcsFile());
|
QString gcsFile(ProgramPaths::gcsFile());
|
||||||
|
|
||||||
if (!QFileInfo::exists(ellipsoidsFile)) {
|
if (ellipsoidsFile.isNull())
|
||||||
qWarning("No ellipsoids file found.");
|
qWarning("No ellipsoids file found.");
|
||||||
ellipsoidsFile = QString();
|
if (gcsFile.isNull())
|
||||||
} if (!QFileInfo::exists(gcsFile)) {
|
|
||||||
qWarning("No GCS file found.");
|
qWarning("No GCS file found.");
|
||||||
gcsFile = QString();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ellipsoidsFile.isNull() && !gcsFile.isNull()) {
|
if (!ellipsoidsFile.isNull() && !gcsFile.isNull()) {
|
||||||
Ellipsoid::loadList(ellipsoidsFile);
|
Ellipsoid::loadList(ellipsoidsFile);
|
||||||
@ -174,9 +170,8 @@ void App::loadPCSs()
|
|||||||
{
|
{
|
||||||
QString pcsFile(ProgramPaths::pcsFile());
|
QString pcsFile(ProgramPaths::pcsFile());
|
||||||
|
|
||||||
if (!QFileInfo::exists(pcsFile)) {
|
if (pcsFile.isNull())
|
||||||
qWarning("No PCS file found.");
|
qWarning("No PCS file found.");
|
||||||
qWarning("Maps based on a projection different from EPSG:3857 won't work.");
|
else
|
||||||
} else
|
|
||||||
PCS::loadList(pcsFile);
|
PCS::loadList(pcsFile);
|
||||||
}
|
}
|
||||||
|
@ -137,8 +137,11 @@ TreeNode<MapAction*> GUI::createMapActionsNode(const TreeNode<Map*> &node)
|
|||||||
MapAction *a = new MapAction(map, _mapsActionGroup);
|
MapAction *a = new MapAction(map, _mapsActionGroup);
|
||||||
connect(a, &MapAction::loaded, this, &GUI::mapInitialized);
|
connect(a, &MapAction::loaded, this, &GUI::mapInitialized);
|
||||||
tree.addItem(a);
|
tree.addItem(a);
|
||||||
} else
|
} else {
|
||||||
|
qWarning("%s: %s", qPrintable(map->path()),
|
||||||
|
qPrintable(map->errorString()));
|
||||||
delete map;
|
delete map;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return tree;
|
return tree;
|
||||||
|
@ -80,6 +80,7 @@ Map *MapList::loadFile(const QString &path, const Projection &proj, bool *isDir)
|
|||||||
errors.append(it.key() + ": " + map->errorString());
|
errors.append(it.key() + ": " + map->errorString());
|
||||||
++it;
|
++it;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
for (it = _parsers.begin(); it != _parsers.end(); it++) {
|
for (it = _parsers.begin(); it != _parsers.end(); it++) {
|
||||||
map = it.value()(path, proj, isDir);
|
map = it.value()(path, proj, isDir);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user