From de2278ba0405f23ec10d3babdb09c0064db71a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85ke=20Engelbrektson?= Date: Fri, 5 Jan 2018 09:34:40 +0100 Subject: [PATCH 1/5] Update gpxsee_sv.ts (#44) New strings translated --- lang/gpxsee_sv.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/gpxsee_sv.ts b/lang/gpxsee_sv.ts index 96621a91..63b8d049 100644 --- a/lang/gpxsee_sv.ts +++ b/lang/gpxsee_sv.ts @@ -918,12 +918,12 @@ Always show the map - + Visa alltid kartan Show the map even when no files are loaded. - + Visa kartan även utan inlästa filer. @@ -955,7 +955,7 @@ General - + Allmänt @@ -1014,7 +1014,7 @@ Slider color: - + Skjutreglagefärg: From b1d1cae9ddbf004f20a0e5a12fd7d70050d011da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 6 Jan 2018 21:51:07 +0100 Subject: [PATCH 2/5] Added support for negative altitude values. Fixes #46 --- src/data/igcparser.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/data/igcparser.cpp b/src/data/igcparser.cpp index 097202e6..c536a186 100644 --- a/src/data/igcparser.cpp +++ b/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] == '-') - p = str2int(data + 2, 4); - else - p = str2int(data + 1, 5); - - int g = str2int(data + 6, 5); - if (p < 0 || g < 0) - return false; + if (data[6] == '-') { + if ((ga = str2int(data + 7, 4)) < 0) + return false; + ga = -ga; + } else { + if ((ga = str2int(data + 6, 5)) < 0) + return false; + } if (data[0] == 'A') - ele = (qreal)g; + ele = (qreal)ga; else ele = NAN; From 5e74642dc8cbf4644e834d45f732bb637fa022ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 6 Jan 2018 21:53:13 +0100 Subject: [PATCH 3/5] Version++ --- .appveyor.yml | 2 +- gpxsee.pro | 2 +- pkg/gpxsee.nsi | 2 +- pkg/gpxsee64.nsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index f9f7f4d0..53f5e929 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: 4.17.{build} +version: 4.18.{build} configuration: Release platform: Any CPU environment: diff --git a/gpxsee.pro b/gpxsee.pro index 7d608f25..71d3a6aa 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -1,5 +1,5 @@ TARGET = GPXSee -VERSION = 4.17 +VERSION = 4.18 QT += core \ gui \ network diff --git a/pkg/gpxsee.nsi b/pkg/gpxsee.nsi index 7d43b93c..1686552b 100644 --- a/pkg/gpxsee.nsi +++ b/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" diff --git a/pkg/gpxsee64.nsi b/pkg/gpxsee64.nsi index 48ff4745..58ff42da 100644 --- a/pkg/gpxsee64.nsi +++ b/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" From 6ebf749bdc31350139d8804181f39baf411caee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Mon, 8 Jan 2018 02:25:14 +0100 Subject: [PATCH 4/5] Added back missing cache reset (causing huge redraw rects causing system memory exhaustion) --- src/GUI/mapview.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/GUI/mapview.cpp b/src/GUI/mapview.cpp index f34bb771..d3427f29 100644 --- a/src/GUI/mapview.cpp +++ b/src/GUI/mapview.cpp @@ -566,6 +566,9 @@ void MapView::clear() _wr = RectC(); digitalZoom(0); + + // If not reset, causes huge redraw areas (and system memory exhaustion) + resetCachedContent(); } void MapView::showTracks(bool show) From 99fa39030f93036c60d3ee3acf8da5bbaff26785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Mon, 8 Jan 2018 02:31:22 +0100 Subject: [PATCH 5/5] Version++ --- .appveyor.yml | 2 +- gpxsee.pro | 2 +- pkg/gpxsee.nsi | 2 +- pkg/gpxsee64.nsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 53f5e929..e766c62f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: 4.18.{build} +version: 4.19.{build} configuration: Release platform: Any CPU environment: diff --git a/gpxsee.pro b/gpxsee.pro index 71d3a6aa..adb2cd25 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -1,5 +1,5 @@ TARGET = GPXSee -VERSION = 4.18 +VERSION = 4.19 QT += core \ gui \ network diff --git a/pkg/gpxsee.nsi b/pkg/gpxsee.nsi index 1686552b..857a73cc 100644 --- a/pkg/gpxsee.nsi +++ b/pkg/gpxsee.nsi @@ -5,7 +5,7 @@ ; The name of the installer Name "GPXSee" ; Program version -!define VERSION "4.18" +!define VERSION "4.19" ; The file to write OutFile "GPXSee-${VERSION}.exe" diff --git a/pkg/gpxsee64.nsi b/pkg/gpxsee64.nsi index 58ff42da..ef14a2c7 100644 --- a/pkg/gpxsee64.nsi +++ b/pkg/gpxsee64.nsi @@ -5,7 +5,7 @@ ; The name of the installer Name "GPXSee" ; Program version -!define VERSION "4.18" +!define VERSION "4.19" ; The file to write OutFile "GPXSee-${VERSION}_x64.exe"