Changeset 50 in flair-src

Timestamp:

Jul 26, 2016, 5:28:43 PM (8 years ago)

Author:

Thomas Fuhrmann

Message:

Waypoints add and remove is working in GUI

Location:

branches/mavlink/tools/Controller/Mavlink

Files:

• build_x86_64/bin/mavlink_test (modified) ( previous)
• src/Mavlink_test.cpp (modified) (4 diffs)
• src/Mavlink_test.h (modified) (2 diffs)

branches/mavlink/tools/Controller/Mavlink/src/Mavlink_test.cpp

@@ -65 +65 @@
   add_wptGroupBox = new GroupBox(settingsTab->NewRow(), "Add waypoint");
   latField = new DoubleSpinBox(add_wptGroupBox->NewRow(), "Latitude",
-                                -90, 90, 0.0001, 4, 3);
+                                -90, 90, 0.001, 3, 3);
   lonField = new DoubleSpinBox(add_wptGroupBox->LastRowLastCol(), "Longitude",
-                                -180, 180, 0.0001, 4, 3);
+                                -180, 180, 0.001, 3, 3);
   btn_add_mission_wpt = new PushButton(add_wptGroupBox->NewRow(), "Add mission wpt");
   btn_add_entrance_wpt = new PushButton(add_wptGroupBox->LastRowLastCol(), "Add entrance wpt");
@@ -135 +135 @@
   while (!ToBeStopped()) {
     // Thread::Info("Debug: Mavlink acquisition loop\n");
-    Thread::SleepMS(1000);
+    Thread::SleepMS(500);
     // latValue = latField->Value();
     // lonValue = lonField->Value();
         
-        // Check the values of the buttons
-        // First tab
         if (btn_initialize->Clicked()) {
                 MissionInitialize();
@@ -153 +151 @@
                 MissionKill();
     }
-        // Second tab
         if (btn_add_mission_wpt->Clicked()) {
-      std::ostringstream stringStream;
-      stringStream.precision(3);
-      stringStream << fixed;
-      stringStream << latField->Value() << " - " << lonField->Value();
-                list_mission_wpt->AddItem(stringStream.str());
+                list_mission_wpt->AddItem(GetWptLatLon());
     }
         if (btn_add_entrance_wpt->Clicked()) {
-                EntranceWptAdd();
+                list_entrance_wpt->AddItem(GetWptLatLon());
     }
         if (btn_add_exit_wpt->Clicked()) {
-                ExitWptAdd();
+                list_exit_wpt->AddItem(GetWptLatLon());
     }
     if (btn_remove_mission_wpt->Clicked()) {
@@ -275 +268 @@
   }
   Thread::Info("Debug: end of decode loop\n");
+}
+
+std::string Mavlink::GetWptLatLon() {
+  std::ostringstream stringStream;
+  stringStream.precision(3);
+  stringStream << fixed;
+  stringStream << latField->Value() << " - " << lonField->Value();
+  return stringStream.str();
 }
 

branches/mavlink/tools/Controller/Mavlink/src/Mavlink_test.h

@@ -84 +84 @@
   gui::PushButton* btn_remove_entrance_wpt;
   gui::PushButton* btn_remove_exit_wpt;  
-  // gui::Label* label_mission_wpt;
-  // gui::Label* label_mission_wpt_list;
-  // gui::Label* label_entrance_wpt;
-  // gui::Label* label_entrance_wpt_list;
-  // gui::Label* label_exit_wpt;
-  // gui::Label* label_exit_wpt_list;
-
-  // Remove wpt groupbox
-  // gui::GroupBox* show_wptGroupBox;
-  // gui::ComboBox* cmb_box_mission_wpt;
-  // gui::ComboBox* cmb_box_mission_wpt;
-  // gui::ComboBox* cmb_box_mission_wpt;
 
   // Action wpt groupbox
@@ -108 +96 @@
   // reimplement the run of the Thread class
   void Run();
+
+  std::string GetWptLatLon();
   
   // First tab callbacks