Index: simulator/plugins/heparin/loader.py =================================================================== diff -u -rcb8d48033154f4b36a6a05b6f31bd10390e84ac7 -r80181d382e841f6e66c8f0ad85d1c78e6856cfde --- simulator/plugins/heparin/loader.py (.../loader.py) (revision cb8d48033154f4b36a6a05b6f31bd10390e84ac7) +++ simulator/plugins/heparin/loader.py (.../loader.py) (revision 80181d382e841f6e66c8f0ad85d1c78e6856cfde) @@ -74,7 +74,7 @@ else: self.requested_state = TXStates.HEPARIN_STATE_DISPENSING - self.hd_simulator.setHeparinResponse(True, 0, self.requested_state) + self.hd_simulator.cmd_set_heparin_pause_resume_response(True, 0, self.requested_state) self.lblAction.setText('Accepted ') @Slot() @@ -84,7 +84,7 @@ :return: none """ reason = self.spnRejectReason.value() - self.hd_simulator.setHeparinResponse(False, reason, self.requested_state) + self.hd_simulator.cmd_set_heparin_pause_resume_response(False, reason, self.requested_state) self.lblAction.setText('Rejected ' + "{}".format(reason)) @Slot() @@ -95,5 +95,5 @@ :return: none """ volume = value * 0.1 - self.hd_simulator.setTreatmentHeparinData(volume) + self.hd_simulator.cmd_set_treatment_heparin_data(volume) self.lblCumulative.setNum(volume) Index: simulator/plugins/inlinebloodpressures/loader.py =================================================================== diff -u -rcb8d48033154f4b36a6a05b6f31bd10390e84ac7 -r80181d382e841f6e66c8f0ad85d1c78e6856cfde --- simulator/plugins/inlinebloodpressures/loader.py (.../loader.py) (revision cb8d48033154f4b36a6a05b6f31bd10390e84ac7) +++ simulator/plugins/inlinebloodpressures/loader.py (.../loader.py) (revision 80181d382e841f6e66c8f0ad85d1c78e6856cfde) @@ -138,7 +138,7 @@ :return: none """ # vAccepted, vReason, vArterialLow, vArterialHigh, vVenousLow, vVenousHigh - self.hd_simulator.sendTreatmentAdjustPressuresLimitsResponse( + self.hd_simulator.cmd_send_treatment_adjust_pressures_limit_response( EResponse.Accepted, 0, self.spnArterialLimitLow.value(), self.spnArterialLimitHigh.value(), @@ -154,7 +154,7 @@ :return: none """ reason = self.spnAVPressuresRejectReason.value() - self.hd_simulator.sendTreatmentAdjustPressuresLimitsResponse( + self.hd_simulator.cmd_send_treatment_adjust_pressures_limit_response( EResponse.Rejected, reason, self.spnArterialLimitLow.value(), self.spnArterialLimitHigh.value(), Index: simulator/plugins/treatmentstates/loader.py =================================================================== diff -u -rcb8d48033154f4b36a6a05b6f31bd10390e84ac7 -r80181d382e841f6e66c8f0ad85d1c78e6856cfde --- simulator/plugins/treatmentstates/loader.py (.../loader.py) (revision cb8d48033154f4b36a6a05b6f31bd10390e84ac7) +++ simulator/plugins/treatmentstates/loader.py (.../loader.py) (revision 80181d382e841f6e66c8f0ad85d1c78e6856cfde) @@ -62,8 +62,8 @@ the slot for saline bolus state change :return: none """ - sub_mode = self.tblSubMode.verticalHeaderItem(self.tblSubMode.currentRow()).text() - uf_state = self.tblUFStates.verticalHeaderItem(self.tblUFStates.currentRow()).text() - saline = self.tblSalineStates.verticalHeaderItem(self.tblSalineStates.currentRow()).text() - heparin = self.tblHeparinStates.verticalHeaderItem(self.tblHeparinStates.currentRow()).text() - self.hd_simulator.setTreatmentStatesData(sub_mode, uf_state, saline, heparin) + sub_mode = int(self.tblSubMode.verticalHeaderItem(self.tblSubMode.currentRow()).text()) + uf_state = int(self.tblUFStates.verticalHeaderItem(self.tblUFStates.currentRow()).text()) + saline = int(self.tblSalineStates.verticalHeaderItem(self.tblSalineStates.currentRow()).text()) + heparin = int(self.tblHeparinStates.verticalHeaderItem(self.tblHeparinStates.currentRow()).text()) + self.hd_simulator.cmd_set_treatment_states_data(sub_mode, uf_state, saline, heparin) Index: tst_TreatmentHeparineData/test.py =================================================================== diff -u -r91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1 -r80181d382e841f6e66c8f0ad85d1c78e6856cfde --- tst_TreatmentHeparineData/test.py (.../test.py) (revision 91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1) +++ tst_TreatmentHeparineData/test.py (.../test.py) (revision 80181d382e841f6e66c8f0ad85d1c78e6856cfde) @@ -53,16 +53,16 @@ getUnit() for value in range(0, 101): - HDSimulator.setTreatmentHeparinData(value * 0.1) + HDSimulator.cmd_set_treatment_heparin_data(value * 0.1) test_values (value * 0.1) - HDSimulator.setTreatmentHeparinData(10.0) + HDSimulator.cmd_set_treatment_heparin_data(10.0) test_values (10.0) - HDSimulator.setTreatmentHeparinData(10.0) + HDSimulator.cmd_set_treatment_heparin_data(10.0) test_values (10.0) - HDSimulator.setTreatmentHeparinData( 0) + HDSimulator.cmd_set_treatment_heparin_data(0) test_values ( 0) Index: tst_TreatmentStatesData/test.py =================================================================== diff -u -r91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1 -r80181d382e841f6e66c8f0ad85d1c78e6856cfde --- tst_TreatmentStatesData/test.py (.../test.py) (revision 91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1) +++ tst_TreatmentStatesData/test.py (.../test.py) (revision 80181d382e841f6e66c8f0ad85d1c78e6856cfde) @@ -26,7 +26,7 @@ def test_values(vSubMode, vUFState, vSalineState, vHeparinState): - HDSimulator.setTreatmentStatesData(vSubMode, vUFState, vSalineState, vHeparinState) + HDSimulator.cmd_set_treatment_states_data(vSubMode, vUFState, vSalineState, vHeparinState) # these test cases are not always depending on each other if (vSubMode == TXStates.TREATMENT_DIALYSIS_STATE_NOT): test.compare( waitForObjectExists(names.o_treatmentStart_treatmentTime_arrowImage ).visible, False ) Index: tst_Treatment_Adjustment_Heparin/test.py =================================================================== diff -u -r91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1 -r80181d382e841f6e66c8f0ad85d1c78e6856cfde --- tst_Treatment_Adjustment_Heparin/test.py (.../test.py) (revision 91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1) +++ tst_Treatment_Adjustment_Heparin/test.py (.../test.py) (revision 80181d382e841f6e66c8f0ad85d1c78e6856cfde) @@ -34,7 +34,7 @@ def test_state(vAccept, vText, vState): mReason = 0 if (not vAccept): mReason = rejectReason.REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION.value - HDSimulator.setHeparinResponse(vAccept, mReason, vState) + HDSimulator.cmd_set_heparin_pause_resume_response(vAccept, mReason, vState) utils.waitForGUI(0.2) heparin_button = findObject(names.o_treatmentStart_HeparinPause) # heparin button is not always enable for click @@ -58,7 +58,7 @@ gotoScreenNtest_Contains_TreatmentHeparinData() # set the Treatment to running state, otherwise the heparin section will be disabled. - HDSimulator.setTreatmentStatesData(TXStates.TREATMENT_DIALYSIS_STATE, TXStates.UF_OFF_STATE, TXStates.SALINE_BOLUS_STATE_IDLE, TXStates.HEPARIN_STATE_OFF) + HDSimulator.cmd_set_treatment_states_data(TXStates.TREATMENT_DIALYSIS_STATE, TXStates.UF_OFF_STATE, TXStates.SALINE_BOLUS_STATE_IDLE, TXStates.HEPARIN_STATE_OFF) # it is not working upon user request so there is not rejection # Initial OFF => BOLUS -> Bolus/HEPARIN Index: tst_Treatment_Adjustment_Pressures/test.py =================================================================== diff -u -r91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1 -r80181d382e841f6e66c8f0ad85d1c78e6856cfde --- tst_Treatment_Adjustment_Pressures/test.py (.../test.py) (revision 91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1) +++ tst_Treatment_Adjustment_Pressures/test.py (.../test.py) (revision 80181d382e841f6e66c8f0ad85d1c78e6856cfde) @@ -101,7 +101,7 @@ venous_limit_min_text = str(waitForObjectExists(names.o_venous_limitbar_textMinimum ).text) venous_limit_min_value = waitForObjectExists(names.o_venous_limitbar ).minimum venous_limit_max_text = str(waitForObjectExists(names.o_venous_limitbar_textMaximum ).text) - venous_limit_max_value = waitForObjectExists(names.o_venous_limitbar ).maximum + venous_limit_max_value = waitForObjectExists(names.o_venous_limitbar ).maximum test.compare(arterial_limit_min_text , str(vArterialLow )) test.compare(arterial_limit_min_value , vArterialLow ) @@ -119,7 +119,7 @@ # arterial constants shall never change regarding the PRS # it has to be set to reject otherwise the dialog is closed. # the accept and dialog close has been tested somewhere else. - HDSimulator.sendTreatmentAdjustPressuresLimitsResponse(False, 0, vArterialLow, vArterialHigh, vVenousLow, vVenousHigh) + HDSimulator.cmd_send_treatment_adjust_pressures_limit_response(False, 0, vArterialLow, vArterialHigh, vVenousLow, vVenousHigh) test_pressure_limits(vArterialLow, vArterialHigh, vVenousLow, vVenousHigh) @@ -132,7 +132,7 @@ venousLow = Ranges.VENOUS_PRESSURE_LOW_DEF venousHigh = Ranges.VENOUS_PRESSURE_HIGH_DEF test.compare(waitForObjectExists(names.o_treatmentAdjustmentPressures_Screen).visible, True) - HDSimulator.sendTreatmentAdjustPressuresLimitsResponse( + HDSimulator.cmd_send_treatment_adjust_pressures_limit_response( True, 0, arterialLow , arterialHigh ,