Commit 176e00d9 authored by beuchatp's avatar beuchatp
Browse files

Prepared the Qt side of things for connecting the default and student...

Prepared the Qt side of things for connecting the default and student controller tabs with ROS. Next step is to add and test the ROS-side code
parent 41840a67
......@@ -28,7 +28,7 @@
<item row="0" column="0">
<widget class="QTabWidget" name="controller_tabs_widget">
<property name="currentIndex">
<number>3</number>
<number>2</number>
</property>
<widget class="QWidget" name="default_tab">
<attribute name="title">
......@@ -36,7 +36,7 @@
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="DefaultControllerTab" name="widget" native="true"/>
<widget class="DefaultControllerTab" name="default_controller_tab_widget" native="true"/>
</item>
</layout>
</widget>
......@@ -46,7 +46,7 @@
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="StudentControllerTab" name="widget_3" native="true"/>
<widget class="StudentControllerTab" name="student_controller_tab_widget" native="true"/>
</item>
</layout>
</widget>
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1545</width>
<height>632</height>
<width>1633</width>
<height>765</height>
</rect>
</property>
<property name="font">
......@@ -19,7 +19,7 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="10">
<item row="3" column="11">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
......@@ -32,7 +32,7 @@
</property>
</spacer>
</item>
<item row="5" column="2">
<item row="6" column="3">
<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="4" column="0">
<item row="5" column="1">
<widget class="QLabel" name="label_row_z">
<property name="maximumSize">
<size>
......@@ -75,7 +75,7 @@
</property>
</widget>
</item>
<item row="4" column="3">
<item row="5" column="4">
<widget class="QLineEdit" name="lineEdit_setpoint_new_z">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
......@@ -99,20 +99,7 @@
</property>
</widget>
</item>
<item row="7" column="0">
<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="2" column="1">
<item row="3" column="2">
<widget class="QLineEdit" name="lineEdit_error_x">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
......@@ -139,7 +126,7 @@
</property>
</widget>
</item>
<item row="0" column="1">
<item row="0" column="2">
<widget class="QLabel" name="label_error_title">
<property name="maximumSize">
<size>
......@@ -161,7 +148,7 @@
</property>
</widget>
</item>
<item row="2" column="3">
<item row="3" column="4">
<widget class="QLineEdit" name="lineEdit_setpoint_new_x">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
......@@ -185,7 +172,7 @@
</property>
</widget>
</item>
<item row="2" column="4">
<item row="3" column="5">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
......@@ -201,12 +188,12 @@
</property>
</spacer>
</item>
<item row="4" column="7">
<item row="5" column="8">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="z_increment_minus_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -225,7 +212,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_setpoint_increment_z">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -246,7 +233,7 @@
<item>
<widget class="QPushButton" name="z_increment_plus_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -264,7 +251,7 @@
</item>
</layout>
</item>
<item row="3" column="0">
<item row="4" column="1">
<widget class="QLabel" name="label_row_y">
<property name="maximumSize">
<size>
......@@ -280,7 +267,7 @@
</property>
</widget>
</item>
<item row="2" column="0">
<item row="3" column="1">
<widget class="QLabel" name="label_row_x">
<property name="maximumSize">
<size>
......@@ -296,12 +283,12 @@
</property>
</widget>
</item>
<item row="3" column="7">
<item row="4" column="8">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QPushButton" name="y_increment_minus_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -320,7 +307,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_setpoint_increment_y">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -341,7 +328,7 @@
<item>
<widget class="QPushButton" name="y_increment_plus_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -359,7 +346,7 @@
</item>
</layout>
</item>
<item row="3" column="3">
<item row="4" column="4">
<widget class="QLineEdit" name="lineEdit_setpoint_new_y">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
......@@ -383,7 +370,7 @@
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="2">
<widget class="QLineEdit" name="lineEdit_error_y">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
......@@ -410,12 +397,12 @@
</property>
</widget>
</item>
<item row="5" column="7">
<item row="6" column="8">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="yaw_increment_minus_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -434,7 +421,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_setpoint_increment_yaw">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -455,7 +442,7 @@
<item>
<widget class="QPushButton" name="yaw_increment_plus_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -473,7 +460,7 @@
</item>
</layout>
</item>
<item row="0" column="7">
<item row="0" column="8">
<widget class="QLabel" name="label_increment_title">
<property name="maximumSize">
<size>
......@@ -495,7 +482,7 @@
</property>
</widget>
</item>
<item row="1" column="3">
<item row="2" column="4">
<widget class="QLabel" name="label_new_title_line2">
<property name="maximumSize">
<size>
......@@ -511,7 +498,7 @@
</property>
</widget>
</item>
<item row="3" column="2">
<item row="4" column="3">
<widget class="QLineEdit" name="lineEdit_setpoint_current_y">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
......@@ -538,7 +525,7 @@
</property>
</widget>
</item>
<item row="2" column="2">
<item row="3" column="3">
<widget class="QLineEdit" name="lineEdit_setpoint_current_x">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
......@@ -565,7 +552,7 @@
</property>
</widget>
</item>
<item row="1" column="2">
<item row="2" column="3">
<widget class="QLabel" name="label_current_title_line2">
<property name="maximumSize">
<size>
......@@ -581,7 +568,7 @@
</property>
</widget>
</item>
<item row="4" column="2">
<item row="5" column="3">
<widget class="QLineEdit" name="lineEdit_setpoint_current_z">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
......@@ -608,7 +595,7 @@
</property>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="2">
<widget class="QLineEdit" name="lineEdit_error_z">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
......@@ -635,7 +622,7 @@
</property>
</widget>
</item>
<item row="5" column="1">
<item row="6" column="2">
<widget class="QLineEdit" name="lineEdit_error_yaw">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
......@@ -662,7 +649,7 @@
</property>
</widget>
</item>
<item row="5" column="0">
<item row="6" column="1">
<widget class="QLabel" name="label_row_yaw">
<property name="maximumSize">
<size>
......@@ -678,7 +665,7 @@
</property>
</widget>
</item>
<item row="1" column="1">
<item row="2" column="2">
<widget class="QLabel" name="label_error_title_line2">
<property name="maximumSize">
<size>
......@@ -687,19 +674,19 @@
</size>
</property>
<property name="text">
<string>(meas-ref)</string>
<string>meas-ref</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="7">
<item row="3" column="8">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QPushButton" name="x_increment_minus_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -718,7 +705,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_setpoint_increment_x">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -739,7 +726,7 @@
<item>
<widget class="QPushButton" name="x_increment_plus_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -757,7 +744,7 @@
</item>
</layout>
</item>
<item row="0" column="2">
<item row="0" column="3">
<widget class="QLabel" name="label_current_title">
<property name="maximumSize">
<size>
......@@ -779,7 +766,7 @@
</property>
</widget>
</item>
<item row="1" column="7">
<item row="2" column="8">
<widget class="QLabel" name="label_increment_title_line2">
<property name="maximumSize">
<size>
......@@ -795,7 +782,7 @@
</property>
</widget>
</item>
<item row="5" column="3">
<item row="6" column="4">
<widget class="QLineEdit" name="lineEdit_setpoint_new_yaw">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
......@@ -819,7 +806,7 @@
</property>
</widget>
</item>
<item row="0" column="3">
<item row="0" column="4">
<widget class="QLabel" name="label_new_title">
<property name="maximumSize">
<size>
......@@ -841,7 +828,7 @@
</property>
</widget>
</item>
<item row="6" column="2">
<item row="7" column="3">
<widget class="QPushButton" name="default_setpoint_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
......@@ -860,7 +847,7 @@
</property>
</widget>
</item>
<item row="6" column="3">
<item row="7" column="4">
<widget class="QPushButton" name="set_setpoint_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
......@@ -879,6 +866,206 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLineEdit" name="lineEdit_measured_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>
<property name="font">
<font>
<family>Courier</family>
</font>
</property>
<property name="text">
<string>xx.xx</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_measured_title">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Measured</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="0">
<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 row="4" column="0">
<widget class="QLineEdit" name="lineEdit_measured_y">
<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>
</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">
<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>
</widget>
</item>
<item row="8" column="1">
<widget class="QLabel" name="label_row_roll">
<property name="text">
<string>roll [deg]</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="6" 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>
</widget>
</item>
<item row="7" column="0">
<widget class="QLineEdit" name="lineEdit_measured_pitch">
<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>
</widget>
</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>
<property name="maximumSize">