mwxlib 1.7.13__py3-none-any.whl → 1.8.0__py3-none-any.whl

mwx/graphman.py

@@ -81,10 +81,10 @@ class Thread:
         try:
             self.handler = self.owner.handler
         except AttributeError:
-            self.handler = FSM({ # DNA<Thread>
+            self.handler = FSM({  # DNA<Thread>
                 None : {
-                 'thread_begin' : [ None ],
-                   'thread_end' : [ None ],
+                 'thread_begin' : [None],
+                   'thread_end' : [None],
                 },
             })
 
@@ -177,9 +177,9 @@ class Thread:
             except BdbQuit:
                 pass
             except KeyboardInterrupt as e:
-                print("- Thread terminated by user:", e)
+                print("- Thread terminated by user;", e)
             except Exception as e:
-                print("- Thread failed in error:", e)
+                print("- Thread failed in error;", e)
                 traceback.print_exc()
                 tbstr = traceback.format_tb(e.__traceback__)
                 wx.CallAfter(wx.MessageBox,
@@ -323,11 +323,11 @@ class LayerInterface(CtrlInterface):
             if self.parameters:
                 self.reset_params(checked_only)
         
-        self.handler.append({ # DNA<Layer>
+        self.handler.append({  # DNA<Layer>
             None : {
-                   'page_shown' : [ None, _F(self.Draw, show=True)  ],
-                  'page_closed' : [ None, _F(self.Draw, show=False) ],
-                  'page_hidden' : [ None, _F(self.Draw, show=False) ],
+                   'page_shown' : [None, _F(self.Draw, show=True)],
+                  'page_closed' : [None, _F(self.Draw, show=False)],
+                  'page_hidden' : [None, _F(self.Draw, show=False)],
             },
             0 : {
                   'C-c pressed' : (0, _F(copy_params)),
@@ -462,7 +462,7 @@ class LayerInterface(CtrlInterface):
             if canvas:
                 canvas.draw_idle()
         except Exception as e:
-            print(f"- Failed to draw Arts of {self.__module__}.", e)
+            print(f"- Failed to draw Arts of {self.__module__};", e)
             del self.Arts
 
 
@@ -508,14 +508,14 @@ class Graph(GraphPlot):
         self.parent = parent
         self.loader = loader or parent
         
-        self.handler.append({ # DNA<Graph>
+        self.handler.append({  # DNA<Graph>
             None : {
-                    'focus_set' : [ None, _F(self.loader.select_view, view=self) ],
-                   'page_shown' : [ None, ],
-                  'page_closed' : [ None, ],
-                  'frame_shown' : [ None, _F(self.update_infobar) ],
-                  'S-a pressed' : [ None, _F(self.toggle_infobar) ],
-                   'f5 pressed' : [ None, _F(self.refresh) ],
+                    'focus_set' : [None, _F(self.loader.select_view, view=self)],
+                   'page_shown' : [None, ],
+                  'page_closed' : [None, ],
+                  'frame_shown' : [None, _F(self.update_infobar)],
+                  'S-a pressed' : [None, _F(self.toggle_infobar)],
+                   'f5 pressed' : [None, _F(self.refresh)],
             },
         })
         ## ドロップターゲットを許可する．
@@ -547,6 +547,23 @@ class Graph(GraphPlot):
         del self.region
         self.draw()
 
+    ## --------------------------------
+    ## Overridden buffer methods.
+    ## --------------------------------
+
+    def kill_all_buffers(self):
+        """Delete all buffers; (override) confirm the action with a dialog."""
+        n = sum(not frame.pathname for frame in self.all_frames)  # Check *need-save* frames.
+        if n:
+            s = 's' if n > 1 else ''
+            if wx.MessageBox(  # Confirm closing the frame.
+                    f"You are closing {n} unsaved frame{s}.\n\n"
+                     "Continue closing?",
+                    style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
+                self.message("The close has been canceled.")
+                return None
+        del self[:]
+
 
 class MyFileDropLoader(wx.FileDropTarget):
     """File Drop interface.
@@ -573,7 +590,7 @@ class MyFileDropLoader(wx.FileDropTarget):
             elif ext == '.jssn':
                 self.loader.load_session(fn)
             elif ext == '.index':
-                self.loader.load_index(fn, self.view)
+                self.loader.import_index(fn, self.view)
             else:
                 paths.append(fn)  # image file just stacks to be loaded
         if paths:
@@ -663,26 +680,26 @@ class Frame(mwx.Frame):
                 lambda v: v.Enable(self.__view.frame is not None)),
                 
             (wx.ID_CLOSE_ALL, "&Close all\t(C-S-k)", "Kill all buffers", Icon('book_red'),
-                lambda v: self.__view.kill_buffer_all(),
+                lambda v: self.__view.kill_all_buffers(),
                 lambda v: v.Enable(self.__view.frame is not None)),
                 
             (wx.ID_SAVE, "&Save as\tCtrl-s", "Save buffer as", Icon('save'),
                 lambda v: self.save_frame(),
                 lambda v: v.Enable(self.__view.frame is not None)),
                 
-            (wx.ID_SAVEAS, "&Save as TIFFs", "Save buffers as a multi-page tiff", Icon('saveall'),
+            (wx.ID_SAVEAS, "&Save as TIFFs\tCtrl+Shift+s", "Save buffers as a multi-page tiff", Icon('saveall'),
                 lambda v: self.save_frames_as_tiff(),
                 lambda v: v.Enable(self.__view.frame is not None)),
             (),
-            ("Index", (
-                (mwx.ID_(11), "&Import index\tCtrl+Shift+o", "Import index file", Icon('open'),
-                    lambda v: self.load_index()),
-                    
-                (mwx.ID_(12), "&Export index\tCtrl+Shift+s", "Export index file", Icon('saveas'),
-                    lambda v: self.save_index(),
-                    lambda v: v.Enable(self.__view.frame is not None)),
-                )),
-            (),
+            # ("Index", (
+            #     (mwx.ID_(11), "&Import index", "Import index file", Icon('open'),
+            #         lambda v: self.import_index()),
+            #         
+            #     (mwx.ID_(12), "&Export index", "Export index file", Icon('saveas'),
+            #         lambda v: self.export_index(),
+            #         lambda v: v.Enable(self.__view.frame is not None)),
+            #     )),
+            # (),
             ("Session", (
                 (mwx.ID_(15), "&Open session", "Open session file",
                     lambda v: self.load_session()),
@@ -760,22 +777,22 @@ class Frame(mwx.Frame):
             if not frame.parent.IsShown():
                 wx.CallAfter(self.show_pane, frame.parent)
         
-        self.graph.handler.append({ # DNA<Graph:Frame>
+        self.graph.handler.append({  # DNA<Graph:Frame>
             None : {
-                  'frame_shown' : [ None, self.set_title ],
-                 'frame_loaded' : [ None, show_frameview ],
-               'frame_modified' : [ None, show_frameview ],
-               'frame_selected' : [ None, self.set_title ],
-                  'canvas_draw' : [ None, lambda v: self.sync(self.graph, self.output) ],
+                  'frame_shown' : [None, self.set_title],
+                 'frame_loaded' : [None, show_frameview],
+               'frame_modified' : [None, show_frameview],
+               'frame_selected' : [None, self.set_title],
+                  'canvas_draw' : [None, lambda v: self.sync(self.graph, self.output)],
             },
         })
-        self.output.handler.append({ # DNA<Graph:Frame>
+        self.output.handler.append({  # DNA<Graph:Frame>
             None : {
-                  'frame_shown' : [ None, self.set_title ],
-                 'frame_loaded' : [ None, show_frameview ],
-               'frame_modified' : [ None, show_frameview ],
-               'frame_selected' : [ None, self.set_title ],
-                  'canvas_draw' : [ None, lambda v: self.sync(self.output, self.graph) ],
+                  'frame_shown' : [None, self.set_title],
+                 'frame_loaded' : [None, show_frameview],
+               'frame_modified' : [None, show_frameview],
+               'frame_selected' : [None, self.set_title],
+                  'canvas_draw' : [None, lambda v: self.sync(self.output, self.graph)],
             },
         })
         
@@ -830,11 +847,11 @@ class Frame(mwx.Frame):
         name = (frame.pathname or frame.name) if frame else ''
         self.SetTitle("{}@{} - [{}] {}".format(self.Name, platform.node(), ssn, name))
 
-    def OnActivate(self, evt):  #<wx._core.ActivateEvent>
+    def OnActivate(self, evt):  # <wx._core.ActivateEvent>
         if self and evt.Active:
             self.set_title(self.selected_view.frame)
 
-    def OnClose(self, evt):  #<wx._core.CloseEvent>
+    def OnClose(self, evt):  # <wx._core.CloseEvent>
         ssn = os.path.basename(self.session_file or '--')
         with wx.MessageDialog(None,
                 "Do you want to save session before closing program?",
@@ -849,7 +866,7 @@ class Frame(mwx.Frame):
         n = sum(bool(plug.thread and plug.thread.active) for plug in self.get_all_plugs())
         if n:
             s = 's' if n > 1 else ''
-            if wx.MessageBox( # Confirm closing the thread.
+            if wx.MessageBox(  # Confirm closing the thread.
                     f"Currently  running {n} thread{s}.\n\n"
                     "Continue closing?",
                     style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
@@ -857,10 +874,10 @@ class Frame(mwx.Frame):
                 evt.Veto()
                 return
             self.Quit()
-        n = sum(frame.pathname is None for frame in self.graph.all_frames)
+        n = sum(not frame.pathname for frame in self.graph.all_frames)  # Check *need-save* frames.
         if n:
             s = 's' if n > 1 else ''
-            if wx.MessageBox( # Confirm closing the frame.
+            if wx.MessageBox(  # Confirm closing the frame.
                     f"You are closing {n} unsaved frame{s}.\n\n"
                      "Continue closing?",
                     style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
@@ -986,7 +1003,7 @@ class Frame(mwx.Frame):
         else:
             pane.Float()
 
-    def OnPaneClose(self, evt):  #<wx.aui.AuiManagerEvent>
+    def OnPaneClose(self, evt):  # <wx.aui.AuiManagerEvent>
         pane = evt.GetPane()
         win = pane.window
         if isinstance(win, aui.AuiNotebook):
@@ -1034,7 +1051,7 @@ class Frame(mwx.Frame):
             return next((x for x in self.get_all_plugs() if x is name), None)
 
     def get_all_plugs(self):
-        for name, module in self.plugins.items():
+        for _name, module in self.plugins.items():
             yield module.__plug__
 
     def load_plug(self, root, session=None, force=False, show=False,
@@ -1218,9 +1235,7 @@ class Frame(mwx.Frame):
         
         if not hasattr(module, 'ID_'):  # give a unique index to the module
             global __plug_ID__          # cache ID *not* in [ID_LOWEST(4999):ID_HIGHEST(5999)]
-            try:
-                __plug_ID__
-            except NameError:
+            if "__plug_ID__" not in globals():
                 __plug_ID__ = 10000
             __plug_ID__ += 1
             module.ID_ = __plug_ID__
@@ -1309,7 +1324,7 @@ class Frame(mwx.Frame):
         shell = self.shellframe.clone_shell(plug)
         name = plug.Name  # init(shell) で名前を参照するため再定義する
         
-        @shell.handler.bind("shell_activated")
+        @shell.handler.bind("shell_activated")  # @TODO: init action が重複してバインドされてしまう．
         def init(shell):
             """Called when the plug shell is activated."""
             nonlocal plug
@@ -1343,7 +1358,7 @@ class Frame(mwx.Frame):
     ## --------------------------------
     INDEXFILE = "results.index"
 
-    def load_index(self, filename=None, view=None):
+    def import_index(self, filename=None, view=None):
         """Load frames :ref to the Index file.
         
         If no view given, the currently selected view is chosen.
@@ -1379,7 +1394,7 @@ class Frame(mwx.Frame):
         ))
         return frames
 
-    def save_index(self, filename=None, frames=None):
+    def export_index(self, filename=None, frames=None):
         """Save frames :ref to the Index file.
         """
         view = self.selected_view
@@ -1405,20 +1420,20 @@ class Frame(mwx.Frame):
             try:
                 self.message("Export index of {!r}...".format(frame.name))
                 fn = frame.pathname
-                if not fn or fn.endswith('>'):  # <dummy-path>
+                if not fn or fn.endswith('>'):  # *dummy-path* --> Use buffer name.
                     fn = os.path.join(savedir, fix_fnchars(frame.name))
                 if not os.path.exists(fn):
                     if not fn.endswith('.tif'):
                         fn += '.tif'
                     self.write_buffer(fn, frame.buffer)
                     frame.pathname = fn
-                    frame.name = os.path.basename(fn)  # new name and pathname
+                    frame.name = os.path.basename(fn)
                     print(' ', self.message("\b done."))
                 else:
                     print(' ', self.message("\b skipped."))
                 output_frames.append(frame)
             except OSError as e:
-                print('-', self.message("\b failed.", e))
+                print('-', self.message("\b failed;", e))
         
         frames = output_frames
         res, mis = self.write_attributes(filename, frames)
@@ -1433,8 +1448,11 @@ class Frame(mwx.Frame):
     ## --------------------------------
     ## load/save frames and attributes.
     ## --------------------------------
+    wildcards = [
+        "TIF file (*.tif)|*.tif",
+         "ALL files (*.*)|*.*",
+    ]
 
-    @classmethod
     def read_attributes(self, filename, check_path=True):
         """Read attributes file.
         
@@ -1459,13 +1477,13 @@ class Frame(mwx.Frame):
                 try:
                     res.update(json.loads(s, object_hook=dt_parser))  # Read res safely.
                 except json.decoder.JSONDecodeError:
-                    res.update(eval(s))  # Read res <dict> for backward compatibility.
+                    res.update(eval(s))  # Read as tuple (deprecated).
             
             if check_path:
                 for name, attr in tuple(res.items()):
-                    fn = os.path.join(savedir, name)  # search by relpath (saved dir/name)
+                    fn = os.path.join(savedir, name)  # Search by relpath (saved dir/name).
                     if os.path.exists(fn):
-                        attr['pathname'] = fn  # If found, update pathname.
+                        attr['pathname'] = fn  # If found, update the path.
                     else:
                         fn = attr.get('pathname')  # If not found, check for the recorded path.
                         if not fn or not os.path.exists(fn):
@@ -1473,11 +1491,10 @@ class Frame(mwx.Frame):
         except FileNotFoundError:
             pass
         except Exception as e:
-            print("- Failed to read attributes.", e)
+            print("- Failed to read attributes;", e)
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
         return res, mis
 
-    @classmethod
     def write_attributes(self, filename, frames, merge_data=True):
         """Write attributes file.
         
@@ -1500,10 +1517,10 @@ class Frame(mwx.Frame):
                         new[name] = attr
             
             with open(filename, 'w') as o:
-                # print(pformat(tuple(new.items())), file=o)  # tuple with pformat is deprecated.
+                # print(pformat(tuple(new.items())), file=o)  # Write as tuple (deprecated).
                 json.dump(new, o, indent=2, default=dt_converter)
         except Exception as e:
-            print("- Failed to write attributes.", e)
+            print("- Failed to write attributes;", e)
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
         return new, mis
 
@@ -1530,8 +1547,7 @@ class Frame(mwx.Frame):
         if frames:
             saved_results = {}
             for frame in frames:
-                if frame.pathname.endswith('>'):  # <dummy-path>
-                    ## Attributes are compiled in load_buffer.
+                if frame.pathname.endswith('>'):  # *dummy-path* compiled in load_buffer
                     continue
                 ## Compile attributes from index files located in each frame path.
                 savedir = os.path.dirname(frame.pathname)
@@ -1588,6 +1604,7 @@ class Frame(mwx.Frame):
         _name, ext = os.path.splitext(path)
         if ext != ".tif":
             path += ".tif"
+        
         try:
             name = os.path.basename(path)
             self.message("Saving {!r}...".format(name))
@@ -1600,7 +1617,7 @@ class Frame(mwx.Frame):
             n = len(frames)
             d = len(str(n))
             for j, frame in enumerate(frames):
-                frame.pathname = path + f"<{j:0{d}}>"  # <dummy-path>
+                frame.pathname = path + f"<{j:0{d}}>"  # *dummy-path* in multi-page tiff
             ## multi-page tiff: 同名のインデクスファイルに属性を書き出す．
             self.write_attributes(path[:-4] + ".index", frames, merge_data=False)
             self.message("\b done.")
@@ -1613,10 +1630,6 @@ class Frame(mwx.Frame):
     ## --------------------------------
     ## load/save images.
     ## --------------------------------
-    wildcards = [
-        "TIF file (*.tif)|*.tif",
-         "ALL files (*.*)|*.*",
-    ]
 
     @staticmethod
     def read_buffer(path):
@@ -1677,7 +1690,7 @@ class Frame(mwx.Frame):
                             page_name, info = items[j]  # original buffer name and attributes
                         else:
                             page_name = name + f"<{j:0{d}}>"  # default buffer name
-                        info['pathname'] = path + f"<{j:0{d}}>"  # <dummy-path>
+                        info['pathname'] = path + f"<{j:0{d}}>"  # *dummy-path* in multi-page tiff
                         frame = view.load(buf, page_name, show=0, **info)
                         frames.append(frame)
                 else:
@@ -1803,7 +1816,7 @@ class Frame(mwx.Frame):
             
             def _save(view):
                 paths = [frame.pathname for frame in view.all_frames if frame.pathname]
-                paths = [fn for fn in paths if not fn.endswith('>')]  # <dummy-path> 除外
+                paths = [fn for fn in paths if not fn.endswith('>')]  # *dummy-path* 除外
                 o.write(f"self.{view.Name}.unit = {view.unit:g}\n")
                 o.write(f"self.load_frame({paths!r}, self.{view.Name})\n")
                 try:

mwx/matplot2.py

@@ -85,10 +85,10 @@ class MatplotPanel(wx.Panel):
         
         self.message = log or (lambda s: s)
         
-        #<matplotlib.figure.Figure>
+        # <matplotlib.figure.Figure>
         self.figure = Figure(facecolor='white', figsize=(.1,.1))  # inches
         
-        #<matplotlib.backends.backend_wxagg.FigureCanvasWxAgg>
+        # <matplotlib.backends.backend_wxagg.FigureCanvasWxAgg>
         self.canvas = FigureCanvas(self, -1, self.figure)
         
         ## To avoid AssertionError "self._cachedRenderer is not None"
@@ -96,7 +96,7 @@ class MatplotPanel(wx.Panel):
         ##                         "initial draw which caches the renderer"
         self.canvas.draw()
         
-        #<matplotlib.backends.backend_wxagg.NavigationToolbar2WxAgg>
+        # <matplotlib.backends.backend_wxagg.NavigationToolbar2WxAgg>
         self.toolbar = Toolbar(self.canvas)
         self.toolbar.Show(0)
         
@@ -161,28 +161,28 @@ class MatplotPanel(wx.Panel):
             if self.handler.fork(self.handler.current_event, evt) is None:
                 evt.Skip()
         
-        def skip(evt):  #<wx._core.KeyEvent> #<matplotlib.backend_bases.MouseEvent>
+        def skip(evt):  # <wx._core.KeyEvent> <matplotlib.backend_bases.MouseEvent>
             try:
                 evt.Skip()
             except AttributeError:
                 pass
         
-        self.__handler = FSM({ # DNA<MatplotPanel>
+        self.__handler = FSM({  # DNA<MatplotPanel>
                 None : {
-                  'canvas_draw' : [ None, self.OnDraw ],  # before canvas.draw
-                #'canvas_drawn' : [ None, ],              # after canvas.draw
-              #'canvas_resized' : [ None, ],
-                    'focus_set' : [ None, self.on_focus_set ],
-                   'focus_kill' : [ None, self.on_focus_kill ],
-                 'figure_enter' : [ None, self.on_figure_enter ],
-                 'figure_leave' : [ None, self.on_figure_leave ],
-                   'axes_enter' : [ None, ],
-                   'axes_leave' : [ None, ],
-                 'home pressed' : [ None, self.OnHomePosition ],
-             'Xbutton1 pressed' : [ None, self.OnBackPosition ],
-             'Xbutton2 pressed' : [ None, self.OnForwardPosition ],
-               'M-left pressed' : [ None, self.OnBackPosition ],
-              'M-right pressed' : [ None, self.OnForwardPosition ],
+                  'canvas_draw' : [None, self.OnDraw],  # before canvas.draw
+                #'canvas_drawn' : [None, ],             # after canvas.draw
+              #'canvas_resized' : [None, ],
+                    'focus_set' : [None, self.on_focus_set],
+                   'focus_kill' : [None, self.on_focus_kill],
+                 'figure_enter' : [None, self.on_figure_enter],
+                 'figure_leave' : [None, self.on_figure_leave],
+                   'axes_enter' : [None, ],
+                   'axes_leave' : [None, ],
+                 'home pressed' : [None, self.OnHomePosition],
+             'Xbutton1 pressed' : [None, self.OnBackPosition],
+             'Xbutton2 pressed' : [None, self.OnForwardPosition],
+               'M-left pressed' : [None, self.OnBackPosition],
+              'M-right pressed' : [None, self.OnForwardPosition],
                 },
                 NORMAL : {
                    'art_picked' : (NORMAL, ),
@@ -302,16 +302,16 @@ class MatplotPanel(wx.Panel):
 
     def clear(self):
         """Initialize the plot figure."""
-        #<matplotlib.axes.Axes>
+        # <matplotlib.axes.Axes>
         self.figure.clear()
         self.figure.add_subplot(111)  # cf. add_axes(rect=(l,b,w,h))
         
-        #<matplotlib.lines.Line2D>
+        # <matplotlib.lines.Line2D>
         (self.selected,) = self.axes.plot([], [], "yo-", ms=6, lw=2, alpha=0.75,
                                           markeredgecolor='y', visible=0)
         self.selected.set_data([], [])
         
-        #<matplotlib.widgets.Cursor>
+        # <matplotlib.widgets.Cursor>
         self.cursor = Cursor(self.axes, useblit=True, color='grey', linewidth=1)
         self.cursor.visible = 1
 
@@ -392,13 +392,13 @@ class MatplotPanel(wx.Panel):
     unselectedModeLineBg = 'auto'
     unselectedModeLineFg = 'auto'
 
-    def on_modeline_tip(self, evt):  #<wx._core.MouseEvent>
+    def on_modeline_tip(self, evt):  # <wx._core.MouseEvent>
         flag = self.modeline.HitTest(evt.Position)
         if flag == wx.HT_WINDOW_INSIDE:
             self.modeline.SetToolTip(self.modeline.Label)
         evt.Skip()
 
-    def on_focus_set(self, evt):  #<wx._core.FocusEvent>
+    def on_focus_set(self, evt):  # <wx._core.FocusEvent>
         if self.modeline.IsShown():
             self.modeline.SetBackgroundColour(self.selectedModeLineBg)
             self.modeline.SetForegroundColour(self.selectedModeLineFg)
@@ -406,7 +406,7 @@ class MatplotPanel(wx.Panel):
         self.escape()
         evt.Skip()
 
-    def on_focus_kill(self, evt):  #<wx._core.FocusEvent>
+    def on_focus_kill(self, evt):  # <wx._core.FocusEvent>
         if self.modeline.IsShown():
             self.modeline.SetBackgroundColour(self.unselectedModeLineBg)
             self.modeline.SetForegroundColour(self.unselectedModeLineFg)
@@ -450,10 +450,10 @@ class MatplotPanel(wx.Panel):
             x, y = x[0], y[0]
         self.message("({:g}, {:g})".format(x, y))
 
-    def on_figure_enter(self, evt):  #<matplotlib.backend_bases.MouseEvent>
+    def on_figure_enter(self, evt):  # <matplotlib.backend_bases.MouseEvent>
         pass
 
-    def on_figure_leave(self, evt):  #<matplotlib.backend_bases.MouseEvent>
+    def on_figure_leave(self, evt):  # <matplotlib.backend_bases.MouseEvent>
         self.cursor.clear(evt)
         self.canvas.draw()
 
@@ -493,16 +493,16 @@ class MatplotPanel(wx.Panel):
     def p_event(self, v):
         self.__isPressed = v
 
-    def on_menu_lock(self, evt):  #<matplotlib.backend_bases.MouseEvent>
+    def on_menu_lock(self, evt):  # <matplotlib.backend_bases.MouseEvent>
         self.__isMenu = 1
 
-    def on_menu(self, evt):  #<matplotlib.backend_bases.MouseEvent>
+    def on_menu(self, evt):  # <matplotlib.backend_bases.MouseEvent>
         if self.__isMenu:
             self.canvas.SetFocus()
             Menu.Popup(self, self.menu)
         self.__isMenu = 0
 
-    def on_pick(self, evt):  #<matplotlib.backend_bases.PickEvent>
+    def on_pick(self, evt):  # <matplotlib.backend_bases.PickEvent>
         """Find index near (x,y) and set the selector.
         Called (maybe) after mouse button pressed.
         """
@@ -518,10 +518,10 @@ class MatplotPanel(wx.Panel):
             x = evt.mouseevent.xdata
             y = evt.mouseevent.ydata
             try:
-                #<matplotlib.lines.Line2D>
+                # <matplotlib.lines.Line2D>
                 xs, ys = evt.artist.get_data()
             except AttributeError:
-                #<matplotlib.collections.PathCollection>
+                # <matplotlib.collections.PathCollection>
                 xs, ys = evt.artist.get_offsets().T
             
             distances = np.hypot(x-xs[indices], y-ys[indices])
@@ -533,14 +533,14 @@ class MatplotPanel(wx.Panel):
             self.handler('art_picked', evt)
             self.message("({:g}, {:g}) index {}".format(x, y, evt.index))
 
-    def on_hotkey_press(self, evt):  #<wx._core.KeyEvent>
+    def on_hotkey_press(self, evt):  # <wx._core.KeyEvent>
         """Called when a key is pressed."""
         key = hotkey(evt)
         self.__key = regulate_key(key + '-')
         if self.handler('{} pressed'.format(key), evt) is None:
             evt.Skip()
 
-    def on_hotkey_down(self, evt):  #<wx._core.KeyEvent>
+    def on_hotkey_down(self, evt):  # <wx._core.KeyEvent>
         """Called when a key is pressed while dragging.
         Specifically called when the mouse is being captured.
         """
@@ -549,14 +549,14 @@ class MatplotPanel(wx.Panel):
         else:
             evt.Skip()
 
-    def on_hotkey_up(self, evt):  #<wx._core.KeyEvent>
+    def on_hotkey_up(self, evt):  # <wx._core.KeyEvent>
         """Called when a key is released."""
         key = hotkey(evt)
         self.__key = ''
         if self.handler('{} released'.format(key), evt) is None:
             evt.Skip()
 
-    def _on_mouse_event(self, evt):  #<matplotlib.backend_bases.MouseEvent>
+    def _on_mouse_event(self, evt):  # <matplotlib.backend_bases.MouseEvent>
         """Called in mouse event handlers."""
         if not evt.inaxes or evt.inaxes is not self.axes:
             (evt.xdata, evt.ydata) = self.mapdisp2xy(evt.x, evt.y)
@@ -571,7 +571,7 @@ class MatplotPanel(wx.Panel):
             evt.key = key
         return key
 
-    def on_button_press(self, evt):  #<matplotlib.backend_bases.MouseEvent>
+    def on_button_press(self, evt):  # <matplotlib.backend_bases.MouseEvent>
         """Called when the mouse button is pressed."""
         self.p_event = evt
         key = self._on_mouse_event(evt)
@@ -582,7 +582,7 @@ class MatplotPanel(wx.Panel):
             self.__isDragging = False
             self.handler('{}button pressed'.format(key), evt)
 
-    def on_button_release(self, evt):  #<matplotlib.backend_bases.MouseEvent>
+    def on_button_release(self, evt):  # <matplotlib.backend_bases.MouseEvent>
         """Called when the mouse button is released."""
         key = self._on_mouse_event(evt)
         if self.__isDragging:
@@ -595,7 +595,7 @@ class MatplotPanel(wx.Panel):
             self.handler('{}button released'.format(key), evt)
         self.p_event = None
 
-    def on_motion_notify(self, evt):  #<matplotlib.backend_bases.MouseEvent>
+    def on_motion_notify(self, evt):  # <matplotlib.backend_bases.MouseEvent>
         """Called when the mouse is moved."""
         key = self._on_mouse_event(evt)
         if evt.button in (1,2,3):
@@ -616,7 +616,7 @@ class MatplotPanel(wx.Panel):
                 return
             self.handler('{} motion'.format(event), evt)
 
-    def on_scroll(self, evt):  #<matplotlib.backend_bases.MouseEvent>
+    def on_scroll(self, evt):  # <matplotlib.backend_bases.MouseEvent>
         """Called when scrolling the mouse wheel."""
         self.p_event = evt
         key = self._on_mouse_event(evt)