From 66a57af569a6ef224628b3dc89b82f779d50fc92 Mon Sep 17 00:00:00 2001
From: beuchatp <beuchatp@control.ee.ethz.ch>
Date: Mon, 17 Dec 2018 18:51:48 +0100
Subject: [PATCH] Added things to GUI: red rectangles to indicated an occluded
measurement, and unavailable image for battery and flying state
---
.../GUI_Qt/flyingAgentGUI/flyingagentgui.qrc | 6 +-
.../forms/defaultcontrollertab.ui | 177 ++-
.../forms/studentcontrollertab.ui | 1037 +++++++++--------
.../images/battery_unavailable.png | Bin 0 -> 2775 bytes
.../images/flying_state_unavilable.png | Bin 0 -> 4797 bytes
.../include/defaultcontrollertab.h | 2 +-
.../src/connectstartstopbar.cpp | 2 +-
.../flyingAgentGUI/src/coordinatorrow.cpp | 2 +-
.../src/defaultcontrollertab.cpp | 20 +-
9 files changed, 694 insertions(+), 552 deletions(-)
create mode 100644 pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_unavailable.png
create mode 100644 pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_unavilable.png
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 0f6e7d8e..ebe28271 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 46a0ee55..64921ccc 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 0360a46e..c21c48a5 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
GIT binary patch
literal 2775
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
literal 0
HcmV?d00001
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
GIT binary patch
literal 4797
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
Xor1sWxHYe500000NkvXXu0mjfcNGNh
literal 0
HcmV?d00001
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 6ee01b2e..7c1fde73 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 f06c2875..107748a6 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 da14cfc0..0b1f05ce 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 3b2c3896..cd3a84ee 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
--
GitLab