Commit 929383ba authored by beuchatp's avatar beuchatp
Browse files

Added first draft of the new Tuning GUI. Needs connecting in Qt and in ROS

parent 27872271
......@@ -27,7 +27,8 @@ SOURCES += src/main.cpp\
src/coordinatorrow.cpp \
src/studentcontrollertab.cpp \
src/defaultcontrollertab.cpp \
src/pickercontrollertab.cpp
src/pickercontrollertab.cpp \
src/tuningcontrollertab.cpp
HEADERS += include/mainwindow.h \
include/topbanner.h \
......@@ -40,8 +41,10 @@ HEADERS += include/mainwindow.h \
include/studentcontrollertab.h \
include/defaultcontrollertab.h \
include/pickercontrollertab.h \
include/tuningcontrollertab.h \
include/Constants_for_Qt_compile.h
FORMS += forms/mainwindow.ui \
forms/topbanner.ui \
forms/connectstartstopbar.ui \
......@@ -52,7 +55,8 @@ FORMS += forms/mainwindow.ui \
forms/coordinatorrow.ui \
forms/studentcontrollertab.ui \
forms/defaultcontrollertab.ui \
forms/pickercontrollertab.ui
forms/pickercontrollertab.ui \
forms/tuningcontrollertab.ui
RESOURCES += \
flyingagentgui.qrc
......@@ -28,7 +28,7 @@
<item row="0" column="0">
<widget class="QTabWidget" name="controller_tabs_widget">
<property name="currentIndex">
<number>0</number>
<number>3</number>
</property>
<property name="movable">
<bool>true</bool>
......@@ -63,13 +63,23 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tuning_tab">
<attribute name="title">
<string>Tuning</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
<widget class="TuningControllerTab" name="tuning_controller_tab_widget" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="safe_tab">
<attribute name="title">
<string>Safe</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="SafeControllerTab" name="widget_2" native="true"/>
<widget class="SafeControllerTab" name="safe_controller_tab_widget" native="true"/>
</item>
</layout>
</widget>
......@@ -102,6 +112,12 @@
<header>pickercontrollertab.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>TuningControllerTab</class>
<extends>QWidget</extends>
<header>tuningcontrollertab.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
......
......@@ -30,8 +30,8 @@
<property name="spacing">
<number>12</number>
</property>
<item row="0" column="4">
<widget class="QPushButton" name="enable_safe_button">
<item row="0" column="2">
<widget class="QPushButton" name="enable_student_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -57,12 +57,12 @@
</font>
</property>
<property name="text">
<string>Safe</string>
<string>Student</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="enable_controller_label">
<item row="1" column="0">
<widget class="QLabel" name="load_yaml_label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -88,15 +88,28 @@
</font>
</property>
<property name="text">
<string>Enable</string>
<string>Load YAML</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="enable_default_button">
<item row="0" column="6">
<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="0" column="5">
<widget class="QPushButton" name="enable_safe_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -122,46 +135,37 @@
</font>
</property>
<property name="text">
<string>Default</string>
<string>Safe</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="load_yaml_label">
<item row="1" column="3">
<widget class="QPushButton" name="load_yaml_picker_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<width>60</width>
<height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<width>180</width>
<height>50</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Load YAML</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<string>Picker</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QPushButton" name="load_yaml_safe_button">
<item row="1" column="2">
<widget class="QPushButton" name="load_yaml_student_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -181,12 +185,12 @@
</size>
</property>
<property name="text">
<string>Safe</string>
<string>Student</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="load_yaml_default_button">
<item row="0" column="1">
<widget class="QPushButton" name="enable_default_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -205,13 +209,53 @@
<height>50</height>
</size>
</property>
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Default</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="load_yaml_student_button">
<item row="0" column="0">
<widget class="QLabel" name="enable_controller_label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>50</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Enable</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QPushButton" name="load_yaml_safe_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -231,12 +275,12 @@
</size>
</property>
<property name="text">
<string>Student</string>
<string>Safe</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="enable_student_button">
<item row="1" column="1">
<widget class="QPushButton" name="load_yaml_default_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -255,14 +299,8 @@
<height>50</height>
</size>
</property>
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Student</string>
<string>Default</string>
</property>
</widget>
</item>
......@@ -297,8 +335,8 @@
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="load_yaml_picker_button">
<item row="0" column="4">
<widget class="QPushButton" name="enable_tuning_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -318,22 +356,34 @@
</size>
</property>
<property name="text">
<string>Picker</string>
<string>Tuning</string>
</property>
</widget>
</item>
<item row="0" column="5">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<item row="1" column="4">
<widget class="QPushButton" name="load_yaml_tuning_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeHint" stdset="0">
<property name="minimumSize">
<size>
<width>40</width>
<height>20</height>
<width>60</width>
<height>50</height>
</size>
</property>
</spacer>
<property name="maximumSize">
<size>
<width>180</width>
<height>50</height>
</size>
</property>
<property name="text">
<string>Tuning</string>
</property>
</widget>
</item>
</layout>
</item>
......
......@@ -213,6 +213,7 @@
<addaction name="action_showHideController_default"/>
<addaction name="action_showHideController_student"/>
<addaction name="action_showHideController_picker"/>
<addaction name="action_showHideController_tuning"/>
<addaction name="action_showHideController_safe"/>
</widget>
<addaction name="menuFile"/>
......@@ -290,6 +291,17 @@
<string>Safe</string>
</property>
</action>
<action name="action_showHideController_tuning">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>Tuning</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
......
......@@ -88,6 +88,9 @@
<height>60</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="2">
......@@ -174,6 +177,9 @@
<height>60</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="2">
......@@ -190,6 +196,9 @@
<height>60</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="3">
......@@ -206,6 +215,9 @@
<height>60</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="4">
......@@ -222,6 +234,9 @@
<height>60</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
......@@ -278,6 +293,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -438,6 +456,9 @@
<family>Courier</family>
</font>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
......@@ -493,6 +514,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -520,6 +544,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -563,6 +590,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -590,6 +620,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -617,6 +650,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -644,6 +680,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -784,6 +823,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -811,6 +853,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -838,6 +883,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -881,6 +929,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -908,6 +959,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -935,6 +989,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -962,6 +1019,9 @@
<property name="text">
<string>xx.xx</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
......@@ -1002,6 +1062,9 @@
<family>Courier</family>
</font>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="7" column="4">
......@@ -1042,6 +1105,9 @@
<family>Courier</family>
</font>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="4">
......@@ -1063,6 +1129,9 @@
<family>Courier</family>
</font>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="3" column="4">
......@@ -1084,6 +1153,9 @@
<family>Courier</family>
</font>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>