pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/geography/opencpn-plugin-watchdog Update to 20180827. ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/829c5565ffdf
branches: trunk
changeset: 384539:829c5565ffdf
user: bouyer <bouyer%pkgsrc.org@localhost>
date: Mon Aug 27 15:59:07 2018 +0000
description:
Update to 20180827. Changes since 20180405:
display alarm counts
add pypilot alarm
simplify ui using context menu
fix sog for speed alarm
fix course alarm near north
correct wind panel
fix wind alarms
Various bug fixes
pkgsrc fix for gtk3: set brush to transparent for anchor alarm circle
diffstat:
geography/opencpn-plugin-watchdog/Makefile | 7 +-
geography/opencpn-plugin-watchdog/PLIST | 4 +-
geography/opencpn-plugin-watchdog/distinfo | 14 +-
geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp | 271 +++++----
geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp | 14 +-
5 files changed, 166 insertions(+), 144 deletions(-)
diffs (truncated from 426 to 300 lines):
diff -r a95f644024c0 -r 829c5565ffdf geography/opencpn-plugin-watchdog/Makefile
--- a/geography/opencpn-plugin-watchdog/Makefile Mon Aug 27 15:54:09 2018 +0000
+++ b/geography/opencpn-plugin-watchdog/Makefile Mon Aug 27 15:59:07 2018 +0000
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.15 2018/07/19 17:58:58 bouyer Exp $
+# $NetBSD: Makefile,v 1.16 2018/08/27 15:59:07 bouyer Exp $
#
-VERSION= 20180405
+VERSION= 20180827
DISTNAME= watchdog_pi-${VERSION}
PKGNAME= opencpn-plugin-watchdog-${VERSION}
-PKGREVISION= 4
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_GITHUB:=seandepagnier/}
GITHUB_PROJECT= watchdog_pi
-GITHUB_TAG= 4e79fdba96ccd1a17b81166e6956571bf734597d
+GITHUB_TAG= eea8cb97a5596868f99cff15176fd35b36780e28
MAINTAINER= bouyer%NetBSD.org@localhost
HOMEPAGE= https://opencpn.org/OpenCPN/plugins/watchdog.html
diff -r a95f644024c0 -r 829c5565ffdf geography/opencpn-plugin-watchdog/PLIST
--- a/geography/opencpn-plugin-watchdog/PLIST Mon Aug 27 15:54:09 2018 +0000
+++ b/geography/opencpn-plugin-watchdog/PLIST Mon Aug 27 15:59:07 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/04/05 16:20:40 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/08/27 15:59:07 bouyer Exp $
lib/opencpn/libwatchdog_pi.so
share/locale/ar_SA/LC_MESSAGES/opencpn-watchdog_pi.mo
share/locale/ca_ES/LC_MESSAGES/opencpn-watchdog_pi.mo
@@ -31,5 +31,3 @@
share/locale/vi_VN/LC_MESSAGES/opencpn-watchdog_pi.mo
share/locale/zh_TW/LC_MESSAGES/opencpn-watchdog_pi.mo
share/opencpn/plugins/watchdog_pi/data/watchdog_pi.svg
-share/opencpn/plugins/watchdog_pi/data/watchdog_pi_rollover.svg
-share/opencpn/plugins/watchdog_pi/data/watchdog_pi_toggled.svg
diff -r a95f644024c0 -r 829c5565ffdf geography/opencpn-plugin-watchdog/distinfo
--- a/geography/opencpn-plugin-watchdog/distinfo Mon Aug 27 15:54:09 2018 +0000
+++ b/geography/opencpn-plugin-watchdog/distinfo Mon Aug 27 15:59:07 2018 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2018/07/03 15:14:15 bouyer Exp $
+$NetBSD: distinfo,v 1.11 2018/08/27 15:59:07 bouyer Exp $
-SHA1 (watchdog_pi-20180405-4e79fdba96ccd1a17b81166e6956571bf734597d.tar.gz) = e96b4390349488a41d8ca74203a3316512be84cb
-RMD160 (watchdog_pi-20180405-4e79fdba96ccd1a17b81166e6956571bf734597d.tar.gz) = 033f0c65129a811b01ce24655c9bc4ec4435f3d8
-SHA512 (watchdog_pi-20180405-4e79fdba96ccd1a17b81166e6956571bf734597d.tar.gz) =
9398cc2663d5acee13022105a98a76eb1b2dc3cf67e7d49bb0554161488125276b181e9e5392654dea23413e167b95b0acfd4600d1f4ed1c72b678e622873c89
-Size (watchdog_pi-20180405-4e79fdba96ccd1a17b81166e6956571bf734597d.tar.gz) = 485682 bytes
+SHA1 (watchdog_pi-20180827-eea8cb97a5596868f99cff15176fd35b36780e28.tar.gz) = d0d6bc7028fe0a3d3ecb36d87738e7c94a2b6f3b
+RMD160 (watchdog_pi-20180827-eea8cb97a5596868f99cff15176fd35b36780e28.tar.gz) = 9684606e9f2097c233d97d6f2b14bba3933f0366
+SHA512 (watchdog_pi-20180827-eea8cb97a5596868f99cff15176fd35b36780e28.tar.gz) =
c42bf342d1936d354ffda5476b0abd1fd1bc3252e0a5c20a80674197fafb7ccd432f0e5333b761c6db4f83167249c55dfa7839ab159d5e735b201311d9b2be2b
+Size (watchdog_pi-20180827-eea8cb97a5596868f99cff15176fd35b36780e28.tar.gz) = 482981 bytes
SHA1 (patch-cmake_PluginConfigure.cmake) = bc2d6409f95cffee145173280c33f9e7fe439864
-SHA1 (patch-src_Alarm.cpp) = 3eab8a83a2304c9378b1e21bfc367e41833b3973
-SHA1 (patch-src_watchdog_pi.cpp) = 8d8077490aa7a121fae82931ae0c8de89f82fbaf
+SHA1 (patch-src_Alarm.cpp) = cb7f656692ced7c41b0177c27646defaeecab646
+SHA1 (patch-src_watchdog_pi.cpp) = b47afde07f9861d9290989ada590bbb0e82cf7a3
SHA1 (patch-src_wddc.cpp) = 3c43974da65dfe9a18a77f4b84595a4ab602cfd9
diff -r a95f644024c0 -r 829c5565ffdf geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp
--- a/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp Mon Aug 27 15:54:09 2018 +0000
+++ b/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp Mon Aug 27 15:59:07 2018 +0000
@@ -1,16 +1,147 @@
-$NetBSD: patch-src_Alarm.cpp,v 1.2 2018/07/03 15:14:16 bouyer Exp $
+$NetBSD: patch-src_Alarm.cpp,v 1.3 2018/08/27 15:59:07 bouyer Exp $
---- src/Alarm.cpp.orig 2018-03-04 15:24:36.000000000 +0100
-+++ src/Alarm.cpp 2018-07-02 12:13:29.929855122 +0200
+--- src/Alarm.cpp.orig 2018-08-25 23:08:44.000000000 +0200
++++ src/Alarm.cpp 2018-08-27 16:00:48.979962717 +0200
@@ -27,6 +27,7 @@
#include <map>
#include <wx/wx.h>
+#include <cmath>
- #include "wx28compat.h"
#include "wddc.h"
-@@ -81,7 +82,7 @@
+ #include <wx/process.h>
+@@ -70,7 +71,7 @@
+ wxString Type() { return _("Anchor"); }
+
+ bool Test() {
+- if(isnan(g_watchdog_pi->m_sog))
++ if(std::isnan(g_watchdog_pi->m_sog))
+ return m_bNoData;
+ return Distance() > m_Radius;
+ }
+@@ -87,7 +88,7 @@
+
+ double anchordist = Distance();
+ wxString s;
+- if(isnan(anchordist))
++ if(std::isnan(anchordist))
+ s = "N/A";
+ else {
+ wxString fmt("%.0f ");
+@@ -106,6 +107,7 @@
+ m_Radius/1853.0/60.0,
+ m_Longitude);
+
++ dc.SetBrush(*wxTRANSPARENT_BRUSH);
+ if(m_bEnabled) {
+ if(m_bFired)
+ dc.SetPen(wxPen(*wxRED, 2));
+@@ -151,7 +152,7 @@
+
+ private:
+ double Distance() {
+- if(isnan(g_watchdog_pi->m_cog))
++ if(std::isnan(g_watchdog_pi->m_cog))
+ return NAN;
+ PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
+
+@@ -180,7 +181,7 @@
+
+ bool Test() {
+ double error = CourseError();
+- if(isnan(error))
++ if(std::isnan(error))
+ return m_bNoData;
+
+ return error > m_Tolerance;
+@@ -189,7 +190,7 @@
+ wxString GetStatus() {
+ double courseerror = CourseError();
+ wxString s;
+- if(isnan(courseerror))
++ if(std::isnan(courseerror))
+ s = "N/A";
+ else {
+ wxString fmt("%.0f ");
+@@ -210,7 +211,7 @@
+ double lat1 = lastfix.Lat, lon1 = lastfix.Lon, lat2, lon2, lat3, lon3;
+ double dist = lastfix.Sog;
+
+- if(isnan(dist))
++ if(std::isnan(dist))
+ return;
+
+ PositionBearingDistanceMercator_Plugin(lat1, lon1, m_Course+m_Tolerance,
+@@ -301,7 +302,7 @@
+
+ wxString GetStatus() {
+ wxString s;
+- if(isnan(g_watchdog_pi->m_sog))
++ if(std::isnan(g_watchdog_pi->m_sog))
+ s = "N/A";
+ else {
+ wxString fmt("%.1f");
+@@ -335,7 +336,7 @@
+
+ bool Test() {
+ double knots = Knots();
+- if(isnan(knots))
++ if(std::isnan(knots))
+ return m_bNoData;
+
+ if(m_Mode == UNDERSPEED)
+@@ -390,7 +391,7 @@
+ {
+ Alarm::OnTimer( tEvent );
+ double sog = g_watchdog_pi->LastFix().Sog;
+- if(!isnan(sog))
++ if(!std::isnan(sog))
+ m_SOGqueue.push_front(sog);
+ while((int)m_SOGqueue.size() > m_iAverageTime)
+ m_SOGqueue.pop_back();
+@@ -452,12 +453,12 @@
+ switch(m_Mode) {
+ case UNDERSPEED:
+ case OVERSPEED:
+- if(isnan(m_speed))
++ if(std::isnan(m_speed))
+ return "N/A";
+ else
+ return wxString::Format(fmt + (m_Mode == UNDERSPEED ? " < " : " > ") + fmt, m_speed, m_dVal);
+ case DIRECTION:
+- if(isnan(m_direction))
++ if(std::isnan(m_direction))
+ return "N/A";
+ else
+ return wxString::Format(fmt + " < " + fmt + " < " + fmt,
+@@ -470,7 +471,7 @@
+ void Render(wdDC &dc, PlugIn_ViewPort &vp) {
+ if(m_Mode != DIRECTION)
+ return;
+- if(isnan(m_direction))
++ if(std::isnan(m_direction))
+ return;
+ PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
+
+@@ -644,7 +645,7 @@
+ s += " ";
+
+ double val = Value();
+- if(isnan(val))
++ if(std::isnan(val))
+ s += "N/A";
+ else {
+ wxString fmt("%.2f");
+@@ -783,7 +784,7 @@
+ value = nmea.Mtw.Temperature;
+ break;
+ }
+- if(isnan(value))
++ if(std::isnan(value))
+ return;
+
+ m_WeatherDataTime = wxDateTime::Now();
+@@ -965,7 +966,7 @@
bool Test() {
PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
@@ -19,7 +150,7 @@
return m_bNoData;
double lat1 = lastfix.Lat, lon1 = lastfix.Lon, lat2, lon2;
-@@ -96,7 +97,7 @@
+@@ -980,7 +981,7 @@
while(count < 10 && dist1 > 1e-6) {
PositionBearingDistanceMercator_Plugin
(lastfix.Lat, lastfix.Lon, lastfix.Cog, dist + dist1, &lat2, &lon2);
@@ -28,7 +159,7 @@
if(dist1 < 1) {
m_LandFallTime = wxTimeSpan::Seconds(3600.0 * (dist + dist1) / lastfix.Sog);
m_crossinglat1 = lat1, m_crossinglon1 = lon1;
-@@ -188,7 +189,7 @@
+@@ -1072,7 +1073,7 @@
void Render(wdDC &dc, PlugIn_ViewPort &vp) {
PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
@@ -37,7 +168,7 @@
return;
wxPoint r1, r2, r3, r4;
-@@ -350,7 +351,7 @@
+@@ -1234,7 +1235,7 @@
bool Test() {
PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
@@ -46,7 +177,7 @@
return m_bNoData;
double lat, lon;
-@@ -389,7 +390,7 @@
+@@ -1273,7 +1274,7 @@
switch(m_Mode) {
case TIME: {
@@ -55,7 +186,7 @@
if(ODVersionNewerThan( 1, 1, 1)) {
dist = lastfix.Sog * ( m_TimeMinutes / 60 );
PositionBearingDistanceMercator_Plugin(lastfix.Lat, lastfix.Lon, lastfix.Cog, dist, &lat, &lon);
-@@ -589,7 +590,7 @@
+@@ -1472,7 +1473,7 @@
break;
}
case DISTANCE: {
@@ -64,7 +195,7 @@
// check OD version to see which lookup to use
if( ODVersionNewerThan( 1, 1, 1)) {
BoundaryCrossingList.clear();
-@@ -817,7 +818,7 @@
+@@ -1700,7 +1701,7 @@
break;
}
case ANCHOR: {
@@ -73,120 +204,14 @@
if(m_BoundaryName == wxEmptyString)
m_BoundaryName = g_BoundaryName;
if(m_BoundaryDescription == wxEmptyString)
-@@ -850,7 +851,7 @@
+@@ -1731,7 +1732,7 @@
break;
}
case GUARD: {
- if(wxIsNaN(g_AISTarget.m_dLat) || wxIsNaN(g_AISTarget.m_dLat)) break;
+ if(std::isnan(g_AISTarget.m_dLat) || std::isnan(g_AISTarget.m_dLat)) break;
- wxJSONValue jMsg;
- wxJSONWriter writer;
- wxString MsgString;
-@@ -1701,7 +1702,7 @@
- }
-
- bool Test() {
-- if(isnan(g_watchdog_pi->m_sog))
-+ if(std::isnan(g_watchdog_pi->m_sog))
- return m_bNoData;
- return Distance() > m_Radius;
- }
-@@ -1718,7 +1719,7 @@
-
- double anchordist = Distance();
- wxString s;
-- if(isnan(anchordist))
-+ if(std::isnan(anchordist))
- s = _T("N/A");
- else {
- wxString fmt(_T("%.0f "));
-@@ -1782,7 +1783,7 @@
Home |
Main Index |
Thread Index |
Old Index