Index: DD_RO_WaterMode/loader.py =================================================================== diff -u -r05edab0c07f66b4d8ed5358f1b329a8ac48cfb5d -red036ca13ecc35dcbdca1ce8474bddfcbd1b0756 --- DD_RO_WaterMode/loader.py (.../loader.py) (revision 05edab0c07f66b4d8ed5358f1b329a8ac48cfb5d) +++ DD_RO_WaterMode/loader.py (.../loader.py) (revision ed036ca13ecc35dcbdca1ce8474bddfcbd1b0756) @@ -34,7 +34,10 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function(CAN.CanChannels.ui_sync_broadcast_ch_id, MsgIds.MSG_ID_UI_ADJUST_RO_WATER_MODE_REQUEST.value, - self.handle_request) + self.handle_adjustment_request) + self.can_interface.register_receiving_publication_function(CAN.CanChannels.ui_sync_broadcast_ch_id, + MsgIds.MSG_ID_UI_RO_WATER_MODE_REQUEST.value, + self.handle_request) def _init_loader(self): """ @@ -47,17 +50,23 @@ "RO Defeatured", ] - self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) - self.lbRoWaterModeRequest = self.find_widget(QtWidgets.QLabel , 'lbRoWaterModeRequest' ) - self.spnReason = self.find_widget(QtWidgets.QSpinBox , 'spnReason' ) - self.cbAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbAccepted' ) + self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) + self.tbSendAdjustment = self.find_widget(QtWidgets.QToolButton , 'tbSendAdjustment' ) + self.lbAdjustRoWaterModeRequest = self.find_widget(QtWidgets.QLabel , 'lbAdjustRoWaterModeRequest' ) + self.lbRoWaterModeRequest = self.find_widget(QtWidgets.QLabel , 'lbRoWaterModeRequest' ) + self.spnReason = self.find_widget(QtWidgets.QSpinBox , 'spnReason' ) + self.spnReasonAdjustment = self.find_widget(QtWidgets.QSpinBox , 'spnReasonAdjustment' ) + self.cbAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbAccepted' ) + self.cbAcceptedAdjustment = self.find_widget(QtWidgets.QCheckBox , 'cbAcceptedAdjustment' ) + self.cbValue = self.find_widget(QtWidgets.QComboBox , 'cbValue' ) def _init_connections(self): """ initializes the widgets connections :return: none """ + self.tbSendAdjustment.clicked.connect(self.do_dd_adjust_ro_water_mode_response) self.tbSend.clicked.connect(self.do_dd_ro_water_mode_response) @@ -67,25 +76,43 @@ initializes the widgets' properties :return: none """ - self.lbRoWaterModeRequest .setText("-") - self.cbAccepted .setChecked ( True ) - self.spnReason .setValue ( 0 ) + self.lbAdjustRoWaterModeRequest .setText("-") + self.lbRoWaterModeRequest .setText("-") + self.cbAccepted .setChecked ( True ) + self.cbAcceptedAdjustment .setChecked ( True ) + self.spnReason .setValue ( 0 ) + self.spnReasonAdjustment .setValue ( 0 ) @Slot() + def do_dd_adjust_ro_water_mode_response(self): + """ + the slot for dd level sensor change + :return: none + """ + self.lbAdjustRoWaterModeRequest .setText("-") + + self.dd_interface.dd_adjust_ro_water_mode_responses( + self.cbAcceptedAdjustment .isChecked() , + self.spnReasonAdjustment .value() + ) + + def do_dd_ro_water_mode_response(self): """ the slot for dd level sensor change :return: none """ + self.lbRoWaterModeRequest .setText("-") + self.dd_interface.dd_ro_water_mode_responses( self.cbAccepted .isChecked() , - self.spnReason .value() + self.spnReason .value() , + self.cbValue .currentIndex() , ) - @Slot() - def handle_request(self, message, timestamp = 0.0): + def handle_adjustment_request(self, message, timestamp = 0.0): """ the slot for Valve data change :return: none @@ -94,4 +121,12 @@ index = MsgFieldPositions.START_POS_FIELD_1 value,index = conversions.bytearray_to_integer( message, index) cmdString = self.cmdStrings[value] if value >= 0 and value < len(self.cmdStrings) else "" - self.lbRoWaterModeRequest.setText(f"{cmdString} ({value})") + self.lbAdjustRoWaterModeRequest.setText(f"{cmdString} ({value})") + + @Slot() + def handle_request(self, message, timestamp = 0.0): + """ + the slot for Valve data change + :return: none + """ + self.lbRoWaterModeRequest.setText("Request Received")