mirror of
https://github.com/tumic0/GPXSee.git
synced 2024-12-04 08:19:10 +01:00
Compare commits
3 Commits
c9a46be7a8
...
681f6c5b09
Author | SHA1 | Date | |
---|---|---|---|
681f6c5b09 | |||
e34f77f1a1 | |||
00e8004042 |
@ -1,4 +1,4 @@
|
|||||||
version: 13.7.{build}
|
version: 13.8.{build}
|
||||||
|
|
||||||
configuration:
|
configuration:
|
||||||
- Release
|
- Release
|
||||||
|
@ -3,7 +3,7 @@ unix:!macx:!android {
|
|||||||
} else {
|
} else {
|
||||||
TARGET = GPXSee
|
TARGET = GPXSee
|
||||||
}
|
}
|
||||||
VERSION = 13.7
|
VERSION = 13.8
|
||||||
|
|
||||||
|
|
||||||
QT += core \
|
QT += core \
|
||||||
|
@ -37,7 +37,7 @@ Unicode true
|
|||||||
; The name of the installer
|
; The name of the installer
|
||||||
Name "GPXSee"
|
Name "GPXSee"
|
||||||
; Program version
|
; Program version
|
||||||
!define VERSION "13.7"
|
!define VERSION "13.8"
|
||||||
|
|
||||||
; The file to write
|
; The file to write
|
||||||
OutFile "GPXSee-${VERSION}_x64.exe"
|
OutFile "GPXSee-${VERSION}_x64.exe"
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
|
#include "common/util.h"
|
||||||
#include "gpxparser.h"
|
#include "gpxparser.h"
|
||||||
#include "tcxparser.h"
|
#include "tcxparser.h"
|
||||||
#include "csvparser.h"
|
#include "csvparser.h"
|
||||||
@ -94,7 +95,7 @@ void Data::processData(QList<TrackData> &trackData, QList<RouteData> &routeData)
|
|||||||
Data::Data(const QString &fileName, bool tryUnknown)
|
Data::Data(const QString &fileName, bool tryUnknown)
|
||||||
{
|
{
|
||||||
QFile file(fileName);
|
QFile file(fileName);
|
||||||
QFileInfo fi(fileName);
|
QFileInfo fi(Util::displayName(fileName));
|
||||||
QList<TrackData> trackData;
|
QList<TrackData> trackData;
|
||||||
QList<RouteData> routeData;
|
QList<RouteData> routeData;
|
||||||
|
|
||||||
|
@ -270,6 +270,10 @@ bool GHPParser::parse(QFile *file, QList<TrackData> &tracks,
|
|||||||
_errorString = "unexpected end of file";
|
_errorString = "unexpected end of file";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (!segment.size()) {
|
||||||
|
_errorString = "No usable data found";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
tracks.append(TrackData());
|
tracks.append(TrackData());
|
||||||
tracks.last().append(segment);
|
tracks.last().append(segment);
|
||||||
|
@ -65,7 +65,7 @@ MapList::ParserMap MapList::_parsers = parsers();
|
|||||||
Map *MapList::loadFile(const QString &path, bool *isDir)
|
Map *MapList::loadFile(const QString &path, bool *isDir)
|
||||||
{
|
{
|
||||||
ParserMap::iterator it;
|
ParserMap::iterator it;
|
||||||
QFileInfo fi(path);
|
QFileInfo fi(Util::displayName(path));
|
||||||
QString suffix(fi.completeSuffix().toLower());
|
QString suffix(fi.completeSuffix().toLower());
|
||||||
Map *map = 0;
|
Map *map = 0;
|
||||||
QStringList errors;
|
QStringList errors;
|
||||||
|
Loading…
Reference in New Issue
Block a user