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

mwx/controls.py

@@ -1,8 +1,9 @@
 #! python3
 """mwxlib param controller and wx custom controls.
 """
+from contextlib import contextmanager
 from itertools import chain
-import inspect
+import io
 import wx
 import wx.lib.platebtn as pb
 import wx.lib.scrolledpanel as scrolled
@@ -13,7 +14,7 @@ from .utilus import funcall as _F
 from .framework import pack, Menu, CtrlInterface
 
 import numpy as np
-from numpy import nan, inf  # noqa: necessary to eval
+from numpy import nan, inf  # noqa # necessary to eval
 
 
 def _Tip(*tips):
@@ -772,6 +773,19 @@ class Clipboard:
     This does not work unless wx.App instance exists.
     The clipboard data cannot be transferred unless wx.Frame exists.
     """
+    @contextmanager
+    @staticmethod
+    def istrstream():
+        with io.StringIO(Clipboard.read()) as f:
+            yield f
+    
+    @contextmanager
+    @staticmethod
+    def ostrstream():
+        with io.StringIO() as f:
+            yield f
+            Clipboard.write(f.getvalue())
+    
     @staticmethod
     def read(verbose=False):
         do = wx.TextDataObject()
@@ -849,7 +863,7 @@ class Clipboard:
 ## --------------------------------
 
 class Icon(wx.Bitmap):
-    """Returns an iconic bitmap with the specified size (w, h).
+    """Return an iconic bitmap with the specified size (w, h).
     
     The key is either Icon.provided_arts or Icon.custom_images key.
     If the key is empty it returns a transparent bitmap, otherwise NullBitmap.
@@ -1021,6 +1035,7 @@ class Button(pb.PlateButton):
     
     def SetBitmap(self, bmp):
         """Set the bitmap displayed in the button.
+        
         (override) If it fails, it clears the bitmap.
         """
         try:

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.4.12"
+__version__ = "1.4.20"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -49,7 +49,7 @@ def deb(target=None, loop=True, locals=None, **kwargs):
     kwargs.setdefault("execStartupScript", True)
     kwargs.setdefault("ensureClose", True)
     
-    if "debrc" in kwargs: # for backward compatibility
+    if "debrc" in kwargs:  # for backward compatibility
         warn("Deprecated keyword: 'debrc'. Use 'session' instead.", DeprecationWarning)
         kwargs.setdefault('session', kwargs.pop('debrc'))
     
@@ -221,7 +221,7 @@ class KeyCtrlInterfaceMixin:
     
     @staticmethod
     def getKeyState(key):
-        """Returns state of speckey (cf. wx.GetKeyState)."""
+        """Return state of speckey (cf. wx.GetKeyState)."""
         try:
             return wx.GetKeyState(_speckeys_wxkmap[key])
         except KeyError:
@@ -618,8 +618,9 @@ class Menu(wx.Menu):
     def Destroy(self):
         try:
             self._unbind()
-        finally:
-            return wx.Menu.Destroy(self)
+        except Exception:
+            pass
+        return wx.Menu.Destroy(self)
     
     @staticmethod
     def Popup(parent, menulist, *args, **kwargs):
@@ -795,11 +796,9 @@ class Frame(wx.Frame, KeyCtrlInterfaceMixin):
                       "About this software")
     
     def Destroy(self):
-        try:
-            self.timer.Stop()
-            self.shellframe.Destroy() # shellframe is not my child
-        finally:
-            return wx.Frame.Destroy(self)
+        self.timer.Stop()
+        self.shellframe.Destroy() # shellframe is not my child
+        return wx.Frame.Destroy(self)
 
 
 class MiniFrame(wx.MiniFrame, KeyCtrlInterfaceMixin):
@@ -876,12 +875,12 @@ class AuiNotebook(aui.AuiNotebook):
     
     @property
     def _all_tabs(self): # (deprecated) internal use only
-        """Returns all AuiTabCtrl objects (internal use only)."""
+        """Return all AuiTabCtrl objects (internal use only)."""
         return [x for x in self.Children if isinstance(x, aui.AuiTabCtrl)]
     
     @property
     def _all_panes(self): # (deprecated) internal use only
-        """Returns all AuiPaneInfo excluding `dummy` one (internal use only)."""
+        """Return all AuiPaneInfo excluding `dummy` one (internal use only)."""
         return list(self._mgr.AllPanes)[1:]
     
     def get_pages(self, type=None):
@@ -919,7 +918,7 @@ class AuiNotebook(aui.AuiNotebook):
             return True
     
     def find_tab(self, win):
-        """Returns AuiTabCtrl and AuiNotebookPage for the window.
+        """Return AuiTabCtrl and AuiNotebookPage for the window.
         
         cf. aui.AuiNotebook.FindTab -> bool, tab, idx
         Note:
@@ -1255,9 +1254,9 @@ class ShellFrame(MiniFrame):
                    '* released' : (0, fork_debugger),
                   'C-g pressed' : (0, self.Quit, fork_debugger),
                    'f1 pressed' : (0, self.About),
-                  'C-f pressed' : (0, self.OnFindText),
-                   'f3 pressed' : (0, self.OnFindNext),
-                 'S-f3 pressed' : (0, self.OnFindPrev),
+                  'C-f pressed' : (0, self.on_search_dialog),
+                   'f3 pressed' : (0, self.repeat_forward_search),
+                 'S-f3 pressed' : (0, self.repeat_backward_search),
                   'f11 pressed' : (0, _F(self.toggle_window, win=self.ghost, alias='toggle_ghost')),
                 'S-f11 pressed' : (0, _F(self.toggle_window, win=self.watcher, alias='toggle_watcher')),
                   'f12 pressed' : (0, _F(self.Close, alias="close")),
@@ -1413,12 +1412,11 @@ class ShellFrame(MiniFrame):
             del builtins.highlight
         except AttributeError:
             pass
-        try:
-            self.timer.Stop()
-            self.save_session()
-        finally:
-            self._mgr.UnInit()
-            return MiniFrame.Destroy(self)
+        
+        self.timer.Stop()
+        self.save_session()
+        self._mgr.UnInit()
+        return MiniFrame.Destroy(self)
     
     def OnClose(self, evt):
         if self.debugger.busy:
@@ -1493,24 +1491,16 @@ class ShellFrame(MiniFrame):
         evt.Skip()
     
     def OnShow(self, evt):
-        pane = self._mgr.GetPane(self.watcher)
-        if evt.IsShown():
-            if pane.IsShown():
-                self.inspector.watch()
-                self.monitor.watch()
-        else:
-            if pane.IsDocked():
-                self.inspector.unwatch()
-                self.monitor.unwatch()
+        for pane in self._mgr.GetAllPanes():
+            ## When the window is hidden, disable docking and keep child panes floating.
+            pane.Dockable(evt.IsShown() or pane.IsDocked())
         evt.Skip()
     
     def OnGhostShow(self, evt):
         if evt.IsShown():
             self.inspector.watch()
-            self.monitor.watch()
         else:
             self.inspector.unwatch()
-            self.monitor.unwatch()
         evt.Skip()
     
     def OnConsolePageChanged(self, evt): #<wx._aui.AuiNotebookEvent>
@@ -1610,6 +1600,7 @@ class ShellFrame(MiniFrame):
     
     def Quit(self, evt=None):
         """Stop debugger and monitor."""
+        self.monitor.unwatch()
         self.debugger.unwatch()
         self.debugger.send_input('\n') # terminates the reader of threading pdb
         shell = self.debugger.interactive_shell # reset interp locals
@@ -1951,13 +1942,13 @@ class ShellFrame(MiniFrame):
         return next((x for x in self.get_all_editors() if x.IsShown()), self.Scratch)
     
     ## --------------------------------
-    ## Find text dialog
+    ## Find / Replace text dialog
     ## --------------------------------
     ## *** The following code is a modification of <wx.py.frame.Frame> ***
     
     __find_target = None
     
-    def OnFindText(self, evt):
+    def on_search_dialog(self, evt):
         if self.findDlg is not None:
             self.findDlg.SetFocus()
             return
@@ -1967,29 +1958,38 @@ class ShellFrame(MiniFrame):
             return
         self.__find_target = wnd
         self.findData.FindString = wnd.topic_at_caret
-        self.findDlg = wx.FindReplaceDialog(wnd, self.findData, "Find",
-                            style=wx.FR_NOWHOLEWORD|wx.FR_NOUPDOWN)
+        self.findData.Flags |= wx.FR_DOWN
+        self.findDlg = wx.FindReplaceDialog(wnd, self.findData, "Find")
         self.findDlg.Show()
     
-    def OnFindNext(self, evt, backward=False): #<wx._core.FindDialogEvent>
-        data = self.findData
-        down_p = data.Flags & wx.FR_DOWN
-        if (backward and down_p) or (not backward and not down_p):
-            data.Flags ^= wx.FR_DOWN # toggle up/down flag
+    def repeat_forward_search(self, evt):
+        self.OnFindNext(evt, direction=True)
+    
+    def repeat_backward_search(self, evt):
+        self.OnFindNext(evt, direction=False)
+    
+    def OnFindNext(self, evt, direction=None): #<wx._core.FindDialogEvent>
+        if not self.findData.FindString:
+            self.message("No last search.")
+            return
+        
+        if direction is not None:
+            ## dir = self.findData.Flags & wx.FR_DOWN  # 0:up, 1:down
+            ## if direction != dir:
+            ##     self.findData.Flags ^= wx.FR_DOWN  # toggle up/down flag
+            if direction:
+                self.findData.Flags |= wx.FR_DOWN
+            else:
+                self.findData.Flags &= ~wx.FR_DOWN
         
         wnd = wx.Window.FindFocus()
         if not isinstance(wnd, stc.StyledTextCtrl):
             wnd = self.__find_target
             if not wnd:
                 return
-        wnd.DoFindNext(data, self.findDlg or wnd)
+        wnd.DoFindNext(self.findData, self.findDlg or wnd)
         if self.findDlg:
             self.OnFindClose(None)
-        wnd.EnsureVisible(wnd.cline)
-        wnd.ensureLineMoreOnScreen(wnd.cline)
-    
-    def OnFindPrev(self, evt):
-        self.OnFindNext(evt, backward=True)
     
     def OnFindClose(self, evt): #<wx._core.FindDialogEvent>
         self.findDlg.Destroy()
@@ -2003,7 +2003,7 @@ def filling(obj=None, **kwargs):
                          rootLabel=typename(obj),
                          pos=wx.GetMousePosition(),
                          **kwargs)
-    frame.filling.text.WrapMode = 0 # no wrap
-    frame.filling.text.Zoom = -1 # zoom level of size of fonts
+    frame.filling.text.WrapMode = 0  # no wrap
+    frame.filling.text.Zoom = -1  # zoom level of size of fonts
     frame.Show()
     return frame

mwx/graphman.py

@@ -1,9 +1,9 @@
 #! python3
 """Graph manager.
 """
+from contextlib import contextmanager
 from functools import wraps
 from importlib import reload, import_module
-from contextlib import contextmanager
 from bdb import BdbQuit
 from pprint import pformat
 import threading
@@ -30,10 +30,10 @@ from .utilus import funcall as _F
 from .controls import KnobCtrlPanel, Icon
 from .framework import CtrlInterface, AuiNotebook, Menu, FSM
 
-from .matplot2 import MatplotPanel # noqa
+from .matplot2 import MatplotPanel  # noqa
 from .matplot2g import GraphPlot
-from .matplot2lg import LinePlot # noqa
-from .matplot2lg import LineProfile # noqa
+from .matplot2lg import LinePlot  # noqa
+from .matplot2lg import LineProfile  # noqa
 from .matplot2lg import Histogram
 
 
@@ -451,7 +451,7 @@ class LayerInterface(CtrlInterface):
         lambda self,v: self.Show(v))
     
     def IsShown(self):
-        """Returns True if the window is physically visible on the screen.
+        """Return True if the window is physically visible on the screen.
         
         (override) Equivalent to ``IsShownOnScreen``.
                    Note: The instance could be a page within a notebook.
@@ -898,8 +898,6 @@ class Frame(mwx.Frame):
         evt.Skip()
     
     def Destroy(self):
-        ## for name in list(self.plugins):
-        ##     self.unload_plug(name) # => plug.Destroy
         self._mgr.UnInit()
         return mwx.Frame.Destroy(self)
     
@@ -1348,7 +1346,7 @@ class Frame(mwx.Frame):
             plug = _plug
         init(shell)
         self.shellframe.Show()
-        if wx.GetKeyState(wx.WXK_SHIFT):
+        if wx.GetKeyState(wx.WXK_SHIFT): # open the source code.
             self.shellframe.load(plug)
     
     def OnLoadPlugins(self, evt):
@@ -1383,9 +1381,9 @@ class Frame(mwx.Frame):
             view = self.selected_view
         
         if not filename:
-            fn = view.frame.pathname if view.frame else ''
+            default_path = view.frame.pathname if view.frame else None
             with wx.FileDialog(self, "Select index file to import",
-                    defaultDir=os.path.dirname(fn or ''),
+                    defaultDir=os.path.dirname(default_path or ''),
                     defaultFile=self.ATTRIBUTESFILE,
                     wildcard="Index (*.index)|*.index|"
                              "ALL files (*.*)|*.*",
@@ -1420,9 +1418,9 @@ class Frame(mwx.Frame):
                 return None
         
         if not filename:
-            fn = view.frame.pathname if view.frame else ''
+            default_path = view.frame.pathname if view.frame else None
             with wx.FileDialog(self, "Select index file to export",
-                    defaultDir=os.path.dirname(fn or ''),
+                    defaultDir=os.path.dirname(default_path or ''),
                     defaultFile=self.ATTRIBUTESFILE,
                     wildcard="Index (*.index)|*.index",
                     style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:
@@ -1437,7 +1435,8 @@ class Frame(mwx.Frame):
                 self.message("Export index of {!r}...".format(frame.name))
                 fn = frame.pathname
                 if not fn:
-                    fn = os.path.join(savedir, frame.name) # new file
+                    fn = os.path.join(savedir,
+                            re.sub(r'[\/:*?"<>|]', '_', frame.name)) # replace invalid chars
                 if not os.path.exists(fn):
                     if not fn.endswith('.tif'):
                         fn += '.tif'
@@ -1466,8 +1465,8 @@ class Frame(mwx.Frame):
     @classmethod
     def read_attributes(self, filename):
         """Read attributes file."""
-        from numpy import nan, inf  # noqa: necessary to eval
-        import datetime             # noqa: necessary to eval
+        from numpy import nan, inf  # noqa # necessary to eval
+        import datetime             # noqa # necessary to eval
         try:
             res = {}
             mis = {}
@@ -1491,8 +1490,7 @@ class Frame(mwx.Frame):
         except Exception as e:
             print("- Failed to read attributes.", e)
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
-        finally:
-            return res, mis # finally raises no exception
+        return res, mis
     
     @classmethod
     def write_attributes(self, filename, frames):
@@ -1503,7 +1501,6 @@ class Frame(mwx.Frame):
             
             ## `res` order may differ from that of given frames,
             ## so we take a few steps to merge `new` to be exported.
-            
             res.update(new) # res updates to new info,
             new.update(res) # copy res back keeping new order.
             
@@ -1513,8 +1510,7 @@ class Frame(mwx.Frame):
         except Exception as e:
             print("- Failed to write attributes.", e)
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
-        finally:
-            return new, mis # finally raises no exception
+        return new, mis
     
     def load_frame(self, paths=None, view=None):
         """Load frames from files to the view window.
@@ -1592,9 +1588,9 @@ class Frame(mwx.Frame):
             paths = [paths]
         
         if paths is None:
-            fn = view.frame.pathname if view.frame else ''
+            default_path = view.frame.pathname if view.frame else None
             with wx.FileDialog(self, "Open image files",
-                    defaultDir=os.path.dirname(fn or ''),
+                    defaultDir=os.path.dirname(default_path or ''),
                     defaultFile='',
                     wildcard='|'.join(self.wildcards),
                     style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST
@@ -1649,10 +1645,10 @@ class Frame(mwx.Frame):
                 return None
         
         if not path:
-            fn = view.frame.pathname if view.frame else ''
+            default_path = view.frame.pathname if view.frame else None
             with wx.FileDialog(self, "Save buffer as",
-                    defaultDir=os.path.dirname(fn or ''),
-                    defaultFile=re.sub(r'[\/:*?"<>|]', '_', frame.name),
+                    defaultDir=os.path.dirname(default_path or ''),
+                    defaultFile=re.sub(r'[\/:*?"<>|]', '_', frame.name), # replace invalid chars
                     wildcard='|'.join(self.wildcards),
                     style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:
                 if dlg.ShowModal() != wx.ID_OK:
@@ -1799,13 +1795,12 @@ class Frame(mwx.Frame):
             o.write("self._mgr.LoadPerspective({!r})\n".format(self._mgr.SavePerspective()))
             
             def _save(view):
-                name = view.Name
                 paths = [x.pathname for x in view.all_frames if x.pathname]
-                o.write(f"self.{name}.unit = {view.unit:g}\n")
-                o.write(f"self.load_frame({paths!r}, self.{name})\n")
+                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.{name}.select({index})\n")
+                    o.write(f"self.{view.Name}.select({index})\n")
                 except Exception:
                     pass
             

mwx/matplot2.py

@@ -3,12 +3,11 @@
 """
 import wx
 
-import matplotlib; matplotlib.use('wxagg') # noqa
+import matplotlib; matplotlib.use('wxagg')  # noqa
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
 from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as Toolbar
 from matplotlib.widgets import Cursor
 from matplotlib.figure import Figure
-from matplotlib import cm
 import numpy as np
 
 from . import framework as mwx
@@ -40,6 +39,7 @@ if 1:
     class Cursor(Cursor):
         def onmove(self, event):
             """Internal event handler to draw the cursor when the mouse moves.
+            
             (override) If the cursor is off the axes, the xdata and ydata will
                        be None, and will simply be cleared rather than drawn.
             """

mwx/matplot2g.py

@@ -13,7 +13,7 @@ from scipy import ndimage as ndi
 
 from . import framework as mwx
 from .framework import Menu
-from .utilus import warn
+## from .utilus import warn
 from .utilus import funcall as _F
 from .controls import Clipboard
 from .matplot2 import MatplotPanel
@@ -636,6 +636,8 @@ class GraphPlot(MatplotPanel):
             show    : Show immediately when loaded.
             **kwargs: frame attributes.
         """
+        assert buf is not None, "Load buffer must be an array or string (not None)"
+        
         if isinstance(buf, str):
             buf = Image.open(buf)
         
@@ -1639,8 +1641,7 @@ class GraphPlot(MatplotPanel):
                     color='red', size=7, #fontsize=8,
                   )
                 )
-            self.selector = self.get_current_mark()
-            self.trace_point(*self.selector, type=MARK)
+            self.trace_point(*self.get_current_mark(), type=MARK)
         self.draw(self.marked)
     
     def OnMarkAppend(self, evt):
@@ -1663,7 +1664,7 @@ class GraphPlot(MatplotPanel):
         else:
             self.__marksel = [k]
         self.update_art_of_mark()
-        
+        self.selector = self.get_current_mark()
         if self.selector.shape[1] > 1:
             self.handler('line_drawn', self.frame) # 多重マーカー選択時
     

mwx/mgplt.py

@@ -154,7 +154,5 @@ class GnuplotFrame(mwx.Frame):
         self.menubar.reset()
     
     def Destroy(self):
-        try:
-            del self.gnuplot
-        finally:
-            return mwx.Frame.Destroy(self)
+        del self.gnuplot
+        return mwx.Frame.Destroy(self)