Index: TD_Post_Treatment/loader.py =================================================================== diff -u -rc3931e4333dc489085c3a5a32fa76f77f1d9bb8f -rbbd8740f52c6c5dfea4883b7a346901cd59f7083 --- TD_Post_Treatment/loader.py (.../loader.py) (revision c3931e4333dc489085c3a5a32fa76f77f1d9bb8f) +++ TD_Post_Treatment/loader.py (.../loader.py) (revision bbd8740f52c6c5dfea4883b7a346901cd59f7083) @@ -53,8 +53,18 @@ """ self.btnAutoEject = self.find_widget(QtWidgets.QPushButton, 'btnAutoEjectSend' ) self.spnAutoEjectRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnEjectReasonSpinBox' ) + self.cbEjectAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbEjectAccepted' ) self.lbAutoEject = self.find_widget(QtWidgets.QLabel , 'lbAutoEject' ) + self.btnPatientDisconnectSend = self.find_widget(QtWidgets.QPushButton, 'btnPatientDisconnectSend' ) + self.spnPatientDisconnectReasonSpinBox = self.find_widget(QtWidgets.QSpinBox , 'spnPatientDisconnectReasonSpinBox' ) + self.cbPatientDisconnectAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbPatientDisconnectAccepted' ) + self.lbPatientDisconnect = self.find_widget(QtWidgets.QLabel , 'lbPatientDisconnect' ) + + self.lbTxLogs = self.find_widget(QtWidgets.QLabel , 'lbTxLogs' ) + self.btnTxLogsSend = self.find_widget(QtWidgets.QPushButton, 'btnTxLogsSend' ) + self.spnTxLogsReasonSpinBox = self.find_widget(QtWidgets.QSpinBox , 'spnTxLogsReasonSpinBox' ) + self.cbTxLogsAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbTxLogsAccepted' ) self.spnBloodFlow = self.find_widget(QtWidgets.QSpinBox , 'spnBloodFlow' ) self.spnBloodFlowActual = self.find_widget(QtWidgets.QSpinBox , 'spnBloodFlowActual' ) @@ -118,76 +128,17 @@ self.spnWaterSampleResult = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnWaterSampleResult' ) - self.spnBloodFlow = self.find_widget(QtWidgets.QSpinBox , 'spnBloodFlow' ) - self.spnBloodFlowActual = self.find_widget(QtWidgets.QSpinBox , 'spnBloodFlowActual' ) - self.spnDialysateFlow = self.find_widget(QtWidgets.QSpinBox , 'spnDialysateFlow' ) - self.spnDialysateFlowActual = self.find_widget(QtWidgets.QSpinBox , 'spnDialysateFlowActual' ) - self.spnTreatmentDuration = self.find_widget(QtWidgets.QSpinBox , 'spnTreatmentDuration' ) - self.spnTreatmentDurationActual = self.find_widget(QtWidgets.QSpinBox , 'spnTreatmentDurationActual' ) - self.spnAcidConcentrate = self.find_widget(QtWidgets.QSpinBox , 'spnAcidConcentrate' ) - self.spnAcidConcentrateActual = self.find_widget(QtWidgets.QSpinBox , 'spnAcidConcentrateActual' ) - self.spnBicarbonateCartridgeSize = self.find_widget(QtWidgets.QSpinBox , 'spnBicarbonateCartridgeSize' ) - self.spnBicarbonateCartridgeSizeActual = self.find_widget(QtWidgets.QSpinBox , 'spnBicarbonateCartridgeSizeActual' ) - self.spnPotassiumConcentration = self.find_widget(QtWidgets.QSpinBox , 'spnPotassiumConcentration' ) - self.spnPotassiumConcentrationActual = self.find_widget(QtWidgets.QSpinBox , 'spnPotassiumConcentrationActual' ) - self.spnCalciumConcentration = self.find_widget(QtWidgets.QSpinBox , 'spnCalciumConcentration' ) - self.spnCalciumConcentrationActual = self.find_widget(QtWidgets.QSpinBox , 'spnCalciumConcentrationActual' ) - self.spnBicarbonateConcentration = self.find_widget(QtWidgets.QSpinBox , 'spnBicarbonateConcentration' ) - self.spnBicarbonateConcentrationActual = self.find_widget(QtWidgets.QSpinBox , 'spnBicarbonateConcentrationActual' ) - self.spnSodiumConcentration = self.find_widget(QtWidgets.QSpinBox , 'spnSodiumConcentration' ) - self.spnSodiumConcentrationActual = self.find_widget(QtWidgets.QSpinBox , 'spnSodiumConcentrationActual' ) - self.spnVitalsInterval = self.find_widget(QtWidgets.QSpinBox , 'spnVitalsInterval' ) - self.spnVitalsIntervalActual = self.find_widget(QtWidgets.QSpinBox , 'spnVitalsIntervalActual' ) - self.spnDialyzerType = self.find_widget(QtWidgets.QSpinBox , 'spnDialyzerType' ) - self.spnTreatmentStart = self.find_widget(QtWidgets.QSpinBox , 'spnTreatmentStart' ) - self.spnTreatmentEnd = self.find_widget(QtWidgets.QSpinBox , 'spnTreatmentEnd' ) - self.spnFluidBolusVolume = self.find_widget(QtWidgets.QSpinBox , 'spnFluidBolusVolume' ) - self.spnFluidBolusVolumeActual = self.find_widget(QtWidgets.QSpinBox , 'spnFluidBolusVolumeActual' ) - self.spnHeparinType = self.find_widget(QtWidgets.QSpinBox , 'spnHeparinType' ) - self.spnHeparinDeliveryDuration = self.find_widget(QtWidgets.QSpinBox , 'spnHeparinDeliveryDuration' ) - self.spnHeparinDeliveryDurationActual = self.find_widget(QtWidgets.QSpinBox , 'spnHeparinDeliveryDurationActual' ) - self.spnTreatmentModality = self.find_widget(QtWidgets.QSpinBox , 'spnTreatmentModality' ) - self.spnTreatmentModalityActual = self.find_widget(QtWidgets.QSpinBox , 'spnTreatmentModalityActual' ) - self.spnHDFOperationMode = self.find_widget(QtWidgets.QSpinBox , 'spnHDFOperationMode' ) - self.spnHDFOperationModeActual = self.find_widget(QtWidgets.QSpinBox , 'spnHDFOperationModeActual' ) - self.spnHepatitisStatus = self.find_widget(QtWidgets.QSpinBox , 'spnHepatitisStatus' ) - self.spnDialysateTemperature = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnDialysateTemperature' ) - self.spnDialysateTemperatureActual = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnDialysateTemperatureActual' ) - self.spnDialysateVolumeUsed = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnDialysateVolumeUsed' ) - self.spnHeparinBolusVolume = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnHeparinBolusVolume' ) - self.spnHeparinBolusVolumeActual = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnHeparinBolusVolumeActual' ) - self.spnHeparinDispensingRate = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnHeparinDispensingRate' ) - self.spnHeparinDispensingRateActual = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnHeparinDispensingRateActual' ) - self.spnHeparinDeliveredVolume = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnHeparinDeliveredVolume' ) - self.spnUFVolume = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnUFVolume' ) - self.spnUFVolumeActual = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnUFVolumeActual' ) - self.spnUFVolumeTarget = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnUFVolumeTarget' ) - self.spnUFRate = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnUFRate' ) - self.spnUFRateActual = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnUFRateActual' ) - self.spnUFRateTarget = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnUFRateTarget' ) - self.spnSubstitutionVolume = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnSubstitutionVolume' ) - self.spnSubstitutionActual = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnSubstitutionActual' ) - self.spnSubstitutionVolumeTarget = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnSubstitutionVolumeTarget' ) - self.spnSubstitutionRate = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnSubstitutionRate' ) - self.spnSubstitutionRateActual = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnSubstitutionRateActual' ) - self.spnSubstitutionRateTarget = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnSubstitutionRateTarget' ) - self.spnIsoUFVolume = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnIsoUFVolume' ) - self.spnIsoUFVolumeActual = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnIsoUFVolumeActual' ) - self.spnIsoUFVolumeTarget = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnIsoUFVolumeTarget' ) - self.spnIsoUFRate = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnIsoUFRate' ) - self.spnIsoUFRateActual = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnIsoUFRateActual' ) - self.spnIsoUFRateTarget = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnIsoUFRateTarget' ) - self.spnWaterSampleResult = self.find_widget(QtWidgets.QDoubleSpinBox , 'spnWaterSampleResult' ) - - def _init_connections(self): """ initializes the widgets connections :return: none """ - self.btnAutoEject .clicked.connect(self.do_auto_eject) + self.btnAutoEject .clicked.connect(self.do_auto_eject ) + self.btnPatientDisconnectSend .clicked.connect(self.do_patient_disconnect ) + self.btnTxLogsSend .clicked.connect(self.do_treatment_logs ) + def _init_widgets(self): """ initializes the widgets' properties @@ -257,8 +208,9 @@ @Slot() def do_auto_eject(self): - reason = self.spnAutoEjectRejectReason.value() - self.td_interface.td_blood_set_auto_eject_response(reason) + accepted = self.cbEjectAccepted .isChecked() + reason = self.spnAutoEjectRejectReason .value() + self.td_interface.td_blood_set_auto_eject_response(accepted, reason) self.lbAutoEject.setText("-") @@ -270,6 +222,14 @@ """ self.lbAutoEject.setText("Requested") + + @Slot() + def do_patient_disconnect(self): + accepted = self.cbPatientDisconnectAccepted .isChecked() + reason = self.spnPatientDisconnectReasonSpinBox .value() + self.td_interface.td_patient_disconnect_confirm_response(accepted, reason) + self.lbPatientDisconnect.setText("-") + @Slot() def handle_patient_disconnect_request(self, message, timestamp = 0.0):