root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-08 08:14:28 +02:00
Code Issues Projects Releases Activity

Moved the datums initialization where it belongs

Browse Source
This commit is contained in:
Martin Tůma
2017-11-26 22:52:50 +01:00
parent 56e4c80999
commit bc218c9f65
4 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/GUI/gui.cpp
View File

@ -23,8 +23,6 @@
#include <QUrl>
#include <QPixmapCache>
#include "data/data.h"
#include "map/ellipsoid.h"
#include "map/datum.h"
#include "map/map.h"
#include "map/maplist.h"
#include "map/emptymap.h"
@ -49,7 +47,6 @@
GUI::GUI()
{
loadDatums();
loadMaps();
loadPOIs();
@ -102,50 +99,6 @@ GUI::~GUI()
}
}
void GUI::loadDatums()
{
QString ef, df;
bool ok = false;
if (QFile::exists(USER_ELLIPSOID_FILE))
ef = USER_ELLIPSOID_FILE;
else if (QFile::exists(GLOBAL_ELLIPSOID_FILE))
ef = GLOBAL_ELLIPSOID_FILE;
else
qWarning("No ellipsoids file found.");
if (QFile::exists(USER_DATUM_FILE))
df = USER_DATUM_FILE;
else if (QFile::exists(GLOBAL_DATUM_FILE))
df = GLOBAL_DATUM_FILE;
else
qWarning("No datums file found.");
if (!ef.isNull() && !df.isNull()) {
if (!Ellipsoid::loadList(ef)) {
if (Ellipsoid::errorLine())
qWarning("%s: parse error on line %d: %s", qPrintable(ef),
Ellipsoid::errorLine(), qPrintable(Ellipsoid::errorString()));
else
qWarning("%s: %s", qPrintable(ef), qPrintable(
Ellipsoid::errorString()));
} else {
if (!Datum::loadList(df)) {
if (Datum::errorLine())
qWarning("%s: parse error on line %d: %s", qPrintable(ef),
Datum::errorLine(), qPrintable(Datum::errorString()));
else
qWarning("%s: %s", qPrintable(ef), qPrintable(
Datum::errorString()));
} else
ok = true;
}
}
if (!ok)
qWarning("Maps based on a datum different from WGS84 won't work.");
}
void GUI::loadMaps()
{
_ml = new MapList(this);