Index: shared/scripts/names.py =================================================================== diff -u -ref497ba544e919ae353985f2b3915997c5da3f32 -rab2ebd8c7b5c8df145c2b8cc06a397258ecf2f13 --- shared/scripts/names.py (.../names.py) (revision ef497ba544e919ae353985f2b3915997c5da3f32) +++ shared/scripts/names.py (.../names.py) (revision ab2ebd8c7b5c8df145c2b8cc06a397258ecf2f13) @@ -12,7 +12,7 @@ # author Behrouz NematiPour # -AUT_NAME = "denaliSquish" # Squish +AUT_NAME = "denali" # Squish AlarmPriority = [ 0, 1, 2, 3, 4 ] # 4 is out of range check # KEPT THE START AT LINE 20 SO ANY (MESSAGE LINE NUMBER - 20) IS THE INDEX @@ -209,10 +209,25 @@ o_treatmentStart_59_Text = {"container": o_treatmentStart_TreatmentStart, "text": 59, "type": "Text", "unnamed": 1, "visible": True} # Alarm Status +o_alarm_dialog_content = {"container": o_Overlay , "objectName": "_NotificationDialog" , "type": "ContentItem" } +o_alarm_button_minimize = {"container": o_alarm_dialog_content , "id" : "_minimizeButton" , "type": "UpDownButton" ,"visible": True } +o_alarm_button_mute = {"container": o_alarm_dialog_content , "id" : "_muteButton" , "type": "MuteButton" ,"visible": True } +o_alarm_button_mute_img = {"container": o_alarm_button_mute , "id" : "_muteImage" , "type": "Image" } +o_alarm_button_mute_min = {"container": o_alarm_button_mute , "id" : "_hourText" , "type": "Text" } +o_alarm_button_mute_sec = {"container": o_alarm_button_mute , "id" : "_minuteText" , "type": "Text" } +o_alarm_button_row = {"container": o_alarm_dialog_content , "id" : "_buttonGroup" , "type": "Row" } +o_alarm_button_resume = {"container": o_alarm_button_row , "id" : "_resumeTouchRect" , "type": "TouchRect" } +o_alarm_button_rinseback = {"container": o_alarm_button_row , "id" : "_rinsebackTouchRect" , "type": "TouchRect" } +o_alarm_button_end = {"container": o_alarm_button_row , "id" : "_endTouchRect" , "type": "TouchRect" } +o_alarm_button_ok = {"container": o_alarm_button_row , "id" : "_okTouchRect" , "type": "TouchRect" } +o_alarm_text_description = {"container": o_alarm_dialog_content , "id" : "_desc" , "type": "Text" } + +o_alarm_bar = {"container": o_Overlay , "id": "_alarmBar" , "type": "NotificationBar"} +o_alarm_bar_text = {"container": o_alarm_bar , "id": "_text" , "type": "Text" } + + 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_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} @@ -442,7 +457,7 @@ o_managerHome_canbusFaultCount = {"container": o_managerHome, "id": "_canbusFaultCountText", "type": "Text" } # Alarm System -o_NotificationDialog_Description_Text = {"container": o_Overlay, "objectName": "_NotificationDialog_Description", "type": "Text"} +#o_NotificationDialog_Description_Text = {"container": o_Overlay, "objectName": "_NotificationDialog_Description", "type": "Text"} o_NotificationDialog_OKAY = {"container": o_Overlay, "text": "OKAY", "type": "Text"} o_create_treatment_button = {"container": o_treatmentHome, "text": "CREATE TREATMENT", "type": "Text", "unnamed": 1 } @@ -477,3 +492,4 @@ o_treatment_begin_flickable = {"container": o_treatment_begin_container, "objectName": "_treatmentBeginFlickable", "type": "TreatmentBegin"} o_treatment_begin_start_button = {"container": o_treatment_begin_container, "objectName": "_treatmentBeginStart", "type": "TouchRect"} o_treatment_begin_back_button = {"container": o_treatment_begin_container, "objectName": "_backButton", "type": "BackButton"} +