Index: TD_BloodPrime/loader.py =================================================================== diff -u -rf7630c8a12b488b5d65cfebbec07b58de31cf484 -rc6aa11b8a4a60886c17e4d3d2c0166c6160f1053 --- TD_BloodPrime/loader.py (.../loader.py) (revision f7630c8a12b488b5d65cfebbec07b58de31cf484) +++ TD_BloodPrime/loader.py (.../loader.py) (revision c6aa11b8a4a60886c17e4d3d2c0166c6160f1053) @@ -46,8 +46,6 @@ self.cmdStrings = [ "Pause", "Resume", - "Decrease Rate", - "Increase Rate", ] self.tbProgressSend = self.find_widget(QtWidgets.QToolButton , 'tbProgressSend' ) @@ -56,6 +54,10 @@ self.lbProgressTargetVolume = self.find_widget(QtWidgets.QLabel , 'lbProgressTargetVolume' ) self.slProgressDeliveredVolume = self.find_widget(QtWidgets.QSlider , 'slProgressDeliveredVolume' ) self.lbProgressDeliveredVolume = self.find_widget(QtWidgets.QLabel , 'lbProgressDeliveredVolume' ) + self.slProgressTimeout = self.find_widget(QtWidgets.QSlider , 'slProgressTimeout' ) + self.lbProgressTimeout = self.find_widget(QtWidgets.QLabel , 'lbProgressTimeout' ) + self.slProgressCountdown = self.find_widget(QtWidgets.QSlider , 'slProgressCountdown' ) + self.lbProgressCountdown = self.find_widget(QtWidgets.QLabel , 'lbProgressCountdown' ) self.tbCmdRspSend = self.find_widget(QtWidgets.QToolButton , 'tbCmdRspSend' ) self.tbCmdRspReset = self.find_widget(QtWidgets.QToolButton , 'tbCmdRspReset' ) @@ -75,6 +77,10 @@ self.slProgressTargetVolume .valueChanged .connect(self.do_progress_target_volume_changed) self.slProgressDeliveredVolume .valueChanged .connect(self.do_progress_send) self.slProgressDeliveredVolume .valueChanged .connect(self.do_progress_delivered_volume_changed) + self.slProgressTimeout .valueChanged .connect(self.do_progress_send) + self.slProgressTimeout .valueChanged .connect(self.do_progress_timeout_changed) + self.slProgressCountdown .valueChanged .connect(self.do_progress_send) + self.slProgressCountdown .valueChanged .connect(self.do_progress_countdown_changed) self.tbCmdRspSend .clicked .connect(self.do_cmd_response_send) self.tbCmdRspReset .clicked .connect(self.do_cmd_response_reset) @@ -97,7 +103,9 @@ """ self.td_interface.td_blood_prime_progress( self.slProgressTargetVolume.value(), - self.slProgressDeliveredVolume.value() + self.slProgressDeliveredVolume.value(), + self.slProgressTimeout.value(), + self.slProgressCountdown.value(), ) @@ -112,9 +120,21 @@ @Slot() + def do_progress_timeout_changed(self, value): + self.lbProgressTimeout.setText(f"{value}") + + + @Slot() + def do_progress_countdown_changed(self, value): + self.lbProgressCountdown.setText(f"{value}") + + + @Slot() def do_progress_reset(self): - self.slProgressTargetVolume .setValue(0) - self.slProgressDeliveredVolume .setValue(0) + self.slProgressTargetVolume .setValue(0) + self.slProgressDeliveredVolume .setValue(0) + self.slProgressTimeout .setValue(0) + self.slProgressCountdown .setValue(0) @Slot()