Merge branch 'master' of http://192.168.0.10:3000/pandx/TSI_Config

TSI_Config.pro

@@ -42,6 +42,7 @@ FORMS += \
     radial_vibration.ui \
     seismic_monitor.ui \
     setpoint.ui \
+    singlerelay.ui \
     tachometer.ui \
     tmrrelayassociation.ui \
     velocity.ui

acceleration.ui

@@ -192,6 +192,11 @@
         <height>22</height>
        </rect>
       </property>
+      <item>
+       <property name="text">
+        <string>32 k</string>
+       </property>
+      </item>
      </widget>
     </widget>
     <widget class="QGroupBox" name="groupBox_2">
@@ -228,6 +233,11 @@
         <height>20</height>
        </rect>
       </property>
+      <item>
+       <property name="text">
+        <string>30000</string>
+       </property>
+      </item>
      </widget>
      <widget class="QLabel" name="label_30">
       <property name="geometry">
@@ -264,6 +274,11 @@
         <height>20</height>
        </rect>
       </property>
+      <item>
+       <property name="text">
+        <string>30</string>
+       </property>
+      </item>
      </widget>
      <widget class="QLabel" name="label_12">
       <property name="geometry">

seismic_monitor.ui

@@ -49,6 +49,9 @@
      <property name="text">
       <string>启用</string>
      </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
     </widget>
     <widget class="QToolButton" name="toolButton_5">
      <property name="geometry">
@@ -88,6 +91,9 @@
      <property name="text">
       <string>启用</string>
      </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
     </widget>
     <widget class="QToolButton" name="toolButton_6">
      <property name="geometry">
@@ -204,6 +210,9 @@
         <property name="text">
          <string>通道 2</string>
         </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
        </widget>
        <widget class="QRadioButton" name="radioButton_35">
         <property name="geometry">
@@ -256,6 +265,9 @@
         <property name="text">
          <string>通道 1</string>
         </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
        </widget>
        <widget class="QRadioButton" name="radioButton_38">
         <property name="geometry">
@@ -625,6 +637,9 @@
      <property name="text">
       <string>启用</string>
      </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
     </widget>
     <widget class="QToolButton" name="toolButton_3">
      <property name="geometry">
@@ -664,6 +679,9 @@
      <property name="text">
       <string>启用</string>
      </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
     </widget>
     <widget class="QToolButton" name="toolButton_4">
      <property name="geometry">
@@ -725,7 +743,7 @@
      </rect>
     </property>
     <property name="currentIndex">
-     <number>0</number>
+     <number>1</number>
     </property>
     <widget class="QWidget" name="tab">
      <attribute name="title">
@@ -998,6 +1016,9 @@
         <property name="text">
          <string>通道 1</string>
         </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
        </widget>
        <widget class="QRadioButton" name="radioButton_28">
         <property name="geometry">
@@ -1037,6 +1058,9 @@
         <property name="text">
          <string>通道 1</string>
         </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
        </widget>
        <widget class="QRadioButton" name="radioButton_30">
         <property name="geometry">

setpoint.ui

@@ -23,7 +23,7 @@
     </rect>
    </property>
    <property name="title">
-    <string>警报 / 危险 2</string>
+    <string>危险 / 警报 2</string>
    </property>
    <widget class="QComboBox" name="comboBox_4">
     <property name="geometry">
@@ -126,7 +126,13 @@
      </widget>
     </item>
     <item>
-     <widget class="QComboBox" name="comboBox_6"/>
+     <widget class="QComboBox" name="comboBox_6">
+      <item>
+       <property name="text">
+        <string>通道 1</string>
+       </property>
+      </item>
+     </widget>
     </item>
    </layout>
   </widget>
@@ -179,7 +185,7 @@
     </rect>
    </property>
    <property name="title">
-    <string>警报 / 危险 1</string>
+    <string>告警 / 警报 1</string>
    </property>
    <widget class="QLabel" name="label_21">
     <property name="geometry">

velocity.ui

@@ -314,6 +314,11 @@
         <height>20</height>
        </rect>
       </property>
+      <item>
+       <property name="text">
+        <string>55000</string>
+       </property>
+      </item>
      </widget>
      <widget class="QLabel" name="label_11">
       <property name="geometry">
@@ -363,6 +368,11 @@
         <height>20</height>
        </rect>
       </property>
+      <item>
+       <property name="text">
+        <string>30</string>
+       </property>
+      </item>
      </widget>
      <widget class="QSpinBox" name="spinBox_4">
       <property name="geometry">
@@ -776,6 +786,9 @@
      <property name="text">
       <string> 告警锁定</string>
      </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
     </widget>
     <widget class="QCheckBox" name="checkBox_25">
      <property name="geometry">
@@ -789,6 +802,9 @@
      <property name="text">
       <string> 危险锁定</string>
      </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
     </widget>
     <widget class="QLabel" name="label_82">
      <property name="geometry">