root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-27 11:39:16 +02:00
Code Issues Projects Releases Activity

Added file changes missing in last commit...

Browse Source
This commit is contained in:
Martin Tůma
2016-10-25 19:46:44 +02:00
parent b99def1b30
commit 6cc22afcdc
6 changed files with 72 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/csvparser.cpp
View File

@ -2,7 +2,7 @@
bool CSVParser::loadFile(QIODevice *device)
{
bool ret;
bool res;
int ln = 1;
_errorLine = 0;
@ -17,14 +17,14 @@ bool CSVParser::loadFile(QIODevice *device)
return false;
}
qreal lat = list[0].trimmed().toDouble(&ret);
if (!ret) {
qreal lat = list[0].trimmed().toDouble(&res);
if (!res || (lat < -90.0 || lat > 90.0)) {
_errorString = "Invalid latitude.";
_errorLine = ln;
return false;
}
qreal lon = list[1].trimmed().toDouble(&ret);
if (!ret) {
qreal lon = list[1].trimmed().toDouble(&res);
if (!res || (lon < -180.0 || lon > 180.0)) {
_errorString = "Invalid longitude.";
_errorLine = ln;
return false;

2
src/data.cpp
View File

@ -3,6 +3,7 @@
#include "gpxparser.h"
#include "tcxparser.h"
#include "csvparser.h"
#include "kmlparser.h"
#include "data.h"
@ -10,6 +11,7 @@ Data::Data() : _errorLine(0)
{
_parsers << new GPXParser(_track_data, _route_data, _waypoint_data);
_parsers << new TCXParser(_track_data, _route_data, _waypoint_data);
_parsers << new KMLParser(_track_data, _route_data, _waypoint_data);
_parsers << new CSVParser(_track_data, _route_data, _waypoint_data);
}

8
src/gpxparser.cpp
View File

@ -81,12 +81,20 @@ Coordinates GPXParser::coordinates(const QXmlStreamAttributes &attr)
bool res;
qreal lon, lat;
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
lon = attr.value("lon").toString().toDouble(&res);
#else // QT_VERSION < 5
lon = attr.value("lon").toDouble(&res);
#endif // QT_VERSION < 5
if (!res || (lon < -180.0 || lon > 180.0)) {
_reader.raiseError("Invalid longitude.");
return Coordinates();
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
lat = attr.value("lat").toString().toDouble(&res);
#else // QT_VERSION < 5
lat = attr.value("lat").toDouble(&res);
#endif // QT_VERSION < 5
if (!res || (lat < -90.0 || lat > 90.0)) {
_reader.raiseError("Invalid latitude.");
return Coordinates();

12
src/gui.cpp
View File

@ -107,7 +107,7 @@ GUI::~GUI()
void GUI::createBrowser()
{
QStringList filter;
filter << "*.gpx" << "*.tcx" << "*.csv";
filter << "*.gpx" << "*.tcx" << "*.kml" << "*.csv";
_browser = new FileBrowser(this);
_browser->setFilter(filter);
}
@ -600,9 +600,10 @@ void GUI::dataSources()
void GUI::openFile()
{
QStringList files = QFileDialog::getOpenFileNames(this, tr("Open file"),
QString(), tr("All supported files (*.gpx *.tcx *.csv)") + ";;"
QString(), tr("All supported files (*.gpx *.tcx *.kml *.csv)") + ";;"
+ tr("GPX files (*.gpx)") + ";;" + tr("TCX files (*.tcx)") + ";;"
+ tr("CSV files (*.csv)") + ";;" + tr("All files (*)"));
+ tr("CSV files (*.csv)") + ";;" + tr("KML files (*.kml)") + ";;"
+ tr("All files (*)"));
QStringList list = files;
for (QStringList::Iterator it = list.begin(); it != list.end(); it++)
@ -681,9 +682,10 @@ bool GUI::loadFile(const QString &fileName)
void GUI::openPOIFile()
{
QStringList files = QFileDialog::getOpenFileNames(this, tr("Open POI file"),
QString(), tr("All supported files (*.gpx *.tcx *.csv)") + ";;"
QString(), tr("All supported files (*.gpx *.tcx *.kml *.csv)") + ";;"
+ tr("GPX files (*.gpx)") + ";;" + tr("CSV files (*.csv)") + ";;"
+ tr("TCX files (*.tcx)") + ";;" + tr("All files (*)"));
+ tr("TCX files (*.tcx)") + ";;" + tr("KML files (*.kml)") + ";;"
+ tr("All files (*)"));
QStringList list = files;
for (QStringList::Iterator it = list.begin(); it != list.end(); it++)