Index: shared/scripts/names.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r84c1284ecff1f30169d50afb688be18934eb8506 --- shared/scripts/names.py (.../names.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ shared/scripts/names.py (.../names.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -238,9 +238,9 @@ o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentConsumblesStack_PreTreatmentConsumablesStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} #patient connection ultrafiltration section -o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentPrimeStack", "type": "PreTreatmentPrimeStack", "visible": True} -o_PreTreatmentPrimeStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} -o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSampleStack", "visible": True} +o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentPrimeStack", "type": "PreTreatmentPrimeStack"} +o_PreTreatmentPrimeStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase"} +o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSampleStack"} o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} o_PreTreatmentUltrafiltration_volumeSlider_Slider = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "objectName": "_volumeSlider", "type": "Slider", "visible": True} o_PreTreatmentUltrafiltration_Ultrafiltration_Volume_Text = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "text": "Ultrafiltration Volume (L)", "type": "Text", "unnamed": 1, "visible": True} @@ -335,30 +335,34 @@ o_skip_text_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "SKIP", "type": "Text", "unnamed": 1, "visible": True} #Water Sample -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} +# stacks_parent_parent = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True} +o_PreTreatmentStack_PreTreatmentStack_Child = {"container": o_PreTreatmentStack_PreTreatmentStack, "id": "_stackView", "type": "StackView", "unnamed": 1, "visible": True} +o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSample = {"container": o_PreTreatmentStack_PreTreatmentStack_Child, "objectName": "_preTreatmentWaterSampleStack", "type": "PreTreatmentWaterSampleStack"} +o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSample, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} +# o_PreTreatmentBase_swipeview_SwipeView_2 = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} +# o_swipeview_image_Image = {"container": o_PreTreatmentBase_swipeview_SwipeView_2, "id": "_image", "source": "file:///home/denali/Projects/application/resources/settings//Instructions/44_water test pass fail v2.png", "type": "Image", "unnamed": 1, "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} +o_PreTreatmentBase_Filter_Flush_Text = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "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} +o_filter_flush_progress_main = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "objectName": "_TimeText", "type": "TimeText", "visible": True} +o_filter_flush_progress = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True} #Next Button object o_next_button_MouseArea = {"container": o_Gui_MainView, "id": "_mouseArea", "occurrence": 6, "type": "MouseArea", "unnamed": 1, "visible": True} -o_next_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} +o_next_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "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} +o_water_sample_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "WATER SAMPLE", "type": "Text", "unnamed": 1, "visible": True} #Back button object -o_water_sample_back_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} +o_water_sample_back_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "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} +o_pass_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "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} +o_fail_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "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} +o_ok_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "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} +o_stephead_indicator = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True} #main treatment time duration o_pop_screen = {"container": o_Overlay, "type": "PopupItem", "unnamed": 1, "visible": True} @@ -569,13 +573,13 @@ #Rinseback Instruction Title in INIT state o_rinse_back_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "Rinseback Setup", "type": "Text", "unnamed": 1, "visible": True} #Rinseback Start button text -o_start_rinseback_init_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "START RINSEBACK", "type": "Text", "unnamed": 1, "visible": True} -o_EndTreatmentRinsebackInit_beginRinsebackTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_beginRinsebackTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True} +o_start_rinseback_init_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "START RINSEBACK", "type": "Text" } +o_EndTreatmentRinsebackInit_beginRinsebackTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_beginRinsebackTouchRect", "type": "TouchRect"} #Rinseback back to treatment button text -o_init_rinseback_back_to_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "BACK TO TREATMENT", "type": "Text", "unnamed": 1, "visible": True} -o_EndTreatmentRinsebackInit_backTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_backTreatmentTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True} +o_init_rinseback_back_to_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "BACK TO TREATMENT", "type": "Text"} +o_EndTreatmentRinsebackInit_backTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_backTreatmentTouchRect", "type": "TouchRect"} #Rinseback end treatment button text -o_init_rinseback_end_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "END TREATMENT", "type": "Text", "unnamed": 1, "visible": True} +o_init_rinseback_end_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "END TREATMENT", "type": "Text"} o_EndTreatmentRinsebackInit_endTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_endTreatmentTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True} #Rinseback END image and button text o_EndTreatmentRinseback_imageEnd_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageEnd", "source": "qrc:/images/iRedCrossWCircle", "type": "ImageText", "unnamed": 1, "visible": True} @@ -685,22 +689,24 @@ o_MainHome_CREATE_TREATMENT_Text = {"container": o_MainHome_MainHome, "text": "CREATE TREATMENT", "type": "Text", "unnamed": 1, "visible": True} #instructions -o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSample = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_preTreatmentWaterSampleStack", "type": "PreTreatmentWaterSampleStack", "visible": True} -o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSample, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} -o_PreTreatmentBase_swipeview_SwipeView_WaterSample = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} -o_next_button_ws = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} -o_fail_button_ws = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "FAIL", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_swipeview_SwipeView_Consumables = {"container": o_preTreatmentConsumablesStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} -o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesCartridgeInstallation", "type": "TreatmentFlowBase", "visible": True} -o_preTreatmentDisposablesCartridgeInstallation_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} -o_next_button_cartridge_installation = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} -o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesCartridgeConnetion", "type": "TreatmentFlowBase", "visible": True} -o_preTreatmentDisposablesCartridgeConnetion_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} -o_next_button_cartridge_connection = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} +# o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSample = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_preTreatmentWaterSampleStack", "type": "PreTreatmentWaterSampleStack"} +# o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSample, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase"} +o_next_button_ws = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "NEXT", "type": "Text"} +o_fail_button_ws = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "FAIL", "type": "Text"} +o_PreTreatmentBase_swipeview_SwipeView_WaterSample = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"} +o_PreTreatmentBase_swipeview_SwipeView_Consumables = {"container": o_preTreatmentConsumablesStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"} + +o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesCartridgeInstallation"} +o_preTreatmentDisposablesCartridgeInstallation_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"} + +o_next_button_cartridge_installation = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase, "text": "NEXT", "type": "Text"} +o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesCartridgeConnetion", "type": "TreatmentFlowBase"} +o_preTreatmentDisposablesCartridgeConnetion_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"} +o_next_button_cartridge_connection = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase, "text": "NEXT", "type": "Text"} o_next_button_heparinsyringe = {"container": o_Gui_MainView, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} -o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesSalineBag", "type": "TreatmentFlowBase", "visible": True} -o_preTreatmentDisposablesSalineBag_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} -o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} +o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesSalineBag", "type": "TreatmentFlowBase"} +o_preTreatmentDisposablesSalineBag_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"} +o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase"} o_PreTreatmentBase_swipeview_SwipeView_3 = {"container": o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} o_skip_button = {"container": o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase, "text": "SKIP", "type": "Text", "unnamed": 1, "visible": True} o_interval_obj = {"container":o_treatmentStack_treatmentHome_TreatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True} @@ -735,8 +741,8 @@ o_EndTreatmentBase_swipeview_SwipeView = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} o_instruction = {"type": "Text", "unnamed": 1, "visible": True} o_right_arrow = {"id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} -o_image_path = {"type": "Image", "unnamed": 1, "visible": True} - +o_image_path = {"type": "Image", "id": "_image"} +o_notification_bar_recirc = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "objectName": "NotificationBar", "type": "NotificationBarSmall"} # #settings_Home o_userConfirmation_UserConfirmation = {"container": o_Gui_MainView, "objectName": "UserConfirmation", "type": "UserConfirmation", "visible": True} o_services_screen_text_obj = {"container": o_userConfirmation_UserConfirmation, "type": "Text", "unnamed": 1, "visible": True} @@ -1063,11 +1069,3 @@ o_SettingsBase_Failed_to_set_subnet_mask_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Failed to set subnet mask.", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_Failed_to_set_DNS_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Failed to set DNS.", "type": "Text", "unnamed": 1, "visible": True} - - - - - - - -