Index: shared/scripts/configuration/config.py =================================================================== diff -u -r91cd5e1131d9773e8cec3d338cdd0391d98bc320 -rfb6ac562400c6f366eb194c2c9e3ea9d0186d162 --- shared/scripts/configuration/config.py (.../config.py) (revision 91cd5e1131d9773e8cec3d338cdd0391d98bc320) +++ shared/scripts/configuration/config.py (.../config.py) (revision fb6ac562400c6f366eb194c2c9e3ea9d0186d162) @@ -57,7 +57,8 @@ BICARBONATE_CONCENTRATE = "Fres. Centrisol" DIALYZER_TYPE = ["BB Diacap Pro 13H", "BB Diacap Pro 16H", "BB Diacap Pro 19H", "F Optiflux F160NRe", "F Optiflux F180NRe"] -OPERATIONAL_PARAMETERS = {"Heparin Type": HEPARIN_TYPE, "Acid Concentrate": "Fres. Naturalyte", +#Random selection for operational parameter for custom dta +OPERATIONAL_PARAMETERS = {"Heparin Type": HEPARIN_TYPE, "Acid Concentrate": "08-1251-1", "Bicarbonate Concentrate": BICARBONATE_CONCENTRATE, "Dialyzer Type": "BB Diacap Pro 16H"} #dictionary consist of custom treatment values Index: shared/scripts/configuration/utility.py =================================================================== diff -u -re8da75c7ba46f21fe99cc7400f3616a715c2ea5e -rfb6ac562400c6f366eb194c2c9e3ea9d0186d162 --- shared/scripts/configuration/utility.py (.../utility.py) (revision e8da75c7ba46f21fe99cc7400f3616a715c2ea5e) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision fb6ac562400c6f366eb194c2c9e3ea9d0186d162) @@ -70,7 +70,7 @@ 107, 0, -(screenHeight-460), squish.Qt.NoModifier) else: squish.mouseWheel(ScreenObj, (screenWidth-100), - -(screenHeight-700), 0, 200, squish.Qt.NoModifier) + -(screenHeight-780), 0, 200, squish.Qt.NoModifier) raise LookupError("zone object is not in view to the user after " + \ "trying 100 times") Index: shared/scripts/names.py =================================================================== diff -u -r91cd5e1131d9773e8cec3d338cdd0391d98bc320 -rfb6ac562400c6f366eb194c2c9e3ea9d0186d162 --- shared/scripts/names.py (.../names.py) (revision 91cd5e1131d9773e8cec3d338cdd0391d98bc320) +++ shared/scripts/names.py (.../names.py) (revision fb6ac562400c6f366eb194c2c9e3ea9d0186d162) @@ -111,8 +111,7 @@ o_PreTreatmentCreate_Create_a_Custom_Treatment_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "text": "Create a Custom Treatment", "type": "Text", "unnamed": 1, "visible": True} #confirm and back button object property o_PreTreatmentCreate_backButton_BackButton = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_backButton", "type": "BackButton", "visible": True} -o_PreTreatmentCreate_confirmButton_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_confirmButton", "type": "TouchRect", "visible": False} -#o_PreTreatmentCreate_confirmButton_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "type": "Text", "visible": True, "text": "CONTINUE", "unnamed":1} +o_PreTreatmentCreate_confirmButton_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} o_PreTreatmentBase_Patient_ID_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "Patient ID", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentCreate_PRESCRIPTION_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "text": "PRESCRIPTION", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentCreate_OPERATING_PARAMETERS_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "text": "OPERATING PARAMETERS", "type": "Text", "unnamed": 1, "visible": True} Index: tst_create_custom_treatment/test.py =================================================================== diff -u -r91cd5e1131d9773e8cec3d338cdd0391d98bc320 -rfb6ac562400c6f366eb194c2c9e3ea9d0186d162 --- tst_create_custom_treatment/test.py (.../test.py) (revision 91cd5e1131d9773e8cec3d338cdd0391d98bc320) +++ tst_create_custom_treatment/test.py (.../test.py) (revision fb6ac562400c6f366eb194c2c9e3ea9d0186d162) @@ -299,7 +299,7 @@ """ test.startSection("Set the arterial low and high limits using slider") utils.waitForGUI(1) - for arterial_value in range(config.ARTERIAL_VALUE_0, config.ARTERIAL_VALUE_NEGATIVE_300, config.NEGATIVE_BUFFER): + for arterial_value in range(config.ARTERIAL_VALUE_0, config.ARTERIAL_VALUE_NEGATIVE_270, config.NEGATIVE_BUFFER): utility.set_arterial_ranges_max_val(arterial_value) utility.set_arterial_ranges_max_val(config.ARTERIAL_VALUE_0) for arterial_value in range(config.ARTERIAL_VALUE_NEGATIVE_300, config.ARTERIAL_VALUE_NEGATIVE_20, config.POSITIVE_BUFFER): @@ -352,8 +352,6 @@ type(waitForObject(names.o_input_patient_id), config.PATIENT_ID) test.compare(waitForObject(names.o_PreTreatmentBase_Patient_ID_Text).text, config.PATIENT_ID_TEXT, "Title text should be -> "+str(config.PATIENT_ID_TEXT)) mouseClick(waitForObject(names.o_confirm_button)) - -# utils.waitForGui(5) def verify_create_custom_treatment_parameter(): @@ -497,12 +495,13 @@ for dialysate_temperature in config.CREATE_TREATMENT_PARAMETER_RANGE[config.DIALYSATE_TEMPERATURE]: test_custom_treatment_slider(names.o_PreTreatmentCreate_dialysateTemperatureSlider_Slider, dialysate_temperature, config.CREATE_TREATMENT_SLIDER_VALUES["dialysate_temperature"], config.DIALYSATE_TEMPERATURE) test.endSection() + + set_arterial_low_and_high_limits_using_slider() #scroll the screen to the title rinseback flow rate parameter_object = set_parameter_type(text = config.RINSEBACK_FLOW_RATE) utility.scroll_to_zone(parameter_object, names.o_treatment_create_flickable) - set_arterial_low_and_high_limits_using_slider() set_venous_low_and_high_limits_using_slider() test.startSection("Verification of blood pressure measurement interval values")