Index: TD_Pre_Treatment/loader.py =================================================================== diff -u -rd9081d89b2a1b40b9bd6b198010e2ac86daaed6d -r111dde456d779ca809a27a17f84a8ab2133abd60 --- TD_Pre_Treatment/loader.py (.../loader.py) (revision d9081d89b2a1b40b9bd6b198010e2ac86daaed6d) +++ TD_Pre_Treatment/loader.py (.../loader.py) (revision 111dde456d779ca809a27a17f84a8ab2133abd60) @@ -65,7 +65,7 @@ self.btnValidateReset = self.find_widget(QtWidgets.QToolButton, 'btnValidateReset' ) self.btnAutoLoad = self.find_widget(QtWidgets.QPushButton, 'btnAutoLoadSend' ) self.btnAutoLoadReset = self.find_widget(QtWidgets.QToolButton, 'btnAutoLoadReset' ) - self.btnStartTxReset = self.find_widget(QtWidgets.QToolButton, 'btnStartTxReset' ) + self.btnStartTxReset = self.find_widget(QtWidgets.QToolButton, 'btnStartTxReset' ) self.spnCreateRxRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnCreateRxRejectReason' ) self.spnAutoLoadRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnLoadReasonSpinBox' ) @@ -75,45 +75,55 @@ self.lbStartTreatment = self.find_widget(QtWidgets.QLabel , 'lbStartTreatment' ) self.lbCreateTx = self.find_widget(QtWidgets.QLabel , 'lbCreateTx' ) + self.spnTreatmentModalitRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnTreatmentModalityRejectReason' ) + self.spnHDFTreatmentModeRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnHDFTreatmentModeRejectReason' ) self.spnBloodFlowRateRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnBloodFlowRateRejectReason' ) self.spnDialysateFlowRateRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnDialysateFlowRateRejectReason' ) self.spnTreatmentDurationRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnTreatmentDurationRejectReason' ) - self.spnSalineBolusVolumeRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnSalineBolusVolumeRejectReason' ) self.spnHeparinStopTimeRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnHeparinStopTimeRejectReason' ) self.spnHeparinTypeRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnHeparinTypeRejectReason' ) - self.spnAcidConcentrateRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnAcidConcentrateRejectReason' ) - self.spnBicarbonateConcentrateRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnBicarbonateConcentrateRejectReason' ) + self.spnDryBicarbConcentrateRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnDryBicarbConcentrateRejectReason' ) + self.spnSodiumRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnSodiumRejectReason' ) + self.spnBicarbonateRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnBicarbonateRejectReason' ) self.spnDialyzerTypeRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnDialyzerTypeRejectReason' ) + self.spnSalineBolusVolumeRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnSalineBolusVolumeRejectReason' ) self.spnBloodPressureMeasureIntervalRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnBloodPressureMeasureIntervalRejectReason' ) - self.spnRinsebackFlowRateRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnRinsebackFlowRateRejectReason' ) + self.spnPrimeDiscardVolumeRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnPrimeDiscardVolumeRejectReason' ) self.spnRinsebackVolumeRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnRinsebackVolumeRejectReason' ) - self.spnArterialPressureLimitWindowRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnArterialPressureLimitWindowRejectReason' ) - self.spnVenousPressureLimitWindowRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnVenousPressureLimitWindowRejectReason' ) - self.spnVenousPressureLimitAsymtrcRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnVenousPressureLimitAsymtrcRejectReason' ) - self.spnTransmembranePressureLimitWindowRejectReason= self.find_widget(QtWidgets.QSpinBox , 'spnTransmembranePressureLimitWindowRejectReason' ) - self.spnDialysateTempRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnDialysateTempRejectReason' ) - self.spnHeparinDispensingRateRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnHeparinDispensingRateRejectReason' ) + self.spnHepatitisBStatusRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnHepatitisBStatusRejectReason' ) + self.spnSubstitutionFluidRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnSubstitutionFluidRejectReason' ) self.spnHeparinBolusVolumeRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnHeparinBolusVolumeRejectReason' ) + self.spnHeparinDispensingRateRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnHeparinDispensingRateRejectReason' ) + self.spnDialysateTempRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnDialysateTempRejectReason' ) + self.spnAcidConcentrateRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnAcidConcentrateRejectReason' ) + self.spnUFVolumeRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnUFVolumeRejectReason' ) + self.spnPreWeightRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnPreWeightRejectReason' ) + self.spnEstimatedTargetWeightRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnEstimatedTargetWeightRejectReason' ) + self.lbTreatmentModality = self.find_widget(QtWidgets.QLabel , 'lbTreatmentModalityValue' ) + self.lbHDFTreatmentMode = self.find_widget(QtWidgets.QLabel , 'lbHDFTreatmentModeValue' ) self.lbBloodFlowRate = self.find_widget(QtWidgets.QLabel , 'lbBloodFlowRateValue' ) self.lbDialysateFlowRate = self.find_widget(QtWidgets.QLabel , 'lbDialysateFlowRateValue' ) self.lbTreatmentDuration = self.find_widget(QtWidgets.QLabel , 'lbTreatmentDurationValue' ) - self.lbSalineBolusVolume = self.find_widget(QtWidgets.QLabel , 'lbSalineBolusVolumeValue' ) self.lbHeparinStopTime = self.find_widget(QtWidgets.QLabel , 'lbHeparinStopTimeValue' ) self.lbHeparinType = self.find_widget(QtWidgets.QLabel , 'lbHeparinTypeValue' ) - self.lbAcidConcentrate = self.find_widget(QtWidgets.QLabel , 'lbAcidConcentrateValue' ) - self.lbBicarbonateConcentrate = self.find_widget(QtWidgets.QLabel , 'lbBicarbonateConcentrateValue' ) + self.lbDryBicarbConcentrate = self.find_widget(QtWidgets.QLabel , 'lbDryBicarbConcentrateValue' ) + self.lbSodium = self.find_widget(QtWidgets.QLabel , 'lbSodiumValue' ) + self.lbBicarbonate = self.find_widget(QtWidgets.QLabel , 'lbBicarbonateValue' ) self.lbDialyzerType = self.find_widget(QtWidgets.QLabel , 'lbDialyzerTypeValue' ) + self.lbSalineBolusVolume = self.find_widget(QtWidgets.QLabel , 'lbSalineBolusVolumeValue' ) self.lbBloodPressureMeasureInterval = self.find_widget(QtWidgets.QLabel , 'lbBloodPressureMeasureIntervalValue' ) - self.lbRinsebackFlowRate = self.find_widget(QtWidgets.QLabel , 'lbRinsebackFlowRateValue' ) + self.lbPrimeDiscardVolume = self.find_widget(QtWidgets.QLabel , 'lbPrimeDiscardVolumeValue' ) self.lbRinsebackVolume = self.find_widget(QtWidgets.QLabel , 'lbRinsebackVolumeValue' ) - self.lbArterialPressureLimitWindow = self.find_widget(QtWidgets.QLabel , 'lbArterialPressureLimitWindowValue' ) - self.lbVenousPressureLimitWindow = self.find_widget(QtWidgets.QLabel , 'lbVenousPressureLimitWindowValue' ) - self.lbVenousPressureLimitAsymtrc = self.find_widget(QtWidgets.QLabel , 'lbVenousPressureLimitAsymtrcValue' ) - self.lbTransmembranePressureLimitWindow = self.find_widget(QtWidgets.QLabel , 'lbTransmembranePressureLimitWindowValue' ) - self.lbDialysateTemp = self.find_widget(QtWidgets.QLabel , 'lbDialysateTempValue' ) - self.lbHeparinDispensingRate = self.find_widget(QtWidgets.QLabel , 'lbHeparinDispensingRateValue' ) + self.lbHepatitisBStatus = self.find_widget(QtWidgets.QLabel , 'lbHepatitisBStatusValue' ) + self.lbSubstitutionFluid = self.find_widget(QtWidgets.QLabel , 'lbSubstitutionFluidValue' ) self.lbHeparinBolusVolume = self.find_widget(QtWidgets.QLabel , 'lbHeparinBolusVolumeValue' ) + self.lbHeparinDispensingRate = self.find_widget(QtWidgets.QLabel , 'lbHeparinDispensingRateValue' ) + self.lbDialysateTemp = self.find_widget(QtWidgets.QLabel , 'lbDialysateTempValue' ) + self.lbAcidConcentrate = self.find_widget(QtWidgets.QLabel , 'lbAcidConcentrateValue' ) + self.lbUFVolue = self.find_widget(QtWidgets.QLabel , 'lbUFVolueValue' ) + self.lbPreWeight = self.find_widget(QtWidgets.QLabel , 'lbPreWeightValue' ) + self.lbEstimatedTargetWeight = self.find_widget(QtWidgets.QLabel , 'lbEstimatedTargetWeightValue' ) @@ -174,71 +184,86 @@ :return: none """ accepted = ( + self.spnTreatmentModalitRejectReason .value() + + self.spnHDFTreatmentModeRejectReason .value() + self.spnBloodFlowRateRejectReason .value() + self.spnDialysateFlowRateRejectReason .value() + self.spnTreatmentDurationRejectReason .value() + - self.spnSalineBolusVolumeRejectReason .value() + self.spnHeparinStopTimeRejectReason .value() + self.spnHeparinTypeRejectReason .value() + - self.spnAcidConcentrateRejectReason .value() + - self.spnBicarbonateConcentrateRejectReason .value() + + self.spnDryBicarbConcentrateRejectReason .value() + + self.spnSodiumRejectReason .value() + + self.spnBicarbonateRejectReason .value() + self.spnDialyzerTypeRejectReason .value() + + self.spnSalineBolusVolumeRejectReason .value() + self.spnBloodPressureMeasureIntervalRejectReason .value() + - self.spnRinsebackFlowRateRejectReason .value() + + self.spnPrimeDiscardVolumeRejectReason .value() + self.spnRinsebackVolumeRejectReason .value() + - self.spnArterialPressureLimitWindowRejectReason .value() + - self.spnVenousPressureLimitWindowRejectReason .value() + - self.spnVenousPressureLimitAsymtrcRejectReason .value() + - self.spnTransmembranePressureLimitWindowRejectReason.value() + - self.spnDialysateTempRejectReason .value() + + self.spnHepatitisBStatusRejectReason .value() + + self.spnSubstitutionFluidRejectReason .value() + + self.spnHeparinBolusVolumeRejectReason .value() + self.spnHeparinDispensingRateRejectReason .value() + - self.spnHeparinBolusVolumeRejectReason .value() + self.spnDialysateTempRejectReason .value() + + self.spnAcidConcentrateRejectReason .value() + + self.spnUFVolumeRejectReason .value() + + self.spnPreWeightRejectReason .value() + + self.spnEstimatedTargetWeightRejectReason .value() ) == 0 self.td_interface.td_Treatment_Parameters_Validation( 1 if accepted else 0, + self.spnTreatmentModalitRejectReason .value(), + self.spnHDFTreatmentModeRejectReason .value(), self.spnBloodFlowRateRejectReason .value(), self.spnDialysateFlowRateRejectReason .value(), self.spnTreatmentDurationRejectReason .value(), - self.spnSalineBolusVolumeRejectReason .value(), self.spnHeparinStopTimeRejectReason .value(), self.spnHeparinTypeRejectReason .value(), - self.spnAcidConcentrateRejectReason .value(), - self.spnBicarbonateConcentrateRejectReason .value(), + self.spnDryBicarbConcentrateRejectReason .value(), + self.spnSodiumRejectReason .value(), + self.spnBicarbonateRejectReason .value(), self.spnDialyzerTypeRejectReason .value(), + self.spnSalineBolusVolumeRejectReason .value(), self.spnBloodPressureMeasureIntervalRejectReason .value(), - self.spnRinsebackFlowRateRejectReason .value(), + self.spnPrimeDiscardVolumeRejectReason .value(), self.spnRinsebackVolumeRejectReason .value(), - self.spnArterialPressureLimitWindowRejectReason .value(), - self.spnVenousPressureLimitWindowRejectReason .value(), - self.spnVenousPressureLimitAsymtrcRejectReason .value(), - self.spnTransmembranePressureLimitWindowRejectReason.value(), - self.spnDialysateTempRejectReason .value(), + self.spnHepatitisBStatusRejectReason .value(), + self.spnSubstitutionFluidRejectReason .value(), + self.spnHeparinBolusVolumeRejectReason .value(), self.spnHeparinDispensingRateRejectReason .value(), - self.spnHeparinBolusVolumeRejectReason .value() + self.spnDialysateTempRejectReason .value(), + self.spnAcidConcentrateRejectReason .value(), + self.spnUFVolumeRejectReason .value(), + self.spnPreWeightRejectReason .value(), + self.spnEstimatedTargetWeightRejectReason .value() ) @Slot() def do_validateReset(self): + self.spnTreatmentModalitRejectReason .setValue(0) + self.spnHDFTreatmentModeRejectReason .setValue(0) self.spnBloodFlowRateRejectReason .setValue(0) self.spnDialysateFlowRateRejectReason .setValue(0) self.spnTreatmentDurationRejectReason .setValue(0) - self.spnSalineBolusVolumeRejectReason .setValue(0) self.spnHeparinStopTimeRejectReason .setValue(0) self.spnHeparinTypeRejectReason .setValue(0) - self.spnAcidConcentrateRejectReason .setValue(0) - self.spnBicarbonateConcentrateRejectReason .setValue(0) + self.spnDryBicarbConcentrateRejectReason .setValue(0) + self.spnSodiumRejectReason .setValue(0) + self.spnBicarbonateRejectReason .setValue(0) self.spnDialyzerTypeRejectReason .setValue(0) + self.spnSalineBolusVolumeRejectReason .setValue(0) self.spnBloodPressureMeasureIntervalRejectReason .setValue(0) - self.spnRinsebackFlowRateRejectReason .setValue(0) + self.spnPrimeDiscardVolumeRejectReason .setValue(0) self.spnRinsebackVolumeRejectReason .setValue(0) - self.spnArterialPressureLimitWindowRejectReason .setValue(0) - self.spnVenousPressureLimitWindowRejectReason .setValue(0) - self.spnVenousPressureLimitAsymtrcRejectReason .setValue(0) - self.spnTransmembranePressureLimitWindowRejectReason.setValue(0) - self.spnDialysateTempRejectReason .setValue(0) - self.spnHeparinDispensingRateRejectReason .setValue(0) + self.spnHepatitisBStatusRejectReason .setValue(0) + self.spnSubstitutionFluidRejectReason .setValue(0) self.spnHeparinBolusVolumeRejectReason .setValue(0) + self.spnHeparinDispensingRateRejectReason .setValue(0) + self.spnDialysateTempRejectReason .setValue(0) + self.spnAcidConcentrateRejectReason .setValue(0) + self.spnUFVolumeRejectReason .setValue(0) + self.spnPreWeightRejectReason .setValue(0) + self.spnEstimatedTargetWeightRejectReason .setValue(0) @Slot() def handle_load_request(self, message, timestamp = 0.0): @@ -272,25 +297,30 @@ """ message = message['message'] self.index = MsgFieldPositions.START_POS_FIELD_1 + self.lbTreatmentModality .setText(str(self.getIntValue(message))) + self.lbHDFTreatmentMode .setText(str(self.getIntValue(message))) self.lbBloodFlowRate .setText(str(self.getIntValue(message))) self.lbDialysateFlowRate .setText(str(self.getIntValue(message))) self.lbTreatmentDuration .setText(str(self.getIntValue(message))) - self.lbSalineBolusVolume .setText(str(self.getIntValue(message))) self.lbHeparinStopTime .setText(str(self.getIntValue(message))) self.lbHeparinType .setText(str(self.getIntValue(message))) - self.lbAcidConcentrate .setText(str(self.getIntValue(message))) - self.lbBicarbonateConcentrate .setText(str(self.getIntValue(message))) + self.lbDryBicarbConcentrate .setText(str(self.getIntValue(message))) + self.lbSodium .setText(str(self.getIntValue(message))) + self.lbBicarbonate .setText(str(self.getIntValue(message))) self.lbDialyzerType .setText(str(self.getIntValue(message))) + self.lbSalineBolusVolume .setText(str(self.getIntValue(message))) self.lbBloodPressureMeasureInterval .setText(str(self.getIntValue(message))) - self.lbRinsebackFlowRate .setText(str(self.getIntValue(message))) + self.lbPrimeDiscardVolume .setText(str(self.getIntValue(message))) self.lbRinsebackVolume .setText(str(self.getIntValue(message))) - self.lbArterialPressureLimitWindow .setText(str(self.getIntValue(message))) - self.lbVenousPressureLimitWindow .setText(str(self.getIntValue(message))) - self.lbVenousPressureLimitAsymtrc .setText(str(self.getIntValue(message))) - self.lbTransmembranePressureLimitWindow .setText(str(self.getIntValue(message))) - self.lbDialysateTemp .setText(f"{self.getFloatValue(message):.1f}") - self.lbHeparinDispensingRate .setText(f"{self.getFloatValue(message):.1f}") + self.lbHepatitisBStatus .setText(str(self.getIntValue(message))) + self.lbSubstitutionFluid .setText(f"{self.getFloatValue(message):.1f}") self.lbHeparinBolusVolume .setText(f"{self.getFloatValue(message):.1f}") + self.lbHeparinDispensingRate .setText(f"{self.getFloatValue(message):.1f}") + self.lbDialysateTemp .setText(f"{self.getFloatValue(message):.1f}") + self.lbAcidConcentrate .setText(f"{self.getFloatValue(message):.3f}") + self.lbUFVolue .setText(f"{self.getFloatValue(message):.1f}") + self.lbPreWeight .setText(f"{self.getFloatValue(message):.1f}") + self.lbEstimatedTargetWeight .setText(f"{self.getFloatValue(message):.1f}") def getIntValue (self, message):