Index: shared/scripts/names.py =================================================================== diff -u -rae23d45d1c55ec9a79fe842b47eacc459a69ecfa -r1462b91c2ed482c9ad78fafb68953426189a5b6f --- shared/scripts/names.py (.../names.py) (revision ae23d45d1c55ec9a79fe842b47eacc459a69ecfa) +++ shared/scripts/names.py (.../names.py) (revision 1462b91c2ed482c9ad78fafb68953426189a5b6f) @@ -67,7 +67,7 @@ #alarm list minimize and maximize button o_alarm_list_minimize_maximize_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iList", "type": "Image", "unnamed": 1, "visible": True} #generated alarm id -o_alarm_id = {"container": o_Overlay, "id": "_text", "type": "Text", "unnamed": 1, "visible": True} +o_alarm_id = {"container": o_Overlay, "type": "Text", "unnamed": 1, "visible": True} #generated alarm message o_alarm_message = {"container": o_Overlay, "id": "_itemsValue", "type": "Text", "unnamed": 1, "visible": True} #list alarm messages @@ -186,6 +186,7 @@ o_volumeSlider_slider = {"container": o_Overlay,"id": "_volumeSlider", "type": "Slider", "unnamed": 1, "visible": True} o_ultrafiltration_volume_text = {"container": o_Overlay, "text": "ULTRAFILTRATION VOLUME (L)", "type": "Text", "unnamed": 1, "visible": True} o_ultrafiltration_closeButton = {"container": o_Overlay, "id": "_closeButton", "type": "CloseButton", "unnamed": 1, "visible": True} +o_backbutton_backbutton = {"container": o_Overlay, "id": "_backButton", "type": "BackButton", "unnamed": 1, "visible": True} o_notificationbar_response = {"container": o_Overlay, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True} o_ultrafiltration_pause_btn = {"container": o_Overlay, "text": "PAUSE ULTRAFILTRATION", "type": "Text", "unnamed": 1, "visible": True} o_ultrafiltration_resume_btn = {"container": o_Overlay, "text": "RESUME ULTRAFILTRATION", "type": "Text", "unnamed": 1, "visible": True} @@ -222,7 +223,7 @@ o_SettingsBase_SettingsDateTime = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDateTime", "visible": True} o_SettingsBase_SettingsWiFi = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsWiFi", "visible": True} o_wifi_screen_back_button = {"container": o_SettingsBase_SettingsWiFi, "objectName": "_backButton", "type": "BackButton", "visible": True} -# o_SettingsBase_mouseArea_MouseArea = {"container": o_SettingsBase_SettingsWiFi, "objectName": "_backButton", "type": "BackButton", "visible": True} +o_SettingsBase_mouseArea_MouseArea = {"container": o_SettingsBase_SettingsWiFi, "objectName": "_backButton", "type": "BackButton", "visible": True} o_eject_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iEject", "type": "Image", "unnamed": 1, "visible": True} o_SettingsBase_SettingsBase = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase", "visible": True} o_settings_base_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True} @@ -263,8 +264,10 @@ o_PreTreatmentBase_heartRate_TextEntry = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_heartRate", "type": "TextEntry", "unnamed": 1, "visible": True} #patient connection training section -o_PreTreatmentBase_swipeview_SwipeView = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} -o_swipeview_tutorial_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "type": "Text", "unnamed": 1, "visible": True} +o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_preTreatmentDisposablesStack", "type": "PreTreatmentDisposablesStack", "visible": True} +o_PreTreatmentBase_swipeview_SwipeView_connectionStack = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} +o_PreTreatmentBase_swipeview_SwipeView = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} +o_swipeview_tutorial_text = {"container": o_PreTreatmentBase_swipeview_SwipeView_connectionStack, "type": "Text", "unnamed": 1, "visible": True} o_patient_connection_PreTreatmentBase_rightImage_Image = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} o_patient_connection_PreTreatmentBase_leftImage_Image = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True} o_PreTreatmentUltrafiltration_Indicators = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True} @@ -494,18 +497,18 @@ o_PreTreatmentBase_TreatmentFlowBase = {"container": ":o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack", "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} o_pretreatmentPrimeStack_preTreatmentDrySelfTest_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack, "objectName": "_preTreatmentDrySelfTest", "type": "TreatmentFlowBase", "visible": True} #self dry state progress tim circle -o_self_test_dry_progress = {"container": o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True} +o_self_test_dry_progress = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True} #check list text common object o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentPrimeStack", "type": "PreTreatmentPrimeStack", "visible": True} o_pretreatmentPrimeStack_preTreatmentDisposablesPrime_TreatmentFlowBase = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "objectName": "_preTreatmentDisposablesPrime", "type": "TreatmentFlowBase", "visible": True} -o_self_test_dry_check_list_text = {"container": o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack, "type": "Text", "unnamed": 1, "visible": True} +o_self_test_dry_check_list_text = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "type": "Text", "unnamed": 1, "visible": True} #Priming title o_priming_title_text = {"container": o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack, "text": "Priming", "type": "Text", "unnamed": 1, "visible": True} #check_mark_parent_object -o_self_test_dry_progress_circle = {"container": o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack, "id": "_progressCircle", "type": "ProgressCircle", "unnamed": 1, "visible": True} +o_self_test_dry_progress_circle = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "id": "_progressCircle", "type": "ProgressCircle", "unnamed": 1, "visible": True} #start prime button and continue button -o_start_prime_btn = {"container": o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack, "text": "Start Prime", "type": "Text", "unnamed": 1, "visible": True} +o_start_prime_btn = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "text": "Start Prime", "type": "Text", "unnamed": 1, "visible": True} o_preTreatmentDisposablesPrime_startPrimeButton_TouchRect = {"container": o_pretreatmentPrimeStack_preTreatmentDisposablesPrime_TreatmentFlowBase, "id": "_startPrimeButton", "type": "TouchRect", "unnamed": 1, "visible": True} o_continue_btn = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "text": "CONTINUE", "type": "Text", "unnamed": 1, "visible": True} o_preTreatmentDisposablesPrime_confirmButton_TouchRect = {"container": o_pretreatmentPrimeStack_preTreatmentDisposablesPrime_TreatmentFlowBase, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} @@ -514,7 +517,6 @@ o_keyboard_switch2 = {"container": o_Gui_MainView, "id": "_shiftKeyIcon", "source": "qrc:/plugins/QtQuick/VirtualKeyboard/Styles/denali/images/iShiftActive.svg", "type": "Image", "unnamed": 1, "visible": True} #disposable -o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_preTreatmentDisposablesStack", "type": "PreTreatmentDisposablesStack", "visible": True} o_preTreatmentDisposablesStack_preTreatmentDisposablesSelfTest_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesSelfTest", "type": "TreatmentFlowBase", "visible": True} o_system_self_test = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "text" : "System Self Test", "type": "Text", "unnamed": 1, "visible": True} #progress @@ -525,10 +527,10 @@ o_disposable_leftImage_Image = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True} o_right_side_arrow = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} o_continue_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONTINUE", "type": "Text", "unnamed": 1, "visible": True} -o_cartridge_installation_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Open the front panel door.\nAnd check the cartridge.", "type": "Text", "unnamed": 1, "visible": True} +o_cartridge_installation_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Open the front panel door.", "type": "Text", "unnamed": 1, "visible": True} +o_cartridge_connection_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Connect the cartridge blood lines to the dialyzer.", "type": "Text", "unnamed": 1, "visible": True} o_heparin_syringe_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Fill a syringe with heparin and connect the cartridge heparin tubing line.", "type": "Text", "unnamed": 1, "visible": True} -o_cartridge_connection_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Connect the cartridge blood and dialysis fluid lines to the dialyzer.", "type": "Text", "unnamed": 1, "visible": True} - + #pre treatment objects 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} @@ -816,6 +818,7 @@ o_EndTreatmentBase_leftImage_Image = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True} #Reconnect text o_EndTreatmentBase_RECONNECT_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "RECONNECT", "type": "Text", "unnamed": 1, "visible": True} +o_EndTreatmentBase_Reconnect_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "Reconnect", "type": "Text", "unnamed": 1, "visible": True} #Reconnect button text # o_EndTreatmentBase_Reconnect_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "Reconnect", "type": "Text", "unnamed": 1, "visible": True} o_EndTreatmentBase_TouchRect = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "type": "TouchRect", "unnamed": 1, "visible": True} @@ -838,7 +841,7 @@ #alarm minimize button o_SettingsBase_Information_Text = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True} o_SettingsDateTime_mouseArea_MouseArea_2 = {"container": o_SettingsBase_SettingsDateTime, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} -o_SettingsHome_mouseArea_MouseArea_2_set_date_time = {"container": o_SettingsHome_SettingsHome, "id": "_mouseArea", "occurrence": 7, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsHome_mouseArea_MouseArea_2_set_date_time = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 7, "type": "MouseArea", "unnamed": 1, "visible": True} # service screen o_export_logs_text = {"container": o_SettingsBase_SettingsBase, "text": "Export Logs", "type": "Text", "unnamed": 1, "visible": True} @@ -953,13 +956,14 @@ o_disinfectHome_rightImage_Image = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} #Disinfection-settings path o_touchRect2_TouchRect = {"container": o_Gui_MainView, "objectName": "_touchRect2", "type": "TouchRect", "visible": True} +o_SettingsHome_DG_cleaning_button = {"container": o_SettingsHome_SettingsHome_2, "text": "DG Cleaning", "type": "Text", "unnamed": 1, "visible": True} o_SettingsHome_touchItem_TouchRect = {"container": o_SettingsHome_SettingsHome, "id": "_touchItem", "type": "TouchRect", "unnamed": 1, "visible": True} o_SettingsHome_DG_cleaning_mouse_Area = {"container": o_SettingsHome_SettingsHome_settings, "id": "_mouseArea", "occurrence": 5, "type": "MouseArea", "unnamed": 1, "visible": True} o_SettingsBase_row_Row = {"container": o_SettingsBase_SettingsDG, "id": "_row", "type": "Row", "unnamed": 1, "visible": True} o_SettingsBase_NotificationBar_NotificationBarSmall = {"container": o_SettingsBase_SettingsDG,"objectName": "NotificationBar", "type": "NotificationBarSmall", "visible": True} o_SettingsBase_TouchRect = {"container": o_SettingsBase_SettingsDG, "type": "TouchRect", "unnamed": 1, "visible": True} o_SettingsBase_image_Image = {"container": o_SettingsBase_SettingsDG, "id": "_image", "source": "qrc:/images/iBack", "type": "Image", "unnamed": 1, "visible": True} -treatment_mouseArea = {"container": o_Gui_MainView, "text": "Treatment", "type": "Text", "unnamed": 1, "visible": True} +# treatment_mouseArea = {"container": o_Gui_MainView, "text": "Treatment", "type": "Text", "unnamed": 1, "visible": True} o_disinfectHome_backButton_BackButton = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "objectName": "_backButton", "type": "BackButton", "visible": True} #cloudsync