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}")