Ignore:
Timestamp:
Sep 21, 2016, 11:40:56 AM (5 years ago)
Author:
Thomas Fuhrmann
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/mavlink/tools/Controller/Mavlink/src/GuiInterface.h

    r71 r77  
    3535  class GroupBox;
    3636  class ListWidget;
     37  class Label;
    3738}
    3839}
     
    4748  // reimplement the run of the Thread class
    4849  void Run();
    49 
    50   std::string GetWptLatLon();
    5150 
    5251  // First tab callbacks
    53   virtual void MissionInitialize() = 0;
    5452  virtual void MissionStart() = 0;
    5553  virtual void MissionStop() = 0;
    56   virtual void MissionKill() = 0;
    57   virtual void WptSend() = 0;
    58   virtual void WptClear() = 0;
    59   virtual void WptLoopSend() = 0;
     54  virtual void MissionResume() = 0;
     55  virtual void MissionSend() = 0;
     56
     57  std::string MissionCmdGet();
    6058
    6159  // Main GUI
     
    6664  // Controls groupbox
    6765  flair::gui::GroupBox* controlsGroupBox;
    68   flair::gui::PushButton* btnInitialize;
    6966  flair::gui::PushButton* btnStartMission;
    7067  flair::gui::PushButton* btnStopMission;
    71   flair::gui::PushButton* btnKill;
     68  flair::gui::PushButton* btnResumeMission;
    7269 
    73   // Add wpt groupbox
    74   flair::gui::GroupBox* addWptGroupBox;
    75   flair::gui::DoubleSpinBox* latField;
    76   flair::gui::DoubleSpinBox* lonField;
    77   flair::gui::PushButton* btnAddMissionWpt;
    78   flair::gui::PushButton* btnAddEntranceWpt;
    79   flair::gui::PushButton* btnAddExitWpt;
     70  // Add cmd groupbox
     71  flair::gui::GroupBox* addCmdGroupBox;
     72  // flair::gui::Label* commandLabel;
     73  // flair::gui::Label* param1Label;
     74  // flair::gui::Label* param2Label;
     75  // flair::gui::Label* param3Label;
     76  flair::gui::ComboBox* comboCmd;
     77  flair::gui::DoubleSpinBox* param1Field;
     78  flair::gui::DoubleSpinBox* param2Field;
     79  flair::gui::DoubleSpinBox* param3Field; 
     80  flair::gui::PushButton* btnAddMissionCmd;
     81  flair::gui::PushButton* btnDelMissionCmd;
     82  flair::gui::PushButton* btnSendMission;
    8083
    8184  // Show wpt groupbox
    82   flair::gui::GroupBox* showWptGroupBox;
    83   flair::gui::ListWidget* listMissionWpt;
    84   flair::gui::ListWidget* listEntranceWpt;
    85   flair::gui::ListWidget* listExitWpt;
    86   flair::gui::PushButton* btnRemoveMissionWpt;
    87   flair::gui::PushButton* btnRemoveEntranceWpt;
    88   flair::gui::PushButton* btnRemoveExitWpt; 
     85  flair::gui::GroupBox* showItemsGroupBox;
     86  flair::gui::ListWidget* listMissionItems;
     87  // flair::gui::ListWidget* listEntranceWpt;
     88  // flair::gui::ListWidget* listExitWpt;
     89  // flair::gui::PushButton* btnRemoveMissionWpt;
     90  // flair::gui::PushButton* btnRemoveEntranceWpt;
     91  // flair::gui::PushButton* btnRemoveExitWpt; 
    8992
    9093  // Action wpt groupbox
    91   flair::gui::GroupBox* actionWptGroupBox;
    92   flair::gui::PushButton* btnSendWpt;
    93   flair::gui::PushButton* btnClearWpt;
    94   flair::gui::PushButton* btnLoop;
     94  // flair::gui::GroupBox* actionWptGroupBox;
     95  // flair::gui::PushButton* btnSendWpt;
     96  // flair::gui::PushButton* btnClearWpt;
     97  // flair::gui::PushButton* btnLoop;
    9598
    9699  // Socket to send commands
     
    98101
    99102  //TODO : think if useful to have private members
     103 
     104private:
     105  const std::vector<std::string> commandsAvailable = {"WAYPOINT", "TAKEOFF", "LAND", "RETURN", "JUMP"};
    100106};
    101107
Note: See TracChangeset for help on using the changeset viewer.