diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 215f5ed..0b062fa 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,14 +2,9 @@ - - - - - @@ -182,13 +178,13 @@ @@ -426,12 +422,17 @@ - - - - - - + + + + + + + + + + + @@ -465,9 +466,7 @@ - - - + @@ -477,35 +476,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -542,12 +539,17 @@ - - - - - - + + + + + + + + + + + @@ -581,9 +583,7 @@ - - - + @@ -593,35 +593,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -698,70 +696,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -788,6 +722,14 @@ + + + + + + + + @@ -798,26 +740,83 @@ - + - - + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data_centre.py b/data_centre.py index 08872fa..2f453c5 100644 --- a/data_centre.py +++ b/data_centre.py @@ -14,17 +14,18 @@ except: print('data_centre has omx:{}'.format(has_omx)) -current_message = None +current_message = [None, None] -def set_message(message): +def set_message(message_type,message ): global current_message print('trying to set message') - current_message = message + current_message = [message_type, message] + def clear_message(): global current_message - current_message = None + current_message = [None, None] ######## sets names for the persistant data objects ######## NEXT_BANK_JSON = 'next_bank_number.json' diff --git a/display_centre/display.py b/display_centre/display.py index 22b0186..8895f66 100644 --- a/display_centre/display.py +++ b/display_centre/display.py @@ -99,9 +99,10 @@ class Display(object): def load_message(self): if data_centre.current_message: - self.display_text.insert(END, 'INFO: {}'.format(data_centre.current_message)) - self.display_text.tag_add("ERROR_MESSAGE", 14.0, 15.0) - self.tk.after(4000, data_centre.clear_message) + self.display_text.insert(END, '{}: {}'.format(data_centre.current_message[0], data_centre.current_message[1])) + self.display_text.tag_add('{}_MESSAGE'.format(data_centre.current_message[0]), 16.0, 17.0) + message_length = 4000 + self.tk.after(message_length, data_centre.clear_message) else: self.display_text.insert(END, '=============================================== \n') diff --git a/video_centre/video_player.py b/video_centre/video_player.py index 46dc97f..834ed63 100644 --- a/video_centre/video_player.py +++ b/video_centre/video_player.py @@ -103,6 +103,8 @@ class video_player: if after_seek_position > self.start and after_seek_position < self.end: self.set_position(after_seek_position) #self.player.seek(amount) + else: + data_centre.current_message = ['INFO', 'can not seek outside range'] def set_position(self, position): self.player.set_position(position)