Index: shared/scripts/configuration/config.py =================================================================== diff -u -r98dedc96e8192ecb00fc180475b455ec5cdf1665 -raf803314536a5a1468deb3e9cc4309e124dba421 --- shared/scripts/configuration/config.py (.../config.py) (revision 98dedc96e8192ecb00fc180475b455ec5cdf1665) +++ shared/scripts/configuration/config.py (.../config.py) (revision af803314536a5a1468deb3e9cc4309e124dba421) @@ -20,11 +20,6 @@ AUT_NAME = "denaliSquish" -COLOR_CODES = {"Aqua": "#81ffff", "Blue": "#017dea", "Blue 2": "#1090d5", "Green": "#29fd2d", "Grey": "#d3d3d3", - "Lavender": "#db98f5", "Light Blue": "#acd7f1", "Light Teal": "#29f1da","Lime": "#b7fc36", - "Magenta":"#fd28fd", "Orange": "#f2721c", "Peach":"#f1979a", "Red": "#c53b33", "Rose":"#fc178d", - "Slate blue":"#7f7ffa", "Violet": "#6435c9", "White": "#ffffff", "Yellow": "#fcfc4d"} - TREATMENT_UNHIGHLIGHTED_COLOR = "#000000" TREATMENT_HIGHLIGHTED_COLOR = "#135088" Index: shared/scripts/names.py =================================================================== diff -u -r98dedc96e8192ecb00fc180475b455ec5cdf1665 -raf803314536a5a1468deb3e9cc4309e124dba421 --- shared/scripts/names.py (.../names.py) (revision 98dedc96e8192ecb00fc180475b455ec5cdf1665) +++ shared/scripts/names.py (.../names.py) (revision af803314536a5a1468deb3e9cc4309e124dba421) @@ -370,12 +370,16 @@ #post screen +o_postModeScreen_ScreenItem = {"container": o_Gui_MainView, "id": "_postModeScreen", "type": "ScreenItem", "unnamed": 1, "visible": True} +o_postModeScreen_22_Text = {"container": o_postModeScreen_ScreenItem, "text": 22, "type": "Text", "unnamed": 1, "visible": False} o_busy_indicator = {"container": o_initialModeScreen_ScreenItem, "id": "_busyIndicator", "source": "qrc:/images/iBusy", "type": "Image", "unnamed": 1, "visible": True} o_done_indicator = {"container": o_initialModeScreen_ScreenItem, "id": "_checkIndicator", "source": "qrc:/images/iBusyDone", "type": "Image", "unnamed": 1, "visible": True} o_fail_indicator = {"container": o_initialModeScreen_ScreenItem, "id": "_checkIndicator", "source": "qrc:/images/iBusyFail", "type": "Image", "unnamed": 1, "visible": True} -o_progress_bar = {"container": o_initialModeScreen_ScreenItem, "id": "_textMaximum", "type": "Text", "unnamed": 1, "visible": False} +o_progress_bar = {"container": o_postModeScreen_ScreenItem, "type": "ProgressBar", "unnamed": 1, "visible": True} + + # #create_treatment # #vital time interval # #create_custom treatment testcase Index: tst_post/test.py =================================================================== diff -u -r4d66e02dce6ed8c33da954937c892dde409f98e5 -raf803314536a5a1468deb3e9cc4309e124dba421 --- tst_post/test.py (.../test.py) (revision 4d66e02dce6ed8c33da954937c892dde409f98e5) +++ tst_post/test.py (.../test.py) (revision af803314536a5a1468deb3e9cc4309e124dba421) @@ -66,14 +66,8 @@ Method to obtain progress @return: Progress value """ - progress_bar = object.parent(waitForObjectExists(names.o_progress_bar)) - progress_bar_children = object.children(progress_bar) - PROGRESS_BAR_VAL_PARENT_INDEX = 3 - progress_bar_val_parent = progress_bar_children[PROGRESS_BAR_VAL_PARENT_INDEX] - progress_bar_val_parents_children = object.children(progress_bar_val_parent) - PROGRESS_VALUE = 1 - progress_bar_val = progress_bar_val_parents_children[PROGRESS_VALUE] - return progress_bar_val.text.toUtf8().constData() + progress_bar = waitForObjectExists(names.o_progress_bar) + return progress_bar.value def verify_final_message_posted(final_msg=None, final_msg_posted=None) -> None: """