Index: simulator/plugins/pretreatmentstates/loader.py =================================================================== diff -u -red2d7cb5c8c2059444fd17cd4e1c0975461a903c -rad05ce7c5ed604813d9fd6ba1ad487096c9729b8 --- simulator/plugins/pretreatmentstates/loader.py (.../loader.py) (revision ed2d7cb5c8c2059444fd17cd4e1c0975461a903c) +++ simulator/plugins/pretreatmentstates/loader.py (.../loader.py) (revision ad05ce7c5ed604813d9fd6ba1ad487096c9729b8) @@ -22,6 +22,7 @@ tblSubMode: QtWidgets.QTableWidget tblWaterSampleStates: QtWidgets.QTableWidget + tblConsumablesSelfTestStates: QtWidgets.QTableWidget tblNoCartridgeSelfTestStates: QtWidgets.QTableWidget tblInstallationStates: QtWidgets.QTableWidget tblDrySelfTestStates: QtWidgets.QTableWidget @@ -41,6 +42,7 @@ self.tblSubMode = self.find_table_widget('tblSubMode') self.tblWaterSampleStates = self.find_table_widget('tblWaterSampleStates') + self.tblConsumablesSelfTestStates = self.find_table_widget('tblConsumablesSelfTestStates') self.tblNoCartridgeSelfTestStates = self.find_table_widget('tblNoCartridgeSelfTestStates') self.tblInstallationStates = self.find_table_widget('tblInstallationStates') self.tblDrySelfTestStates = self.find_table_widget('tblDrySelfTestStates') @@ -59,6 +61,7 @@ self.tblSubMode.cellClicked.connect(self.do_treatment_states) self.tblWaterSampleStates.cellClicked.connect(self.do_treatment_states) + self.tblConsumablesSelfTestStates.cellClicked.connect(self.do_treatment_states) self.tblNoCartridgeSelfTestStates.cellClicked.connect(self.do_treatment_states) self.tblInstallationStates.cellClicked.connect(self.do_treatment_states) self.tblDrySelfTestStates.cellClicked.connect(self.do_treatment_states) @@ -74,6 +77,7 @@ """ self.tblSubMode.setCurrentCell(HD_Pre_Treatment_Mode_States.HD_PRE_TREATMENT_START_STATE.value, 0) self.tblWaterSampleStates.setCurrentCell(HD_Pre_Treatment_Sample_Water_States.SAMPLE_WATER_SETUP_STATE.value, 0) + self.tblConsumablesSelfTestStates.setCurrentCell(HD_Pre_Treatment_Consumable_Self_Test_States.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, 0) self.tblNoCartridgeSelfTestStates.setCurrentCell(HD_Pre_Treatment_No_Cart_Self_Tests_States.NO_CART_SELF_TESTS_START_STATE.value, 0) self.tblInstallationStates.setCurrentCell(HD_Pre_Treatment_Cartridge_Install_States.CARTRIDGE_INSTALL_STATE.value, 0) self.tblDrySelfTestStates.setCurrentCell(HD_Pre_Treatment_Dry_Self_Tests_States.DRY_SELF_TESTS_START_STATE.value, 0) @@ -89,6 +93,7 @@ """ sub_mode = int(self.tblSubMode.verticalHeaderItem(self.tblSubMode.currentRow()).text()) water_sample = int(self.tblWaterSampleStates.verticalHeaderItem(self.tblWaterSampleStates.currentRow()).text()) + consumables_self_test = int(self.tblConsumablesSelfTestStates.verticalHeaderItem(self.tblConsumablesSelfTestStates.currentRow()).text()) no_cartridge_self_test = int(self.tblNoCartridgeSelfTestStates.verticalHeaderItem(self.tblNoCartridgeSelfTestStates.currentRow()).text()) installation = int(self.tblInstallationStates.verticalHeaderItem(self.tblInstallationStates.currentRow()).text()) dry_self_test = int(self.tblDrySelfTestStates.verticalHeaderItem(self.tblDrySelfTestStates.currentRow()).text()) @@ -98,6 +103,7 @@ self.hd_simulator.cmd_send_pre_treatment_state_data( sub_mode, water_sample, + consumables_self_test, no_cartridge_self_test, installation, dry_self_test,