update 'valentin'

pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h

@@ -148,7 +148,8 @@
 #define DRONEX_INTEGRATOR_ON        15
 #define DRONEX_INTEGRATOR_OFF       16
 #define DRONEX_INTEGRATOR_RESET     17
-
+#define DRONEX_FOLLOW_TRAJECTORY    18
+#define DRONEX_RESET                19
 
 // Universal constants
 #define PI 3.141592653589
@@ -257,12 +258,15 @@ private slots:
     void on_take_off_dronex_button_clicked();
     void on_land_on_dronex_button_clicked();
     void on_abort_dronex_button_clicked();
-
     void on_integrate_on_dronex_button_clicked();
     void on_integrate_off_dronex_button_clicked();
     void on_integrate_reset_dronex_button_clicked();
     void on_set_weigth_param_clicked();
     void on_set_pitch_baseline_param_clicked();
+    void on_follow_dronex_trajectory_button_clicked();
+    void on_dronex_reset_button_clicked();
+
+
 
 private:
     Ui::MainWindow *ui;

pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp

@@ -1637,9 +1637,16 @@ void MainWindow::on_set_weigth_param_clicked()
 {
     Setpoint msg;
 
+    if(!ui->weight_param->text().isEmpty()){
+        msg.x = (ui->weight_param->text()).toFloat();
+    }
+
+    /*
     msg.x = (ui->weight_param->text()).toFloat();
     msg.y = 0;
     msg.z = 0;
+    */
+
     
     this->droneXWeightParamPublisher.publish(msg);
 }
@@ -2011,6 +2018,14 @@ void MainWindow::on_integrate_reset_dronex_button_clicked(){
     send_dronex_button_clicked_message(DRONEX_INTEGRATOR_RESET);
 }
 
+void MainWindow::on_follow_dronex_trajectory_button_clicked(){
+    send_dronex_button_clicked_message(DRONEX_FOLLOW_TRAJECTORY);
+}
+
+
+void MainWindow::on_dronex_reset_button_clicked(){
+    send_dronex_button_clicked_message(DRONEX_RESET);
+}
 
 
 

pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.ui

@@ -391,7 +391,7 @@
            </font>
           </property>
           <property name="currentIndex">
-           <number>0</number>
+           <number>1</number>
           </property>
           <property name="usesScrollButtons">
            <bool>true</bool>
@@ -418,7 +418,7 @@
               <item row="1" column="0">
                <layout class="QHBoxLayout" name="horizontalLayout_14" stretch="1,0,0">
                 <item>
-                 <layout class="QVBoxLayout" name="verticalLayout_10" stretch="0,0,0">
+                 <layout class="QVBoxLayout" name="verticalLayout_10" stretch="0,0,0,0,0">
                   <item>
                    <widget class="QPushButton" name="take_off_dronex_button">
                     <property name="sizePolicy">
@@ -462,6 +462,9 @@
                   </item>
                   <item>
                    <widget class="QPushButton" name="abort_dronex_button">
+                    <property name="enabled">
+                     <bool>true</bool>
+                    </property>
                     <property name="sizePolicy">
                      <sizepolicy hsizetype="Minimum" vsizetype="Ignored">
                       <horstretch>0</horstretch>
@@ -490,6 +493,32 @@
                     </property>
                    </widget>
                   </item>
+                  <item>
+                   <widget class="QPushButton" name="follow_dronex_trajectory_button">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Minimum" vsizetype="Ignored">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string>Follow Trajectory</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QPushButton" name="dronex_reset_button">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Minimum" vsizetype="Ignored">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string>Reset</string>
+                    </property>
+                   </widget>
+                  </item>
                  </layout>
                 </item>
                 <item>