diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_unknown.png b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_unknown.png new file mode 100644 index 0000000000000000000000000000000000000000..e20348f65a39bac7c0e40a2a4c0b338ef018dc03 Binary files /dev/null and b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_unknown.png differ diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_disabling.png b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_disabling.png new file mode 100644 index 0000000000000000000000000000000000000000..667c8027f2b902f08f8e81d3120599a5ed151d48 Binary files /dev/null and b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_disabling.png differ diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_enabling.png b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_enabling.png new file mode 100644 index 0000000000000000000000000000000000000000..ef2dc5bffa6d27edbb6c6ff1171cd77a5af5c20a Binary files /dev/null and b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_enabling.png differ diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_flying.png b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_flying.png new file mode 100644 index 0000000000000000000000000000000000000000..b0b51f3d42edbfad9f875c1faa413391c4f21de9 Binary files /dev/null and b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_flying.png differ diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_off.png b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_off.png new file mode 100644 index 0000000000000000000000000000000000000000..70669664f07c12ef27a41f5b5fb918aff93da688 Binary files /dev/null and b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_off.png differ diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_unknown.png b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_unknown.png new file mode 100644 index 0000000000000000000000000000000000000000..5c0c7337a103e5726af53def62e37ad22209c972 Binary files /dev/null and b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_unknown.png differ 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 0207be88c0d347111f46737711c851069a56dfd9..b908a4fbc1c3d1ec4e4627c8102c236f086e5a72 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 @@ -44,7 +44,7 @@ <item> <widget class="QGroupBox" name="groupBox"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -52,6 +52,8 @@ <property name="font"> <font> <pointsize>18</pointsize> + <weight>50</weight> + <bold>false</bold> </font> </property> <property name="title"> @@ -71,7 +73,10 @@ </widget> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="sizeConstraint"> + <enum>QLayout::SetMaximumSize</enum> + </property> <property name="leftMargin"> <number>6</number> </property> @@ -85,321 +90,275 @@ <number>6</number> </property> <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <property name="leftMargin"> - <number>6</number> + <widget class="QPushButton" name="RF_disconnect_button"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="topMargin"> - <number>6</number> + <property name="minimumSize"> + <size> + <width>180</width> + <height>70</height> + </size> </property> - <property name="rightMargin"> - <number>6</number> + <property name="maximumSize"> + <size> + <width>750</width> + <height>70</height> + </size> </property> - <property name="bottomMargin"> - <number>6</number> + <property name="font"> + <font> + <pointsize>16</pointsize> + </font> </property> - <item> - <widget class="QLabel" name="connected_disconnected_label"> - <property name="font"> - <font> - <pointsize>16</pointsize> - <italic>true</italic> - </font> - </property> - <property name="text"> - <string>Crazyradio status:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="raw_voltage_label"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="font"> - <font> - <pointsize>16</pointsize> - <italic>false</italic> - </font> - </property> - <property name="text"> - <string>Voltage: </string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="flying_state_label"> - <property name="font"> - <font> - <pointsize>16</pointsize> - </font> - </property> - <property name="text"> - <string>FlyingState</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> - </property> - </widget> - </item> - </layout> + <property name="text"> + <string>Disconnect</string> + </property> + </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <property name="leftMargin"> - <number>6</number> + <widget class="QLabel" name="rf_status_label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="topMargin"> - <number>6</number> + <property name="minimumSize"> + <size> + <width>95</width> + <height>70</height> + </size> </property> - <property name="rightMargin"> - <number>6</number> + <property name="maximumSize"> + <size> + <width>95</width> + <height>70</height> + </size> </property> - <property name="bottomMargin"> - <number>6</number> + <property name="text"> + <string/> </property> - <item> - <widget class="QPushButton" name="RF_disconnect_button"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>180</width> - <height>80</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>750</width> - <height>80</height> - </size> - </property> - <property name="font"> - <font> - <pointsize>16</pointsize> - </font> - </property> - <property name="text"> - <string>Disconnect</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="rf_status_label"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>90</width> - <height>80</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>90</width> - <height>80</height> - </size> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="RF_Connect_button"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>180</width> - <height>80</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>750</width> - <height>80</height> - </size> - </property> - <property name="font"> - <font> - <pointsize>16</pointsize> - </font> - </property> - <property name="text"> - <string>Connect</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="voltage_field"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>180</width> - <height>80</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>400</width> - <height>80</height> - </size> - </property> - <property name="font"> - <font> - <pointsize>16</pointsize> - </font> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label_battery"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>90</width> - <height>80</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>90</width> - <height>80</height> - </size> - </property> - <property name="font"> - <font> - <pointsize>16</pointsize> - <italic>true</italic> - </font> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="take_off_button"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>180</width> - <height>80</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>750</width> - <height>80</height> - </size> - </property> - <property name="font"> - <font> - <pointsize>16</pointsize> - </font> - </property> - <property name="text"> - <string>Take Off</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="land_button"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>180</width> - <height>80</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>750</width> - <height>80</height> - </size> - </property> - <property name="font"> - <font> - <pointsize>16</pointsize> - </font> - </property> - <property name="text"> - <string>Land</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="motors_OFF_button"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>180</width> - <height>80</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>750</width> - <height>80</height> - </size> - </property> - <property name="font"> - <font> - <pointsize>16</pointsize> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Motors OFF</string> - </property> - </widget> - </item> - </layout> + </widget> + </item> + <item> + <widget class="QPushButton" name="RF_Connect_button"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>70</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>750</width> + <height>70</height> + </size> + </property> + <property name="font"> + <font> + <pointsize>16</pointsize> + </font> + </property> + <property name="text"> + <string>Connect</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="voltage_field"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>160</width> + <height>70</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>160</width> + <height>70</height> + </size> + </property> + <property name="font"> + <font> + <pointsize>16</pointsize> + </font> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="battery_"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>50</width> + <height>70</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>50</width> + <height>70</height> + </size> + </property> + <property name="font"> + <font> + <pointsize>16</pointsize> + <italic>true</italic> + </font> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="take_off_button"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>70</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>750</width> + <height>70</height> + </size> + </property> + <property name="font"> + <font> + <pointsize>16</pointsize> + </font> + </property> + <property name="text"> + <string>Take Off</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="land_button"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>70</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>750</width> + <height>70</height> + </size> + </property> + <property name="font"> + <font> + <pointsize>16</pointsize> + </font> + </property> + <property name="text"> + <string>Land</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="flying_state_label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>90</width> + <height>70</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>90</width> + <height>70</height> + </size> + </property> + <property name="font"> + <font> + <pointsize>16</pointsize> + </font> + </property> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="motors_OFF_button"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>70</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>750</width> + <height>70</height> + </size> + </property> + <property name="font"> + <font> + <pointsize>16</pointsize> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Motors OFF</string> + </property> + </widget> </item> </layout> </item> @@ -432,7 +391,7 @@ </font> </property> <property name="currentIndex"> - <number>2</number> + <number>0</number> </property> <property name="usesScrollButtons"> <bool>true</bool> @@ -441,6 +400,12 @@ <bool>false</bool> </property> <widget class="QWidget" name="tab_safe"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="font"> <font> <pointsize>14</pointsize> @@ -1090,6 +1055,12 @@ </layout> </widget> <widget class="QWidget" name="tab_demo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <attribute name="title"> <string> Demo </string> </attribute> @@ -1832,6 +1803,12 @@ </layout> </widget> <widget class="QWidget" name="tab_student"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <attribute name="title"> <string>Student</string> </attribute> @@ -2234,6 +2211,12 @@ </layout> </widget> <widget class="QWidget" name="tab_mpc"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <attribute name="title"> <string>MPC</string> </attribute> @@ -2539,6 +2522,12 @@ </layout> </widget> <widget class="QWidget" name="tab_remote"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <attribute name="title"> <string>Remote</string> </attribute> @@ -2972,6 +2961,12 @@ </layout> </widget> <widget class="QWidget" name="tab"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <attribute name="title"> <string>Tuning</string> </attribute> @@ -3407,14 +3402,20 @@ <item row="6" column="2"> <widget class="QPushButton" name="load_mpc_yaml_button"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>50</height> + </size> + </property> <property name="maximumSize"> <size> - <width>16777215</width> + <width>180</width> <height>50</height> </size> </property> @@ -3431,20 +3432,20 @@ <item row="7" column="2"> <widget class="QPushButton" name="load_remote_yaml_button"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="minimumSize"> <size> - <width>0</width> - <height>0</height> + <width>180</width> + <height>50</height> </size> </property> <property name="maximumSize"> <size> - <width>16777215</width> + <width>180</width> <height>50</height> </size> </property> @@ -3461,14 +3462,20 @@ <item row="5" column="2"> <widget class="QPushButton" name="load_student_yaml_button"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>50</height> + </size> + </property> <property name="maximumSize"> <size> - <width>16777215</width> + <width>180</width> <height>50</height> </size> </property> @@ -3485,14 +3492,20 @@ <item row="5" column="0"> <widget class="QPushButton" name="enable_student_controller"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>50</height> + </size> + </property> <property name="maximumSize"> <size> - <width>16777215</width> + <width>180</width> <height>50</height> </size> </property> @@ -3509,11 +3522,23 @@ <item row="0" column="2"> <widget class="QLabel" name="label_2"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>43</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>180</width> + <height>43</height> + </size> + </property> <property name="font"> <font> <pointsize>16</pointsize> @@ -3530,11 +3555,23 @@ <item row="0" column="0"> <widget class="QLabel" name="label_21"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>43</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>180</width> + <height>43</height> + </size> + </property> <property name="font"> <font> <pointsize>16</pointsize> @@ -3551,11 +3588,23 @@ <item row="1" column="0"> <widget class="QLabel" name="label"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>43</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>180</width> + <height>43</height> + </size> + </property> <property name="font"> <font> <pointsize>16</pointsize> @@ -3574,14 +3623,20 @@ <item row="4" column="0"> <widget class="QPushButton" name="enable_demo_controller"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>50</height> + </size> + </property> <property name="maximumSize"> <size> - <width>16777215</width> + <width>180</width> <height>50</height> </size> </property> @@ -3611,14 +3666,20 @@ <item row="3" column="2"> <widget class="QPushButton" name="load_safe_yaml_button"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>50</height> + </size> + </property> <property name="maximumSize"> <size> - <width>16777215</width> + <width>180</width> <height>50</height> </size> </property> @@ -3635,14 +3696,20 @@ <item row="3" column="0"> <widget class="QPushButton" name="enable_safe_controller"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>50</height> + </size> + </property> <property name="maximumSize"> <size> - <width>16777215</width> + <width>180</width> <height>50</height> </size> </property> @@ -3659,14 +3726,20 @@ <item row="4" column="2"> <widget class="QPushButton" name="load_demo_yaml_button"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>50</height> + </size> + </property> <property name="maximumSize"> <size> - <width>16777215</width> + <width>180</width> <height>50</height> </size> </property> @@ -3683,11 +3756,23 @@ <item row="1" column="2"> <widget class="QLabel" name="label_22"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>43</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>180</width> + <height>43</height> + </size> + </property> <property name="font"> <font> <pointsize>16</pointsize> @@ -3741,14 +3826,20 @@ <item row="6" column="0"> <widget class="QPushButton" name="enable_mpc_controller"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>50</height> + </size> + </property> <property name="maximumSize"> <size> - <width>16777215</width> + <width>180</width> <height>50</height> </size> </property> @@ -3765,20 +3856,20 @@ <item row="7" column="0"> <widget class="QPushButton" name="enable_remote_controller"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="minimumSize"> <size> - <width>0</width> - <height>0</height> + <width>180</width> + <height>50</height> </size> </property> <property name="maximumSize"> <size> - <width>16777215</width> + <width>180</width> <height>50</height> </size> </property> @@ -3795,14 +3886,20 @@ <item row="8" column="0"> <widget class="QPushButton" name="enable_tuning_controller"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>50</height> + </size> + </property> <property name="maximumSize"> <size> - <width>16777215</width> + <width>180</width> <height>50</height> </size> </property> @@ -3819,14 +3916,20 @@ <item row="8" column="2"> <widget class="QPushButton" name="load_tuning_yaml_button"> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>180</width> + <height>50</height> + </size> + </property> <property name="maximumSize"> <size> - <width>16777215</width> + <width>180</width> <height>50</height> </size> </property> diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentgui.qrc b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentgui.qrc index a02b9c1d0dcb86ea57ff20040c8cd99ec8f052a6..0f6e7d8eebb915c0f0f16522394150bbc2d84ec1 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentgui.qrc +++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentgui.qrc @@ -9,5 +9,11 @@ <file>images/rf_connected.png</file> <file>images/rf_connecting.png</file> <file>images/rf_disconnected.png</file> + <file>images/battery_unknown.png</file> + <file>images/flying_state_disabling.png</file> + <file>images/flying_state_enabling.png</file> + <file>images/flying_state_flying.png</file> + <file>images/flying_state_off.png</file> + <file>images/flying_state_unknown.png</file> </qresource> </RCC>