Index: shared/scripts/names.py =================================================================== diff -u -r6b85a46cebe626c28a1accd4ea0019d3388abef4 -rc79559a8ecd6dc676c7aed956ba1a5d1e45534a0 --- shared/scripts/names.py (.../names.py) (revision 6b85a46cebe626c28a1accd4ea0019d3388abef4) +++ shared/scripts/names.py (.../names.py) (revision c79559a8ecd6dc676c7aed956ba1a5d1e45534a0) @@ -494,8 +494,7 @@ o_CreateCustomTreatment_Continue_button = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} # pre-treatment priming -o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_pretreatmentPrimeStack ", "type": "PreTreatmentPrimeStack", "visible": True} - +o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_pretreatmentPrimeStack", "type": "PreTreatmentPrimeStack", "visible": True} o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentPrimeStack", "type": "PreTreatmentPrimeStack", "visible": True} 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} @@ -532,8 +531,8 @@ 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.", "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 arterial and venous bloodlines using the recirculation connector.", "type": "Text", "unnamed": 1, "visible": True} +o_heparin_syringe_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Fill a syringe with {77:2:mL:1} heparin and connect to the heparin tubing line.", "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} @@ -735,7 +734,8 @@ # instructions for patient disconnection o_PostTreatmentStack_PostTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PostTreatmentStack", "type": "PostTreatmentStack", "visible": True} o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase = {"container": o_PostTreatmentStack_PostTreatmentStack, "objectName": "_patientDisconnectionConfirm", "type": "TreatmentFlowBase", "visible": True} -o_patientDisconnectionConfirm_swipeview_SwipeView = {"container": o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} +o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase2 = {"container": o_PostTreatmentStack_PostTreatmentStack, "objectName": "_patientDisconnectionConfirm", "type": "PostTreatmentBase", "visible": True} +o_patientDisconnectionConfirm_swipeview_SwipeView = {"container": o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase2, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} o_confirm_button_patient_disconnection = {"container": o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} # post treatment review screen @@ -791,7 +791,7 @@ o_disposables_removal_right_arrow = {"container": o_PostTreatmentStack_disposablesRemovalConfirm_TreatmentFlowBase, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} o_disposables_removal_text = {"container": o_PostTreatmentStack_disposablesRemovalConfirm_TreatmentFlowBase, "text": "Disposables Removal", "type": "Text", "unnamed": 1, "visible": True} o_treatmentReviewConfirm_Export_Text = {"container": o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview, "text": "Export", "type": "Text", "unnamed": 1, "visible": True} -o_eject_button = {"container": o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview, "id": "_image", "source": "qrc:/images/iEject", "type": "Image", "unnamed": 1, "visible": True} +o_eject_button = {"container": o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview, "id": "_usbButton", "type": "USBButton", "unnamed": 1, "visible": True} o_left_arrow = {"id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True} o_PostTreatment_Export_mousearea = {"container": o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview, "id": "_mouseArea", "occurrence": 2, "type": "MouseArea", "unnamed": 1, "visible": True} @@ -985,7 +985,7 @@ # cloudsync o_patientDisconnectionConfirm_CONFIRM_Text = {"container": o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} -o_treatmentReviewConfirm_Code_Tx_code_Label = {"container": o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview, "text": "Code: Tx_code", "type": "Label", "unnamed": 1, "visible": True} +o_treatmentReviewConfirm_Code_Tx_code_Label = {"container": o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview, "text": "Code:", "type": "Label", "unnamed": 1, "visible": True} # Setting WiFi, Bluetooth cuff, DG cleaning device_settings_screen = {"container": o_Gui_MainView, "text": "Treatment", "type": "Text", "unnamed": 1, "visible": True} @@ -1088,4 +1088,9 @@ o_EndTreatmentBase_ButtonEndTreatment = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "type": "ButtonEndTreatment", "unnamed": 1, "visible": True} o_EndTreatmentRinsebackComplete_SALINE_BOLUS_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "SALINE BOLUS", "type": "Text", "unnamed": 1, "visible": True} o_EndTreatmentRinsebackComplete_backButton_BackButton = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "objectName": "_backButton", "type": "BackButton", "visible": True} +o_treatmentReviewConfirm_usbButton_USBButton = {"container": o_PostTreatmentStack_treatmentReviewConfirm_PostTreatmentReview, "id": "_usbButton", "type": "USBButton", "unnamed": 1, "visible": True} +o_PostTreatmentStack_patientDisconnectionConfirm_PostTreatmentBase = {"container": o_PostTreatmentStack_PostTreatmentStack, "objectName": "_patientDisconnectionConfirm", "type": "PostTreatmentBase", "visible": True} +o_patientDisconnectionConfirm_instructionView_InstructionView = {"container": o_PostTreatmentStack_patientDisconnectionConfirm_PostTreatmentBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1, "visible": True} +o_pretreatmentPrimeStack_preTreatmentDisposablesPrime_PreTreatmentBase = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "objectName": "_preTreatmentDisposablesPrime", "type": "PreTreatmentBase", "visible": True} +o_preTreatmentDisposablesPrime_Prime_Text = {"container": o_pretreatmentPrimeStack_preTreatmentDisposablesPrime_PreTreatmentBase, "text": "Prime", "type": "Text", "unnamed": 1, "visible": True}