Version++

Fixes #46

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 4.17.{build}
+version: 4.18.{build}
 configuration: Release
 platform: Any CPU
 environment:

gpxsee.pro

@@ -1,5 +1,5 @@
 TARGET = GPXSee
-VERSION = 4.17
+VERSION = 4.18
 QT += core \
     gui \
     network

lang/gpxsee_sv.ts

@@ -918,12 +918,12 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="40"/>
         <source>Always show the map</source>
-        <translation type="unfinished"></translation>
+        <translation>Visa alltid kartan</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="43"/>
         <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>
         <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="460"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Allmänt</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="88"/>
@@ -1014,7 +1014,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="190"/>
         <source>Slider color:</source>
-        <translation type="unfinished"></translation>
+        <translation>Skjutreglagefärg:</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="224"/>

pkg/gpxsee.nsi

@@ -5,7 +5,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "4.17"
+!define VERSION "4.18"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"

pkg/gpxsee64.nsi

@@ -5,7 +5,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "4.17"
+!define VERSION "4.18"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"

src/GUI/app.cpp

@@ -94,10 +94,10 @@ void App::loadDatums()
 		} else {
 			if (!Datum::loadList(df)) {
 				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()));
 				else
-					qWarning("%s: %s", qPrintable(ef), qPrintable(
+					qWarning("%s: %s", qPrintable(df), qPrintable(
 					  Datum::errorString()));
 			} else
 				ok = true;

src/data/igcparser.cpp

@@ -47,22 +47,22 @@ static bool readLon(const char *data, qreal &lon)
 
 static bool readAltitude(const char *data, qreal &ele)
 {
-	int p;
+	int ga;
 
 	if (!(data[0] == 'A' || data[0] == 'V'))
 		return false;
 
-	if (data[1] == '-')
+	if (data[6] == '-') {
-		p = str2int(data + 2, 4);
+		if ((ga = str2int(data + 7, 4)) < 0)
-	else
+			return false;
-		p = str2int(data + 1, 5);
+		ga = -ga;
-
+	} else {
-	int g = str2int(data + 6, 5);
+		if ((ga = str2int(data + 6, 5)) < 0)
-	if (p < 0 || g < 0)
+			return false;
-		return false;
+	}
 
 	if (data[0] == 'A')
-		ele = (qreal)g;
+		ele = (qreal)ga;
 	else
 		ele = NAN;
 
@@ -87,7 +87,7 @@ static bool readTimestamp(const char *data, QTime &time)
 
 static bool readARecord(const char *line, qint64 len)
 {
-	if (len < 9 || line[0] != 'A')
+	if (len < 7 || line[0] != 'A')
 		return false;
 
 	for (int i = 1; i < 7; i++)