Skip to content

GitLab

To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit be3de539 authored by beuchatp's avatar beuchatp
Browse files

Added new tabs to the flying agent GUI as separate classes. The classes still... 

Added new tabs to the flying agent GUI as separate classes. The classes still need to be implemented
parent 58bbf543
Expand all Hide whitespace changes
Inline Side-by-side
pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/flyingAgentGUI.pro
View file @ be3de539
......@@ -24,7 +24,10 @@ SOURCES += src/main.cpp\
src/controllertabs.cpp \
src/safecontrollertab.cpp \
src/coordinator.cpp \
src/coordinatorrow.cpp
src/coordinatorrow.cpp \
src/studentcontrollertab.cpp \
src/defaultcontrollertab.cpp \
src/pickercontrollertab.cpp
HEADERS += include/mainwindow.h \
include/topbanner.h \
......@@ -33,7 +36,10 @@ HEADERS += include/mainwindow.h \
include/controllertabs.h \
include/safecontrollertab.h \
include/coordinator.h \
include/coordinatorrow.h
include/coordinatorrow.h \
include/studentcontrollertab.h \
include/defaultcontrollertab.h \
include/pickercontrollertab.h
FORMS += forms/mainwindow.ui \
forms/topbanner.ui \
......@@ -42,7 +48,10 @@ FORMS += forms/mainwindow.ui \
forms/controllertabs.ui \
forms/safecontrollertab.ui \
forms/coordinator.ui \
forms/coordinatorrow.ui
forms/coordinatorrow.ui \
forms/studentcontrollertab.ui \
forms/defaultcontrollertab.ui \
forms/pickercontrollertab.ui
RESOURCES += \
flyingagentgui.qrc
pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/controllertabs.ui
View file @ be3de539
......@@ -28,32 +28,47 @@
<item row="0" column="0">
<widget class="QTabWidget" name="controller_tabs_widget">
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="safe_tab">
<widget class="QWidget" name="default_tab">
<attribute name="title">
<string>Safe</string>
<string>Default</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="SafeControllerTab" name="widget" native="true"/>
<widget class="DefaultControllerTab" name="widget" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="demo_tab">
<widget class="QWidget" name="student_tab">
<attribute name="title">
<string>Demo</string>
<string>Student</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="StudentControllerTab" name="widget_3" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="student_tab">
<widget class="QWidget" name="picker_tab">
<attribute name="title">
<string>Student</string>
<string>Picker</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="PickerControllerTab" name="widget_4" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="mpc_tab">
<widget class="QWidget" name="safe_tab">
<attribute name="title">
<string>MPC</string>
<string>Safe</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="SafeControllerTab" name="widget_2" native="true"/>
</item>
</layout>
</widget>
</widget>
</item>
......@@ -66,6 +81,24 @@
<header>safecontrollertab.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>StudentControllerTab</class>
<extends>QWidget</extends>
<header>studentcontrollertab.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>DefaultControllerTab</class>
<extends>QWidget</extends>
<header>defaultcontrollertab.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>PickerControllerTab</class>
<extends>QWidget</extends>
<header>pickercontrollertab.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
......
pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/enablecontrollerloadyamlbar.ui
View file @ be3de539
......@@ -27,6 +27,62 @@
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="7" column="1">
<widget class="QPushButton" name="load_yaml_safe_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>180</width>
<height>40</height>
</size>
</property>
<property name="text">
<string>Safe</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QPushButton" name="enable_safe_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>180</width>
<height>40</height>
</size>
</property>
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Safe</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="enable_controller_top_label">
<property name="sizePolicy">
......@@ -95,7 +151,7 @@
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QPushButton" name="load_yaml_demo_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
......@@ -120,7 +176,7 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QPushButton" name="enable_demo_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
......@@ -151,32 +207,7 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="load_yaml_safe_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>180</width>
<height>40</height>
</size>
</property>
<property name="text">
<string>Safe</string>
</property>
</widget>
</item>
<item row="6" column="0">
<item row="8" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
......@@ -257,8 +288,8 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="enable_student_button">
<item row="2" column="0">
<widget class="QPushButton" name="enable_default_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -284,12 +315,12 @@
</font>
</property>
<property name="text">
<string>Student</string>
<string>Default</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QPushButton" name="load_yaml_student_button">
<item row="2" column="1">
<widget class="QPushButton" name="load_yaml_default_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -309,12 +340,12 @@
</size>
</property>
<property name="text">
<string>Student</string>
<string>Default</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QPushButton" name="enable_mpc_button">
<item row="3" column="0">
<widget class="QPushButton" name="enable_student_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -340,37 +371,12 @@
</font>
</property>
<property name="text">
<string>MPC</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="load_yaml_mpc_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>180</width>
<height>40</height>
</size>
</property>
<property name="text">
<string>MPC</string>
<string>Student</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="enable_safe_button">
<item row="3" column="1">
<widget class="QPushButton" name="load_yaml_student_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -389,14 +395,8 @@
<height>40</height>
</size>
</property>
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Safe</string>
<string>Student</string>
</property>
</widget>
</item>
......
pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/pickercontrollertab.ui 0 → 100644
View file @ be3de539
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>PickerControllerTab</class>
<widget class="QWidget" name="PickerControllerTab">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Picker</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/studentcontrollertab.ui 0 → 100644
View file @ be3de539
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>StudentControllerTab</class>
<widget class="QWidget" name="StudentControllerTab">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1366</width>
<height>703</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>16</pointsize>
</font>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<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>
</widget>
</item>
<item row="2" 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="2" column="5">
<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="8" column="0">
<widget class="QLineEdit" name="lineEdit_measured_yaw_2">
<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="9" 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="4" column="2">
<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="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="3" column="1">
<widget class="QLabel" name="label_row_y">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>y [m]</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QLineEdit" name="lineEdit_current_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="4" column="1">
<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="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>