From fad32a852f143b1609d97394439ba6625af0303a Mon Sep 17 00:00:00 2001
From: Paul Beuchat <beuchatp@control.ee.ethz.ch>
Date: Wed, 25 Apr 2018 07:20:08 +0200
Subject: [PATCH] Added enable and load yaml buttoms to gui
---
.../GUI_Qt/studentGUI/src/MainWindow.ui | 112 ++++++++++++++++--
1 file changed, 104 insertions(+), 8 deletions(-)
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.ui b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.ui
index 64e3f342..b7814a99 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.ui
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>1092</width>
- <height>701</height>
+ <width>1331</width>
+ <height>721</height>
</rect>
</property>
<property name="sizePolicy">
@@ -1791,6 +1791,54 @@
<property name="bottomMargin">
<number>6</number>
</property>
+ <item row="5" column="2">
+ <widget class="QPushButton" name="load_student_yaml_button">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>14</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Student</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QPushButton" name="enable_student_controller">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>14</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Student</string>
+ </property>
+ </widget>
+ </item>
<item row="0" column="2">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
@@ -1857,7 +1905,7 @@
</widget>
</item>
<item row="4" column="0">
- <widget class="QPushButton" name="en_custom_controller">
+ <widget class="QPushButton" name="enable_demo_controller">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -1880,7 +1928,7 @@
</property>
</widget>
</item>
- <item row="5" column="0">
+ <item row="7" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -1918,7 +1966,7 @@
</widget>
</item>
<item row="3" column="0">
- <widget class="QPushButton" name="en_safe_controller">
+ <widget class="QPushButton" name="enable_safe_controller">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -1942,7 +1990,7 @@
</widget>
</item>
<item row="4" column="2">
- <widget class="QPushButton" name="load_custom_yaml_button">
+ <widget class="QPushButton" name="load_demo_yaml_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -2002,7 +2050,7 @@
</property>
</widget>
</item>
- <item row="5" column="1">
+ <item row="7" column="1">
<widget class="Line" name="line_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -2023,6 +2071,54 @@
</property>
</widget>
</item>
+ <item row="6" column="0">
+ <widget class="QPushButton" name="enable_mpc_controller">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>14</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>MPC</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="2">
+ <widget class="QPushButton" name="load_mpc_yaml_button">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>14</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>MPC</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
@@ -2043,7 +2139,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>1092</width>
+ <width>1331</width>
<height>25</height>
</rect>
</property>
--
GitLab