mwxlib 1.4.20__py3-none-any.whl → 1.5.9__py3-none-any.whl

mwx/graphman.py

@@ -100,8 +100,6 @@ class Thread:
                 None : {
                  'thread_begin' : [ None ], # begin processing
                    'thread_end' : [ None ], # end processing
-                  'thread_quit' : [ None ], # terminated by user
-                 'thread_error' : [ None ], # failed in error
                 },
             })
     
@@ -115,9 +113,7 @@ class Thread:
         Allows only this worker (but no other thread) to enter.
         """
         frame = inspect.currentframe().f_back.f_back
-        filename = frame.f_code.co_filename
         name = frame.f_code.co_name
-        fname, _ = os.path.splitext(os.path.basename(filename))
         
         ## Other threads are not allowed to enter.
         ct = threading.current_thread()
@@ -125,17 +121,22 @@ class Thread:
         
         ## The thread must be activated to enter.
         ## assert self.active, f"{self!r} must be activated to enter {name!r}."
-        try:
-            self.handler(f"{fname}/{name}:enter", self)
-            yield self
-        except Exception:
-            self.handler(f"{fname}/{name}:error", self)
-            raise
-        finally:
-            self.handler(f"{fname}/{name}:exit", self)
+        yield self
+    
+    def enters(self, f):
+        """Decorator to add a one-time handler for the enter event.
+        The specified function will be called from the main thread.
+        """
+        return self.handler.binds('thread_begin', _F(f))
+    
+    def exits(self, f):
+        """Decorator to add a one-time handler for the exit event.
+        The specified function will be called from the main thread.
+        """
+        return self.handler.binds('thread_end', _F(f))
     
     def wraps(self, f, *args, **kwargs):
-        """Decorator of thread starter function."""
+        """Decorator for a function that starts a new thread."""
         @wraps(f)
         def _f(*v, **kw):
             return self.Start(f, *v, *args, **kw, **kwargs)
@@ -186,21 +187,23 @@ class Thread:
         @wraps(f)
         def _f(*v, **kw):
             try:
-                self.handler('thread_begin', self)
+                wx.CallAfter(self.handler, 'thread_begin', self)
                 self.result = f(*v, **kw)
             except BdbQuit:
                 pass
             except KeyboardInterrupt as e:
-                print("- Thread execution stopped:", e)
-            except AssertionError as e:
-                print("- Thread execution failed:", e)
+                print("- Thread terminated by user:", e)
             except Exception as e:
+                tbstr = traceback.format_tb(e.__traceback__)
+                wx.CallAfter(wx.MessageBox,
+                             f"{e}\n\n" + tbstr[-1] + f"{type(e).__name__}: {e}",
+                             f"Error in the thread running {f.__name__!r}\n\n",
+                             style=wx.ICON_ERROR)
                 traceback.print_exc()
-                print("- Thread exception:", e)
-                self.handler('thread_error', self)
+                print("- Thread failed in error:", e)
             finally:
                 self.active = 0
-                self.handler('thread_end', self)
+                wx.CallAfter(self.handler, 'thread_end', self)
         
         if self.running:
             wx.MessageBox("The thread is running (Press [C-g] to quit).",
@@ -226,11 +229,10 @@ class Thread:
         def _stop():
             with wx.BusyInfo("One moment please, "
                              "waiting for threads to die..."):
-                self.handler('thread_quit', self)
                 self.worker.join(1)
         if self.running:
             self.active = 0
-            wx.CallAfter(_stop) # main-thread で終了させる
+            wx.CallAfter(_stop)  # main thread で終了させる
 
 
 class LayerInterface(CtrlInterface):
@@ -349,10 +351,6 @@ class LayerInterface(CtrlInterface):
         
         self.handler.append({ # DNA<Layer>
             None : {
-                 'thread_begin' : [ None ], # begin processing
-                   'thread_end' : [ None ], # end processing
-                  'thread_quit' : [ None ], # terminated by user
-                 'thread_error' : [ None ], # failed in error
                    'page_shown' : [ None, _F(self.Draw, show=True)  ],
                   'page_closed' : [ None, _F(self.Draw, show=False) ],
                   'page_hidden' : [ None, _F(self.Draw, show=False) ],
@@ -448,7 +446,7 @@ class LayerInterface(CtrlInterface):
     
     Shown = property(
         lambda self: self.IsShown(),
-        lambda self,v: self.Show(v))
+        lambda self, v: self.Show(v))
     
     def IsShown(self):
         """Return True if the window is physically visible on the screen.
@@ -465,11 +463,11 @@ class LayerInterface(CtrlInterface):
         (override) Show associated pane window.
                    Note: This might be called from a thread.
         """
-        wx.CallAfter(self.parent.show_pane, self, show)
+        wx.CallAfter(self.parent.show_pane, self, show)  # Show pane windows in the main thread.
     
     Drawn = property(
         lambda self: self.IsDrawn(),
-        lambda self,v: self.Draw(v))
+        lambda self, v: self.Draw(v))
     
     def IsDrawn(self):
         return any(art.get_visible() for art in self.Arts)
@@ -503,6 +501,30 @@ class Layer(LayerInterface, KnobCtrlPanel):
         LayerInterface.__init__(self, parent, session)
 
 
+def register(cls, module=None):
+    """Register dummy plug; Add module.Plugin <Layer>.
+    """
+    if not module:
+        module = inspect.getmodule(cls) # rebase module or __main__
+    
+    if issubclass(cls, LayerInterface):
+        cls.__module__ = module.__name__ # __main__ to module
+        warn(f"Duplicate iniheritance of LayerInterface by {cls}.")
+        module.Plugin = cls
+        return cls
+    
+    class _Plugin(LayerInterface, cls):
+        def __init__(self, parent, session=None, **kwargs):
+            cls.__init__(self, parent, **kwargs)
+            LayerInterface.__init__(self, parent, session)
+    
+    _Plugin.__module__ = cls.__module__ = module.__name__
+    _Plugin.__name__ = cls.__name__ + str("~")
+    _Plugin.__doc__ = cls.__doc__
+    module.Plugin = _Plugin
+    return _Plugin
+
+
 class Graph(GraphPlot):
     """GraphPlot (override) to better make use for graph manager
     
@@ -583,7 +605,7 @@ class MyFileDropLoader(wx.FileDropTarget):
         self.loader = loader
     
     def OnDropFiles(self, x, y, filenames):
-        pos = self.view.ScreenPosition + (x,y)
+        pos = self.view.ScreenPosition + (x, y)
         paths = []
         for fn in filenames:
             name, ext = os.path.splitext(fn)
@@ -660,7 +682,7 @@ class Frame(mwx.Frame):
         self.histogram.Name = "histogram"
         
         self._mgr.AddPane(self.graph,
-                          aui.AuiPaneInfo().CenterPane().CloseButton(1)
+                          aui.AuiPaneInfo().CenterPane()
                              .Name("graph").Caption("graph").CaptionVisible(1))
         
         size = (200, 200)
@@ -785,7 +807,7 @@ class Frame(mwx.Frame):
         self.menubar.reset()
         
         def show_frameview(frame):
-            wx.CallAfter(self.show_pane, frame.parent) # Show graph / output
+            wx.CallAfter(self.show_pane, frame.parent)  # Show graph / output in the main thread.
         
         self.graph.handler.append({ # DNA<Graph:Frame>
             None : {
@@ -824,8 +846,8 @@ class Frame(mwx.Frame):
             _display(self.graph, show)
             _display(self.output, show)
             evt.Skip()
-        self.Bind(wx.EVT_MOVE_START, lambda v :on_move(v, show=0))
-        self.Bind(wx.EVT_MOVE_END, lambda v :on_move(v, show=1))
+        self.Bind(wx.EVT_MOVE_START, lambda v: on_move(v, show=0))
+        self.Bind(wx.EVT_MOVE_END, lambda v: on_move(v, show=1))
         
         ## Custom Key Bindings
         self.define_key('* C-g', self.Quit)
@@ -843,13 +865,13 @@ class Frame(mwx.Frame):
     def sync(self, a, b):
         """Synchronize b to a."""
         if (self.SYNC_SWITCH
-            and a.frame and b.frame
-            and a.frame.unit == b.frame.unit
-            and a.buffer.shape == b.buffer.shape):
-                b.xlim = a.xlim
-                b.ylim = a.ylim
-                b.OnDraw(None)
-                b.canvas.draw_idle()
+                and a.frame and b.frame
+                and a.frame.unit == b.frame.unit
+                and a.buffer.shape == b.buffer.shape):
+            b.xlim = a.xlim
+            b.ylim = a.ylim
+            b.OnDraw(None)
+            b.canvas.draw_idle()
     
     def set_title(self, frame):
         ssn = os.path.basename(self.session_file or '--')
@@ -927,7 +949,7 @@ class Frame(mwx.Frame):
         ## ドッキング時に再計算される
         if name == "output" or name is self.output:
             w, h = self.graph.GetClientSize()
-            pane.best_size = (w//2 - 3, h) # 分割線幅補正 -12pix (Windows only ?)
+            pane.best_size = (w//2 - 3, h)  # 分割線幅補正 -12pix (Windows only ?)
         
         ## Force Layer windows to show.
         if interactive:
@@ -943,12 +965,8 @@ class Frame(mwx.Frame):
                 pane.Float()
                 show = True
         
-        ## Note: We need to distinguish cases whether:
-        ##       - pane.window is AuiNotebook or normal Panel,
-        ##       - pane.window is floating (win.Parent is AuiFloatingFrame) or docked.
-        
-        plug = self.get_plug(name) # -> None if pane.window is a Graph
-        win = pane.window # -> Window (plug / notebook / Graph)
+        plug = self.get_plug(name)  # -> None if pane.window is a Graph
+        win = pane.window
         try:
             shown = plug.IsShown()
         except AttributeError:
@@ -958,7 +976,7 @@ class Frame(mwx.Frame):
             if isinstance(win, aui.AuiNotebook):
                 j = win.GetPageIndex(plug)
                 if j != win.Selection:
-                    win.Selection = j # the focus moves => EVT_SHOW
+                    win.Selection = j  # the focus moves => EVT_SHOW
                 else:
                     plug.handler('page_shown', plug)
             else:
@@ -999,7 +1017,7 @@ class Frame(mwx.Frame):
                 pane.dock_direction = dock
             if not plug.caption:
                 pane.CaptionVisible(False)       # no caption bar
-                pane.Gripper(dock not in (0, 5)) # show a grip when docked
+                pane.Gripper(dock not in (0,5))  # show a grip when docked
             pane.Dockable(dock)
         
         if pane.dock_direction:
@@ -1050,30 +1068,6 @@ class Frame(mwx.Frame):
         elif isinstance(name, LayerInterface):
             return name
     
-    @staticmethod
-    def register(cls, module=None):
-        """Register dummy plug; Add module.Plugin <Layer>.
-        """
-        if not module:
-            module = inspect.getmodule(cls) # rebase module or __main__
-        
-        if issubclass(cls, LayerInterface):
-            cls.__module__ = module.__name__ # __main__ to module
-            warn(f"Duplicate iniheritance of LayerInterface by {cls}.")
-            module.Plugin = cls
-            return cls
-        
-        class _Plugin(LayerInterface, cls):
-            def __init__(self, parent, session=None, **kwargs):
-                cls.__init__(self, parent, **kwargs)
-                LayerInterface.__init__(self, parent, session)
-        
-        _Plugin.__module__ = cls.__module__ = module.__name__
-        _Plugin.__name__ = cls.__name__ + str("~")
-        _Plugin.__doc__ = cls.__doc__
-        module.Plugin = _Plugin
-        return _Plugin
-    
     def load_module(self, root):
         """Load module of plugin (internal use only).
         
@@ -1102,17 +1096,17 @@ class Frame(mwx.Frame):
             print(f"- Unable to load {root!r}.", e)
             return False
         
-        ## the module must have a class `Plugin`.
+        ## Check if the module has a class `Plugin`.
         if not hasattr(module, 'Plugin'):
             if isinstance(root, type):
                 warn(f"Use dummy plug for debugging {name!r}.")
                 module.__dummy_plug__ = root
-                self.register(root, module)
+                register(root, module)
         else:
             if hasattr(module, '__dummy_plug__'):
                 root = module.__dummy_plug__         # old class (imported)
                 cls = getattr(module, root.__name__) # new class (reloaded)
-                self.register(cls, module)
+                register(cls, module)
         return module
     
     def load_plug(self, root, force=False, session=None, show=False,
@@ -1159,48 +1153,47 @@ class Frame(mwx.Frame):
         
         module = self.load_module(root)
         if not module:
-            return False # failed to import
+            return False
         
+        ## assert name == Plugin.__module__
         try:
-            name = module.Plugin.__module__
-            title = module.Plugin.category
-            
-            pane = self._mgr.GetPane(title)
-            
-            if pane.IsOk(): # <pane:title> is already registered
-                nb = pane.window
-                if not isinstance(nb, aui.AuiNotebook):
-                    raise NameError("Notebook name must not be the same as any other plugins")
+            Plugin = module.Plugin   # Check if the module has a class `Plugin`.
+            title = Plugin.category  # Plugin <LayerInterface>
             
-            pane = self.get_pane(name)
+            pane = self._mgr.GetPane(title)  # Check if <pane:title> is already registered.
+            if pane.IsOk():
+                if not isinstance(pane.window, aui.AuiNotebook):
+                    raise NameError("Notebook name must not be the same as any other plugin")
             
-            if pane.IsOk(): # <pane:name> is already registered
+            pane = self.get_pane(name)  # Check if <pane:name> is already registered.
+            if pane.IsOk():
                 if name not in self.plugins:
-                    raise NameError("Plugin name must not be the same as any other panes")
-                
-                show = show or pane.IsShown()
-                props.update(
-                    dock_direction = pane.IsDocked() and pane.dock_direction,
-                    floating_pos = floating_pos or pane.floating_pos[:], # copy unloading pane
-                    floating_size = floating_size or pane.floating_size[:], # copy unloading pane
-                )
+                    raise NameError("Plugin name must not be the same as any other pane")
+            
         except (AttributeError, NameError) as e:
             traceback.print_exc()
-            wx.CallAfter(wx.MessageBox,
+            wx.CallAfter(wx.MessageBox,  # Show the message after load_session has finished.
                          f"{e}\n\n" + traceback.format_exc(),
                          f"Error in loading {module.__name__!r}",
                          style=wx.ICON_ERROR)
             return False
         
-        ## Create and register the plugin
+        ## Unload the plugin if loaded.
         if pane.IsOk():
-            self.unload_plug(name) # unload once right here
+            show = show or pane.IsShown()
+            props.update(
+                dock_direction = pane.IsDocked() and pane.dock_direction,
+                floating_pos = floating_pos or pane.floating_pos[:], # copy unloading pane
+                floating_size = floating_size or pane.floating_size[:], # copy unloading pane
+            )
+            self.unload_plug(name)
         
+        ## Create the plugin object.
         try:
-            plug = module.Plugin(self, session, **kwargs)
+            plug = Plugin(self, session, **kwargs)
         except Exception as e:
             traceback.print_exc()
-            wx.CallAfter(wx.MessageBox,
+            wx.CallAfter(wx.MessageBox,  # Show the message after load_session has finished.
                          f"{e}\n\n" + traceback.format_exc(),
                          f"Error in loading {name!r}",
                          style=wx.ICON_ERROR)
@@ -1209,10 +1202,10 @@ class Frame(mwx.Frame):
         ## Add to the list after the plug is created successfully.
         self.plugins[name] = module
         
-        ## set reference of a plug (one module, one plugin)
+        ## Set reference of a plug (one module, one plugin).
         module.__plug__ = plug
         
-        ## Create pane or notebook pane
+        ## Create pane or notebook pane.
         caption = plug.caption
         if not isinstance(caption, str):
             caption = name
@@ -1224,7 +1217,7 @@ class Frame(mwx.Frame):
                 nb = pane.window
                 nb.AddPage(plug, caption)
             else:
-                size = plug.GetSize() + (2,30) # padding for notebook
+                size = plug.GetSize() + (2,30)  # padding for notebook
                 nb = AuiNotebook(self, name=title)
                 nb.AddPage(plug, caption)
                 self._mgr.AddPane(nb, aui.AuiPaneInfo()
@@ -1246,11 +1239,11 @@ class Frame(mwx.Frame):
         self.update_pane(name, **props)
         self.show_pane(name, show)
         
-        ## Create a menu
+        ## Create a menu.
         plug.__Menu_item = None
         
-        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)]
+        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:
@@ -1322,11 +1315,6 @@ class Frame(mwx.Frame):
             traceback.print_exc()
             print("- Failed to save session of", plug)
         self.load_plug(plug.__module__, force=1, session=session)
-        
-        ## Update shell.target --> new plug
-        for shell in self.shellframe.get_all_shells():
-            if shell.target is plug:
-                shell.handler('shell_activated', shell)
     
     def inspect_plug(self, name):
         """Dive into the process to inspect plugs in the shell.
@@ -1339,10 +1327,11 @@ class Frame(mwx.Frame):
         
         @shell.handler.bind("shell_activated")
         def init(shell):
+            """Called when the plug shell is activated."""
             nonlocal plug
             _plug = self.get_plug(name)
             if _plug is not plug:
-                shell.target = _plug or self # reset for loaded/unloaded plug
+                shell.target = _plug or self  # Reset the target to the reloaded plug.
             plug = _plug
         init(shell)
         self.shellframe.Show()
@@ -1459,7 +1448,7 @@ class Frame(mwx.Frame):
         return frames
     
     ## --------------------------------
-    ## load/save frames and attributes 
+    ## load/save frames and attributes
     ## --------------------------------
     
     @classmethod
@@ -1744,14 +1733,18 @@ class Frame(mwx.Frame):
         self._mgr.Update()
         self.menubar.reset()
         
-        dirname_ = os.path.dirname(i.name)
-        if dirname_:
-            os.chdir(dirname_)
-        
         ## Reposition the window if it is not on the desktop.
         if wx.Display.GetFromWindow(self) == -1:
             self.Position = (0, 0)
         
+        ## LoadPerspective => 表示状態の不整合．手動でイベントを発生させる．
+        for pane in self._mgr.GetAllPanes():
+            if pane.IsShown():
+                win = pane.window
+                if isinstance(win, aui.AuiNotebook):
+                    win = win.CurrentPage
+                win.handler('page_shown', win)
+        
         self.message("\b done.")
     
     def save_session_as(self):
@@ -1799,8 +1792,8 @@ class Frame(mwx.Frame):
                 o.write(f"self.{view.Name}.unit = {view.unit:g}\n")
                 o.write(f"self.load_frame({paths!r}, self.{view.Name})\n")
                 try:
-                    index = paths.index(view.frame.pathname)
-                    o.write(f"self.{view.Name}.select({index})\n")
+                    if view.frame.pathname in paths:
+                        o.write(f"self.{view.Name}.select({view.frame.name!r})\n")
                 except Exception:
                     pass
             

mwx/matplot2.py

@@ -11,7 +11,7 @@ from matplotlib.figure import Figure
 import numpy as np
 
 from . import framework as mwx
-from .framework import hotkey, regulate_key, pack, Menu, FSM
+from .framework import hotkey, regulate_key, postcall, pack, Menu, FSM
 
 
 ## state constants
@@ -178,8 +178,6 @@ class MatplotPanel(wx.Panel):
                    'axes_enter' : [ None, ],
                    'axes_leave' : [ None, ],
                  'home pressed' : [ None, self.OnHomePosition ],
-                 'left pressed' : [ None, self.OnBackPosition ],
-                'right pressed' : [ None, self.OnForwardPosition ],
              'Xbutton1 pressed' : [ None, self.OnBackPosition ],
              'Xbutton2 pressed' : [ None, self.OnForwardPosition ],
                 },
@@ -314,6 +312,8 @@ class MatplotPanel(wx.Panel):
         self.cursor = Cursor(self.axes, useblit=True, color='grey', linewidth=1)
         self.cursor.visible = 1
     
+    ## Note: To avoid a wxAssertionError when running in a thread.
+    @postcall
     def draw(self, art=None):
         """Draw plots.
         Call each time the drawing should be updated.
@@ -345,22 +345,22 @@ class MatplotPanel(wx.Panel):
     
     xbound = property(
         lambda self: np.array(self.axes.get_xbound()),
-        lambda self,v: self.axes.set_xbound(v),
+        lambda self, v: self.axes.set_xbound(v),
         doc="X-axis numerical bounds where lowerBound < upperBound)")
     
     ybound = property(
         lambda self: np.array(self.axes.get_ybound()),
-        lambda self,v: self.axes.set_ybound(v),
+        lambda self, v: self.axes.set_ybound(v),
         doc="Y-axis numerical bounds where lowerBound < upperBound)")
     
     xlim = property(
         lambda self: np.array(self.axes.get_xlim()),
-        lambda self,v: self.axes.set_xlim(v),
+        lambda self, v: self.axes.set_xlim(v),
         doc="X-axis range [left, right]")
     
     ylim = property(
         lambda self: np.array(self.axes.get_ylim()),
-        lambda self,v: self.axes.set_ylim(v),
+        lambda self, v: self.axes.set_ylim(v),
         doc="Y-axis range [bottom, top]")
     
     @property
@@ -418,7 +418,7 @@ class MatplotPanel(wx.Panel):
         wx.UIActionSimulator().KeyUp(wx.WXK_ESCAPE)
     
     ## --------------------------------
-    ## External I/O file and clipboard 
+    ## External I/O file and clipboard
     ## --------------------------------
     
     def copy_to_clipboard(self):
@@ -561,7 +561,7 @@ class MatplotPanel(wx.Panel):
         ## Overwrite evt.key with modifiers.
         key = self.__key
         if evt.button in (1,2,3):
-            key += 'LMR'[evt.button-1] #{1:L, 2:M, 3:R}
+            key += 'LMR'[evt.button-1] # {1:L, 2:M, 3:R}
             evt.key = key + 'button'
         elif evt.button in ('up', 'down'):
             key += 'wheel{}'.format(evt.button) # wheel[up|down]
@@ -621,10 +621,11 @@ class MatplotPanel(wx.Panel):
         self.p_event = None
     
     ## --------------------------------
-    ## Pan/Zoom actions 
+    ## Pan/Zoom actions
     ## --------------------------------
     
-    ZOOM_RATIO = 10**0.2
+    ZOOM_RATIO = 10 ** 0.2
+    ZOOM_LIMIT = 0.1  # logical limit <= epsilon
     
     def OnDraw(self, evt):
         """Called before canvas.draw."""
@@ -663,7 +664,7 @@ class MatplotPanel(wx.Panel):
         if c is None:
             c = (lim[1] + lim[0]) / 2
         y = c - M * (c - lim)
-        if abs(y[1] - y[0]) > 0.1 or M > 1:
+        if abs(y[1] - y[0]) > self.ZOOM_LIMIT:
             return y
     
     def OnZoom(self, evt):