Index: simulator/plugins/treatmentstates/loader.py =================================================================== diff -u -rf4523ffcaff0d27f7392c943f0a487fcb01a7d34 -r2204a65b0af94e7e555f0f4207fd2701c164d1d5 --- simulator/plugins/treatmentstates/loader.py (.../loader.py) (revision f4523ffcaff0d27f7392c943f0a487fcb01a7d34) +++ simulator/plugins/treatmentstates/loader.py (.../loader.py) (revision 2204a65b0af94e7e555f0f4207fd2701c164d1d5) @@ -18,6 +18,7 @@ """ The Ultrafiltration ui loader """ + tbSend: QtWidgets.QToolButton tbReset: QtWidgets.QToolButton tblSubMode: QtWidgets.QTableWidget @@ -32,13 +33,13 @@ def __init__(self, hd_simulator: HDSimulator): super().__init__(os.path.dirname(__file__), hd_simulator) - print(" ---------- ", self.hd_simulator) def _init_loader(self): """ finds and creates widgets :return: none """ + self.tbSend = self.find_tool_button('tbSend') self.tbReset = self.find_tool_button('tbReset') self.tblSubMode = self.find_table_widget('tblSubMode') @@ -57,16 +58,17 @@ :return: none """ self.tbReset.clicked.connect(self._init_widgets) + self.tbSend.clicked.connect(self.do_treatment_states) - self.tblSubMode.cellClicked.connect(self.do_treatment_states) - self.tblUFStates.cellClicked.connect(self.do_treatment_states) - self.tblSalineStates.cellClicked.connect(self.do_treatment_states) - self.tblHeparinStates.cellClicked.connect(self.do_treatment_states) - self.tblRinsebackStates.cellClicked.connect(self.do_treatment_states) - self.tblRecirculateStates.cellClicked.connect(self.do_treatment_states) - self.tblBloodPrimeStates.cellClicked.connect(self.do_treatment_states) - self.tblTreatmentEndStates.cellClicked.connect(self.do_treatment_states) - self.tblTreatmentStopStates.cellClicked.connect(self.do_treatment_states) + self.tblSubMode.currentCellChanged.connect(self.do_treatment_states) + self.tblUFStates.currentCellChanged.connect(self.do_treatment_states) + self.tblSalineStates.currentCellChanged.connect(self.do_treatment_states) + self.tblHeparinStates.currentCellChanged.connect(self.do_treatment_states) + self.tblRinsebackStates.currentCellChanged.connect(self.do_treatment_states) + self.tblRecirculateStates.currentCellChanged.connect(self.do_treatment_states) + self.tblBloodPrimeStates.currentCellChanged.connect(self.do_treatment_states) + self.tblTreatmentEndStates.currentCellChanged.connect(self.do_treatment_states) + self.tblTreatmentStopStates.currentCellChanged.connect(self.do_treatment_states) # apply/send the initial states # self.do_treatment_states() @@ -77,7 +79,7 @@ :return: none """ self.tblSubMode.setCurrentCell(TXStates.TREATMENT_START_STATE, 0) - self.tblUFStates.setCurrentCell(TXStates.UF_OFF_STATE, 0) + self.tblUFStates.setCurrentCell(TXStates.UF_RUNNING_STATE, 0) self.tblSalineStates.setCurrentCell(TXStates.SALINE_BOLUS_STATE_IDLE, 0) self.tblHeparinStates.setCurrentCell(TXStates.HEPARIN_STATE_OFF, 0) self.tblRinsebackStates.setCurrentCell(TXStates.RINSEBACK_STOP_INIT_STATE, 0)