mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-07-09 00:34:27 +02:00
Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
99fa39030f | |||
6ebf749bdc | |||
5e74642dc8 | |||
b1d1cae9dd | |||
de2278ba04 | |||
e90f152432 | |||
8deab1c9ca | |||
51e0f9a9c6 | |||
e330abe180 |
@ -1,4 +1,4 @@
|
|||||||
version: 4.17.{build}
|
version: 4.19.{build}
|
||||||
configuration: Release
|
configuration: Release
|
||||||
platform: Any CPU
|
platform: Any CPU
|
||||||
environment:
|
environment:
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
TARGET = GPXSee
|
TARGET = GPXSee
|
||||||
VERSION = 4.17
|
VERSION = 4.19
|
||||||
QT += core \
|
QT += core \
|
||||||
gui \
|
gui \
|
||||||
network
|
network
|
||||||
|
@ -918,12 +918,12 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/optionsdialog.cpp" line="40"/>
|
<location filename="../src/GUI/optionsdialog.cpp" line="40"/>
|
||||||
<source>Always show the map</source>
|
<source>Always show the map</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation>Visa alltid kartan</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/optionsdialog.cpp" line="43"/>
|
<location filename="../src/GUI/optionsdialog.cpp" line="43"/>
|
||||||
<source>Show the map even when no files are loaded.</source>
|
<source>Show the map even when no files are loaded.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation>Visa kartan även utan inlästa filer.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/optionsdialog.cpp" line="212"/>
|
<location filename="../src/GUI/optionsdialog.cpp" line="212"/>
|
||||||
@ -955,7 +955,7 @@
|
|||||||
<location filename="../src/GUI/optionsdialog.cpp" line="55"/>
|
<location filename="../src/GUI/optionsdialog.cpp" line="55"/>
|
||||||
<location filename="../src/GUI/optionsdialog.cpp" line="460"/>
|
<location filename="../src/GUI/optionsdialog.cpp" line="460"/>
|
||||||
<source>General</source>
|
<source>General</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation>Allmänt</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/optionsdialog.cpp" line="88"/>
|
<location filename="../src/GUI/optionsdialog.cpp" line="88"/>
|
||||||
@ -1014,7 +1014,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/optionsdialog.cpp" line="190"/>
|
<location filename="../src/GUI/optionsdialog.cpp" line="190"/>
|
||||||
<source>Slider color:</source>
|
<source>Slider color:</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation>Skjutreglagefärg:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/optionsdialog.cpp" line="224"/>
|
<location filename="../src/GUI/optionsdialog.cpp" line="224"/>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
; The name of the installer
|
; The name of the installer
|
||||||
Name "GPXSee"
|
Name "GPXSee"
|
||||||
; Program version
|
; Program version
|
||||||
!define VERSION "4.17"
|
!define VERSION "4.19"
|
||||||
|
|
||||||
; The file to write
|
; The file to write
|
||||||
OutFile "GPXSee-${VERSION}.exe"
|
OutFile "GPXSee-${VERSION}.exe"
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
; The name of the installer
|
; The name of the installer
|
||||||
Name "GPXSee"
|
Name "GPXSee"
|
||||||
; Program version
|
; Program version
|
||||||
!define VERSION "4.17"
|
!define VERSION "4.19"
|
||||||
|
|
||||||
; The file to write
|
; The file to write
|
||||||
OutFile "GPXSee-${VERSION}_x64.exe"
|
OutFile "GPXSee-${VERSION}_x64.exe"
|
||||||
|
@ -94,10 +94,10 @@ void App::loadDatums()
|
|||||||
} else {
|
} else {
|
||||||
if (!Datum::loadList(df)) {
|
if (!Datum::loadList(df)) {
|
||||||
if (Datum::errorLine())
|
if (Datum::errorLine())
|
||||||
qWarning("%s: parse error on line %d: %s", qPrintable(ef),
|
qWarning("%s: parse error on line %d: %s", qPrintable(df),
|
||||||
Datum::errorLine(), qPrintable(Datum::errorString()));
|
Datum::errorLine(), qPrintable(Datum::errorString()));
|
||||||
else
|
else
|
||||||
qWarning("%s: %s", qPrintable(ef), qPrintable(
|
qWarning("%s: %s", qPrintable(df), qPrintable(
|
||||||
Datum::errorString()));
|
Datum::errorString()));
|
||||||
} else
|
} else
|
||||||
ok = true;
|
ok = true;
|
||||||
|
@ -566,6 +566,9 @@ void MapView::clear()
|
|||||||
_wr = RectC();
|
_wr = RectC();
|
||||||
|
|
||||||
digitalZoom(0);
|
digitalZoom(0);
|
||||||
|
|
||||||
|
// If not reset, causes huge redraw areas (and system memory exhaustion)
|
||||||
|
resetCachedContent();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MapView::showTracks(bool show)
|
void MapView::showTracks(bool show)
|
||||||
|
@ -47,22 +47,22 @@ static bool readLon(const char *data, qreal &lon)
|
|||||||
|
|
||||||
static bool readAltitude(const char *data, qreal &ele)
|
static bool readAltitude(const char *data, qreal &ele)
|
||||||
{
|
{
|
||||||
int p;
|
int ga;
|
||||||
|
|
||||||
if (!(data[0] == 'A' || data[0] == 'V'))
|
if (!(data[0] == 'A' || data[0] == 'V'))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (data[1] == '-')
|
if (data[6] == '-') {
|
||||||
p = str2int(data + 2, 4);
|
if ((ga = str2int(data + 7, 4)) < 0)
|
||||||
else
|
|
||||||
p = str2int(data + 1, 5);
|
|
||||||
|
|
||||||
int g = str2int(data + 6, 5);
|
|
||||||
if (p < 0 || g < 0)
|
|
||||||
return false;
|
return false;
|
||||||
|
ga = -ga;
|
||||||
|
} else {
|
||||||
|
if ((ga = str2int(data + 6, 5)) < 0)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (data[0] == 'A')
|
if (data[0] == 'A')
|
||||||
ele = (qreal)g;
|
ele = (qreal)ga;
|
||||||
else
|
else
|
||||||
ele = NAN;
|
ele = NAN;
|
||||||
|
|
||||||
@ -87,7 +87,7 @@ static bool readTimestamp(const char *data, QTime &time)
|
|||||||
|
|
||||||
static bool readARecord(const char *line, qint64 len)
|
static bool readARecord(const char *line, qint64 len)
|
||||||
{
|
{
|
||||||
if (len < 9 || line[0] != 'A')
|
if (len < 7 || line[0] != 'A')
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
for (int i = 1; i < 7; i++)
|
for (int i = 1; i < 7; i++)
|
||||||
|
Reference in New Issue
Block a user