Commit f1521056 authored by Giacomo Strangolino's avatar Giacomo Strangolino
Browse files

replaced quinputoutput with combo + label

parent fd24f5c6
......@@ -14,33 +14,27 @@
<string>Turbopump</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="5" column="0" colspan="5">
<widget class="QGroupBox" name="gbLastErr">
<property name="title">
<string>Last Error</string>
<item row="6" column="0" colspan="4">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Communication</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="MyTextBox" name="textErrCode">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="1" colspan="4">
<widget class="QuButton" name="qubAck">
<item row="3" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Acknowledge</string>
<string>Gas Mode</string>
</property>
<property name="target">
<string>$1/ErrorAckn(true)</string>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="0" colspan="5">
<item row="0" column="0" colspan="6">
<widget class="QLabel" name="label">
<property name="font">
<font>
......@@ -56,41 +50,119 @@
</property>
</widget>
</item>
<item row="6" column="3" colspan="2">
<widget class="QuButton" name="qubAck_2">
<property name="text">
<string>Initialize</string>
<item row="5" column="0" colspan="6">
<widget class="QGroupBox" name="gbLastErr">
<property name="title">
<string>Last Error</string>
</property>
<property name="target">
<string>$1-&gt;Init</string>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="MyTextBox" name="textErrCode">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="8" column="0" colspan="6">
<widget class="QGroupBox" name="gbPowerSupply">
<property name="title">
<string>Power Supply</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">
<widget class="QuButton" name="qubPSOn">
<property name="text">
<string>ON</string>
</property>
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="QuButton" name="qubPSOff">
<property name="text">
<string>OFF</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>On</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QuLed" name="ledPSOn"/>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Ok</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QuLed" name="ledPSOk"/>
</item>
</layout>
</widget>
</item>
<item row="7" column="4">
<widget class="QuLabel" name="quLabel_2">
<property name="source">
<string>$1/State</string>
<item row="2" column="4">
<widget class="QuButton" name="qubStart">
<property name="text">
<string>Start</string>
</property>
<property name="target">
<string>$1/MotorPump(1)</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="4">
<item row="7" column="0" colspan="5">
<widget class="QuLabel" name="quLabel">
<property name="source">
<string>$1/Status</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="3">
<widget class="QLabel" name="label_4">
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Communication</string>
<string>Motor</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0" colspan="5">
<item row="2" column="5">
<widget class="QuButton" name="qubStop">
<property name="text">
<string>Stop</string>
</property>
<property name="target">
<string>$1/MotorPump(0)</string>
</property>
</widget>
</item>
<item row="6" column="4" colspan="2">
<widget class="QuButton" name="qubAck_2">
<property name="text">
<string>Initialize</string>
</property>
<property name="target">
<string>$1-&gt;Init</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="6">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string/>
......@@ -201,63 +273,28 @@
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Motor</string>
<item row="7" column="5">
<widget class="QuLabel" name="quLabel_2">
<property name="source">
<string>$1/State</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</widget>
</item>
<item row="3" column="5">
<widget class="QuComboBox" name="quComboBox">
<property name="target">
<string>$1/GasMode</string>
</property>
<property name="indexMode">
<bool>true</bool>
</property>
</widget>
</item>
<item row="8" column="0" colspan="5">
<widget class="QGroupBox" name="gbPowerSupply">
<property name="title">
<string>Power Supply</string>
<item row="3" column="1" colspan="4">
<widget class="QuLabel" name="quLabel_3">
<property name="source">
<string>$1/GasMode</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">
<widget class="QuButton" name="qubPSOn">
<property name="text">
<string>ON</string>
</property>
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="QuButton" name="qubPSOff">
<property name="text">
<string>OFF</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>On</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QuLed" name="ledPSOn"/>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Ok</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QuLed" name="ledPSOk"/>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
......@@ -270,47 +307,20 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Gas Mode</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QuButton" name="qubStop">
<property name="text">
<string>Stop</string>
</property>
<property name="target">
<string>$1/MotorPump(0)</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QuButton" name="qubStart">
<property name="text">
<string>Start</string>
</property>
<property name="target">
<string>$1/MotorPump(1)</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<item row="2" column="1" colspan="3">
<widget class="QuLed" name="quLed">
<property name="source">
<string>$1/MotorPump</string>
</property>
</widget>
</item>
<item row="3" column="1" colspan="4">
<widget class="QuInputOutput" name="quInputOutput">
<property name="source">
<string>$1/GasMode</string>
<item row="4" column="1" colspan="5">
<widget class="QuButton" name="qubAck">
<property name="text">
<string>Acknowledge</string>
</property>
<property name="target">
<string>$1/ErrorAckn(true)</string>
</property>
</widget>
</item>
......@@ -328,16 +338,16 @@
<extends>QWidget</extends>
<header>quled.h</header>
</customwidget>
<customwidget>
<class>QuComboBox</class>
<extends>QComboBox</extends>
<header>qucombobox.h</header>
</customwidget>
<customwidget>
<class>QuButton</class>
<extends>QPushButton</extends>
<header>qubutton.h</header>
</customwidget>
<customwidget>
<class>QuInputOutput</class>
<extends>QFrame</extends>
<header>quinputoutput.h</header>
</customwidget>
<customwidget>
<class>MyLed</class>
<extends>QWidget</extends>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment