mp_image: handle each event in a separate function to allow override in sub-classes

Signed-off-by: Rhys Mainwaring <[email protected]>

Author: srmainwaring

MAVProxy/modules/lib/mp_image.py

@@ -576,6 +576,49 @@ def handle_osd(self, obj):
             return
         self.osd_elements[obj.label] = obj
 
+    def process_event(self, obj):
+        """Process a single event"""
+        if isinstance(obj, MPImageOSD_Element):
+            self.handle_osd(obj)
+        if isinstance(obj, MPImageData):
+            self.set_image_data(obj.data, obj.width, obj.height)
+        if isinstance(obj, MPImageTitle):
+            state.frame.SetTitle(obj.title)
+        if isinstance(obj, MPImageRecenter):
+            self.on_recenter(obj.location)
+        if isinstance(obj, MPImageMenu):
+            self.set_menu(obj.menu)
+        if isinstance(obj, MPImagePopupMenu):
+            self.set_popup_menu(obj.menu)
+        if isinstance(obj, MPImageBrightness):
+            state.brightness = obj.brightness
+            self.need_redraw = True
+        if isinstance(obj, MPImageFullSize):
+            self.full_size()
+        if isinstance(obj, MPImageFitToWindow):
+            self.fit_to_window()
+        if isinstance(obj, win_layout.WinLayout):
+            win_layout.set_wx_window_layout(state.frame, obj)
+        if isinstance(obj, MPImageGStreamer):
+            self.start_gstreamer(obj.pipeline)
+        if isinstance(obj, MPImageVideo):
+            self.start_video(obj.filename)
+        if isinstance(obj, MPImageFPSMax):
+            self.fps_max = obj.fps_max
+            print("FPS_MAX: ", self.fps_max)
+        if isinstance(obj, MPImageSeekPercent):
+            self.seek_video(obj.percent)
+        if isinstance(obj, MPImageSeekFrame):
+            self.seek_video_frame(obj.frame)
+        if isinstance(obj, MPImageColormap):
+            self.colormap = obj.colormap
+        if isinstance(obj, MPImageColormapIndex):
+            self.colormap_index = obj.colormap_index
+        if isinstance(obj, MPImageStartTracker):
+            self.start_tracker(obj)
+        if isinstance(obj, MPImageEndTracker):
+            self.tracker = None
+
     def on_redraw_timer(self, event):
         '''the redraw timer ensures we show new map tiles as they
         are downloaded'''
@@ -586,46 +629,8 @@ def on_redraw_timer(self, event):
             except Exception:
                 time.sleep(0.05)
                 return
-            if isinstance(obj, MPImageOSD_Element):
-                self.handle_osd(obj)
-            if isinstance(obj, MPImageData):
-                self.set_image_data(obj.data, obj.width, obj.height)
-            if isinstance(obj, MPImageTitle):
-                state.frame.SetTitle(obj.title)
-            if isinstance(obj, MPImageRecenter):
-                self.on_recenter(obj.location)
-            if isinstance(obj, MPImageMenu):
-                self.set_menu(obj.menu)
-            if isinstance(obj, MPImagePopupMenu):
-                self.set_popup_menu(obj.menu)
-            if isinstance(obj, MPImageBrightness):
-                state.brightness = obj.brightness
-                self.need_redraw = True
-            if isinstance(obj, MPImageFullSize):
-                self.full_size()
-            if isinstance(obj, MPImageFitToWindow):
-                self.fit_to_window()
-            if isinstance(obj, win_layout.WinLayout):
-                win_layout.set_wx_window_layout(state.frame, obj)
-            if isinstance(obj, MPImageGStreamer):
-                self.start_gstreamer(obj.pipeline)
-            if isinstance(obj, MPImageVideo):
-                self.start_video(obj.filename)
-            if isinstance(obj, MPImageFPSMax):
-                self.fps_max = obj.fps_max
-                print("FPS_MAX: ", self.fps_max)
-            if isinstance(obj, MPImageSeekPercent):
-                self.seek_video(obj.percent)
-            if isinstance(obj, MPImageSeekFrame):
-                self.seek_video_frame(obj.frame)
-            if isinstance(obj, MPImageColormap):
-                self.colormap = obj.colormap
-            if isinstance(obj, MPImageColormapIndex):
-                self.colormap_index = obj.colormap_index
-            if isinstance(obj, MPImageStartTracker):
-                self.start_tracker(obj)
-            if isinstance(obj, MPImageEndTracker):
-                self.tracker = None
+
+            self.process_event(obj)
 
         if self.need_redraw:
             self.redraw()