Now follows a route

Rasbats · Jun 25, 2019 · 552ea19 · 552ea19
1 parent 67af1ef
commit 552ea19
Show file tree

Hide file tree

Showing 6 changed files with 478 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ SET(TITLE_NAME ShipDriver)
 SET(CPACK_PACKAGE_CONTACT "Mike Rossiter")
 
 SET(VERSION_MAJOR "2")
-SET(VERSION_MINOR "1")
+SET(VERSION_MINOR "2")
 
 SET(NAME_SUFFIX "ov50")
 
@@ -59,7 +59,7 @@ SET(SRC_ShipDriver
 	    src/tinyxml.h
 		src/tinyxml.cpp
 	    src/tinyxmlerror.cpp
-		src/tinyxmlparser.cpp
+		src/tinyxmlparser.cpp		
 	)
 
 IF(WIN32)

diff --git a/src/ShipDriver_pi.h b/src/ShipDriver_pi.h
@@ -52,7 +52,7 @@
 
 
 #define     PLUGIN_VERSION_MAJOR    2
-#define     PLUGIN_VERSION_MINOR    1
+#define     PLUGIN_VERSION_MINOR    2
 
 #define     MY_API_VERSION_MAJOR    1
 #define     MY_API_VERSION_MINOR    6

diff --git a/src/ShipDrivergui.cpp b/src/ShipDrivergui.cpp
@@ -212,7 +212,10 @@ ShipDriverBase::ShipDriverBase( wxWindow* parent, wxWindowID id, const wxString&
 
 	fgSizer82->Add( m_buttonAuto, 1, wxALL|wxEXPAND, 2 );
 
-	m_button7 = new wxButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_button7 = new wxButton( this, wxID_ANY, _("Follow"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_button7->SetFont(wxFont(12, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxT("Arial")));
+	m_button7->SetBackgroundColour(wxColour(255, 255, 255));
+	m_button7->SetToolTip(_("Follow Route"));
 	m_button7->SetMinSize( wxSize( 50,-1 ) );
 
 	fgSizer82->Add( m_button7, 1, wxALL|wxEXPAND, 2 );
@@ -267,6 +270,7 @@ ShipDriverBase::ShipDriverBase( wxWindow* parent, wxWindowID id, const wxString&
 	m_bpStop->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ShipDriverBase::OnStop ), NULL, this );
 	m_buttonStandby->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ShipDriverBase::OnStandby ), NULL, this );
 	m_buttonAuto->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ShipDriverBase::OnAuto ), NULL, this );
+	m_button7->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ShipDriverBase::OnFollow), NULL, this);
 	m_buttonWind->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ShipDriverBase::OnWind ), NULL, this );
 	m_buttonMinus1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ShipDriverBase::OnMinus1 ), NULL, this );
 	m_buttonMinus10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ShipDriverBase::OnMinus10 ), NULL, this );
@@ -284,6 +288,7 @@ ShipDriverBase::~ShipDriverBase()
 	m_bpStop->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ShipDriverBase::OnStop ), NULL, this );
 	m_buttonStandby->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ShipDriverBase::OnStandby ), NULL, this );
 	m_buttonAuto->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ShipDriverBase::OnAuto ), NULL, this );
+	m_button7->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ShipDriverBase::OnFollow), NULL, this);
 	m_buttonWind->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ShipDriverBase::OnWind ), NULL, this );
 	m_buttonMinus1->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ShipDriverBase::OnMinus1 ), NULL, this );
 	m_buttonMinus10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ShipDriverBase::OnMinus10 ), NULL, this );

diff --git a/src/ShipDrivergui.h b/src/ShipDrivergui.h
@@ -66,6 +66,7 @@ class ShipDriverBase : public wxDialog
 		virtual void OnStop( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnStandby( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnAuto( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnFollow(wxCommandEvent& event) { event.Skip(); }
 		virtual void OnWind( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnMinus1( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnMinus10( wxCommandEvent& event ) { event.Skip(); }