Changeset 77 in flair-src for branches/mavlink/tools/Controller/Mavlink/src/GuiInterface.h

Timestamp:

09/21/16 11:40:56 (8 years ago)

Author:

Thomas Fuhrmann

Message:

Change the GUI of MavPlanner to match with mission planning (only GUI is working)

File:

• branches/mavlink/tools/Controller/Mavlink/src/GuiInterface.h (modified) (4 diffs)

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

@@ -35 +35 @@
   class GroupBox;
   class ListWidget;
+  class Label;
 }
 }
@@ -47 +48 @@
   // reimplement the run of the Thread class
   void Run();
-
-  std::string GetWptLatLon();
   
   // First tab callbacks
-  virtual void MissionInitialize() = 0;
   virtual void MissionStart() = 0;
   virtual void MissionStop() = 0;
-  virtual void MissionKill() = 0;
-  virtual void WptSend() = 0;
-  virtual void WptClear() = 0;
-  virtual void WptLoopSend() = 0;
+  virtual void MissionResume() = 0;
+  virtual void MissionSend() = 0;
+
+  std::string MissionCmdGet();
 
   // Main GUI
@@ -66 +64 @@
   // Controls groupbox
   flair::gui::GroupBox* controlsGroupBox;
-  flair::gui::PushButton* btnInitialize;
   flair::gui::PushButton* btnStartMission;
   flair::gui::PushButton* btnStopMission;
-  flair::gui::PushButton* btnKill;
+  flair::gui::PushButton* btnResumeMission;
   
-  // Add wpt groupbox
-  flair::gui::GroupBox* addWptGroupBox;
-  flair::gui::DoubleSpinBox* latField;
-  flair::gui::DoubleSpinBox* lonField;
-  flair::gui::PushButton* btnAddMissionWpt;
-  flair::gui::PushButton* btnAddEntranceWpt;
-  flair::gui::PushButton* btnAddExitWpt;
+  // Add cmd groupbox
+  flair::gui::GroupBox* addCmdGroupBox;
+  // flair::gui::Label* commandLabel;
+  // flair::gui::Label* param1Label;
+  // flair::gui::Label* param2Label;
+  // flair::gui::Label* param3Label;
+  flair::gui::ComboBox* comboCmd; 
+  flair::gui::DoubleSpinBox* param1Field;
+  flair::gui::DoubleSpinBox* param2Field;
+  flair::gui::DoubleSpinBox* param3Field;  
+  flair::gui::PushButton* btnAddMissionCmd;
+  flair::gui::PushButton* btnDelMissionCmd;
+  flair::gui::PushButton* btnSendMission;
 
   // Show wpt groupbox
-  flair::gui::GroupBox* showWptGroupBox;
-  flair::gui::ListWidget* listMissionWpt;
-  flair::gui::ListWidget* listEntranceWpt;
-  flair::gui::ListWidget* listExitWpt;
-  flair::gui::PushButton* btnRemoveMissionWpt;
-  flair::gui::PushButton* btnRemoveEntranceWpt;
-  flair::gui::PushButton* btnRemoveExitWpt;  
+  flair::gui::GroupBox* showItemsGroupBox;
+  flair::gui::ListWidget* listMissionItems;
+  // flair::gui::ListWidget* listEntranceWpt;
+  // flair::gui::ListWidget* listExitWpt;
+  // flair::gui::PushButton* btnRemoveMissionWpt;
+  // flair::gui::PushButton* btnRemoveEntranceWpt;
+  // flair::gui::PushButton* btnRemoveExitWpt;  
 
   // Action wpt groupbox
-  flair::gui::GroupBox* actionWptGroupBox;
-  flair::gui::PushButton* btnSendWpt;
-  flair::gui::PushButton* btnClearWpt;
-  flair::gui::PushButton* btnLoop;
+  // flair::gui::GroupBox* actionWptGroupBox;
+  // flair::gui::PushButton* btnSendWpt;
+  // flair::gui::PushButton* btnClearWpt;
+  // flair::gui::PushButton* btnLoop;
 
   // Socket to send commands
@@ -98 +101 @@
 
   //TODO : think if useful to have private members
+  
+private:
+  const std::vector<std::string> commandsAvailable = {"WAYPOINT", "TAKEOFF", "LAND", "RETURN", "JUMP"};
 };