mwxlib 0.93.1__py3-none-any.whl → 0.93.7__py3-none-any.whl

mwx/controls.py

@@ -714,7 +714,7 @@ class ControlPanel(scrolled.ScrolledPanel):
     ## --------------------------------
     @property
     def parameters(self):
-        return [p.value for p in chain(*self.__params)]
+        return [p.value for p in self.get_params()]
     
     @parameters.setter
     def parameters(self, v):

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.93.1"
+__version__ = "0.93.7"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -963,9 +963,8 @@ class AuiNotebook(aui.AuiNotebook):
                 pane.name = f"pane{j+1}"
             self._mgr.LoadPerspective(frames)
             self._mgr.Update()
-        except Exception as e:
-            print(f"- Failed to load perspective: {e}")
-            pass
+        except Exception:
+            print("- Failed to load perspective:", e)
         finally:
             self.Parent.Thaw()
 

mwx/graphman.py

@@ -33,6 +33,19 @@ from .matplot2g import GraphPlot
 from .matplot2lg import Histogram
 
 
+def split_paths(obj):
+    """Split obj path into dirname and basename.
+    The object can be module name:str, module, or class.
+    """
+    if hasattr(obj, '__file__'): #<class 'module'>
+        obj = obj.__file__
+    elif isinstance(obj, type):  #<class 'type'>
+        obj = inspect.getsourcefile(obj)
+    if obj.endswith(".py"):
+        obj, _ = os.path.splitext(obj)
+    return os.path.split(obj)
+
+
 class Thread(object):
     """Thread manager for graphman.Layer
     
@@ -167,12 +180,12 @@ class Thread(object):
             except BdbQuit:
                 pass
             except KeyboardInterrupt as e:
-                print("- Thread:execution stopped: {}".format(e))
+                print("- Thread:execution stopped:", e)
             except AssertionError as e:
-                print("- Thread:execution failed: {}".format(e))
+                print("- Thread:execution failed:", e)
             except Exception as e:
                 traceback.print_exc()
-                print("- Thread:exception: {}".format(e))
+                print("- Thread:exception:", e)
                 self.handler('thread_error', self)
             finally:
                 self.active = 0
@@ -298,7 +311,11 @@ class LayerInterface(CtrlInterface):
         self.parent = parent
         self.__artists = []
         
-        self.parameters = None # => reset
+        try:
+            ## Check if parameters exists without triggering dynamic lookup.
+            inspect.getattr_static(self, "parameters")
+        except AttributeError:
+            self.parameters = None
         
         def copy_params(**kwargs):
             if self.parameters:
@@ -375,24 +392,30 @@ class LayerInterface(CtrlInterface):
         self.Bind(wx.EVT_WINDOW_DESTROY, destroy)
         
         def on_show(v):
+            if not self:
+                return
             if v.IsShown():
                 self.handler('page_shown', self)
-            elif self and isinstance(self.Parent, aui.AuiNotebook):
-                self.handler('page_hidden', self) # -> notebook
+            elif isinstance(self.Parent, aui.AuiNotebook):
+                self.handler('page_hidden', self)
             v.Skip()
         self.Bind(wx.EVT_SHOW, on_show)
         
         try:
             self.Init()
-            if session:
-                self.load_session(session)
         except Exception as e:
             traceback.print_exc()
             if parent:
                 bmp = wx.StaticBitmap(self, bitmap=Icon('!!!'))
                 txt = wx.StaticText(self, label="Exception")
-                txt.SetToolTip(repr(e))
+                txt.SetToolTip(str(e))
                 self.layout((bmp, txt), row=2)
+        try:
+            if session:
+                self.load_session(session)
+        except Exception as e:
+            traceback.print_exc()
+            print("- Failed to load session of", self)
     
     def Init(self):
         """Initialize layout before load_session (to be overridden)."""
@@ -413,7 +436,13 @@ class LayerInterface(CtrlInterface):
         lambda self,v: self.Show(v))
     
     def IsShown(self):
-        return self.parent.get_pane(self).IsShown()
+        """Returns True if the window is physically visible on the screen.
+        
+        Note: This method is overridden to be equivalent to IsShownOnScreen,
+              as the object may be a page within a notebook.
+        """
+        ## return self.pane.IsShown()
+        return self.IsShownOnScreen()
     
     def Show(self, show=True, interactive=False):
         """Show associated pane (override) window."""
@@ -439,13 +468,12 @@ class LayerInterface(CtrlInterface):
             ## Arts may be belonging to graph, output, and any other windows.
             for art in self.Arts:
                 art.set_visible(show)
-            ## EVT_SHOW [page_hidden] is called when the page is destroyed.
             ## To avoid RuntimeError, check if canvas object has been deleted.
             canvas = art.axes.figure.canvas
             if canvas:
                 canvas.draw_idle()
         except Exception as e:
-            print("- Failed to draw Arts of {!r}: {}".format(self.__module__, e))
+            print("- Failed to draw Arts of {}: {}".format(self.__module__, e))
             del self.Arts
 
 
@@ -457,7 +485,6 @@ class Layer(ControlPanel, LayerInterface):
         LayerInterface.__init__(self, parent, session)
     
     ## Explicit (override) precedence
-    message = LayerInterface.message
     IsShown = LayerInterface.IsShown
     Shown = LayerInterface.Shown
     Show = LayerInterface.Show
@@ -543,8 +570,8 @@ class MyFileDropLoader(wx.FileDropTarget):
     """File Drop interface
     
     Args:
-        loader : mainframe
         target : target view to drop in, e.g. frame, graph, pane, etc.
+        loader : mainframe
     """
     def __init__(self, target, loader):
         wx.FileDropTarget.__init__(self)
@@ -687,11 +714,11 @@ class Frame(mwx.Frame):
             (),
             (mwx.ID_(13), "&Graph window\tF9", "Show graph window", wx.ITEM_CHECK,
                 lambda v: self.show_pane("graph", v.IsChecked()),
-                lambda v: v.Check(self.get_pane("graph").IsShown())),
+                lambda v: v.Check(self.graph.IsShown())),
                 
             (mwx.ID_(14), "&Output window\tF10", "Show Output window", wx.ITEM_CHECK,
                 lambda v: self.show_pane("output", v.IsChecked()),
-                lambda v: v.Check(self.get_pane("output").IsShown())),
+                lambda v: v.Check(self.output.IsShown())),
             (),
         ]
         self.menubar["Edit"] = [
@@ -717,7 +744,7 @@ class Frame(mwx.Frame):
             (),
             (mwx.ID_(24), "&Histogram\tCtrl-h", "Show Histogram window", wx.ITEM_CHECK,
                 lambda v: self.show_pane("histogram", v.IsChecked()),
-                lambda v: v.Check(self.get_pane("histogram").IsShown())),
+                lambda v: v.Check(self.histogram.IsShown())),
                 
             (mwx.ID_(25), "&Invert Color\t(C-i)", "Invert colormap", wx.ITEM_CHECK,
                 lambda v: self.__view.invert_cmap(),
@@ -796,7 +823,7 @@ class Frame(mwx.Frame):
             self.handler('C-g pressed', v)
         
         ## Accepts DnD
-        self.SetDropTarget(MyFileDropLoader(self, self))
+        self.SetDropTarget(MyFileDropLoader(self.graph, self))
     
     sync_switch = True
     
@@ -905,23 +932,32 @@ class Frame(mwx.Frame):
                 pane.Float()
                 show = True
         
+        ## Fork page shown/closed events to emulatie EVT_SHOW => plug.on_show.
+        ## cf. >>> win.EventHandler.ProcessEvent(wx.ShowEvent(win.Id, show))
+        ## 
+        ## 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)
-        if show:
+        try:
+            shown = plug.IsShown()
+        except AttributeError:
+            shown = pane.IsShown()
+        if show and not shown:
             if isinstance(win, aui.AuiNotebook):
                 j = win.GetPageIndex(plug)
                 if j != win.Selection:
-                    win.Selection = j # the focus is moved => [page_shown]
+                    win.Selection = j # the focus is moved => EVT_SHOW
                 else:
                     plug.handler('page_shown', plug)
-            elif not pane.IsShown():
-                if not plug or win.Parent is not self: # otherwise Layer.on_show
-                    win.handler('page_shown', win)
-        else:
+            else:
+                win.handler('page_shown', win)
+        elif not show and shown:
             if isinstance(win, aui.AuiNotebook):
-                for plug in win.all_pages: # => [page_closed] to all pages
+                for plug in win.all_pages:
                     plug.handler('page_closed', plug)
-            elif pane.IsShown():
+            else:
                 win.handler('page_closed', win)
         
         ## Modify the floating position of the pane when displayed.
@@ -929,8 +965,10 @@ class Frame(mwx.Frame):
         ##       and will be fixed in wxPython 4.2.1.
         if wx.Display.GetFromWindow(pane.window) == -1:
             pane.floating_pos = wx.GetMousePosition()
+        
         pane.Show(show)
         self._mgr.Update()
+        return (show != shown)
     
     def update_pane(self, name, show=False, **kwargs):
         """Update the layout of the pane.
@@ -964,8 +1002,7 @@ class Frame(mwx.Frame):
             pane.Dock()
         else:
             pane.Float()
-        self.show_pane(name, show)
-        self._mgr.Update()
+        return self.show_pane(name, show)
     
     def OnPaneClose(self, evt): #<wx.aui.AuiManagerEvent>
         pane = evt.GetPane()
@@ -975,9 +1012,6 @@ class Frame(mwx.Frame):
                 plug.handler('page_closed', plug)
         else:
             win.handler('page_closed', win)
-        pane.Show(0)
-        self._mgr.Update()
-        evt.Veto() # Don't skip. Just hide it.
     
     ## --------------------------------
     ## Plugin (Layer) interface
@@ -1031,13 +1065,9 @@ class Frame(mwx.Frame):
                 LayerInterface.__init__(self, parent, session)
             
             ## Explicit (override) precedence
-            message = LayerInterface.message
             IsShown = LayerInterface.IsShown
             Shown = LayerInterface.Shown
             Show = LayerInterface.Show
-            
-            ## Implicit (override) precedence
-            ## cls.Init / cls.save_session / cls.load_session
         
         _Plugin.__module__ = cls.__module__ = module.__name__
         _Plugin.__name__ = cls.__name__ + str("~")
@@ -1045,20 +1075,6 @@ class Frame(mwx.Frame):
         module.Plugin = _Plugin
         return _Plugin
     
-    @staticmethod
-    def _split_paths(root):
-        if hasattr(root, '__file__'): #<class 'module'>
-            name = root.__file__
-        elif isinstance(root, type):  #<class 'type'>
-            name = inspect.getsourcefile(root)
-        else:
-            name = root
-        dirname = os.path.dirname(name)
-        name = os.path.basename(name)
-        if name.endswith(".py"):
-            name, _ = os.path.splitext(name)
-        return dirname, name
-    
     def load_module(self, root):
         """Load module of plugin (internal use only).
         
@@ -1066,7 +1082,7 @@ class Frame(mwx.Frame):
             This is called automatically from load_plug,
             and should not be called directly from user.
         """
-        dirname_, name = self._split_paths(root)
+        dirname_, name = split_paths(root)
         
         ## Update the include-path to load the module correctly.
         if os.path.isdir(dirname_):
@@ -1130,13 +1146,17 @@ class Frame(mwx.Frame):
         props = dict(show=show, dock=dock, layer=layer, pos=pos, row=row, prop=prop,
                      floating_pos=floating_pos, floating_size=floating_size)
         
-        _dirname, name = self._split_paths(root)
+        _dirname, name = split_paths(root)
         
         plug = self.get_plug(name)
-        if plug and not force: # <plug:name> is already registered.
+        if plug and not force:
             self.update_pane(name, **props)
-            if session:
-                plug.load_session(session)
+            try:
+                if session:
+                    plug.load_session(session)
+            except Exception as e:
+                traceback.print_exc()
+                print("- Failed to load session of", plug)
             return None
         
         module = self.load_module(root)
@@ -1173,8 +1193,8 @@ class Frame(mwx.Frame):
         except (AttributeError, NameError) as e:
             traceback.print_exc()
             wx.CallAfter(wx.MessageBox,
-                         "{}\n\n".format(e) + traceback.format_exc(),
-                         "Error in loading {!r}".format(module.__name__),
+                         f"{e}\n\n" + traceback.format_exc(),
+                         f"Error in loading {module.__name__!r}",
                          style=wx.ICON_ERROR)
             return False
         
@@ -1187,8 +1207,8 @@ class Frame(mwx.Frame):
         except Exception as e:
             traceback.print_exc()
             wx.CallAfter(wx.MessageBox,
-                         "{}\n\n".format(e) + traceback.format_exc(),
-                         "Error in loading {!r}".format(name),
+                         f"{e}\n\n" + traceback.format_exc(),
+                         f"Error in loading {name!r}",
                          style=wx.ICON_ERROR)
             return False
         
@@ -1252,7 +1272,7 @@ class Frame(mwx.Frame):
             plug.__Menu_item = (
                 module.ID_, text, hint, wx.ITEM_CHECK,
                 lambda v: self.show_pane(name, v.IsChecked(), interactive=1),
-                lambda v: v.Check(self.get_pane(name).IsShown()),
+                lambda v: v.Check(plug.IsShown()),
             )
             if menu not in self.menubar:
                 self.menubar[menu] = []
@@ -1300,8 +1320,8 @@ class Frame(mwx.Frame):
         except Exception as e:
             traceback.print_exc()
             wx.CallAfter(wx.MessageBox,
-                         "{}\n\n".format(e) + traceback.format_exc(),
-                         "Error in unloading {!r}".format(name),
+                         f"{e}\n\n" + traceback.format_exc(),
+                         f"Error in unloading {name!r}",
                          style=wx.ICON_ERROR)
             return False
     
@@ -1316,7 +1336,7 @@ class Frame(mwx.Frame):
                 plug.save_session(session)
             except Exception:
                 traceback.print_exc()
-                print("- Failed to save session: {}".format(plug))
+                print("- Failed to save session of", plug)
             return self.load_plug(plug.__module__, force=1, session=session)
         return False
     
@@ -1476,7 +1496,7 @@ class Frame(mwx.Frame):
         except FileNotFoundError:
             pass
         except Exception as e:
-            print("- Failed to read attributes: {}".format(e))
+            print("- Failed to read attributes:", e)
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
         finally:
             return res, mis # finally raises no exception
@@ -1499,7 +1519,7 @@ class Frame(mwx.Frame):
                 pprint(tuple(new.items()), stream=o)
             
         except Exception as e:
-            print("- Failed to write attributes: {}".format(e))
+            print("- Failed to write attributes:", e)
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
         finally:
             return new, mis # finally raises no exception
@@ -1617,7 +1637,7 @@ class Frame(mwx.Frame):
             self.message("\b done.")
         except Exception as e:
             self.message("\b failed.")
-            wx.MessageBox(repr(e), style=wx.ICON_ERROR)
+            wx.MessageBox(str(e), style=wx.ICON_ERROR)
         
         if frame:
             view.select(frame)
@@ -1778,7 +1798,7 @@ class Frame(mwx.Frame):
                     plug.save_session(session)
                 except Exception:
                     traceback.print_exc()
-                    print("- Failed to save session: {}".format(plug))
+                    print("- Failed to save session of", plug)
                 o.write("self.load_plug({!r}, session={})\n".format(path, session or None))
             o.write("self._mgr.LoadPerspective({!r})\n".format(self._mgr.SavePerspective()))
             

mwx/matplot2.py

@@ -297,8 +297,8 @@ class MatplotPanel(wx.Panel):
         self.cursor.visible = 1
     
     def draw(self, art=None):
-        """Draw the plot.
-        Called every time the drawing is updated.
+        """Draw plots.
+        Call each time the drawing should be updated.
         """
         if isinstance(art, matplotlib.artist.Artist):
             self.axes.draw_artist(art)
@@ -403,16 +403,16 @@ class MatplotPanel(wx.Panel):
     
     def copy_to_clipboard(self):
         """Copy canvas image to clipboard."""
-        self.message("Copy image to clipboard.")
+        ## b = self.selected.get_visible()
+        c = self.cursor.visible
         try:
-            b = self.selected.get_visible()
-            c = self.cursor.visible
-            self.selected.set_visible(0)
+            ## self.selected.set_visible(0)
             self.cursor.visible = 0
             self.canvas.draw()
             self.canvas.Copy_to_Clipboard()
+            self.message("Copy image to clipboard.")
         finally:
-            self.selected.set_visible(b)
+            ## self.selected.set_visible(b)
             self.cursor.visible = c
             self.canvas.draw()
     
@@ -428,8 +428,7 @@ class MatplotPanel(wx.Panel):
         self.message("({:g}, {:g})".format(x, y))
     
     def on_figure_enter(self, evt): #<matplotlib.backend_bases.MouseEvent>
-        if self.Selector.size:
-            self.trace_point(*self.Selector)
+        pass
     
     def on_figure_leave(self, evt): #<matplotlib.backend_bases.MouseEvent>
         self.cursor.clear(evt)
@@ -605,10 +604,6 @@ class MatplotPanel(wx.Panel):
     
     ZOOM_RATIO = 10**0.2
     
-    def update_position(self):
-        self.toolbar.update()
-        self.toolbar.push_current()
-    
     def OnDraw(self, evt):
         """Called before canvas.draw."""
         pass
@@ -631,12 +626,14 @@ class MatplotPanel(wx.Panel):
     def OnHomePosition(self, evt):
         """Go back to home position."""
         self.toolbar.home()
-        self.update_position()
+        self.toolbar.update()
+        self.toolbar.push_current()
         self.draw()
     
     def OnEscapeSelection(self, evt):
         """Escape from selection."""
         del self.Selector
+        self.canvas.draw_idle()
     
     ## def OnShiftLimit(self, evt, r=0.1):
     ##     w = self.xlim[1] - self.xlim[0]
@@ -687,7 +684,6 @@ class MatplotPanel(wx.Panel):
         ## self.toolbar.set_cursor(1)
         self.set_wxcursor(wx.CURSOR_ARROW)
         self.toolbar.pan()
-        ## self.draw()
         self.handler.current_state = self.__prev  # --> previous state of PAN
         del self.__prev
     
@@ -702,7 +698,6 @@ class MatplotPanel(wx.Panel):
         ## self.toolbar.set_cursor(1)
         self.set_wxcursor(wx.CURSOR_ARROW)
         self.toolbar.zoom()
-        ## self.draw()
         self.handler.current_state = self.__prev  # --> previous state of ZOOM
         del self.__prev
     

mwx/matplot2g.py

@@ -703,7 +703,7 @@ class GraphPlot(MatplotPanel):
         
         self.draw()
         self.writeln()
-        self.trace_point(*self.Selector, type=NORMAL)
+        self.trace_point(*self.Selector)
         
         return self.frame
     
@@ -863,7 +863,8 @@ class GraphPlot(MatplotPanel):
         """Reset display range (xylim's), update home position."""
         if self.frame:
             self.axes.axis(self.frame.get_extent()) # reset xlim and ylim
-            self.update_position()
+            self.toolbar.update()
+            self.toolbar.push_current()
             self.draw()
     
     def fit_to_canvas(self):
@@ -887,6 +888,7 @@ class GraphPlot(MatplotPanel):
         MatplotPanel.on_focus_set(self, evt)
         if self.frame:
             self.handler('frame_selected', self.frame)
+        self.trace_point(*self.Selector)
     
     def on_focus_kill(self, evt):
         """Called when focus is killed (override)."""
@@ -979,24 +981,24 @@ class GraphPlot(MatplotPanel):
     clipboard_data = None
     
     def write_buffer_to_clipboard(self):
-        """Copy - Write buffer data to clipboard."""
+        """Write buffer data to clipboard."""
         if not self.frame:
             self.message("No frame")
             return
         try:
-            self.message("Write buffer to clipboard.")
             name = self.frame.name
             data = self.frame.roi
             GraphPlot.clipboard_name = name
             GraphPlot.clipboard_data = data
             bins, vlim, img = imconvert(data, self.frame.vlim)
             Clipboard.imwrite(img)
+            self.message("Write buffer to clipboard.")
         except Exception as e:
-            self.message("- Failure in clipboard: {}".format(e))
             traceback.print_exc()
+            self.message("- Failed to write to clipboard:", e)
     
     def read_buffer_from_clipboard(self):
-        """Paste - Read buffer data from clipboard."""
+        """Read buffer data from clipboard."""
         try:
             name = GraphPlot.clipboard_name
             data = GraphPlot.clipboard_data
@@ -1009,8 +1011,8 @@ class GraphPlot(MatplotPanel):
                 self.message("Read image from clipboard.")
                 self.load(Clipboard.imread())
         except Exception as e:
-            self.message("- No data in clipboard: {}".format(e))
             traceback.print_exc()
+            self.message("- No data in clipboard:", e)
     
     def destroy_colorbar(self):
         if self.cbar:
@@ -1137,8 +1139,8 @@ class GraphPlot(MatplotPanel):
     
     def OnMotion(self, evt):
         """Called when mouse moves in axes (overridden)."""
-        if self.frame and self.Selector.shape[1] < 2:
-            self.trace_point(evt.xdata, evt.ydata, type=NORMAL)
+        if self.Selector.shape[1] < 2:
+            self.trace_point(evt.xdata, evt.ydata)
     
     def OnPageDown(self, evt):
         """Next page."""