Index: shared/scripts/names.py =================================================================== diff -u -rafe526037d45aa052df6575bea714c01b1b98bcb -rb6a0252c08f0ca9244add4d9f15d1ec98212f9f9 --- shared/scripts/names.py (.../names.py) (revision afe526037d45aa052df6575bea714c01b1b98bcb) +++ shared/scripts/names.py (.../names.py) (revision b6a0252c08f0ca9244add4d9f15d1ec98212f9f9) @@ -49,7 +49,6 @@ o_MainHome_MainHome = {"container": o_Gui_MainView, "objectName": "_MainHome", "type": "MainHome", "visible": True} o_standby_page = {"container": o_MainHome_MainHome, "type": "Column", "unnamed": 1, "visible": True} - #alarm list o_alarm_list_container = {"container": o_Overlay, "id": "_flickable", "type": "Flickable", "unnamed": 1, "visible": True} o_notification_bar_alarm_list_button = {"container": o_Gui_MainView, "id": "_alarmListImage", "source": "qrc:/images/iList", "type": "Image", "unnamed": 1, "visible": True} @@ -109,7 +108,6 @@ o_PreTreatmentBase_backgroundRect_Rectangle = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} o_PreTreatmentBase_confirmButton_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} - #standbymode o_MainHome_MainHome = {"container": o_Gui_MainView, "objectName": "_MainHome", "type": "MainHome", "visible": True} o_standby_page = {"container": o_MainHome_MainHome, "type": "Column", "unnamed": 1, "visible": True} @@ -303,6 +301,44 @@ o_initialModeScreen_ScreenItem = {"container": o_Gui_MainView, "id": "_initialModeScreen", "type": "ScreenItem", "unnamed": 1, "visible": True} +#Water Sample Pretreatment +#Filter Flush screen +o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True} +o_PreTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True} +o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSampleStack", "visible": True} +o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} + +#Water sample sub screen +o_text_object = {"type": "Text", "unnamed": 1, "visible": True} +o_bullet_object = {"type": "StepBullet", "unnamed": 1, "visible": True} + +o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True} +stacks_parent_parent = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True} +stack_parent = {"container": stacks_parent_parent, "id": "_stackView", "type": "StackView", "unnamed": 1, "visible": True} + +o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSampleStack = {"container":stack_parent, "objectName": "_preTreatmentWaterSampleStack", "type": "PreTreatmentWaterSampleStack", "visible": True} +o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2 = {"container": o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSampleStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} + +#Filter flush title object +o_PreTreatmentBase_Filter_Flush_Text = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "Filter Flush", "type": "Text", "unnamed": 1, "visible": True} +#Filter Flush Progress bar object +o_filter_flush_progress_main = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "objectName": "_TimeText", "type": "TimeText", "visible": True} +o_filter_flush_progress = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True} +#Next Button object +o_next_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} +#Water Sample button object +o_water_sample_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "WATER SAMPLE", "type": "Text", "unnamed": 1, "visible": True} +#Back button object +o_back_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} +#Pass button object +o_pass_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "PASS", "type": "Text", "unnamed": 1, "visible": True} +#Fail button object +o_fail_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "FAIL", "type": "Text", "unnamed": 1, "visible": True} +#Ok button object +o_ok_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "OK", "type": "Text", "unnamed": 1, "visible": True} +#Indicator Headstep bullet object +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}