界面优化,监控逻辑优化
This commit is contained in:
286
ui/main.ui
286
ui/main.ui
@ -9,8 +9,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1004</width>
|
||||
<height>563</height>
|
||||
<width>1006</width>
|
||||
<height>568</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
@ -248,7 +248,7 @@
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1,1,10,1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1,1,10,0">
|
||||
<item>
|
||||
<widget class="QComboBox" name="cb_data_func">
|
||||
<property name="minimumSize">
|
||||
@ -346,19 +346,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btn_data_open">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>30</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Consolas</family>
|
||||
<pointsize>12</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<widget class="QToolButton" name="toolButton">
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
@ -387,7 +375,7 @@
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="hl_2_unit1" stretch="1,1,1,10,1">
|
||||
<layout class="QHBoxLayout" name="hl_2_unit1" stretch="1,1,1,10,0">
|
||||
<item>
|
||||
<widget class="QComboBox" name="cb_unit_func">
|
||||
<property name="minimumSize">
|
||||
@ -483,19 +471,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btn_unit_open">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>30</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Consolas</family>
|
||||
<pointsize>12</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<widget class="QToolButton" name="toolButton_2">
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
@ -583,7 +559,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>212</width>
|
||||
<width>213</width>
|
||||
<height>78</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -645,7 +621,7 @@
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_6">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_6">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_6" stretch="1,10,1">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_8">
|
||||
<property name="sizePolicy">
|
||||
@ -679,19 +655,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btn_durable_open">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>30</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Consolas</family>
|
||||
<pointsize>12</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<widget class="QToolButton" name="toolButton_3">
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
@ -700,7 +664,7 @@
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_7">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_7" stretch="1,10">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_9">
|
||||
<property name="sizePolicy">
|
||||
@ -742,25 +706,6 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_10">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>30</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
@ -977,7 +922,7 @@
|
||||
<widget class="QPlainTextEdit" name="pte_hmi_send"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPlainTextEdit" name="pte_him_recv"/>
|
||||
<widget class="QPlainTextEdit" name="pte_hmi_recv"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
@ -1524,7 +1469,7 @@
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>tcp_pos</string>
|
||||
<string>tcp_pose</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
@ -1584,7 +1529,7 @@
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<item>
|
||||
<widget class="QPushButton" name="pushButton">
|
||||
<widget class="QPushButton" name="hmi_btn">
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Consolas</family>
|
||||
@ -1598,7 +1543,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pushButton_2">
|
||||
<widget class="QPushButton" name="md_btn">
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Consolas</family>
|
||||
@ -1612,7 +1557,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pushButton_3">
|
||||
<widget class="QPushButton" name="ec_btn">
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Consolas</family>
|
||||
@ -1894,22 +1839,6 @@
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>btn_durable_open</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MainWindow</receiver>
|
||||
<slot>file_browser()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>964</x>
|
||||
<y>69</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>990</x>
|
||||
<y>97</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>btn_draw</sender>
|
||||
<signal>clicked()</signal>
|
||||
@ -1917,8 +1846,8 @@
|
||||
<slot>curve_draw()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>692</x>
|
||||
<y>136</y>
|
||||
<x>326</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>701</x>
|
||||
@ -1933,8 +1862,8 @@
|
||||
<slot>durable_cb_change()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>566</x>
|
||||
<y>135</y>
|
||||
<x>326</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>546</x>
|
||||
@ -1942,38 +1871,6 @@
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>btn_unit_open</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MainWindow</receiver>
|
||||
<slot>file_browser()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>981</x>
|
||||
<y>78</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>974</x>
|
||||
<y>181</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>btn_data_open</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MainWindow</receiver>
|
||||
<slot>file_browser()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>964</x>
|
||||
<y>73</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>941</x>
|
||||
<y>180</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>btn_docs_previous</sender>
|
||||
<signal>clicked()</signal>
|
||||
@ -1981,8 +1878,8 @@
|
||||
<slot>pre_page()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>408</x>
|
||||
<y>507</y>
|
||||
<x>326</x>
|
||||
<y>266</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>307</x>
|
||||
@ -1997,8 +1894,8 @@
|
||||
<slot>realtime_page()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>489</x>
|
||||
<y>507</y>
|
||||
<x>326</x>
|
||||
<y>266</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>435</x>
|
||||
@ -2013,8 +1910,8 @@
|
||||
<slot>next_page()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>570</x>
|
||||
<y>507</y>
|
||||
<x>326</x>
|
||||
<y>266</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>520</x>
|
||||
@ -2029,8 +1926,8 @@
|
||||
<slot>search_keyword()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>730</x>
|
||||
<y>507</y>
|
||||
<x>326</x>
|
||||
<y>266</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>688</x>
|
||||
@ -2045,8 +1942,8 @@
|
||||
<slot>search_keyword()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>838</x>
|
||||
<y>505</y>
|
||||
<x>326</x>
|
||||
<y>266</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>932</x>
|
||||
@ -2061,7 +1958,7 @@
|
||||
<slot>hmi_cb_change()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>806</x>
|
||||
<x>475</x>
|
||||
<y>89</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
@ -2077,7 +1974,7 @@
|
||||
<slot>hmi_send()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>887</x>
|
||||
<x>335</x>
|
||||
<y>89</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
@ -2087,14 +1984,14 @@
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>pushButton</sender>
|
||||
<sender>hmi_btn</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MainWindow</receiver>
|
||||
<slot>hmi_page()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>980</x>
|
||||
<y>85</y>
|
||||
<x>326</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>744</x>
|
||||
@ -2103,14 +2000,14 @@
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>pushButton_2</sender>
|
||||
<sender>md_btn</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MainWindow</receiver>
|
||||
<slot>md_page()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>980</x>
|
||||
<y>124</y>
|
||||
<x>326</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>784</x>
|
||||
@ -2119,14 +2016,14 @@
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>pushButton_3</sender>
|
||||
<sender>ec_btn</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MainWindow</receiver>
|
||||
<slot>ec_page()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>980</x>
|
||||
<y>163</y>
|
||||
<x>326</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>969</x>
|
||||
@ -2141,8 +2038,8 @@
|
||||
<slot>md_cb_change()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>467</x>
|
||||
<y>81</y>
|
||||
<x>466</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>612</x>
|
||||
@ -2157,8 +2054,8 @@
|
||||
<slot>md_send()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>327</x>
|
||||
<y>81</y>
|
||||
<x>326</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>795</x>
|
||||
@ -2173,8 +2070,8 @@
|
||||
<slot>ec_send()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>327</x>
|
||||
<y>81</y>
|
||||
<x>326</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>652</x>
|
||||
@ -2189,7 +2086,7 @@
|
||||
<slot>hmi_conn()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>545</x>
|
||||
<x>335</x>
|
||||
<y>89</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
@ -2205,8 +2102,8 @@
|
||||
<slot>md_conn()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>327</x>
|
||||
<y>81</y>
|
||||
<x>326</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>398</x>
|
||||
@ -2221,8 +2118,8 @@
|
||||
<slot>ec_conn()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>327</x>
|
||||
<y>81</y>
|
||||
<x>326</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>412</x>
|
||||
@ -2237,8 +2134,8 @@
|
||||
<slot>check_interval()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>844</x>
|
||||
<y>97</y>
|
||||
<x>326</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>821</x>
|
||||
@ -2253,8 +2150,8 @@
|
||||
<slot>ec_cb_change()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>467</x>
|
||||
<y>81</y>
|
||||
<x>466</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>540</x>
|
||||
@ -2269,8 +2166,8 @@
|
||||
<slot>hmi_conn()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>420</x>
|
||||
<y>79</y>
|
||||
<x>385</x>
|
||||
<y>89</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>216</x>
|
||||
@ -2301,8 +2198,8 @@
|
||||
<slot>show_item_content()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>441</x>
|
||||
<y>321</y>
|
||||
<x>308</x>
|
||||
<y>230</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>205</x>
|
||||
@ -2310,6 +2207,70 @@
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>cb_data_func</sender>
|
||||
<signal>currentTextChanged(QString)</signal>
|
||||
<receiver>MainWindow</receiver>
|
||||
<slot>data_cb_change()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>273</x>
|
||||
<y>61</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>208</x>
|
||||
<y>7</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>toolButton</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MainWindow</receiver>
|
||||
<slot>file_browser()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>973</x>
|
||||
<y>69</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>1002</x>
|
||||
<y>19</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>toolButton_2</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MainWindow</receiver>
|
||||
<slot>file_browser()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>326</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>1004</x>
|
||||
<y>56</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>toolButton_3</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MainWindow</receiver>
|
||||
<slot>file_browser()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>326</x>
|
||||
<y>80</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>1004</x>
|
||||
<y>88</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
<slots>
|
||||
<slot>prog_start()</slot>
|
||||
@ -2338,5 +2299,6 @@
|
||||
<slot>check_interval()</slot>
|
||||
<slot>switch_log_tab()</slot>
|
||||
<slot>show_item_content()</slot>
|
||||
<slot>data_cb_change()</slot>
|
||||
</slots>
|
||||
</ui>
|
||||
|
Reference in New Issue
Block a user