diff options
author | bouyer <bouyer@pkgsrc.org> | 2018-04-05 16:49:15 +0000 |
---|---|---|
committer | bouyer <bouyer@pkgsrc.org> | 2018-04-05 16:49:15 +0000 |
commit | 3156a23414e3405119ef48d219f301267e480b73 (patch) | |
tree | 8c59171540e62f17cf20d2da527a40c6bde0cba8 /geography/opencpn-plugin-weather_routing/patches | |
parent | c66d668432ff76d51e01dd1a205f66e65db5ed8f (diff) | |
download | pkgsrc-3156a23414e3405119ef48d219f301267e480b73.tar.gz |
Update to 20180405. Changes:
support sparse polars with automatic interpolation
ADD cursor bar on the plot to show where we are in time
Add option cursor route enable/disable
Add wind barbs on the weather route.
Updated translations
Lots of UI improvements and general bug fixes
Diffstat (limited to 'geography/opencpn-plugin-weather_routing/patches')
3 files changed, 0 insertions, 67 deletions
diff --git a/geography/opencpn-plugin-weather_routing/patches/patch-src_Polar.cpp b/geography/opencpn-plugin-weather_routing/patches/patch-src_Polar.cpp deleted file mode 100644 index b096eacf55c..00000000000 --- a/geography/opencpn-plugin-weather_routing/patches/patch-src_Polar.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_Polar.cpp,v 1.1 2017/02/08 00:05:55 joerg Exp $ - -Pointers are not relative to 0, so check correct variable. - ---- src/Polar.cpp.orig 2017-01-08 19:55:10.199446917 +0000 -+++ src/Polar.cpp -@@ -180,7 +180,7 @@ Polar::Polar() - - #define MAX_WINDSPEEDS_IN_TABLE 200 - #define MESSAGE(S) (S + wxString(_T("\n")) + wxString::FromUTF8(filename) \ -- + (line > 0 ? (_(" line ") + wxString::Format(_T("%d"), linenum)) : _T(""))) -+ + (linenum > 0 ? (_(" line ") + wxString::Format(_T("%d"), linenum)) : _T(""))) - #define PARSE_WARNING(S) do { if(message.empty()) message = MESSAGE(S); } while (0) - #define PARSE_ERROR(S) if(message.empty()) do { message = _("Boat polar failed") + wxString(_T("\n")) \ - + MESSAGE(S); goto failed; } while (0) diff --git a/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp b/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp deleted file mode 100644 index b2f6da994b0..00000000000 --- a/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-src_RouteMap.cpp,v 1.2 2016/07/18 14:23:46 bouyer Exp $ - ---- src/RouteMap.cpp.orig 2016-07-16 16:02:32.000000000 +0200 -+++ src/RouteMap.cpp 2016-07-18 15:51:20.000000000 +0200 -@@ -546,7 +546,7 @@ - VB = polar.Speed(H, VW); - - /* failed to determine speed.. */ -- if(isnan(B) || isnan(VB)) { -+ if(std::isnan(B) || std::isnan(VB)) { - // when does this hit?? - printf("polar failed bad! %f %f %f %f\n", W, VW, B, VB); - configuration.polar_failed = true; -@@ -662,7 +662,7 @@ - B = W + H; /* rotated relative to true wind */ - - /* test to avoid extra computations related to backtracking */ -- if(!isnan(bearing1)) { -+ if(!std::isnan(bearing1)) { - double bearing3 = heading_resolve(B); - if((bearing1 > bearing2 && bearing3 > bearing2 && bearing3 < bearing1) || - (bearing1 < bearing2 && (bearing3 > bearing2 || bearing3 < bearing1))) { -@@ -2089,7 +2089,7 @@ - - /* did we tack thru the wind? apply penalty */ - bool tacked = false; -- if(!isnan(dt) && p->parent_heading*H < 0 && fabs(p->parent_heading - H) < 180) { -+ if(!std::isnan(dt) && p->parent_heading*H < 0 && fabs(p->parent_heading - H) < 180) { - tacked = true; - dt += configuration.TackingTime; - #if 0 -@@ -2098,7 +2098,7 @@ - #endif - } - -- if(!isnan(dt) && dt < mindt) { -+ if(!std::isnan(dt) && dt < mindt) { - mindt = dt; - minH = H; - endp = p; diff --git a/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMapOverlay.cpp b/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMapOverlay.cpp deleted file mode 100644 index cd92937daa3..00000000000 --- a/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMapOverlay.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_RouteMapOverlay.cpp,v 1.1 2017/04/18 16:54:35 bouyer Exp $ ---- src/RouteMapOverlay.cpp.orig 2017-04-14 13:36:07.000000000 +0200 -+++ src/RouteMapOverlay.cpp 2017-04-14 13:36:23.000000000 +0200 -@@ -1186,7 +1186,7 @@ - } - Unlock(); - -- if(isinf(mindt)) -+ if(std::isinf(mindt)) - goto not_able_to_propagate; - - destination_position = new Position(configuration.EndLat, configuration.EndLon, |