diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui
index 1d09bd97cc6ed4149f34379c3666ee0403c78e6b..737f460b0ae385e2d25c23aabc6eb990df265ec6 100755
--- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>1176</width>
- <height>1514</height>
+ <height>1559</height>
</rect>
</property>
<property name="windowTitle">
@@ -33,7 +33,7 @@
<item row="0" column="1">
<widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -92,11 +92,41 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QPushButton" name="removeTable">
+ <property name="font">
+ <font>
+ <pointsize>14</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Remove Table</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_fitAll">
+ <property name="font">
+ <font>
+ <pointsize>14</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Fit All</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
<item row="1" column="1">
<widget class="QGroupBox" name="groupBox_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="font">
<font>
<pointsize>14</pointsize>
@@ -106,18 +136,6 @@
<string>What to show</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
- <item row="11" column="0">
- <widget class="QPushButton" name="pushButton_fitAll">
- <property name="font">
- <font>
- <pointsize>14</pointsize>
- </font>
- </property>
- <property name="text">
- <string>Fit All</string>
- </property>
- </widget>
- </item>
<item row="5" column="0">
<widget class="QCheckBox" name="checkBox_grid">
<property name="font">
@@ -217,18 +235,6 @@
</property>
</widget>
</item>
- <item row="12" column="0">
- <widget class="QPushButton" name="removeTable">
- <property name="font">
- <font>
- <pointsize>14</pointsize>
- </font>
- </property>
- <property name="text">
- <string>Remove Table</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -324,13 +330,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="text">
@@ -349,13 +355,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>30</height>
+ <height>10</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>30</height>
+ <height>20</height>
</size>
</property>
<property name="font">
@@ -379,13 +385,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="text">
@@ -404,13 +410,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="readOnly">
@@ -432,13 +438,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="minimum">
@@ -463,7 +469,7 @@
<property name="maximumSize">
<size>
<width>600</width>
- <height>16777215</height>
+ <height>90</height>
</size>
</property>
</widget>
@@ -479,13 +485,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
</widget>
@@ -501,13 +507,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
</widget>
@@ -523,13 +529,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>15</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>25</height>
</size>
</property>
<property name="font">
@@ -554,13 +560,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>15</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>25</height>
</size>
</property>
<property name="font">
@@ -585,13 +591,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>15</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>25</height>
</size>
</property>
<property name="font">
@@ -616,13 +622,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>15</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>25</height>
</size>
</property>
<property name="font">
@@ -647,13 +653,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>30</height>
+ <height>10</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>30</height>
+ <height>20</height>
</size>
</property>
<property name="font">
@@ -677,13 +683,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="text">
@@ -702,13 +708,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="text">
@@ -727,13 +733,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="text">
@@ -758,7 +764,7 @@
<property name="maximumSize">
<size>
<width>600</width>
- <height>16777215</height>
+ <height>120</height>
</size>
</property>
<property name="wordWrap">
@@ -786,13 +792,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="text">
@@ -811,13 +817,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>30</height>
+ <height>10</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>30</height>
+ <height>20</height>
</size>
</property>
<property name="font">
@@ -841,13 +847,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>30</height>
+ <height>10</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
- <height>30</height>
+ <height>20</height>
</size>
</property>
<property name="font">
@@ -867,46 +873,27 @@
<string>Command all</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
- <item row="1" column="0">
- <widget class="QPushButton" name="all_disconnect_button">
+ <item row="10" column="1">
+ <widget class="QPushButton" name="all_load_custom_controller_yaml_coordinator_button">
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
- <height>100</height>
- </size>
- </property>
- <property name="text">
- <string>Disconnect</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QPushButton" name="all_connect_button">
- <property name="minimumSize">
- <size>
- <width>0</width>
<height>50</height>
</size>
</property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>100</height>
- </size>
- </property>
<property name="text">
- <string>Reconnect</string>
+ <string>Load Custom YAML</string>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2">
- <widget class="QLabel" name="all_flying_state_label">
+ <item row="6" column="0" colspan="2">
+ <widget class="QLabel" name="all_yaml_label">
<property name="minimumSize">
<size>
<width>0</width>
@@ -926,7 +913,7 @@
</font>
</property>
<property name="text">
- <string>FLYING STATE</string>
+ <string>LOAD YAML PARAMETERS</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
@@ -944,13 +931,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
- <height>100</height>
+ <height>50</height>
</size>
</property>
<property name="text">
@@ -958,60 +945,69 @@
</property>
</widget>
</item>
- <item row="5" column="0">
- <widget class="QPushButton" name="all_enable_safe_controller_button">
+ <item row="1" column="1">
+ <widget class="QPushButton" name="all_connect_button">
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
- <height>100</height>
+ <height>50</height>
</size>
</property>
<property name="text">
- <string>Enable Safe</string>
+ <string>Reconnect</string>
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QPushButton" name="all_land_button">
+ <item row="2" column="0" colspan="2">
+ <widget class="QLabel" name="all_flying_state_label">
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
- <height>100</height>
+ <height>40</height>
</size>
</property>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
<property name="text">
- <string>Land</string>
+ <string>FLYING STATE</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignBottom|Qt::AlignHCenter</set>
</property>
</widget>
</item>
- <item row="5" column="1">
- <widget class="QPushButton" name="all_enable_custom_controller_button">
+ <item row="5" column="0">
+ <widget class="QPushButton" name="all_enable_safe_controller_button">
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
- <height>100</height>
+ <height>50</height>
</size>
</property>
<property name="text">
- <string>Enable Custom</string>
+ <string>Enable Safe</string>
</property>
</widget>
</item>
@@ -1020,13 +1016,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
- <height>100</height>
+ <height>50</height>
</size>
</property>
<property name="text">
@@ -1034,100 +1030,79 @@
</property>
</widget>
</item>
- <item row="0" column="0" colspan="2">
- <widget class="QLabel" name="all_radio_label">
+ <item row="1" column="0">
+ <widget class="QPushButton" name="all_disconnect_button">
<property name="minimumSize">
<size>
<width>0</width>
- <height>20</height>
+ <height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
- <height>40</height>
+ <height>50</height>
</size>
</property>
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="lineWidth">
- <number>1</number>
- </property>
<property name="text">
- <string>CRAZYRADIO</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+ <string>Disconnect</string>
</property>
</widget>
</item>
- <item row="6" column="0" colspan="2">
- <widget class="QLabel" name="all_yaml_label">
+ <item row="5" column="1">
+ <widget class="QPushButton" name="all_enable_custom_controller_button">
<property name="minimumSize">
<size>
<width>0</width>
- <height>20</height>
+ <height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
- <height>40</height>
+ <height>50</height>
</size>
</property>
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
<property name="text">
- <string>LOAD YAML PARAMETERS</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+ <string>Enable Custom</string>
</property>
</widget>
</item>
- <item row="10" column="0">
- <widget class="QPushButton" name="all_load_safe_controller_yaml_coordinator_button">
+ <item row="3" column="1">
+ <widget class="QPushButton" name="all_land_button">
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
- <height>100</height>
+ <height>50</height>
</size>
</property>
<property name="text">
- <string>Load Safe YAML</string>
+ <string>Land</string>
</property>
</widget>
</item>
- <item row="10" column="1">
- <widget class="QPushButton" name="all_load_custom_controller_yaml_coordinator_button">
+ <item row="8" column="0">
+ <widget class="QPushButton" name="all_load_safe_controller_yaml_own_agent_button">
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
- <height>100</height>
+ <height>50</height>
</size>
</property>
<property name="text">
- <string>Load Custom YAML</string>
+ <string>Load Safe YAML</string>
</property>
</widget>
</item>
@@ -1150,6 +1125,25 @@
</property>
</widget>
</item>
+ <item row="10" column="0">
+ <widget class="QPushButton" name="all_load_safe_controller_yaml_coordinator_button">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Load Safe YAML</string>
+ </property>
+ </widget>
+ </item>
<item row="9" column="0" colspan="2">
<widget class="QLabel" name="all_yaml_coordinator_label">
<property name="minimumSize">
@@ -1169,22 +1163,34 @@
</property>
</widget>
</item>
- <item row="8" column="0">
- <widget class="QPushButton" name="all_load_safe_controller_yaml_own_agent_button">
+ <item row="0" column="0" colspan="2">
+ <widget class="QLabel" name="all_radio_label">
<property name="minimumSize">
<size>
<width>0</width>
- <height>50</height>
+ <height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
- <height>100</height>
+ <height>40</height>
</size>
</property>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="lineWidth">
+ <number>1</number>
+ </property>
<property name="text">
- <string>Load Safe YAML</string>
+ <string>CRAZYRADIO</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignBottom|Qt::AlignHCenter</set>
</property>
</widget>
</item>
@@ -1240,7 +1246,7 @@
<x>0</x>
<y>0</y>
<width>1176</width>
- <height>37</height>
+ <height>25</height>
</rect>
</property>
</widget>