Index: simulator/run.py =================================================================== diff -u -r63183a23c930b861a2f59b8dc62ea520d597ee96 -rbefca1db0402e031a5b692aa93dc74bfb314eb9e --- simulator/run.py (.../run.py) (revision 63183a23c930b861a2f59b8dc62ea520d597ee96) +++ simulator/run.py (.../run.py) (revision befca1db0402e031a5b692aa93dc74bfb314eb9e) @@ -160,8 +160,12 @@ tblSalineUFStates: QtWidgets.QTableWidget tblSalineSalineStates: QtWidgets.QTableWidget + # static class variables + saline_requested_state: txStates + def __init__(self): super().__init__(Simulator.ui_file_name) + self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE self.initialize() def setup_ranges(self): @@ -251,8 +255,14 @@ the slot for accept saline bolus button :return: none """ + # toggle the saline requested state + if self.saline_requested_state == txStates.SALINE_BOLUS_STATE_IN_PROGRESS: + self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE + else: + self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IN_PROGRESS + target = self.cmbSalineAcceptTarget.currentText() - denaliMessages.setSalineBolusResponse(True, 0, target, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) + denaliMessages.setSalineBolusResponse(True, 0, target, self.saline_requested_state) self.lblSalineAction.setText('Accepted ' + target) @Slot() @@ -262,7 +272,7 @@ :return: none """ reason = self.spnSalineRejectReason.value() - denaliMessages.setSalineBolusResponse(False, reason, 0, txStates.SALINE_BOLUS_STATE_IN_PROGRESS) + denaliMessages.setSalineBolusResponse(False, reason, 0, self.saline_requested_state) self.lblSalineAction.setText('Rejected ' + "{}".format(reason)) @Slot() @@ -315,8 +325,7 @@ """ denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse( EResponse.Accepted, 0, 2500, 60, 0, 10, 0, 10) - self.lblUfAction.setText('Accepted ') - print("do_uf_edit_accept") + self.lblUfEditAction.setText('Accepted ') @Slot() def do_uf_edit_reject(self): @@ -328,7 +337,6 @@ denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse( EResponse.Rejected, reason, 2500, 60, 0, 10, 0, 10) self.lblUfEditAction.setText('Rejected ' + "{}".format(reason)) - print("do_uf_edit_reject") @Slot() def do_saline_saline_state(self):