Index: shared/scripts/configuration/config.py =================================================================== diff -u -rd0f4e893f8a02c0867aaa9cda0e609ec1d9a6b06 -r5c6c2daa8dc7d453535a9e9f59df872e81d805ca --- shared/scripts/configuration/config.py (.../config.py) (revision d0f4e893f8a02c0867aaa9cda0e609ec1d9a6b06) +++ shared/scripts/configuration/config.py (.../config.py) (revision 5c6c2daa8dc7d453535a9e9f59df872e81d805ca) @@ -25,7 +25,12 @@ "Lavender": "#db98f5", "Light Blue": "#acd7f1", "Light Teal": "#29f1da","Lime": "#b7fc36", "Magenta":"#fd28fd", "Orange": "#f2721c", "Peach":"#f1979a", "Red": "#c53b33", "Rose":"#fc178d", "Slate blue":"#7f7ffa", "Violet": "#6435c9", "White": "#ffffff", "Yellow": "#fcfc4d"} - + +#Alarms location +CONFIG_PATH = Path(os.getcwd()) +HOME_DIR_PATH = CONFIG_PATH.parent.parent.parent +ALARMS_CONF_LOCATION = "".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Alarms/Alarms.conf']) + NUM_OF_ALARM_PRIORITIES = 4 # Total number of alarm priorities ACCEPTED = True REJECTED = False Index: shared/scripts/names.py =================================================================== diff -u -ra913fb6ac1f72e4ae024c717b4524d6d0f89b4ee -r5c6c2daa8dc7d453535a9e9f59df872e81d805ca --- shared/scripts/names.py (.../names.py) (revision a913fb6ac1f72e4ae024c717b4524d6d0f89b4ee) +++ shared/scripts/names.py (.../names.py) (revision 5c6c2daa8dc7d453535a9e9f59df872e81d805ca) @@ -42,6 +42,8 @@ o_standby_page = {"container": o_MainHome_MainHome, "type": "Column", "unnamed": 1, "visible": True} + +o_alarms_text ={"type": "Text", "unnamed": 1, "visible": True} #alarm list o_alarm_list_container = {"container": o_Overlay, "id": "_flickable", "type": "Flickable", "unnamed": 1, "visible": True} o_notification_bar_alarm_list_button = {"container": o_Gui_MainView, "id": "_alarmListImage", "source": "qrc:/images/iList", "type": "Image", "unnamed": 1, "visible": True} @@ -64,8 +66,9 @@ #Alarm list title text o_alarm_title_text = {"container": o_Overlay, "id": "_title", "type": "Text", "unnamed": 1, "visible": True} #Alarm dialogue -o_alarm_dialogue_box_msg = {"container": o_Overlay, "id": "_desc", "objectName": "_NotificationDialog_Description", "type": "Text", "visible": True} - +o_alarm_dialogue_box_msg = {"container": o_Overlay, "id": "_desc", "objectName": "_NotificationDialog_Description", "type": "Text", "visible": True} +#Alarm id +o_alarm_id = {"container": o_Overlay, "type": "Text", "unnamed": 1, "visible": True} #alarm dialog o_alarm_dialog_content = {"container": o_Overlay , "objectName": "_NotificationDialog" , "type": "ContentItem" } o_alarm_dialog_titleBar = {"container": o_alarm_dialog_content , "id" : "_titleBar" , "type": "Rectangle" } @@ -91,7 +94,6 @@ o_dismiss_alarm = {"container": o_Overlay, "id": "_silence", "type": "TouchRect", "unnamed": 1, "visible": True} o_alarm_not_silence_img = {"container": o_alarm_dialog_content, "id": "_muteButton", "type": "MuteButton", "visible": True} o_alarm_silence_img = {"container": o_alarm_dialog_content, "id": "_muteButton", "type": "MuteButton", "visible": True} - #in-treatment o_blood_priming = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "Blood Priming", "type": "Text", "unnamed": 1, "visible": True} o_blood_priming_value_by_default = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "0 mL", "type": "Text", "unnamed": 1, "visible": True} @@ -109,6 +111,5 @@ - \ No newline at end of file Index: tst_ui_alarms_dialog/test.py =================================================================== diff -u -r1aa305a06879500f0756d37c4be50c8aea114dab -r5c6c2daa8dc7d453535a9e9f59df872e81d805ca --- tst_ui_alarms_dialog/test.py (.../test.py) (revision 1aa305a06879500f0756d37c4be50c8aea114dab) +++ tst_ui_alarms_dialog/test.py (.../test.py) (revision 5c6c2daa8dc7d453535a9e9f59df872e81d805ca) @@ -19,15 +19,62 @@ from dialin.protocols.CAN import DenaliCanMessenger from dialin.ui.hd_simulator_alarms import HDAlarmsSimulator + ALARM_EXPIRES_TIME = (0, 10, 20, 30, 30, 100) alarm_id_combination = (2, 3, 5, 7, 10, 15, 20, 25, 30, 50) - +contents = [] +alarm_ids = [] +alarm_titles = [] +alarms_msgs = [] +count_of_alarms = [] +title_count_dict = {} +text_obj_names = [names.o_alarm_title_text,names.o_alarm_id,names.o_alarm_dialogue_box_msg ] logging.basicConfig(filename='log_file.log',level=logging.INFO, datefmt='%d-%b-%y %H:%M:%S') hd_simulator = HDSimulator() logger = logging.getLogger("INFO") messenger = DenaliCanMessenger('can0') alarm = HDAlarmsSimulator(can_interface=messenger, logger=logger) +def get_text_obj(screen_obj,text): + """ + To obtain a text object based on text provided + @param (str) screen_obj: provides the container name on which the text must be present + @param (str) text: instruction text + @returns a real name object + """ + names.o_alarms_text["container"] = screen_obj + names.o_alarms_text["text"] = text + return names.o_alarms_text + +def read_data_from_alarms_conf_file(): + """ + This method is used to read the data from Instructions.conf file. + """ + utils.waitForGUI(0.2) + with open(config.ALARMS_CONF_LOCATION, 'r') as conf_file: + contents = conf_file.readlines() + count = 0 + line_count = 0 + for line in contents: + length =len(line) + line_count += 1 + if line[0] =="[": + alarm_ids.append(conf_data[0]) + continue + else: + conf_data = line.split("=") + if length > 2: + count += 1 + alarm_titles.append(conf_data[0]) + alarms_msgs.append(conf_data[1]) + if line_count == len(contents): + count_of_alarms.append(count) + else: + if count > 0: + count_of_alarms.append(count) + count = 0 + title_count_dict.update(dict(zip(title_list,count_of_alarms))) + def minimize(): """ Method to minimize alarm dialog box