Index: simulator/plugins/pretreatmentstates/loader.py =================================================================== diff -u -r68ba5188e33d6f05936fb77626822f416b9abb37 -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 --- simulator/plugins/pretreatmentstates/loader.py (.../loader.py) (revision 68ba5188e33d6f05936fb77626822f416b9abb37) +++ simulator/plugins/pretreatmentstates/loader.py (.../loader.py) (revision ae63fbc76b4638ffdcdaad7b69648beeee3340c3) @@ -4,7 +4,7 @@ # Python import os # Qt -from PySide2 import QtWidgets +from PySide2 import QtCore, QtWidgets from PySide2.QtCore import Slot # parent from simulator.dynamicloader import DynamicLoader @@ -19,6 +19,7 @@ The Ultrafiltration ui loader """ tbReset: QtWidgets.QToolButton + tbSend: QtWidgets.QToolButton tblSubMode: QtWidgets.QTableWidget tblWaterSampleStates: QtWidgets.QTableWidget @@ -39,6 +40,7 @@ :return: none """ self.tbReset = self.find_tool_button('tbReset') + self.tbSend = self.find_tool_button('tbSend') self.tblSubMode = self.find_table_widget('tblSubMode') self.tblWaterSampleStates = self.find_table_widget('tblWaterSampleStates') @@ -58,16 +60,17 @@ :return: none """ self.tbReset.clicked.connect(self._init_widgets) + self.tbSend.clicked.connect(self.do_pre_treatment_states) - self.tblSubMode.currentCellChanged.connect(self.do_treatment_states) - self.tblWaterSampleStates.currentCellChanged.connect(self.do_treatment_states) - self.tblConsumablesSelfTestStates.currentCellChanged.connect(self.do_treatment_states) - self.tblNoCartridgeSelfTestStates.currentCellChanged.connect(self.do_treatment_states) - self.tblInstallationStates.currentCellChanged.connect(self.do_treatment_states) - self.tblDrySelfTestStates.currentCellChanged.connect(self.do_treatment_states) - self.tblPrimeStates.currentCellChanged.connect(self.do_treatment_states) - self.tblRecirculateStates.currentCellChanged.connect(self.do_treatment_states) - self.tblPatientConnectionStates.currentCellChanged.connect(self.do_treatment_states) + self.tblSubMode.currentCellChanged.connect(self.do_pre_treatment_states) + self.tblWaterSampleStates.currentCellChanged.connect(self.do_pre_treatment_states) + self.tblConsumablesSelfTestStates.currentCellChanged.connect(self.do_pre_treatment_states) + self.tblNoCartridgeSelfTestStates.currentCellChanged.connect(self.do_pre_treatment_states) + self.tblInstallationStates.currentCellChanged.connect(self.do_pre_treatment_states) + self.tblDrySelfTestStates.currentCellChanged.connect(self.do_pre_treatment_states) + self.tblPrimeStates.currentCellChanged.connect(self.do_pre_treatment_states) + self.tblRecirculateStates.currentCellChanged.connect(self.do_pre_treatment_states) + self.tblPatientConnectionStates.currentCellChanged.connect(self.do_pre_treatment_states) @Slot() def _init_widgets(self): @@ -85,8 +88,18 @@ self.tblRecirculateStates.setCurrentCell(HD_Pre_Treatment_Recirc_States.PRE_TREATMENT_RECIRC_STATE.value, 0) self.tblPatientConnectionStates.setCurrentCell(HD_Pre_Treatment_Patient_Connection_States.PATIENT_CONNECTION_STATE.value, 0) + self.tblSubMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) + self.tblWaterSampleStates.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) + self.tblConsumablesSelfTestStates.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) + self.tblNoCartridgeSelfTestStates.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) + self.tblInstallationStates.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) + self.tblDrySelfTestStates.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) + self.tblPrimeStates.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) + self.tblRecirculateStates.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) + self.tblPatientConnectionStates.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) + @Slot() - def do_treatment_states(self): + def do_pre_treatment_states(self): """ the slot for saline bolus state change :return: none