Index: shared/scripts/names.py =================================================================== diff -u -r91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1 -rf9b1549b9531b5a3b244c47d72bf7178cc1165e4 --- shared/scripts/names.py (.../names.py) (revision 91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1) +++ shared/scripts/names.py (.../names.py) (revision f9b1549b9531b5a3b244c47d72bf7178cc1165e4) @@ -160,10 +160,9 @@ # Alarm Status o_qquickview_alarm = {"type": "QQuickView", "unnamed": 1, "visible": True} o_alarm_dialog = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} -o_okay_alarm = {"container": o_Overlay, "id": "_okay", "type": "TouchRect", "unnamed": 1, "visible": True} +o_okay_alarm = {"container": o_Overlay, "objectName": "_alarmOK", "type": "TouchRect"} o_alarm_bar = {"container": o_qquickview_alarm, "objectName": "NotificationBar", "type": "NotificationBar"} o_treatmentStart_heparinTouchArea_TreatmentFluid = {"container": o_treatmentStart_TreatmentStart, "id": "_heparinTouchArea", "type": "TreatmentFluid", "unnamed": 1, "visible": True} -o_dismiss_alarm = {"container": o_Overlay, "id": "_silence", "type": "TouchRect", "unnamed": 1, "visible": True} o_treatmentStart_TimeText_TimeText = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText", "type": "TimeText", "visible": True} o_treatmentStart_TimeText_hour_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_hour", "type": "Text", "visible": True} o_treatmentStart_TimeText_minute_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_minute", "type": "Text", "visible": True} @@ -394,6 +393,11 @@ o_NotificationDialog_Description_Text = {"container": o_Overlay, "objectName": "_NotificationDialog_Description", "type": "Text"} o_NotificationDialog_OKAY = {"container": o_Overlay, "text": "OKAY", "type": "Text"} +# Alert System +o_alert = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle"} +o_alert_confirm = {"container": o_Overlay, "objectName": "AlertConfirmButton", "type": "TouchRect"} +o_alert_cancel = {"container": o_Overlay, "objectName": "AlertCancelButton", "type": "TouchRect"} + o_create_treatment_button = {"container": o_treatmentHome, "text": "CREATE TREATMENT", "type": "Text", "unnamed": 1 } o_create_treatment_container = {"container": o_qquickview_alarm, "objectName": "TreatmentCreate", "type": "TreatmentCreate" } o_create_treatment_flickable = {"container": o_create_treatment_container, "objectName": "_treatmentCreateFlickable", "type": "Flickable"} @@ -416,6 +420,11 @@ o_create_treatment_confirm = {"container": o_create_treatment_confirm_container, "objectName": "_continueRect", "type": "TouchRect"} o_create_treatment_confirm_back_button = {"container": o_create_treatment_confirm_container, "objectName": "_backButton", "type": "BackButton"} +o_create_treatment_arterial_column = {"container": o_create_treatment_container, "objectName": "_arterialPressureLimitsColumn", "type": "Column" } +o_create_treatment_arterial_slider = {"container": o_create_treatment_container, "objectName": "_arterialPressureLimitsSlider", "type": "RangeSlider" } +o_create_treatment_venous_column = {"container": o_create_treatment_container, "objectName": "_venousPressureLimitsColumn", "type": "Column" } +o_create_treatment_venous_slider = {"container": o_create_treatment_container, "objectName": "_venousPressureLimitsSlider", "type": "RangeSlider" } + # Confirm + Priming + Begin Treatment o_confirm_treatment_flickable = {"container": o_create_treatment_confirm_container, "objectName": "_treatmentConfirmFlickable", "type": "Flickable"} o_priming_container = {"container": o_qquickview_alarm, "objectName": "_treatmentPrime", "type": "TreatmentPrime"}