Index: TD_Advanced_Institutional_Records/interface.ui
===================================================================
diff -u -raba2a4ae8f32915dba9a208c621435d8920a0880 -rac2fffa76a2cd0bb25f25b98ccb7a1ee7758d335
--- TD_Advanced_Institutional_Records/interface.ui (.../interface.ui) (revision aba2a4ae8f32915dba9a208c621435d8920a0880)
+++ TD_Advanced_Institutional_Records/interface.ui (.../interface.ui) (revision ac2fffa76a2cd0bb25f25b98ccb7a1ee7758d335)
@@ -17,7 +17,7 @@
- &5 TD info/&11 Advanced Institutional Record
+ &5 TD info/&C Advanced Institutional Record
-
Index: TD_Institutional_Records/interface.ui
===================================================================
diff -u -raba2a4ae8f32915dba9a208c621435d8920a0880 -rac2fffa76a2cd0bb25f25b98ccb7a1ee7758d335
--- TD_Institutional_Records/interface.ui (.../interface.ui) (revision aba2a4ae8f32915dba9a208c621435d8920a0880)
+++ TD_Institutional_Records/interface.ui (.../interface.ui) (revision ac2fffa76a2cd0bb25f25b98ccb7a1ee7758d335)
@@ -17,7 +17,7 @@
- &5 TD info/&10 Institutional Record
+ &5 TD info/&B Institutional Record
-
Index: TD_WaterSample/interface.ui
===================================================================
diff -u -r2072cb360d4b3b993d279f756fc0c0bef78120ed -rac2fffa76a2cd0bb25f25b98ccb7a1ee7758d335
--- TD_WaterSample/interface.ui (.../interface.ui) (revision 2072cb360d4b3b993d279f756fc0c0bef78120ed)
+++ TD_WaterSample/interface.ui (.../interface.ui) (revision ac2fffa76a2cd0bb25f25b98ccb7a1ee7758d335)
@@ -6,17 +6,43 @@
0
0
- 370
- 90
+ 529
+ 270
&5 TD info/&A Water Sample
-
-
-
-
-
-
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Response [0xAB00]
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Water Sample Result Req
+
+
+
+ -
@@ -37,7 +63,7 @@
color: rgb(238, 238, 236);
-background-color: rgb(100, 1, 250);
+background-color: rgb(71, 117, 255);
163 : [0xA300] : TD Water Sample
@@ -47,60 +73,228 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 350
+ 0
+
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(71, 117, 255);
+
+
+ XXX : [0xAC00] : Water Sample Data
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
-
+
+
+ Accepted
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Reason
+
+
+
+ -
+
+
+
+ 50
+ 16777215
+
+
+
+ 900
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Value
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+ 100
+ 16777215
+
+
+
+ Send
+
+
+
+ -
+
+
+
+ 100
+ 16777215
+
+
+
+ Send
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 1000
+ 16777215
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Valve
+
+
+
-
+
+
+ 1
+
+
+ bgValve
+
+
+
+ -
+
+
+ 2
+
+
+ bgValve
+
+
+
+
+
+
+ -
+
+
+ Timeout
+
+
+
-
+
+
+ Timed Out
+
+
+ bgTimeout
+
+
+
+ -
+
+
+ Off
+
+
+ bgTimeout
+
+
+
+
+
+
- -
-
-
-
- 100
- 0
-
-
-
- Water Sample Result Request
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 75
- 0
-
-
-
-
- 100
- 16777215
-
-
-
- false
-
-
- QFrame::WinPanel
-
-
- QFrame::Sunken
-
-
- -
-
-
- Qt::AlignCenter
-
-
-
+
+
+
+
+
Index: TD_WaterSample/loader.py
===================================================================
diff -u -rb7956d9f711ca0e030e6eda624c43b435136b14d -rac2fffa76a2cd0bb25f25b98ccb7a1ee7758d335
--- TD_WaterSample/loader.py (.../loader.py) (revision b7956d9f711ca0e030e6eda624c43b435136b14d)
+++ TD_WaterSample/loader.py (.../loader.py) (revision ac2fffa76a2cd0bb25f25b98ccb7a1ee7758d335)
@@ -44,14 +44,31 @@
finds and creates widgets
:return: none
"""
- self.lbWaterSampleResult = self.find_widget(QtWidgets.QLabel , 'lbWaterSampleResult' )
+ self.lbWaterSampleResult = self.find_widget(QtWidgets.QLabel , 'lbWaterSampleResult' )
+ self.bgValve = self.find_widget(QtWidgets.QButtonGroup , 'bgValve' )
+ self.bgTimeout = self.find_widget(QtWidgets.QButtonGroup , 'bgTimeout' )
+ self.rbValve1 = self.find_widget(QtWidgets.QRadioButton , 'rbValve1' )
+ self.rbValve2 = self.find_widget(QtWidgets.QRadioButton , 'rbValve2' )
+ self.rbOff = self.find_widget(QtWidgets.QRadioButton , 'rbOff' )
+ self.rbTimedOut = self.find_widget(QtWidgets.QRadioButton , 'rbTimedOut' )
+ self.spnReason = self.find_widget(QtWidgets.QSpinBox , 'spnReason' )
+ self.spnValue = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnValue' )
+ self.cbAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbAccepted' )
+ self.btnSendWaterSampleResultResponse = self.find_widget(QtWidgets.QPushButton , 'btnSendWaterSampleResultResponse' )
+ self.btnSendWaterSampleData = self.find_widget(QtWidgets.QPushButton , 'btnSendWaterSampleData' )
+
+
def _init_connections(self):
"""
initializes the widgets connections
:return: none
"""
+ self.bgValve .buttonClicked.connect (self.sendWaterSampleData )
+ self.bgTimeout .buttonClicked.connect (self.sendWaterSampleData )
+ self.btnSendWaterSampleData .clicked.connect (self.sendWaterSampleData )
+ self.btnSendWaterSampleResultResponse .clicked.connect (self.sendWaterSampleResultResponse )
@Slot()
@@ -60,15 +77,40 @@
initializes the widgets' properties
:return: none
"""
+ self.rbValve1 .setChecked ( True )
+ self.rbOff .setChecked ( True )
+ self.cbAccepted .setChecked ( True )
+ self.bgValve.setId(self.rbValve1 , 0)
+ self.bgValve.setId(self.rbValve2 , 1)
+ self.bgTimeout.setId(self.rbOff , 0)
+ self.bgTimeout.setId(self.rbTimedOut , 1)
+
+ self.spnReason .setValue ( 0 )
+ self.spnValue .setValue ( 0 )
+
+
@Slot()
+ def sendWaterSampleData(self):
+ self.td_interface .td_water_sample(self.bgValve .checkedId() ,
+ self.bgTimeout .checkedId() )
+
+
+ @Slot()
+ def sendWaterSampleResultResponse(self):
+ self.td_interface .td_water_sample_result_response( self.cbAccepted .isChecked() ,
+ self.spnReason .value() ,
+ self.spnValue .value() )
+
+
+ @Slot()
def handle_request(self, message, timestamp = 0.0):
"""
the slot for Valve data change
:return: none
"""
message = message['message']
index = MsgFieldPositions.START_POS_FIELD_1
- val,index = conversions.bytearray_to_integer( message, index)
- self.lbWaterSampleResult.setText("Fail" if val == 0 else "Pass")
+ val,index = conversions.bytearray_to_float( message, index)
+ self.lbWaterSampleResult.setText(f"{val:.1f}")