Commit 73b481ee authored by beuchatp's avatar beuchatp
Browse files

Adjusted font size and layout of the Teacher GUI

parent b9217bfb
...@@ -30,20 +30,6 @@ ...@@ -30,20 +30,6 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<item row="2" column="1">
<widget class="QPushButton" name="pushButton_fitAll">
<property name="text">
<string>Fit All</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="removeTable">
<property name="text">
<string>Remove Table</string>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -52,6 +38,11 @@ ...@@ -52,6 +38,11 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="title"> <property name="title">
<string>Creation Modes</string> <string>Creation Modes</string>
</property> </property>
...@@ -60,7 +51,7 @@ ...@@ -60,7 +51,7 @@
<widget class="QRadioButton" name="radioButton_table_mode"> <widget class="QRadioButton" name="radioButton_table_mode">
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>12</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
...@@ -75,7 +66,7 @@ ...@@ -75,7 +66,7 @@
<widget class="QRadioButton" name="radioButton_crazyfly_zones_mode"> <widget class="QRadioButton" name="radioButton_crazyfly_zones_mode">
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>12</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
...@@ -90,7 +81,7 @@ ...@@ -90,7 +81,7 @@
<widget class="QRadioButton" name="radioButton_lock_mode"> <widget class="QRadioButton" name="radioButton_lock_mode">
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>12</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
...@@ -106,15 +97,32 @@ ...@@ -106,15 +97,32 @@
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="title"> <property name="title">
<string>What to show</string> <string>What to show</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="4" column="0"> <item row="11" column="0">
<widget class="QPushButton" name="pushButton_fitAll">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
<string>Fit All</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="checkBox_grid"> <widget class="QCheckBox" name="checkBox_grid">
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>12</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
...@@ -125,11 +133,11 @@ ...@@ -125,11 +133,11 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="6" column="0">
<widget class="QCheckBox" name="checkBox_table"> <widget class="QCheckBox" name="checkBox_table">
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>12</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
...@@ -140,11 +148,11 @@ ...@@ -140,11 +148,11 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0"> <item row="9" column="0">
<widget class="QCheckBox" name="checkBox_vicon_crazyflies"> <widget class="QCheckBox" name="checkBox_vicon_crazyflies">
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>12</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
...@@ -159,7 +167,7 @@ ...@@ -159,7 +167,7 @@
<widget class="QCheckBox" name="checkBox_crazyfly_zones"> <widget class="QCheckBox" name="checkBox_crazyfly_zones">
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>12</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
...@@ -174,7 +182,7 @@ ...@@ -174,7 +182,7 @@
<widget class="QCheckBox" name="checkBox_vicon_markers"> <widget class="QCheckBox" name="checkBox_vicon_markers">
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>12</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
...@@ -185,20 +193,20 @@ ...@@ -185,20 +193,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1"> <item row="10" column="0">
<widget class="QDoubleSpinBox" name="scaleSpinBox"> <widget class="QDoubleSpinBox" name="scaleSpinBox">
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>12</pointsize>
</font> </font>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="3" column="0">
<widget class="QCheckBox" name="checkBox_vicon_highlight_markers"> <widget class="QCheckBox" name="checkBox_vicon_highlight_markers">
<property name="font"> <property name="font">
<font> <font>
<pointsize>6</pointsize> <pointsize>12</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
...@@ -209,6 +217,18 @@ ...@@ -209,6 +217,18 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0">
<widget class="QPushButton" name="removeTable">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
<string>Remove Table</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
...@@ -227,10 +247,8 @@ ...@@ -227,10 +247,8 @@
</item> </item>
</layout> </layout>
<zorder>graphicsView</zorder> <zorder>graphicsView</zorder>
<zorder>removeTable</zorder>
<zorder>groupBox</zorder> <zorder>groupBox</zorder>
<zorder>groupBox_2</zorder> <zorder>groupBox_2</zorder>
<zorder>pushButton_fitAll</zorder>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
...@@ -268,6 +286,13 @@ ...@@ -268,6 +286,13 @@
<height>100</height> <height>100</height>
</size> </size>
</property> </property>
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>All motors OFF</string> <string>All motors OFF</string>
</property> </property>
...@@ -275,6 +300,11 @@ ...@@ -275,6 +300,11 @@
</item> </item>
<item> <item>
<widget class="QTabWidget" name="tabWidget_2"> <widget class="QTabWidget" name="tabWidget_2">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
...@@ -283,23 +313,18 @@ ...@@ -283,23 +313,18 @@
<string>Links</string> <string>Links</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="6" column="1" colspan="6"> <item row="0" column="1">
<widget class="QLabel" name="err_message_student_id"> <widget class="QPushButton" name="refresh_student_ids_button">
<property name="font">
<font>
<pointsize>7</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>TextLabel</string> <string>Refresh IDs</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="1" colspan="6"> <item row="13" column="1">
<widget class="QLabel" name="err_message_cf_zone"> <widget class="QLabel" name="err_message_radio_address">
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>10</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
...@@ -307,15 +332,20 @@ ...@@ -307,15 +332,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1" colspan="6"> <item row="22" column="1">
<widget class="QLabel" name="err_message_cf"> <widget class="QPushButton" name="load_from_DB_button">
<property name="font">
<font>
<pointsize>7</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>TextLabel</string> <string>Load from DB</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QLineEdit" name="radioAddress_text">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="clearButtonEnabled">
<bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -348,14 +378,20 @@ ...@@ -348,14 +378,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="1">
<widget class="QComboBox" name="comboBoxCFZones"/>
</item>
<item row="9" column="1"> <item row="9" column="1">
<widget class="QComboBox" name="comboBoxCFs"/> <widget class="QComboBox" name="comboBoxCFs"/>
</item> </item>
<item row="14" column="1">
<widget class="QComboBox" name="comboBoxCFZones"/>
</item>
<item row="4" column="1"> <item row="4" column="1">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>Choose Student ID:</string> <string>Choose Student ID:</string>
</property> </property>
...@@ -363,33 +399,71 @@ ...@@ -363,33 +399,71 @@
</item> </item>
<item row="7" column="1"> <item row="7" column="1">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>Choose CF to link:</string> <string>Choose CF to link:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="1"> <item row="14" column="1">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>Choose CF Zone to link:</string> <string>Choose CF Zone to link:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="6"> <item row="11" column="1">
<widget class="QLabel" name="label">
<property name="text">
<string>Radio Address:</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLabel" name="err_message_student_id">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QPushButton" name="refresh_cfs_button"> <widget class="QPushButton" name="refresh_cfs_button">
<property name="text"> <property name="text">
<string>Refresh CFs</string> <string>Refresh CFs</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="6"> <item row="23" column="1">
<widget class="QPushButton" name="refresh_student_ids_button"> <widget class="QPushButton" name="save_in_DB_button">
<property name="text"> <property name="text">
<string>Refresh IDs</string> <string>Save in DB</string>
</property>
</widget>
</item>
<item row="16" column="1">
<widget class="QPushButton" name="link_button">
<property name="text">
<string>Link!</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="16" column="1" colspan="6"> <item row="19" column="1">
<widget class="QTableWidget" name="table_links"> <widget class="QTableWidget" name="table_links">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
...@@ -411,56 +485,30 @@ ...@@ -411,56 +485,30 @@
</attribute> </attribute>
</widget> </widget>
</item> </item>
<item row="14" column="6"> <item row="21" column="1">
<widget class="QPushButton" name="link_button">
<property name="text">
<string>Link!</string>
</property>
</widget>
</item>
<item row="18" column="6">
<widget class="QPushButton" name="unlink_button"> <widget class="QPushButton" name="unlink_button">
<property name="text"> <property name="text">
<string>Unlink!</string> <string>Unlink!</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="20" column="6"> <item row="17" column="1">
<widget class="QPushButton" name="save_in_DB_button"> <widget class="QLabel" name="err_message_cf_zone">
<property name="text"> <property name="font">
<string>Save in DB</string> <font>
</property> <pointsize>10</pointsize>
</widget> </font>
</item>
<item row="11" column="6">
<widget class="QLineEdit" name="radioAddress_text">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="clearButtonEnabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="19" column="6">
<widget class="QPushButton" name="load_from_DB_button">
<property name="text">
<string>Load from DB</string>
</property> </property>
</widget>
</item>
<item row="11" column="1">
<widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Radio Address:</string> <string>TextLabel</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="6"> <item row="10" column="1">
<widget class="QLabel" name="err_message_radio_address"> <widget class="QLabel" name="err_message_cf">
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>10</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
...@@ -527,6 +575,12 @@ ...@@ -527,6 +575,12 @@
<height>40</height> <height>40</height>
</size> </size>
</property> </property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>FLYING STATE</string> <string>FLYING STATE</string>