root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00
Code Issues Projects Releases Activity

Apply DEM settings to POI loading on startup

Browse Source
This commit is contained in:
Martin Tůma 2019-01-21 23:40:29 +01:00
parent 4f4c206acb
commit 4fb0bfefc2
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/GUI/app.cpp
View File

@ -13,6 +13,7 @@
#include "map/gcs.h" #include "map/gcs.h"
#include "map/pcs.h" #include "map/pcs.h"
#include "data/dem.h" #include "data/dem.h"
#include "data/data.h"
#include "opengl.h" #include "opengl.h"
#include "gui.h" #include "gui.h"
#include "settings.h" #include "settings.h"
@ -45,28 +46,29 @@ App::App(int &argc, char **argv) : QApplication(argc, argv)
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
setAttribute(Qt::AA_DontShowIconsInMenus); setAttribute(Qt::AA_DontShowIconsInMenus);
#endif // Q_OS_MAC #endif // Q_OS_MAC
QNetworkProxyFactory::setUseSystemConfiguration(true); QNetworkProxyFactory::setUseSystemConfiguration(true);
QSettings settings(APP_NAME, APP_NAME);
settings.beginGroup(OPTIONS_SETTINGS_GROUP);
/* The QNetworkAccessManager must be a child of QApplication, otherwise it /* The QNetworkAccessManager must be a child of QApplication, otherwise it
triggers the following warning on exit (and may probably crash): triggers the following warning on exit (and may probably crash):
"QThreadStorage: Thread X exited after QThreadStorage Y destroyed" */ "QThreadStorage: Thread X exited after QThreadStorage Y destroyed" */
Downloader::setNetworkManager(new QNetworkAccessManager(this)); Downloader::setNetworkManager(new QNetworkAccessManager(this));
DEM::setDir(ProgramPaths::demDir());
OPENGL_SET_SAMPLES(4);
loadDatums();
loadPCSs();
QSettings settings(qApp->applicationName(), qApp->applicationName());
settings.beginGroup(OPTIONS_SETTINGS_GROUP);
#ifdef ENABLE_HTTP2 #ifdef ENABLE_HTTP2
Downloader::enableHTTP2(settings.value(ENABLE_HTTP2_SETTING, Downloader::enableHTTP2(settings.value(ENABLE_HTTP2_SETTING,
ENABLE_HTTP2_DEFAULT).toBool()); ENABLE_HTTP2_DEFAULT).toBool());
#endif // ENABLE_HTTP2 #endif // ENABLE_HTTP2
Downloader::setTimeout(settings.value(CONNECTION_TIMEOUT_SETTING, Downloader::setTimeout(settings.value(CONNECTION_TIMEOUT_SETTING,
CONNECTION_TIMEOUT_DEFAULT).toInt()); CONNECTION_TIMEOUT_DEFAULT).toInt());
Data::useDEMElevation(settings.value(USE_DEM_ELEVATION_SETTING,
USE_DEM_ELEVATION_DEFAULT).toBool());
settings.endGroup(); settings.endGroup();
OPENGL_SET_SAMPLES(4);
loadDatums();
loadPCSs();
DEM::setDir(ProgramPaths::demDir());
_gui = new GUI(); _gui = new GUI();
} }