Index: shared/scripts/configuration/utility.py =================================================================== diff -u -re5f191820a5101bef73d465fbafc9001cac9c144 -r5596042bd1d22d67d902fb6c599dad89f9ada086 --- shared/scripts/configuration/utility.py (.../utility.py) (revision e5f191820a5101bef73d465fbafc9001cac9c144) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 5596042bd1d22d67d902fb6c599dad89f9ada086) @@ -41,7 +41,7 @@ handle the application for log """ test.compare(config.COLOR_CODES[color_name],(act_val.color[name])) - + def check_if_object_is_within_the_container(obj=None, container=None): """ check if an object is inside a container @@ -456,7 +456,6 @@ raise LookupError("value object is not in view to the user after " + \ "trying 100 times") - def expected_heparin_value(val): names.o_heparin_value["text"] = val return names.o_heparin_value @@ -481,13 +480,7 @@ consumables_self_test_state=0, no_cartridge_self_test_state=0, installation_state=0, dry_self_test_state=0, prime_state=0, recirculate_state=0, patient_connection_state=0) - - -def convert_seconds_into_min_and_sec(seconds): - min_and_sec = time.strftime("%M:%S", time.gmtime(seconds)) - return min_and_sec - def self_test_dry_check_list_text(text): names.o_self_test_dry_check_list_text["text"] = text return names.o_self_test_dry_check_list_text @@ -824,3 +817,6 @@ indicators = object.children(indicator_parent) return indicators +def convert_seconds_into_min_and_sec(seconds, format="%M:%S"): + min_and_sec = time.strftime(format, time.gmtime(seconds)) + return min_and_sec Index: shared/scripts/names.py =================================================================== diff -u -re5f191820a5101bef73d465fbafc9001cac9c144 -r5596042bd1d22d67d902fb6c599dad89f9ada086 --- shared/scripts/names.py (.../names.py) (revision e5f191820a5101bef73d465fbafc9001cac9c144) +++ shared/scripts/names.py (.../names.py) (revision 5596042bd1d22d67d902fb6c599dad89f9ada086) @@ -16,8 +16,19 @@ -o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True} -o_Overlay = {"container": o_Gui_MainView, "type": "Overlay", "unnamed": 1, "visible": True} +# Top Parents +o_QQuickView = { "type": "QQuickView"} +o_Overlay = {"container": o_QQuickView, "type": "Overlay"} +o_Gui_MainView = { "type": "Gui::MainView" } + + +# Modal Dialog +o_modalDialog = {"container": o_Overlay , "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} +o_treatmentHome = {"container": o_QQuickView , "id": "_treatmentHome" , "type": "TreatmentHome", "unnamed": 1, "visible": True} +o_treatmentHome_backgroung = {"container": o_treatmentHome, "id": "_backgroundRect" , "type": "Rectangle" , "unnamed": 1, "visible": True} +o_treatmentHome_startTreatment = {"container": o_treatmentHome, "id": "_startTreatmentRect" , "type": "TouchRect" , "unnamed": 1, "visible": True} +o_treatmentHome_createTreatment = {"container": o_treatmentHome, "id": "_createTreatmentRect", "type": "TouchRect" , "unnamed": 1, "visible": True} + o_borderRect_Rectangle = {"container": o_Overlay, "gradient": 0, "id": "_borderRect", "type": "Rectangle", "unnamed": 1, "visible": True} o_minimizeButton_UpDownButton = {"container": o_Overlay, "gradient": 0, "id": "_minimizeButton", "type": "UpDownButton", "unnamed": 1, "visible": True} o_shape_Shape = {"container": o_Gui_MainView, "id": "_shape", "type": "Shape", "unnamed": 1, "visible": True} @@ -389,12 +400,11 @@ o_stephead_indicator = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True} #main treatment time duration -o_QQuickView = { "type": "QQuickView"} -o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True} +o_pop_screen = {"container": o_Overlay, "type": "PopupItem", "unnamed": 1, "visible": True} o_treatmentHome = {"container": o_QQuickView , "id": "_treatmentHome" , "type": "TreatmentHome", "unnamed": 1, "visible": True} o_Treatment_Paused = {"container": o_treatmentHome, "text": "Treatment Paused", "type": "Text", "unnamed": 1, "visible": True} o_Overlay = {"container": o_Gui_MainView, "type": "Overlay", "unnamed": 1, "visible": True} -o_confirm_Text = {"container": o_Overlay, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} +o_confirm_button = {"container": o_Overlay, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} o_treatmentHome_Time_Remaining_Text = {"container": o_treatmentHome, "text": "Time Remaining", "type": "Text", "unnamed": 1, "visible": True} o_treatment_duration = {"container": o_treatmentHome, "objectName": "TreatmentTime", "type": "TreatmentTime", "visible": True} @@ -438,6 +448,7 @@ o_separatorLine_text={"container": o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack, "gradient": 0, "id": "_separatorLine", "type": "Line", "unnamed": 1, "visible": True} o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_preTreatmentConsumablesStack", "type": "PreTreatmentConsumablesStack", "visible": True} +o_pop_up_close_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1, "visible": True} #post screen o_busy_indicator = {"container": o_initialModeScreen_ScreenItem, "id": "_busyIndicator", "source": "qrc:/images/iBusy", "type": "Image", "unnamed": 1, "visible": True}