Index: DD_BloodLeak/interface.ui
===================================================================
diff -u -r284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a -r5c6213ccc4aea7c329f7a320de57cb6d15481fe6
--- DD_BloodLeak/interface.ui (.../interface.ui) (revision 284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a)
+++ DD_BloodLeak/interface.ui (.../interface.ui) (revision 5c6213ccc4aea7c329f7a320de57cb6d15481fe6)
@@ -6,8 +6,8 @@
0
0
- 476
- 68
+ 474
+ 206
@@ -25,120 +25,166 @@
&6 DD info/&3 Blood Leak
-
-
- 4
-
-
- 0
-
+
-
-
+
+
+ 2
+
-
-
-
- 2
+
+
+
+ 0
+ 0
+
-
-
-
-
-
- 0
- 0
-
-
-
-
- 352
- 0
-
-
-
-
- 10
-
-
-
- color: rgb(238, 238, 236);
+
+
+ 352
+ 0
+
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
background-color: rgb(189, 140, 51);
-
-
- 96 : [0x6000] : DD Blood Leak
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Send
-
-
-
- -
-
-
- reset
-
-
-
-
+
+
+ 97 : [0x6100] : DD Blood Leak
+
+
+ Qt::AlignCenter
+
+
-
-
-
-
-
-
- QLayout::SetMaximumSize
-
-
- 10
-
-
- 10
-
-
- 0
-
-
-
-
-
- Blood Leak
-
-
-
- -
-
-
-
-
-
-
-
-
-
+
+
+ Send
+
+
+ -
+
+
+ reset
+
+
+
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
+
+
-
+
+
+ -
+
+
+ Detect
+
+
+
+ -
+
+
+ Status
+
+
+
+ -
+
+
+ Serial Comm State
+
+
+
+ -
+
+
+ -
+
+
+ State
+
+
+
+ -
+
+
+ -
+
+
+ Persistent Counter
+
+
+
+ -
+
+
+ Intensity
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ Intensity Moving Avg
+
+
+
+ -
+
+
+ -
+
+
+ Time Since Zero MS
+
+
+
+ -
+
+
+ -
+
+
+ Drift In Range Status
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ Drift Upper Range Status
+
+
+
+
- cbBloodLeak
tbSend
tbReset
Index: DD_BloodLeak/loader.py
===================================================================
diff -u -rae3a21a4b37161a8bfa0a3fff23470d4ac198f5f -r5c6213ccc4aea7c329f7a320de57cb6d15481fe6
--- DD_BloodLeak/loader.py (.../loader.py) (revision ae3a21a4b37161a8bfa0a3fff23470d4ac198f5f)
+++ DD_BloodLeak/loader.py (.../loader.py) (revision 5c6213ccc4aea7c329f7a320de57cb6d15481fe6)
@@ -30,10 +30,20 @@
finds and creates widgets
:return: none
"""
- self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' )
- self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' )
- self.cbBloodLeak = self.find_widget(QtWidgets.QCheckBox , 'cbBloodLeak' )
+ self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' )
+ self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' )
+ self.spnBloodLeakStatus = self.find_widget(QtWidgets.QSpinBox , 'spnBloodLeakStatus' )
+ self.spnBloodLeakState = self.find_widget(QtWidgets.QSpinBox , 'spnBloodLeakState' )
+ self.spnBloodLeakPersistentCounter = self.find_widget(QtWidgets.QSpinBox , 'spnBloodLeakPersistentCounter' )
+ self.spnBloodLeakSerialCommState = self.find_widget(QtWidgets.QSpinBox , 'spnBloodLeakSerialCommState' )
+ self.spnBloodLeakIntensity = self.find_widget(QtWidgets.QSpinBox , 'spnBloodLeakIntensity' )
+ self.spnBloodLeakDetect = self.find_widget(QtWidgets.QSpinBox , 'spnBloodLeakDetect' )
+ self.spnBloodLeakIntensityMovingAvg = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnBloodLeakIntensityMovingAvg' )
+ self.spnBloodLeakTimeSinceZeroMS = self.find_widget(QtWidgets.QSpinBox , 'spnBloodLeakTimeSinceZeroMS' )
+ self.spnDriftInRangeStatus = self.find_widget(QtWidgets.QSpinBox , 'spnDriftInRangeStatus' )
+ self.spnDriftUpperRangeStatus = self.find_widget(QtWidgets.QSpinBox , 'spnDriftUpperRangeStatus' )
+
def _init_connections(self):
"""
initializes the widgets connections
@@ -48,16 +58,32 @@
initializes the widgets' properties
:return: none
"""
- self.cbBloodLeak .setChecked(False)
+ self.spnBloodLeakStatus .setValue(0)
+ self.spnBloodLeakState .setValue(0)
+ self.spnBloodLeakPersistentCounter .setValue(0)
+ self.spnBloodLeakSerialCommState .setValue(0)
+ self.spnBloodLeakIntensity .setValue(0)
+ self.spnBloodLeakDetect .setValue(0)
+ self.spnBloodLeakIntensityMovingAvg .setValue(0)
+ self.spnBloodLeakTimeSinceZeroMS .setValue(0)
+ self.spnDriftInRangeStatus .setValue(0)
+ self.spnDriftUpperRangeStatus .setValue(0)
@Slot()
def do_dd_blood_leak(self):
"""
the slot for dd blood leak change
:return: none
"""
- blood_leak = int(self.cbBloodLeak.isChecked())
-
self.dd_interface.dd_blood_leak(
- blood_leak
+ self.spnBloodLeakStatus .value(),
+ self.spnBloodLeakState .value(),
+ self.spnBloodLeakPersistentCounter .value(),
+ self.spnBloodLeakSerialCommState .value(),
+ self.spnBloodLeakIntensity .value(),
+ self.spnBloodLeakDetect .value(),
+ self.spnBloodLeakIntensityMovingAvg .value(),
+ self.spnBloodLeakTimeSinceZeroMS .value(),
+ self.spnDriftInRangeStatus .value(),
+ self.spnDriftUpperRangeStatus .value()
)
\ No newline at end of file