diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/flyingagentgui.qrc b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/flyingagentgui.qrc
index 0f6e7d8eebb915c0f0f16522394150bbc2d84ec1..ebe282714b9df5ab1d779484968676e3b51ce58a 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/flyingagentgui.qrc
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/flyingagentgui.qrc
@@ -6,14 +6,16 @@
<file>images/battery_80.png</file>
<file>images/battery_empty.png</file>
<file>images/battery_full.png</file>
+ <file>images/battery_unknown.png</file>
+ <file>images/battery_unavailable.png</file>
<file>images/rf_connected.png</file>
<file>images/rf_connecting.png</file>
<file>images/rf_disconnected.png</file>
- <file>images/battery_unknown.png</file>
<file>images/flying_state_disabling.png</file>
<file>images/flying_state_enabling.png</file>
<file>images/flying_state_flying.png</file>
<file>images/flying_state_off.png</file>
<file>images/flying_state_unknown.png</file>
+ <file>images/flying_state_unavilable.png</file>
</qresource>
-</RCC>
+</RCC>
\ No newline at end of file
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui
index 46a0ee5568180aae2867a2680d4a4579ff51186a..64921ccc6888b776866b2135a6698a36a3c18cd9 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui
@@ -19,7 +19,7 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="3" column="11">
+ <item row="3" column="13">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -32,7 +32,7 @@
</property>
</spacer>
</item>
- <item row="6" column="3">
+ <item row="6" column="5">
<widget class="QLineEdit" name="lineEdit_setpoint_current_yaw">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -59,7 +59,7 @@
</property>
</widget>
</item>
- <item row="5" column="1">
+ <item row="5" column="3">
<widget class="QLabel" name="label_row_z">
<property name="maximumSize">
<size>
@@ -75,7 +75,7 @@
</property>
</widget>
</item>
- <item row="5" column="4">
+ <item row="5" column="6">
<widget class="QLineEdit" name="lineEdit_setpoint_new_z">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -99,7 +99,7 @@
</property>
</widget>
</item>
- <item row="3" column="2">
+ <item row="3" column="4">
<widget class="QLineEdit" name="lineEdit_error_x">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -126,7 +126,7 @@
</property>
</widget>
</item>
- <item row="0" column="2">
+ <item row="0" column="4">
<widget class="QLabel" name="label_error_title">
<property name="maximumSize">
<size>
@@ -148,7 +148,7 @@
</property>
</widget>
</item>
- <item row="3" column="4">
+ <item row="3" column="6">
<widget class="QLineEdit" name="lineEdit_setpoint_new_x">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -172,7 +172,7 @@
</property>
</widget>
</item>
- <item row="3" column="5">
+ <item row="3" column="7">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -188,7 +188,7 @@
</property>
</spacer>
</item>
- <item row="5" column="8">
+ <item row="5" column="10">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="z_increment_minus_button">
@@ -251,7 +251,7 @@
</item>
</layout>
</item>
- <item row="4" column="1">
+ <item row="4" column="3">
<widget class="QLabel" name="label_row_y">
<property name="maximumSize">
<size>
@@ -267,7 +267,7 @@
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="3" column="3">
<widget class="QLabel" name="label_row_x">
<property name="maximumSize">
<size>
@@ -283,7 +283,7 @@
</property>
</widget>
</item>
- <item row="4" column="8">
+ <item row="4" column="10">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QPushButton" name="y_increment_minus_button">
@@ -346,7 +346,7 @@
</item>
</layout>
</item>
- <item row="4" column="4">
+ <item row="4" column="6">
<widget class="QLineEdit" name="lineEdit_setpoint_new_y">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -370,7 +370,7 @@
</property>
</widget>
</item>
- <item row="4" column="2">
+ <item row="4" column="4">
<widget class="QLineEdit" name="lineEdit_error_y">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -397,7 +397,7 @@
</property>
</widget>
</item>
- <item row="6" column="8">
+ <item row="6" column="10">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="yaw_increment_minus_button">
@@ -460,7 +460,7 @@
</item>
</layout>
</item>
- <item row="0" column="8">
+ <item row="0" column="10">
<widget class="QLabel" name="label_increment_title">
<property name="maximumSize">
<size>
@@ -482,7 +482,7 @@
</property>
</widget>
</item>
- <item row="2" column="4">
+ <item row="2" column="6">
<widget class="QLabel" name="label_new_title_line2">
<property name="maximumSize">
<size>
@@ -498,7 +498,7 @@
</property>
</widget>
</item>
- <item row="4" column="3">
+ <item row="4" column="5">
<widget class="QLineEdit" name="lineEdit_setpoint_current_y">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -525,7 +525,7 @@
</property>
</widget>
</item>
- <item row="3" column="3">
+ <item row="3" column="5">
<widget class="QLineEdit" name="lineEdit_setpoint_current_x">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -552,7 +552,7 @@
</property>
</widget>
</item>
- <item row="2" column="3">
+ <item row="2" column="5">
<widget class="QLabel" name="label_current_title_line2">
<property name="maximumSize">
<size>
@@ -568,7 +568,7 @@
</property>
</widget>
</item>
- <item row="5" column="3">
+ <item row="5" column="5">
<widget class="QLineEdit" name="lineEdit_setpoint_current_z">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -595,7 +595,7 @@
</property>
</widget>
</item>
- <item row="5" column="2">
+ <item row="5" column="4">
<widget class="QLineEdit" name="lineEdit_error_z">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -622,7 +622,7 @@
</property>
</widget>
</item>
- <item row="6" column="2">
+ <item row="6" column="4">
<widget class="QLineEdit" name="lineEdit_error_yaw">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -649,7 +649,7 @@
</property>
</widget>
</item>
- <item row="6" column="1">
+ <item row="6" column="3">
<widget class="QLabel" name="label_row_yaw">
<property name="maximumSize">
<size>
@@ -665,7 +665,7 @@
</property>
</widget>
</item>
- <item row="2" column="2">
+ <item row="2" column="4">
<widget class="QLabel" name="label_error_title_line2">
<property name="maximumSize">
<size>
@@ -681,7 +681,7 @@
</property>
</widget>
</item>
- <item row="3" column="8">
+ <item row="3" column="10">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QPushButton" name="x_increment_minus_button">
@@ -744,7 +744,7 @@
</item>
</layout>
</item>
- <item row="0" column="3">
+ <item row="0" column="5">
<widget class="QLabel" name="label_current_title">
<property name="maximumSize">
<size>
@@ -766,7 +766,7 @@
</property>
</widget>
</item>
- <item row="2" column="8">
+ <item row="2" column="10">
<widget class="QLabel" name="label_increment_title_line2">
<property name="maximumSize">
<size>
@@ -782,7 +782,7 @@
</property>
</widget>
</item>
- <item row="6" column="4">
+ <item row="6" column="6">
<widget class="QLineEdit" name="lineEdit_setpoint_new_yaw">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -806,7 +806,7 @@
</property>
</widget>
</item>
- <item row="0" column="4">
+ <item row="0" column="6">
<widget class="QLabel" name="label_new_title">
<property name="maximumSize">
<size>
@@ -828,7 +828,7 @@
</property>
</widget>
</item>
- <item row="7" column="3">
+ <item row="7" column="5">
<widget class="QPushButton" name="default_setpoint_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -847,7 +847,7 @@
</property>
</widget>
</item>
- <item row="7" column="4">
+ <item row="7" column="6">
<widget class="QPushButton" name="set_setpoint_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -866,7 +866,7 @@
</property>
</widget>
</item>
- <item row="3" column="0">
+ <item row="3" column="1">
<widget class="QLineEdit" name="lineEdit_measured_x">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -890,7 +890,7 @@
</property>
</widget>
</item>
- <item row="0" column="0">
+ <item row="0" column="1">
<widget class="QLabel" name="label_measured_title">
<property name="font">
<font>
@@ -906,17 +906,14 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_measured_title_line2">
+ <item row="7" column="3">
+ <widget class="QLabel" name="label_row_pitch">
<property name="text">
- <string>Position</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
+ <string>pitch [deg]</string>
</property>
</widget>
</item>
- <item row="4" column="0">
+ <item row="4" column="1">
<widget class="QLineEdit" name="lineEdit_measured_y">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -940,14 +937,7 @@
</property>
</widget>
</item>
- <item row="7" column="1">
- <widget class="QLabel" name="label_row_pitch">
- <property name="text">
- <string>pitch [deg]</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
+ <item row="5" column="1">
<widget class="QLineEdit" name="lineEdit_measured_z">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -971,7 +961,7 @@
</property>
</widget>
</item>
- <item row="8" column="1">
+ <item row="8" column="3">
<widget class="QLabel" name="label_row_roll">
<property name="text">
<string>roll [deg]</string>
@@ -981,7 +971,7 @@
</property>
</widget>
</item>
- <item row="6" column="0">
+ <item row="6" column="1">
<widget class="QLineEdit" name="lineEdit_measured_yaw">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -1005,7 +995,7 @@
</property>
</widget>
</item>
- <item row="7" column="0">
+ <item row="7" column="1">
<widget class="QLineEdit" name="lineEdit_measured_pitch">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -1029,7 +1019,7 @@
</property>
</widget>
</item>
- <item row="8" column="0">
+ <item row="8" column="1">
<widget class="QLineEdit" name="lineEdit_measured_roll">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -1053,7 +1043,7 @@
</property>
</widget>
</item>
- <item row="9" column="0">
+ <item row="10" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -1066,6 +1056,85 @@
</property>
</spacer>
</item>
+ <item row="2" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QFrame" name="red_frame_position_left">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>10</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background-color:red;</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_measured_title_line2">
+ <property name="text">
+ <string>Position</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QFrame" name="red_frame_position_right">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>10</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background-color:red;</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
<resources/>
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/studentcontrollertab.ui b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/studentcontrollertab.ui
index 0360a46ed15cb788964dbe9bd8219edd707d4dbf..c21c48a5b41af18fb2d9b569a888e1cd503b4b69 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/studentcontrollertab.ui
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/studentcontrollertab.ui
@@ -19,61 +19,8 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="1" column="6">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Setpoint</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item row="7" column="1">
- <widget class="QLabel" name="label_row_pitch">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>60</height>
- </size>
- </property>
- <property name="text">
- <string>pitch [deg]</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLineEdit" name="lineEdit_measured_z">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>180</width>
- <height>60</height>
- </size>
- </property>
- <property name="font">
- <font>
- <family>Courier</family>
- </font>
- </property>
- <property name="text">
- <string>xx.xx</string>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLineEdit" name="lineEdit_measured_x">
+ <item row="5" column="3">
+ <widget class="QLineEdit" name="lineEdit_error_yaw">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -100,60 +47,128 @@
</widget>
</item>
<item row="2" column="7">
- <spacer name="horizontalSpacer">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="x_increment_minus_button">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineEdit_setpoint_increment_x">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>140</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <family>Courier</family>
+ </font>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="x_increment_plus_button">
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>+</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="6">
+ <spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
+ <width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
- <item row="8" column="0">
- <widget class="QLineEdit" name="lineEdit_measured_roll">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <item row="5" column="2">
+ <widget class="QLabel" name="label_row_yaw">
<property name="maximumSize">
<size>
- <width>180</width>
+ <width>16777215</width>
<height>60</height>
</size>
</property>
+ <property name="text">
+ <string>yaw [deg]</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="4">
+ <widget class="QLabel" name="label_current_title">
<property name="font">
<font>
- <family>Courier</family>
+ <weight>75</weight>
+ <bold>true</bold>
</font>
</property>
<property name="text">
- <string>xx.xx</string>
+ <string>Current</string>
</property>
- <property name="readOnly">
- <bool>true</bool>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
</property>
</widget>
</item>
- <item row="9" column="0">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <item row="0" column="1">
+ <widget class="QLabel" name="label_measured_title">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
+ <property name="text">
+ <string>Measured</string>
</property>
- </spacer>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
</item>
- <item row="4" column="2">
- <widget class="QLineEdit" name="lineEdit_error_z">
+ <item row="7" column="4">
+ <widget class="QPushButton" name="default_setpoint_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -166,20 +181,12 @@
<height>60</height>
</size>
</property>
- <property name="font">
- <font>
- <family>Courier</family>
- </font>
- </property>
<property name="text">
- <string>xx.xx</string>
- </property>
- <property name="readOnly">
- <bool>true</bool>
+ <string>Default</string>
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="3" column="2">
<widget class="QLabel" name="label_row_y">
<property name="maximumSize">
<size>
@@ -195,8 +202,8 @@
</property>
</widget>
</item>
- <item row="2" column="3">
- <widget class="QLineEdit" name="lineEdit_setpoint_current_x">
+ <item row="4" column="5">
+ <widget class="QLineEdit" name="lineEdit_setpoint_new_z">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -214,16 +221,10 @@
<family>Courier</family>
</font>
</property>
- <property name="text">
- <string>xx.xx</string>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QLabel" name="label_row_z">
+ <item row="8" column="2">
+ <widget class="QLabel" name="label_row_roll">
<property name="maximumSize">
<size>
<width>16777215</width>
@@ -231,52 +232,25 @@
</size>
</property>
<property name="text">
- <string>z [m]</string>
+ <string>roll [deg]</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
- <item row="5" column="0">
- <widget class="QLineEdit" name="lineEdit_measured_yaw">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>180</width>
- <height>60</height>
- </size>
- </property>
- <property name="font">
- <font>
- <family>Courier</family>
- </font>
- </property>
- <property name="text">
- <string>xx.xx</string>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_measured_title_line2">
+ <item row="1" column="5">
+ <widget class="QLabel" name="label_new_title_line2">
<property name="text">
- <string>Position</string>
+ <string>Setpoint</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLineEdit" name="lineEdit_measured_y">
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="lineEdit_measured_x">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -302,33 +276,91 @@
</property>
</widget>
</item>
- <item row="5" column="1">
- <widget class="QLabel" name="label_row_yaw">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>60</height>
- </size>
+ <item row="0" column="5">
+ <widget class="QLabel" name="label_new_title">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
<property name="text">
- <string>yaw [deg]</string>
+ <string>New</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
- <item row="2" column="2">
- <widget class="QLineEdit" name="lineEdit_error_x">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>180</width>
+ <item row="4" column="7">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QPushButton" name="z_increment_minus_button">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineEdit_setpoint_increment_z">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>140</width>
+ <height>60</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="z_increment_plus_button">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>+</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="3">
+ <widget class="QLineEdit" name="lineEdit_error_x">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>180</width>
<height>60</height>
</size>
</property>
@@ -345,8 +377,8 @@
</property>
</widget>
</item>
- <item row="5" column="2">
- <widget class="QLineEdit" name="lineEdit_error_yaw">
+ <item row="3" column="3">
+ <widget class="QLineEdit" name="lineEdit_error_y">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -372,40 +404,124 @@
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QLabel" name="label_row_x">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>60</height>
- </size>
- </property>
- <property name="text">
- <string>x [m]</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
+ <item row="5" column="7">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QPushButton" name="yaw_increment_minus_button">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineEdit_setpoint_increment_yaw">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>140</width>
+ <height>60</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="yaw_increment_plus_button">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>+</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="8" column="1">
- <widget class="QLabel" name="label_row_roll">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>60</height>
- </size>
- </property>
- <property name="text">
- <string>roll [deg]</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
+ <item row="3" column="7">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QPushButton" name="y_increment_minus_button">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineEdit_setpoint_increment_y">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>140</width>
+ <height>60</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="y_increment_plus_button">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>+</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_measured_title">
+ <item row="0" column="3">
+ <widget class="QLabel" name="label_error_title">
<property name="font">
<font>
<weight>75</weight>
@@ -413,15 +529,15 @@
</font>
</property>
<property name="text">
- <string>Measured</string>
+ <string>Error</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
- <item row="7" column="0">
- <widget class="QLineEdit" name="lineEdit_measured_pitch">
+ <item row="7" column="5">
+ <widget class="QPushButton" name="set_setpoint_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -434,21 +550,23 @@
<height>60</height>
</size>
</property>
- <property name="font">
- <font>
- <family>Courier</family>
- </font>
+ <property name="text">
+ <string>Set New</string>
</property>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <widget class="QLabel" name="label_error_title_line2">
<property name="text">
- <string>xx.xx</string>
+ <string>meas-ref</string>
</property>
- <property name="readOnly">
- <bool>true</bool>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
</property>
</widget>
</item>
- <item row="3" column="2">
- <widget class="QLineEdit" name="lineEdit_error_y">
+ <item row="2" column="5">
+ <widget class="QLineEdit" name="lineEdit_setpoint_new_x">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -466,16 +584,10 @@
<family>Courier</family>
</font>
</property>
- <property name="text">
- <string>xx.xx</string>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
</widget>
</item>
- <item row="2" column="4">
- <widget class="QLineEdit" name="lineEdit_setpoint_new_x">
+ <item row="5" column="5">
+ <widget class="QLineEdit" name="lineEdit_setpoint_new_yaw">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -495,8 +607,8 @@
</property>
</widget>
</item>
- <item row="3" column="3">
- <widget class="QLineEdit" name="lineEdit_setpoint_current_y">
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="lineEdit_measured_z">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -522,8 +634,31 @@
</property>
</widget>
</item>
- <item row="4" column="3">
- <widget class="QLineEdit" name="lineEdit_setpoint_current_z">
+ <item row="2" column="8">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="7">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Setpoint</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="QLineEdit" name="lineEdit_measured_roll">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -549,8 +684,8 @@
</property>
</widget>
</item>
- <item row="5" column="3">
- <widget class="QLineEdit" name="lineEdit_setpoint_current_yaw">
+ <item row="7" column="1">
+ <widget class="QLineEdit" name="lineEdit_measured_pitch">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -576,7 +711,39 @@
</property>
</widget>
</item>
- <item row="3" column="4">
+ <item row="7" column="2">
+ <widget class="QLabel" name="label_row_pitch">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>pitch [deg]</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="QLabel" name="label_row_x">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>x [m]</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="5">
<widget class="QLineEdit" name="lineEdit_setpoint_new_y">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -597,8 +764,8 @@
</property>
</widget>
</item>
- <item row="4" column="4">
- <widget class="QLineEdit" name="lineEdit_setpoint_new_z">
+ <item row="3" column="4">
+ <widget class="QLineEdit" name="lineEdit_setpoint_current_y">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -616,10 +783,39 @@
<family>Courier</family>
</font>
</property>
+ <property name="text">
+ <string>xx.xx</string>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
</widget>
</item>
+ <item row="1" column="4">
+ <widget class="QLabel" name="label_current_title_2">
+ <property name="text">
+ <string>Setpoint</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="1">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item row="5" column="4">
- <widget class="QLineEdit" name="lineEdit_setpoint_new_yaw">
+ <widget class="QLineEdit" name="lineEdit_setpoint_current_yaw">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -637,10 +833,16 @@
<family>Courier</family>
</font>
</property>
+ <property name="text">
+ <string>xx.xx</string>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
</widget>
</item>
- <item row="7" column="3">
- <widget class="QPushButton" name="default_setpoint_button">
+ <item row="4" column="4">
+ <widget class="QLineEdit" name="lineEdit_setpoint_current_z">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -653,13 +855,37 @@
<height>60</height>
</size>
</property>
+ <property name="font">
+ <font>
+ <family>Courier</family>
+ </font>
+ </property>
<property name="text">
- <string>Default</string>
+ <string>xx.xx</string>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
</property>
</widget>
</item>
- <item row="7" column="4">
- <widget class="QPushButton" name="set_setpoint_button">
+ <item row="4" column="2">
+ <widget class="QLabel" name="label_row_z">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>z [m]</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="lineEdit_measured_y">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -672,347 +898,178 @@
<height>60</height>
</size>
</property>
- <property name="text">
- <string>Set New</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QLabel" name="label_error_title">
<property name="font">
<font>
- <weight>75</weight>
- <bold>true</bold>
+ <family>Courier</family>
</font>
</property>
<property name="text">
- <string>Error</string>
+ <string>xx.xx</string>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
+ <property name="readOnly">
+ <bool>true</bool>
</property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="QLabel" name="label_error_title_line2">
- <property name="text">
- <string>meas-ref</string>
+ <item row="5" column="1">
+ <widget class="QLineEdit" name="lineEdit_measured_yaw">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
+ <property name="maximumSize">
+ <size>
+ <width>180</width>
+ <height>60</height>
+ </size>
</property>
- </widget>
- </item>
- <item row="0" column="3">
- <widget class="QLabel" name="label_current_title">
<property name="font">
<font>
- <weight>75</weight>
- <bold>true</bold>
+ <family>Courier</family>
</font>
</property>
<property name="text">
- <string>Current</string>
+ <string>xx.xx</string>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
+ <property name="readOnly">
+ <bool>true</bool>
</property>
</widget>
</item>
- <item row="1" column="3">
- <widget class="QLabel" name="label_current_title_2">
- <property name="text">
- <string>Setpoint</string>
+ <item row="2" column="4">
+ <widget class="QLineEdit" name="lineEdit_setpoint_current_x">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
+ <property name="maximumSize">
+ <size>
+ <width>180</width>
+ <height>60</height>
+ </size>
</property>
- </widget>
- </item>
- <item row="0" column="4">
- <widget class="QLabel" name="label_new_title">
<property name="font">
<font>
- <weight>75</weight>
- <bold>true</bold>
+ <family>Courier</family>
</font>
</property>
<property name="text">
- <string>New</string>
+ <string>xx.xx</string>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
+ <property name="readOnly">
+ <bool>true</bool>
</property>
</widget>
</item>
- <item row="1" column="4">
- <widget class="QLabel" name="label_new_title_line2">
+ <item row="0" column="7">
+ <widget class="QLabel" name="label_2">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
<property name="text">
- <string>Setpoint</string>
+ <string>Increment</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
- <item row="2" column="5">
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <item row="4" column="3">
+ <widget class="QLineEdit" name="lineEdit_error_z">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="sizeHint" stdset="0">
+ <property name="maximumSize">
<size>
- <width>20</width>
- <height>20</height>
+ <width>180</width>
+ <height>60</height>
</size>
</property>
- </spacer>
- </item>
- <item row="0" column="6">
- <widget class="QLabel" name="label_2">
<property name="font">
<font>
- <weight>75</weight>
- <bold>true</bold>
+ <family>Courier</family>
</font>
</property>
<property name="text">
- <string>Increment</string>
+ <string>xx.xx</string>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
+ <property name="readOnly">
+ <bool>true</bool>
</property>
</widget>
</item>
- <item row="2" column="6">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QPushButton" name="x_increment_minus_button">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>60</width>
- <height>60</height>
- </size>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lineEdit_setpoint_increment_x">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>140</width>
- <height>60</height>
- </size>
- </property>
- <property name="font">
- <font>
- <family>Courier</family>
- </font>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="x_increment_plus_button">
- <property name="maximumSize">
- <size>
- <width>60</width>
- <height>60</height>
- </size>
- </property>
- <property name="text">
- <string>+</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="3" column="6">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QPushButton" name="y_increment_minus_button">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>60</width>
- <height>60</height>
- </size>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lineEdit_setpoint_increment_y">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>140</width>
- <height>60</height>
- </size>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="y_increment_plus_button">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>60</width>
- <height>60</height>
- </size>
- </property>
- <property name="text">
- <string>+</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="4" column="6">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item row="1" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
<item>
- <widget class="QPushButton" name="z_increment_minus_button">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <widget class="QFrame" name="red_frame_position_left">
<property name="maximumSize">
<size>
- <width>60</width>
- <height>60</height>
+ <width>10</width>
+ <height>16777215</height>
</size>
</property>
- <property name="text">
- <string>-</string>
+ <property name="styleSheet">
+ <string notr="true">background-color:red;</string>
</property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lineEdit_setpoint_increment_z">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
</property>
- <property name="maximumSize">
- <size>
- <width>140</width>
- <height>60</height>
- </size>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="z_increment_plus_button">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>60</width>
- <height>60</height>
- </size>
- </property>
+ <widget class="QLabel" name="label_measured_title_line2">
<property name="text">
- <string>+</string>
+ <string>Position</string>
</property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="5" column="6">
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QPushButton" name="yaw_increment_minus_button">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>60</width>
- <height>60</height>
- </size>
- </property>
- <property name="text">
- <string>-</string>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="lineEdit_setpoint_increment_yaw">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <widget class="QFrame" name="red_frame_position_right">
<property name="maximumSize">
<size>
- <width>140</width>
- <height>60</height>
+ <width>10</width>
+ <height>16777215</height>
</size>
</property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="yaw_increment_plus_button">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="styleSheet">
+ <string notr="true">background-color:red;</string>
</property>
- <property name="maximumSize">
- <size>
- <width>60</width>
- <height>60</height>
- </size>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
</property>
- <property name="text">
- <string>+</string>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
</property>
</widget>
</item>
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_unavailable.png b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_unavailable.png
new file mode 100644
index 0000000000000000000000000000000000000000..71765cfe18b1d7a915b7f92daf06df3b6558521f
Binary files /dev/null and b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_unavailable.png differ
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_unavilable.png b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_unavilable.png
new file mode 100644
index 0000000000000000000000000000000000000000..60f6878b603abc0ba5dd375765ff06ad36a397ab
Binary files /dev/null and b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_unavilable.png differ
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/defaultcontrollertab.h b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/defaultcontrollertab.h
index 6ee01b2e9fa1014ddd365afb69d8e19c3f5eaacd..7c1fde73cfd8d8d98a30ffe41d5a8383efd41f7c 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/defaultcontrollertab.h
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/defaultcontrollertab.h
@@ -28,7 +28,7 @@
#else
// Include the shared definitions
-//#include "include/Constants_for_Qt_compile.h"
+#include "include/Constants_for_Qt_compile.h"
#endif
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/connectstartstopbar.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/connectstartstopbar.cpp
index f06c2875ca74a81dcc49b2c814ace81774dfccbd..107748a6d81ffa2f0e1ef63dc0ce714775c1a28d 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/connectstartstopbar.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/connectstartstopbar.cpp
@@ -391,7 +391,7 @@ void ConnectStartStopBar::setBatteryImageBasedOnLevel(int battery_level)
case BATTERY_LEVEL_UNAVAILABLE:
{
new_image_index = BATTERY_LABEL_IMAGE_INDEX_UNVAILABLE;
- qstr_new_image.append("battery_unknown.png");
+ qstr_new_image.append("battery_unavailable.png");
break;
}
default:
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/coordinatorrow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/coordinatorrow.cpp
index da14cfc034e209038cee6723ebc1ceda509f00cb..0b1f05ce8231ad23b418eafe7131b6b3a26c63e1 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/coordinatorrow.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/coordinatorrow.cpp
@@ -451,7 +451,7 @@ void CoordinatorRow::setBatteryImageBasedOnLevel(int battery_level)
case BATTERY_LEVEL_UNAVAILABLE:
{
new_image_index = BATTERY_LABEL_IMAGE_INDEX_UNVAILABLE;
- qstr_new_image.append("battery_unknown.png");
+ qstr_new_image.append("battery_unavailable.png");
break;
}
default:
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/defaultcontrollertab.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/defaultcontrollertab.cpp
index 3b2c3896bd805e9a5bb31530a7df1848718d33a5..cd3a84eef78c3d6e54342ea72cfe76c40884edfc 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/defaultcontrollertab.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/defaultcontrollertab.cpp
@@ -7,6 +7,11 @@ DefaultControllerTab::DefaultControllerTab(QWidget *parent) :
{
ui->setupUi(this);
+ // Hide the two red frames that are used to indcated
+ // when pose data is occluded
+ ui->red_frame_position_left->setVisible(false);
+ ui->red_frame_position_right->setVisible(false);
+
#ifdef CATKIN_MAKE
@@ -87,11 +92,20 @@ void DefaultControllerTab::setMeasuredPose(float x , float y , float z , float r
if (error_yaw < 0.0f) qstr = ""; else qstr = "+";
ui->lineEdit_error_yaw->setText(qstr + QString::number( error_yaw * RAD2DEG, 'f', 1));
+
+ // Ensure the red frames are not visible
+ if ( ui->red_frame_position_left->isVisible() )
+ ui->red_frame_position_left->setVisible(true);
+ if ( ui->red_frame_position_right->isVisible() )
+ ui->red_frame_position_right->setVisible(true);
}
else
{
- //ui->label_measured_title->setTextColor(Qt::green);
- //ui->label_measured_title_line2
+ // Make visible the red frames to indicate occluded
+ if ( !(ui->red_frame_position_left->isVisible()) )
+ ui->red_frame_position_left->setVisible(true);
+ if ( !(ui->red_frame_position_right->isVisible()) )
+ ui->red_frame_position_right->setVisible(true);
}
}
@@ -534,4 +548,4 @@ bool DefaultControllerTab::getTypeAndIDParameters()
// Return
return return_was_successful;
}
-#endif
\ No newline at end of file
+#endif