Index: simulator/plugins/HDOpMode/interface.ui =================================================================== diff -u -ra7674c35d63942e38006f75c3ebe52b0df16ae42 -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 --- simulator/plugins/HDOpMode/interface.ui (.../interface.ui) (revision a7674c35d63942e38006f75c3ebe52b0df16ae42) +++ simulator/plugins/HDOpMode/interface.ui (.../interface.ui) (revision ae63fbc76b4638ffdcdaad7b69648beeee3340c3) @@ -34,7 +34,7 @@ background-color: rgb(52, 105, 2); - HD Op Mode + 37 : [0x2500] : HD Op Mode Qt::AlignCenter @@ -169,7 +169,7 @@ - HD OP Mode + 0 : HD OP Mode @@ -364,7 +364,7 @@ - StandBy + 1 : SubMode [StandBy] @@ -451,6 +451,12 @@ + + tbSend + tbReset + tblOpMode + tblSubMode + Index: simulator/plugins/HDOpMode/loader.py =================================================================== diff -u -ra7674c35d63942e38006f75c3ebe52b0df16ae42 -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 --- simulator/plugins/HDOpMode/loader.py (.../loader.py) (revision a7674c35d63942e38006f75c3ebe52b0df16ae42) +++ simulator/plugins/HDOpMode/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 @@ -54,7 +54,9 @@ :return: none """ self.tblOpMode.setCurrentCell(HDDefs.MODE_INIT.value, 0) + self.tblOpMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) self.tblSubMode.setCurrentCell(HD_Standby_States.STANDBY_START_STATE.value, 0) + self.tblSubMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) @Slot() def do_treatment_states(self): Index: simulator/plugins/PostTreatment/interface.ui =================================================================== diff -u -ra7674c35d63942e38006f75c3ebe52b0df16ae42 -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 --- simulator/plugins/PostTreatment/interface.ui (.../interface.ui) (revision a7674c35d63942e38006f75c3ebe52b0df16ae42) +++ simulator/plugins/PostTreatment/interface.ui (.../interface.ui) (revision ae63fbc76b4638ffdcdaad7b69648beeee3340c3) @@ -6,10 +6,16 @@ 0 0 - 1118 + 1150 776 + + + 1150 + 0 + + &5 Post-Treatment/&0 Responses @@ -268,6 +274,9 @@ 25.123 + + 9 + @@ -321,11 +330,14 @@ - 99999 + 9999999999 24 + + 10 + @@ -379,11 +391,14 @@ - 99999 + 9999999999 31 + + 10 + @@ -437,11 +452,14 @@ - 99999 + 9999999999 - 13 + 1620913600 + + 10 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -498,11 +516,14 @@ - 99999 + 9999999999 - 3 + 480 + + 10 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -559,11 +580,14 @@ - 99999 + 9999999999 - 4 + 120 + + 10 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -620,11 +644,14 @@ - 99999 + 9999999999 8 + + 10 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -686,6 +713,9 @@ 16.456 + + 9 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -742,11 +772,14 @@ - 99999 + 9999999999 2 + + 10 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -808,6 +841,9 @@ 26.234 + + 9 + @@ -846,7 +882,7 @@ - 29 - (U32) Heparin Pre-Stop + 29 - (U32) Heparin Stop leHeparinPreStop @@ -861,11 +897,14 @@ - 99999 + 9999999999 27 + + 10 + @@ -919,11 +958,14 @@ - 99999 + 9999999999 1 + + 10 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -985,6 +1027,9 @@ 19.789 + + 9 + @@ -1038,11 +1083,14 @@ - 99999 + 9999999999 - 7 + 0 + + 10 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -1099,11 +1147,14 @@ - 99999 + 9999999999 - 5 + 0 + + 10 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -1165,6 +1216,9 @@ 11.123 + + 9 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -1226,6 +1280,9 @@ 29.456 + + 9 + @@ -1279,11 +1336,14 @@ - 99999 + 9999999999 - 12 + 0 + + 10 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -1340,11 +1400,14 @@ - 99999 + 9999999999 - 33 + 0 + + 10 + @@ -1398,11 +1461,14 @@ - 99999 + 9999999999 - 23 + 0 + + 10 + @@ -1456,11 +1522,14 @@ - 99999 + 9999 - 32 + 1234 + + 4 + @@ -1519,6 +1588,9 @@ 15.345 + + 9 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -1575,11 +1647,14 @@ - 99999 + 9999999999 22 + + 10 + @@ -1638,6 +1713,9 @@ 20.891 + + 9 + @@ -1696,6 +1774,9 @@ 21.912 + + 9 + @@ -1754,6 +1835,9 @@ 28.345 + + 9 + @@ -1807,11 +1891,14 @@ - 99999 + 9999999999 - 6 + 0 + + 10 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -1868,11 +1955,14 @@ - 99999 + 9999999999 9 + + 10 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -1934,6 +2024,9 @@ 18.678 + + 9 + @@ -1992,6 +2085,9 @@ 14.234 + + 9 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2053,6 +2149,9 @@ 30.567 + + 9 + @@ -2111,6 +2210,9 @@ 17.567 + + 9 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -2167,11 +2269,14 @@ - 99999 + 9999999999 10 + + 10 + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter Index: simulator/plugins/PostTreatment/loader.py =================================================================== diff -u -ra1d61285efe44dfa5bddcfca2a61d69e5841ee6c -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 --- simulator/plugins/PostTreatment/loader.py (.../loader.py) (revision a1d61285efe44dfa5bddcfca2a61d69e5841ee6c) +++ simulator/plugins/PostTreatment/loader.py (.../loader.py) (revision ae63fbc76b4638ffdcdaad7b69648beeee3340c3) @@ -12,7 +12,7 @@ from dialin.ui.hd_simulator import HDSimulator from dialin.ui.hd_simulator import RequestRejectReasons -from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray +from dialin.utils.conversions import unsigned_to_bytearray, float_to_bytearray # plugin specific # -- None -- @@ -165,19 +165,19 @@ """ parameters = [ # column 1 - integer_to_bytearray(int(self.leBloodFlowRate.text())), - integer_to_bytearray(int(self.leDialysateFlowRate.text())), - integer_to_bytearray(int(self.leTreatmentDuration.text())), - integer_to_bytearray(int(self.leActualTreatmentDuration.text())), - integer_to_bytearray(int(self.leAcidConcentrateType.text())), - integer_to_bytearray(int(self.leBicarbonateConcentrateType.text())), - integer_to_bytearray(int(self.lePotassiumConcentration.text())), - integer_to_bytearray(int(self.leCalciumConcentration.text())), - integer_to_bytearray(int(self.leBicarbonateConcentration.text())), - integer_to_bytearray(int(self.leSodiumConcentration.text())), + unsigned_to_bytearray(int(self.leBloodFlowRate.text())), + unsigned_to_bytearray(int(self.leDialysateFlowRate.text())), + unsigned_to_bytearray(int(self.leTreatmentDuration.text())), + unsigned_to_bytearray(int(self.leActualTreatmentDuration.text())), + unsigned_to_bytearray(int(self.leAcidConcentrateType.text())), + unsigned_to_bytearray(int(self.leBicarbonateConcentrateType.text())), + unsigned_to_bytearray(int(self.lePotassiumConcentration.text())), + unsigned_to_bytearray(int(self.leCalciumConcentration.text())), + unsigned_to_bytearray(int(self.leBicarbonateConcentration.text())), + unsigned_to_bytearray(int(self.leSodiumConcentration.text())), float_to_bytearray(float(self.leDialysateTemperature.text())), - integer_to_bytearray(int(self.leDialyzerType.text())), - integer_to_bytearray(int(self.leTreatmentDateTime.text())), + unsigned_to_bytearray(int(self.leDialyzerType.text())), + unsigned_to_bytearray(int(self.leTreatmentDateTime.text())), float_to_bytearray(float(self.leAverageBloodFlow.text())), float_to_bytearray(float(self.leAverageDialysateFlow.text())), float_to_bytearray(float(self.leDialysateVolumeUsed.text())), @@ -187,18 +187,18 @@ float_to_bytearray(float(self.leActualUFVolume.text())), float_to_bytearray(float(self.leTargetUFRate.text())), float_to_bytearray(float(self.leActualUFRate.text())), - integer_to_bytearray(int(self.leSalineBolusVolume.text())), - integer_to_bytearray(int(self.leHeparinType.text())), - integer_to_bytearray(int(self.leHeparinConcentration.text())), + unsigned_to_bytearray(int(self.leSalineBolusVolume.text())), + unsigned_to_bytearray(int(self.leHeparinType.text())), + unsigned_to_bytearray(int(self.leHeparinConcentration.text())), float_to_bytearray(float(self.leHeparinBolusVolume.text())), float_to_bytearray(float(self.leHeparinDispenseRate.text())), - integer_to_bytearray(int(self.leHeparinPreStop.text())), + unsigned_to_bytearray(int(self.leHeparinPreStop.text())), float_to_bytearray(float(self.leHeparinDeliveredVolume.text())), float_to_bytearray(float(self.leAverageArterialPressure.text())), float_to_bytearray(float(self.leAverageVenousPressure.text())), - integer_to_bytearray(int(self.leEndTreatmentEarlyAlarm.text())), - integer_to_bytearray(int(self.leDeviceID.text())), - integer_to_bytearray(int(self.leWaterSampleTestResult.text())) + unsigned_to_bytearray(int(self.leEndTreatmentEarlyAlarm.text())), + unsigned_to_bytearray(int(self.leDeviceID.text())), + unsigned_to_bytearray(int(self.leWaterSampleTestResult.text())) ] self.hd_simulator.cmd_send_post_treatment_log_response(True, 0, parameters) @@ -212,19 +212,19 @@ """ parameters = [ # column 1 - integer_to_bytearray(0), - integer_to_bytearray(0), - integer_to_bytearray(0), - integer_to_bytearray(0), - integer_to_bytearray(0), - integer_to_bytearray(0), - integer_to_bytearray(0), - integer_to_bytearray(0), - integer_to_bytearray(0), - integer_to_bytearray(0), + unsigned_to_bytearray(0), + unsigned_to_bytearray(0), + unsigned_to_bytearray(0), + unsigned_to_bytearray(0), + unsigned_to_bytearray(0), + unsigned_to_bytearray(0), + unsigned_to_bytearray(0), + unsigned_to_bytearray(0), + unsigned_to_bytearray(0), + unsigned_to_bytearray(0), float_to_bytearray(0), - integer_to_bytearray(0), - integer_to_bytearray(0), + unsigned_to_bytearray(0), + unsigned_to_bytearray(0), float_to_bytearray(0), float_to_bytearray(0), float_to_bytearray(0), @@ -234,18 +234,18 @@ float_to_bytearray(0), float_to_bytearray(0), float_to_bytearray(0), - integer_to_bytearray(0), - integer_to_bytearray(0), - integer_to_bytearray(0), + unsigned_to_bytearray(0), + unsigned_to_bytearray(0), + unsigned_to_bytearray(0), float_to_bytearray(0), float_to_bytearray(0), - integer_to_bytearray(0), + unsigned_to_bytearray(0), float_to_bytearray(0), float_to_bytearray(0), float_to_bytearray(0), - integer_to_bytearray(0), - integer_to_bytearray(0), - integer_to_bytearray(0) + unsigned_to_bytearray(0), + unsigned_to_bytearray(0), + unsigned_to_bytearray(0) ] reason = self.spnReasonTxLog.value() self.hd_simulator.cmd_send_post_treatment_log_response(False, reason, parameters) Index: simulator/plugins/alarms/interface.ui =================================================================== diff -u -r587822f6461dce6f46302875b09abb552532f698 -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 --- simulator/plugins/alarms/interface.ui (.../interface.ui) (revision 587822f6461dce6f46302875b09abb552532f698) +++ simulator/plugins/alarms/interface.ui (.../interface.ui) (revision ae63fbc76b4638ffdcdaad7b69648beeee3340c3) @@ -6,8 +6,8 @@ 0 0 - 653 - 591 + 994 + 801 @@ -535,8 +535,18 @@ - - + + + + + 1 + + + 65535 + + + + @@ -555,16 +565,70 @@ - - - - 1 - - - 65535 - + + + + + + + + + + + NONE + + + + + U32 + + + + + S32 + + + + + F32 + + + + + BOOL + + + + + + + NONE + + + + + U32 + + + + + S32 + + + + + F32 + + + + + BOOL + + + + @@ -708,5 +772,21 @@ + + spnTopID + valueChanged(int) + btnSend + click() + + + 157 + 103 + + + 135 + 74 + + + Index: simulator/plugins/alarms/loader.py =================================================================== diff -u -red2d7cb5c8c2059444fd17cd4e1c0975461a903c -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 --- simulator/plugins/alarms/loader.py (.../loader.py) (revision ed2d7cb5c8c2059444fd17cd4e1c0975461a903c) +++ simulator/plugins/alarms/loader.py (.../loader.py) (revision ae63fbc76b4638ffdcdaad7b69648beeee3340c3) @@ -40,6 +40,11 @@ lstFlags: QtWidgets.QListWidget tblTriggeredIDs: QtWidgets.QTableWidget + cbFieldDescriptor1: QtWidgets.QComboBox + cbFieldDescriptor2: QtWidgets.QComboBox + leDataField1: QtWidgets.QLineEdit + leDataField2: QtWidgets.QLineEdit + priority = AlarmPriority.ALARM_HIGH flags = 0 @@ -100,6 +105,11 @@ self.spnAlarmID = self.find_spinbox('spnAlarmID') self.tblTriggeredIDs = self.find_table_widget('tblTriggeredIDs') + self.cbFieldDescriptor1 = self.find_combobox('cbFieldDescriptor1') + self.cbFieldDescriptor2 = self.find_combobox('cbFieldDescriptor2') + self.leDataField1 = self.find_line_edit('leDataField1') + self.leDataField2 = self.find_line_edit('leDataField2') + def _init_widgets(self): """ initializes the widgets' properties @@ -209,8 +219,19 @@ :return: none """ alarm_id = self.spnAlarmID.value() + field_descriptor_1 = self.cbFieldDescriptor1.currentIndex() + data_field_1 = self.leDataField1.text() + if data_field_1 == "": + data_field_1 = "0" + field_descriptor_2 = self.cbFieldDescriptor2.currentIndex() + data_field_2 = self.leDataField2.text() + if data_field_2 == "": + data_field_2 = "0" + if alarm_id: - self.alarm.cmd_set_alarm_triggered(alarm_id) + self.alarm.cmd_set_alarm_triggered(alarm_id, + field_descriptor_1, data_field_1, + field_descriptor_2, data_field_2) self.__append_triggered_row(alarm_id) @Slot() Index: simulator/plugins/disinfectionstates/interface.ui =================================================================== diff -u -re25c762014f029632c278b0b324b05f353ea8986 -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 --- simulator/plugins/disinfectionstates/interface.ui (.../interface.ui) (revision e25c762014f029632c278b0b324b05f353ea8986) +++ simulator/plugins/disinfectionstates/interface.ui (.../interface.ui) (revision ae63fbc76b4638ffdcdaad7b69648beeee3340c3) @@ -34,7 +34,7 @@ background-color: rgb(78, 157, 236); - Disinfection + 126 : [0x7E00] : Disinfection Qt::AlignCenter @@ -139,7 +139,7 @@ - HD OP Mode + 0 : DG Disinfec Mode @@ -244,7 +244,7 @@ - Flush + 1 : Flush @@ -434,7 +434,7 @@ - Heat + 2 : Heat @@ -739,7 +739,7 @@ - Chemical + 3 : Chemical Index: simulator/plugins/disinfectionstates/loader.py =================================================================== diff -u -re25c762014f029632c278b0b324b05f353ea8986 -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 --- simulator/plugins/disinfectionstates/loader.py (.../loader.py) (revision e25c762014f029632c278b0b324b05f353ea8986) +++ simulator/plugins/disinfectionstates/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 @@ -63,6 +63,10 @@ self.tblFlushMode.setCurrentCell(0, 0) # not defined in FwCommon yet self.tblHeatMode.setCurrentCell(HD_Standby_States.STANDBY_START_STATE.value, 0) self.tblChemicalMode.setCurrentCell(0, 0) # not defined in FwCommon yet + self.tblSubMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) + self.tblFlushMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) + self.tblHeatMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) + self.tblChemicalMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) @Slot() def do_disinfect_states(self): Index: simulator/plugins/pretreatmentstates/interface.ui =================================================================== diff -u -r1feaa8fa080d42178a883ef7cfad8f12596bf213 -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 --- simulator/plugins/pretreatmentstates/interface.ui (.../interface.ui) (revision 1feaa8fa080d42178a883ef7cfad8f12596bf213) +++ simulator/plugins/pretreatmentstates/interface.ui (.../interface.ui) (revision ae63fbc76b4638ffdcdaad7b69648beeee3340c3) @@ -46,14 +46,21 @@ background-color: rgb(252, 175, 62); - Pre-Treatment States + 92 : [0x5C00] : Pre-Treatment States Qt::AlignCenter + + + send + + + + reset @@ -144,7 +151,7 @@ 43 - 350 + 360 true @@ -205,7 +212,7 @@ - Pre-Treatment States (subMode) [HD_Pre_Treatment_Mode_States] + 0 : Pre-Treatment States (subMode) [HD_Pre_Treatment_Mode_States] @@ -365,7 +372,7 @@ true - 350 + 360 true @@ -385,7 +392,7 @@ - HD_Pre_Treatment_Sample_Water_States + 1 : HD_Pre_Treatment_Sample_Water_States @@ -462,7 +469,7 @@ true - 350 + 360 true @@ -502,7 +509,7 @@ - HD_Pre_Treatment_Consumable_Self_Test_States + 2 : HD_Pre_Treatment_Consumable_Self_Test_States @@ -619,7 +626,7 @@ true - 350 + 360 true @@ -694,7 +701,7 @@ - HD_Pre_Treatment_No_Cart_Self_Tests_States + 3 : HD_Pre_Treatment_No_Cart_Self_Tests_States @@ -881,7 +888,7 @@ true - 350 + 360 true @@ -896,7 +903,7 @@ - Installation State + 4 : Installation State @@ -963,7 +970,7 @@ true - 350 + 360 true @@ -1023,7 +1030,7 @@ - HD_Pre_Treatment_Dry_Self_Tests_States + 5 : HD_Pre_Treatment_Dry_Self_Tests_States @@ -1180,7 +1187,7 @@ true - 350 + 360 true @@ -1250,7 +1257,7 @@ - HD_Pre_Treatment_Prime_States + 6 : HD_Pre_Treatment_Prime_States @@ -1427,7 +1434,7 @@ true - 350 + 360 true @@ -1447,7 +1454,7 @@ - HD_Pre_Treatment_Recirc_States + 7 : HD_Pre_Treatment_Recirc_States @@ -1524,7 +1531,7 @@ true - 350 + 360 true @@ -1539,7 +1546,7 @@ - Patient Connection State + 8 : Patient Connection State 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 Index: simulator/plugins/treatmentstates/interface.ui =================================================================== diff -u -r2204a65b0af94e7e555f0f4207fd2701c164d1d5 -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 --- simulator/plugins/treatmentstates/interface.ui (.../interface.ui) (revision 2204a65b0af94e7e555f0f4207fd2701c164d1d5) +++ simulator/plugins/treatmentstates/interface.ui (.../interface.ui) (revision ae63fbc76b4638ffdcdaad7b69648beeee3340c3) @@ -14,32 +14,6 @@ &1 States/&3 Treatment States - - - - - 10 - - - - background-color: rgb(245, 121, 0); -color: rgb(238, 238, 236); - - - Treatment States - - - Qt::AlignCenter - - - - - - - reset - - - @@ -53,14 +27,7 @@ - - - - send - - - - + @@ -153,7 +120,7 @@ - Treatment States (subMode) + 0 : Treatment States (subMode) @@ -249,7 +216,7 @@ - Blood Prime States + 7 : Blood Prime States @@ -322,7 +289,7 @@ - UF States + 1 : UF States @@ -407,7 +374,7 @@ - Saline States + 2 : Saline States @@ -515,7 +482,7 @@ - Heparin States + 3 : Heparin States @@ -628,7 +595,7 @@ - Rinseback States + 4 : Rinseback States @@ -716,7 +683,7 @@ - Recirculate States + 5 : Recirculate States @@ -795,7 +762,7 @@ - Treatment End States + 8 : Treatment End States @@ -874,7 +841,7 @@ - Treatment Stop States + 9 : Treatment Stop States @@ -894,8 +861,54 @@ + + + + reset + + + + + + + send + + + + + + + + 10 + + + + background-color: rgb(245, 121, 0); +color: rgb(238, 238, 236); + + + 15 : [0x0F00] : Treatment States + + + Qt::AlignCenter + + + + + tbSend + tbReset + tblSubMode + tblBloodPrimeStates + tblUFStates + tblSalineStates + tblHeparinStates + tblRinsebackStates + tblRecirculateStates + tblTreatmentEndStates + tblTreatmentStopStates +