mwxlib 0.96.0__py3-none-any.whl → 0.96.4__py3-none-any.whl

mwx/bookshelf.py

@@ -1,4 +1,5 @@
 #! python3
+from functools import partial
 import re
 import wx
 

mwx/controls.py

@@ -8,11 +8,12 @@ import wx.lib.scrolledpanel as scrolled
 
 from . import images
 from .utilus import SSM
+from .utilus import warn
 from .utilus import funcall as _F
 from .framework import pack, Menu
 
 import numpy as np
-from numpy import nan, inf
+from numpy import nan, inf  # noqa: necessary to eval
 
 
 def _Tip(*tips):
@@ -83,12 +84,12 @@ class Param(object):
     def __len__(self):
         return len(self.range)
     
-    @wx.deprecatedMsg("Use `Param.callback.bind` instead.") #<DeprecationWarning>
     def bind(self, action=None, target='control'):
+        warn("Use `Param.callback.bind` instead.", DeprecationWarning)
         return self.callback.bind(target, action)
     
-    @wx.deprecatedMsg("Use `Param.callback.unbind` instead.") #<DeprecationWarning>
     def unbind(self, action=None, target='control'):
+        warn("Use `Param.callback.unbind` instead.", DeprecationWarning)
         return self.callback.unbind(target, action)
     
     def reset(self, v=None, backcall=True):
@@ -97,10 +98,8 @@ class Param(object):
             v = self.std_value
             if v is None:
                 return
-        elif v == 'nan': v = nan
-        elif v == 'inf': v = inf
-        elif isinstance(v, str):
-            v = self.__eval(v.replace(',', '')) # eliminates commas
+        if isinstance(v, str):
+            v = self.__eval(v.replace(',', '')) # eliminates commas; includes nan, inf
         self._set_value(v)
         if backcall:
             self.callback('control', self)
@@ -111,7 +110,8 @@ class Param(object):
         """
         if v is None:
             v = nan
-        if v in (nan, inf):
+        
+        if np.isnan(v) or np.isinf(v):
             self.__value = v
             for knob in self.knobs:
                 knob.update_ctrl(None, notify=False)
@@ -185,7 +185,7 @@ class Param(object):
     @offset.setter
     def offset(self, v):
         if self.std_value is not None:
-            if v is not nan: # Note: nan +x is not nan
+            if not np.isnan(v):
                 v += self.std_value
         self._set_value(v)
     
@@ -253,6 +253,7 @@ class LParam(Param):
     
     @range.setter
     def range(self, v):
+        assert v is None or len(v) <= 3, "The range must be of length <= 3 or None"
         if v is None:
             v = (0, 0)
         self.__min = v[0]
@@ -266,7 +267,8 @@ class LParam(Param):
         """A knob index -> value
         Returns -1 if the value is nan or inf.
         """
-        if self.value in (nan, inf):
+        v = self.value
+        if np.isnan(v) or np.isinf(v):
             return -1
         return int(round((self.value - self.min) / self.step))
     
@@ -294,7 +296,6 @@ class Knob(wx.Panel):
                   None -> static text (default)
                   chkbox -> label with check box
                   button -> label with flat button
-        editable: textctrl is editable or readonly
         cw      : width of ctrl
         lw      : width of label
         tw      : width of textbox
@@ -319,7 +320,7 @@ class Knob(wx.Panel):
         wx.Panel.__init__(self, parent, **kwargs)
         
         assert isinstance(param, Param),\
-          "Argument `param` must be an instance of Param class."
+          "Argument `param` must be an instance of Param"
         
         self.__bit = 1
         self.__par = param
@@ -354,23 +355,22 @@ class Knob(wx.Panel):
         else:
             raise Exception("unknown style: {!r}".format(style))
         
-        self.label.Enable(lw)
         self.label.Bind(wx.EVT_MIDDLE_DOWN, lambda v: self.__par.reset())
-        
         self.label.SetToolTip(self.__par._tooltip)
+        self.label.Enable(lw) # skip focus
         
-        if editable:
-            self.text = wx.TextCtrl(self, size=(tw,h), style=wx.TE_PROCESS_ENTER)
-            self.text.Bind(wx.EVT_TEXT_ENTER, self.OnTextEnter)
-            self.text.Bind(wx.EVT_KILL_FOCUS, self.OnTextExit)
-            self.text.Bind(wx.EVT_KEY_DOWN, self.OnTextKeyDown)
-            self.text.Bind(wx.EVT_KEY_UP, self.OnTextKeyUp)
-            self.text.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
-            self.text.Bind(wx.EVT_MIDDLE_DOWN, lambda v: self.__par.reset())
-        else:
-            self.text = wx.TextCtrl(self, size=(tw,h), style=wx.TE_READONLY)
+        if not editable:
+            warn("Knob option `editable` is deprecated.", DeprecationWarning)
+        
+        self.text = wx.TextCtrl(self, size=(tw,h), style=wx.TE_PROCESS_ENTER)
+        self.text.Bind(wx.EVT_TEXT_ENTER, self.OnTextEnter)
+        self.text.Bind(wx.EVT_KILL_FOCUS, self.OnTextExit)
+        self.text.Bind(wx.EVT_KEY_DOWN, self.OnTextKeyDown)
+        self.text.Bind(wx.EVT_KEY_UP, self.OnTextKeyUp)
+        self.text.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
+        self.text.Bind(wx.EVT_MIDDLE_DOWN, lambda v: self.__par.reset())
         
-        self.text.Enable(tw)
+        self.text.Enable(tw) # skip focus
         
         if type == 'slider':
             self.ctrl = wx.Slider(self, size=(cw,h), style=wx.SL_HORIZONTAL)
@@ -404,8 +404,8 @@ class Knob(wx.Panel):
         else:
             raise Exception("unknown type: {!r}".format(type))
         
-        self.ctrl.Enable(cw != 0)
         self.ctrl.Bind(wx.EVT_MIDDLE_DOWN, lambda v: self.__par.reset())
+        self.ctrl.Enable(cw) # skip focus
         
         c = (cw and type != 'vspin')
         self.SetSizer(
@@ -425,6 +425,7 @@ class Knob(wx.Panel):
         evt.Skip()
     
     def update_range(self):
+        """Called when range is being changed (internal use only)."""
         v = self.__par
         if isinstance(self.ctrl, wx.Choice): #<wx.Choice>
             items = [v.__str__(x) for x in v.range]
@@ -435,6 +436,7 @@ class Knob(wx.Panel):
             self.ctrl.SetRange(0, len(v)-1) #<wx.Slider> <wx.SpinButton>
     
     def update_label(self):
+        """Called when label is being changed (internal use only)."""
         v = self.__par
         if isinstance(self.label, wx.CheckBox):
             self.label.SetValue(v.check)
@@ -445,6 +447,7 @@ class Knob(wx.Panel):
             self.label.Refresh()
     
     def update_ctrl(self, valid=True, notify=False):
+        """Called when value is being changed (internal use only)."""
         v = self.__par
         try:
             j = v.index
@@ -765,32 +768,32 @@ class Clipboard:
     The clipboard data cannot be transferred unless wx.Frame exists.
     """
     @staticmethod
-    def read(verbose=True):
+    def read(verbose=False):
         do = wx.TextDataObject()
         if wx.TheClipboard.Open():
             wx.TheClipboard.GetData(do)
             wx.TheClipboard.Close()
             text = do.GetText()
             if verbose:
-                print("From clipboard: {}".format(text))
+                print(f"From clipboard:\n{text}")
             return text
         else:
             print("- Unable to open clipboard.")
     
     @staticmethod
-    def write(text, verbose=True):
+    def write(text, verbose=False):
         do = wx.TextDataObject(str(text))
         if wx.TheClipboard.Open():
             wx.TheClipboard.SetData(do)
             wx.TheClipboard.Flush()
             wx.TheClipboard.Close()
             if verbose:
-                print("To clipboard: {}".format(text))
+                print(f"To clipboard:\n{text}")
         else:
             print("- Unable to open clipboard.")
     
     @staticmethod
-    def imread(verbose=True):
+    def imread(verbose=False):
         do = wx.BitmapDataObject()
         if wx.TheClipboard.Open():
             wx.TheClipboard.GetData(do)
@@ -804,14 +807,14 @@ class Clipboard:
             img = bmp.ConvertToImage()
             buf = np.array(img.GetDataBuffer()) # do copy, don't ref
             if verbose:
-                print("From clipboard {:.1f} Mb data".format(buf.nbytes/1e6))
+                print("From clipboard: {:.1f} Mb data read.".format(buf.nbytes/1e6))
             w, h = img.GetSize()
             return buf.reshape(h, w, 3)
         except Exception:
             print("- The contents of the clipboard are not images.")
     
     @staticmethod
-    def imwrite(buf, verbose=True):
+    def imwrite(buf, verbose=False):
         try:
             ## Convert buf --> bmp
             h, w = buf.shape[:2]
@@ -829,7 +832,7 @@ class Clipboard:
             wx.TheClipboard.Flush()
             wx.TheClipboard.Close()
             if verbose:
-                print("To clipboard: {:.1f} Mb data".format(buf.nbytes/1e6))
+                print("To clipboard: {:.1f} Mb data written.".format(buf.nbytes/1e6))
         else:
             print("- Unable to open clipboard.")
 

mwx/framework.py

@@ -1,14 +1,12 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.96.0"
+__version__ = "0.96.4"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
 from importlib import reload
-from contextlib import contextmanager
 import traceback
-import warnings
 import builtins
 import datetime
 import textwrap
@@ -21,8 +19,8 @@ from wx import stc
 from wx.py import dispatcher
 
 from .utilus import funcall as _F
+from .utilus import get_rootpath, ignore, warn # noqa
 from .utilus import FSM, TreeList, apropos, typename, where, mro, pp
-from .utilus import get_rootpath
 
 
 def deb(target=None, loop=True, locals=None, **kwargs):
@@ -232,7 +230,7 @@ class KeyCtrlInterfaceMixin:
         state = self.handler.default_state
         event = keymap + ' pressed'
         
-        assert state is not None, "Don't make keymap for None:state."
+        assert state is not None, "Don't make keymap for None:state"
         
         self.handler.update({ # DNA<KeyCtrlInterfaceMixin>
             state : {
@@ -290,14 +288,12 @@ class KeyCtrlInterfaceMixin:
         key += ' pressed'
         
         if map not in self.handler:
-            warnings.warn(f"New map to define_key {keymap!r} in {self}.",
-                          stacklevel=2)
+            warn(f"New map to define_key {keymap!r} in {self}.")
             self.make_keymap(map) # make new keymap
         
         transaction = self.handler[map].get(key, [state])
         if len(transaction) > 1:
-            warnings.warn(f"Duplicate define_key {keymap!r} in {self}.",
-                          stacklevel=2)
+            warn(f"Duplicate define_key {keymap!r} in {self}.")
         
         if action is None:
             self.handler[map].pop(key, None) # cf. undefine_key
@@ -322,10 +318,6 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
     handler = property(lambda self: self.__handler)
     
     def __init__(self):
-        if hasattr(self, 'handler'):
-            warnings.warn(f"Duplicate iniheritance of CtrlInterface by {self}.",
-                          stacklevel=2)
-            return
         self.__key = ''
         self.__button = ''
         self.__isDragging = False
@@ -629,8 +621,7 @@ class MenuBar(wx.MenuBar, TreeList):
         Call when the menulist is changed.
         """
         if not self.Parent:
-            warnings.warn(f"No parents bound to {self}.",
-                          stacklevel=2)
+            warn(f"No parents bound to {self}.")
             return
         
         menu = self.getmenu(key)
@@ -657,8 +648,7 @@ class MenuBar(wx.MenuBar, TreeList):
         Call when the menulist is changed.
         """
         if not self.Parent:
-            warnings.warn(f"No parents bound to {self}.",
-                          stacklevel=2)
+            warn(f"No parents bound to {self}.")
             return
         
         for j in range(self.GetMenuCount()): # remove and del all top-level menu

mwx/graphman.py

@@ -9,7 +9,6 @@ from bdb import BdbQuit
 import subprocess
 import threading
 import traceback
-import warnings
 import inspect
 import sys
 import os
@@ -26,6 +25,7 @@ from PIL import Image
 from PIL.TiffImagePlugin import TiffImageFile
 
 from . import framework as mwx
+from .utilus import ignore, warn
 from .utilus import funcall as _F
 from .controls import ControlPanel, Icon
 from .framework import CtrlInterface, AuiNotebook, Menu, FSM
@@ -310,7 +310,10 @@ class LayerInterface(CtrlInterface):
             self.__artists.remove(art)
     
     def __init__(self, parent, session=None):
-        CtrlInterface.__init__(self)
+        if hasattr(self, 'handler'):
+            warn(f"Duplicate iniheritance of CtrlInterface by {self}.")
+        else:
+            CtrlInterface.__init__(self)
         
         self.parent = parent
         self.__artists = []
@@ -855,15 +858,14 @@ class Frame(mwx.Frame):
     
     Editor = "notepad"
     
+    @ignore(ResourceWarning)
     def edit(self, fn):
         if hasattr(fn, '__file__'):
             name, _ = os.path.splitext(fn.__file__)
             fn = name + '.py'
         cmd = '{} "{}"'.format(self.Editor, fn)
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore", ResourceWarning)
-            subprocess.Popen(cmd)
-            self.message(cmd)
+        subprocess.Popen(cmd)
+        self.message(cmd)
     
     def set_title(self, frame):
         ssn = os.path.basename(self.session_file or '--')
@@ -887,6 +889,20 @@ class Frame(mwx.Frame):
             elif ret == wx.ID_CANCEL:
                 evt.Veto()
                 return
+        for name in self.plugins:
+            plug = self.get_plug(name)
+            if plug.thread and plug.thread.active:
+                if wx.MessageBox( # Confirm thread close.
+                        "The thread is running.\n\n"
+                        "Enter [q]uit to exit before closing.\n"
+                        "Continue closing?",
+                        "Close {!r}".format(plug.Name),
+                        style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
+                    self.message("The close has been canceled.")
+                    evt.Veto()
+                    return
+                self.Quit()
+                break
         for frame in self.graph.all_frames:
             if frame.pathname is None:
                 if wx.MessageBox( # Confirm close.
@@ -914,11 +930,9 @@ class Frame(mwx.Frame):
         Args:
             name : str or plug object.
         """
-        if name in self.plugins:
-            plug = self.plugins[name].__plug__
-            name = plug.category or name
-        elif isinstance(name, LayerInterface):
-            name = name.category or name
+        plug = self.get_plug(name)
+        if plug:
+            name = plug.category or plug
         if name:
             return self._mgr.GetPane(name)
     
@@ -953,6 +967,7 @@ class Frame(mwx.Frame):
         ## 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)
         try:
@@ -1029,7 +1044,7 @@ class Frame(mwx.Frame):
             win.handler('page_closed', win)
     
     ## --------------------------------
-    ## Plugin (Layer) interface
+    ## Plugin <Layer> interface
     ## --------------------------------
     plugins = property(lambda self: self.__plugins)
     
@@ -1063,15 +1078,14 @@ class Frame(mwx.Frame):
     
     @staticmethod
     def register(cls, module=None):
-        """Register dummy plug; Add module.Plugin(Layer).
+        """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
-            warnings.warn(f"Duplicate iniheritance of LayerInterface by {cls}.",
-                          stacklevel=2)
+            warn(f"Duplicate iniheritance of LayerInterface by {cls}.")
             module.Plugin = cls
             return cls
         
@@ -1121,8 +1135,7 @@ class Frame(mwx.Frame):
         ## the module must have a class `Plugin`.
         if not hasattr(module, 'Plugin'):
             if isinstance(root, type):
-                warnings.warn(f"Use dummy plug for debugging {name!r}.",
-                              stacklevel=3)
+                warn(f"Use dummy plug for debugging {name!r}.")
                 module.__dummy_plug__ = root
                 self.register(root, module)
         else:
@@ -1420,7 +1433,7 @@ class Frame(mwx.Frame):
                              "ALL files (*.*)|*.*",
                     style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST) as dlg:
                 if dlg.ShowModal() != wx.ID_OK:
-                    return
+                    return None
                 filename = dlg.Path
         
         res, mis = self.read_attributes(filename)
@@ -1445,7 +1458,7 @@ class Frame(mwx.Frame):
         if not frames:
             frames = self.selected_view.all_frames
             if not frames:
-                return
+                return None
         
         if not filename:
             fn = next((x.pathname for x in frames if x.pathname), '')
@@ -1455,7 +1468,7 @@ class Frame(mwx.Frame):
                     wildcard="Index (*.index)|*.index",
                     style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:
                 if dlg.ShowModal() != wx.ID_OK:
-                    return
+                    return None
                 filename = dlg.Path
         
         savedir = os.path.dirname(filename)
@@ -1608,6 +1621,7 @@ class Frame(mwx.Frame):
                 os.remove(path)
             raise
     
+    @ignore(ResourceWarning)
     def load_buffer(self, paths=None, view=None):
         """Load buffers from paths to the view window.
         
@@ -1625,11 +1639,11 @@ class Frame(mwx.Frame):
                     style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST
                                     |wx.FD_MULTIPLE) as dlg:
                 if dlg.ShowModal() != wx.ID_OK:
-                    return
+                    return None
                 paths = dlg.Paths
+        frames = []
+        frame = None
         try:
-            frames = []
-            frame = None
             for i, path in enumerate(paths):
                 fn = os.path.basename(path)
                 self.message("Loading {!r} ({} of {})...".format(fn, i+1, len(paths)))
@@ -1672,7 +1686,7 @@ class Frame(mwx.Frame):
         if not frame:
             frame = self.selected_view.frame
             if not frame:
-                return
+                return None
         
         if not path:
             with wx.FileDialog(self, "Save buffer as",
@@ -1680,7 +1694,7 @@ class Frame(mwx.Frame):
                     wildcard='|'.join(self.wildcards),
                     style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:
                 if dlg.ShowModal() != wx.ID_OK:
-                    return
+                    return None
                 path = dlg.Path
         try:
             name = os.path.basename(path)
@@ -1700,13 +1714,14 @@ class Frame(mwx.Frame):
         except Exception as e:
             self.message("\b failed.")
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
+            return None
     
     def save_buffers_as_tiffs(self, path=None, frames=None):
         """Export buffers to a file as a multi-page tiff."""
         if not frames:
             frames = self.selected_view.all_frames
             if not frames:
-                return
+                return None
         
         if not path:
             with wx.FileDialog(self, "Save frames as stack-tiff",
@@ -1714,7 +1729,7 @@ class Frame(mwx.Frame):
                     wildcard="TIF file (*.tif)|*.tif",
                     style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:
                 if dlg.ShowModal() != wx.ID_OK:
-                    return
+                    return None
                 path = dlg.Path
         try:
             name = os.path.basename(path)
@@ -1733,6 +1748,7 @@ class Frame(mwx.Frame):
         except Exception as e:
             self.message("\b failed.")
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
+            return False
         finally:
             del busy
     

mwx/matplot2g.py

@@ -2,7 +2,6 @@
 """mwxlib graph plot for images.
 """
 import traceback
-import warnings
 import wx
 
 from matplotlib import cm
@@ -10,11 +9,12 @@ from matplotlib import patches
 from PIL import Image
 import cv2
 import numpy as np
-from numpy import pi, nan
+from numpy import pi
 from scipy import ndimage as ndi
 
 from . import framework as mwx
 from .framework import Menu
+from .utilus import warn
 from .utilus import funcall as _F
 from .controls import Clipboard
 from .matplot2 import MatplotPanel
@@ -224,24 +224,26 @@ class AxesImagePhantom(object):
     @property
     def unit(self):
         """Logical length per pixel arb.unit [u/pixel]."""
-        return self.__localunit or self.parent.globalunit
+        return self.__localunit or self.parent.unit
     
     @unit.setter
     def unit(self, v):
         u = self.unit
-        if v in (None, nan):
-            v = self.parent.globalunit
+        if v is None:
+            v = self.parent.unit
             self.__localunit = None
+        elif np.isnan(v) or np.isinf(v):
+            raise ValueError("The unit value cannot be NaN or Inf")
         elif v <= 0:
-            raise Exception("The unit value must be greater than zero.")
+            raise ValueError("The unit value must be greater than zero")
         else:
             if v == self.__localunit: # no effect when v is localunit
                 return
             self.__localunit = v
         self.__attributes['localunit'] = self.__localunit
         self.update_extent()
-        self.parent.update_markup_ratio(v/u)
         self.parent.handler('frame_updated', self)
+        self.parent.canvas.draw_idle()
     
     @unit.deleter
     def unit(self):
@@ -249,7 +251,7 @@ class AxesImagePhantom(object):
     
     @property
     def xy_unit(self):
-        u = self.__localunit or self.parent.globalunit
+        u = self.__localunit or self.parent.unit
         return (u, u * self.__aspect_ratio)
     
     @property
@@ -331,8 +333,7 @@ class AxesImagePhantom(object):
         def _cast(n):
             return np.int32(np.floor(np.round(n, 1)))
         if y is None:
-            warnings.warn("Setting xy data with single tuple is deprecated.",
-                          DeprecationWarning, stacklevel=2)
+            warn("Setting xy data with single tuple.", DeprecationWarning)
             x, y = x
         if isinstance(x, (list, tuple)):
             x = np.array(x)
@@ -348,8 +349,7 @@ class AxesImagePhantom(object):
     def xyfrompixel(self, nx, ny=None):
         """Convert pixel [nx,ny] -> (x,y) xydata (float number)."""
         if ny is None:
-            warnings.warn("Setting xy data with single tuple is deprecated.",
-                          DeprecationWarning, stacklevel=2)
+            warn("Setting xy data with single tuple.", DeprecationWarning)
             nx, ny = nx
         if isinstance(nx, (list, tuple)):
             nx = np.array(nx)
@@ -658,8 +658,8 @@ class GraphPlot(MatplotPanel):
             j = names.index(name) # existing frame
         if j != -1:
             art = self.__Arts[j]
-            art.update_buffer(buf) # => frame_modified
-            art.update_attributes(kwargs) # => frame_updated
+            art.update_buffer(buf)        # => [frame_modified]
+            art.update_attributes(kwargs) # => [frame_updated] localunit => [canvas_draw]
             art.update_extent()
             if show:
                 self.select(j)
@@ -674,7 +674,11 @@ class GraphPlot(MatplotPanel):
         self.__Arts.insert(j, art)
         self.handler('frame_loaded', art)
         if show:
+            u = self.frame and self.frame.unit # current frame unit
             self.select(j)
+            ## Update view if the unit length is different from before selection
+            if u != art.unit:
+                self.axes.axis(art.get_extent())
         return art
     
     def select(self, j):
@@ -688,17 +692,10 @@ class GraphPlot(MatplotPanel):
             self.handler('frame_hidden', self.frame)
         
         if j is not None:
-            u = self.frame and self.frame.unit # current frame unit
-            
             art = self.__Arts[j]
             art.set_visible(1)
             self.__index = j % len(self)
             self.handler('frame_shown', art)
-            
-            ## Update view if the unit length is different than before
-            if u != art.unit:
-                ## self.update_axis()
-                self.axes.axis(art.get_extent())
         else:
             self.__index = None
         
@@ -828,10 +825,12 @@ class GraphPlot(MatplotPanel):
     
     @unit.setter
     def unit(self, v):
-        if v in (None, nan):
-            raise Exception("The globalunit must be non-nil value.")
+        if v is None:
+            raise ValueError("The globalunit must be non-nil value")
+        elif np.isnan(v) or np.isinf(v):
+            raise ValueError("Axis limits cannot be NaN or Inf")
         elif v <= 0:
-            raise Exception("The unit value must be greater than zero.")
+            raise ValueError("The unit value must be greater than zero")
         else:
             if v == self.__unit:  # no effect unless unit changes
                 return
@@ -839,19 +838,10 @@ class GraphPlot(MatplotPanel):
             self.__unit = v
             for art in self.__Arts:
                 art.update_extent()
-            else:
-                self.update_markup_ratio(v/u)
-            for art in self.__Arts:
                 self.handler('frame_updated', art)
+            self.canvas.draw_idle()
     
-    globalunit = unit
-    
-    def update_markup_ratio(self, r):
-        """Modify markup objects position."""
-        if self.Selector.size: self.Selector *= r
-        if self.Markers.size: self.Markers *= r
-        if self.Region.size: self.Region *= r
-        self.draw()
+    globalunit = unit # for backward compatibility
     
     def kill_buffer(self):
         if self.buffer is not None:

mwx/matplot2lg.py

@@ -623,7 +623,7 @@ class LineProfile(LinePlot):
         with io.StringIO() as o:
             for x, y in zip(X, Y):
                 o.write("{:g}\t{:g}\n".format(x, y))
-            Clipboard.write(o.getvalue(), verbose=0)
+            Clipboard.write(o.getvalue())
             self.message("Write data to clipboard.")
     
     def annotate(self):

mwx/nutshell.py

@@ -7,7 +7,6 @@ from contextlib import contextmanager
 from pprint import pformat
 from bdb import BdbQuit
 import traceback
-import warnings
 import inspect
 import builtins
 import dis
@@ -26,6 +25,7 @@ from wx.py.shell import Shell
 from wx.py.editwindow import EditWindow
 
 from .utilus import funcall as _F
+from .utilus import ignore
 from .utilus import split_words, split_paren, split_tokens, find_modules
 from .framework import CtrlInterface, AuiNotebook, Menu
 
@@ -1986,7 +1986,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     self.swap_buffer(buf, lineno)
                     return True
                 ## return False
-                raise Exception("The requested URL was not found.")
+                raise Exception("The requested URL was not found")
             if buf._load_file(filename):
                 self.swap_buffer(buf, lineno)
                 return True
@@ -2161,6 +2161,7 @@ class Interpreter(interpreter.Interpreter):
         except AttributeError:
             pass
     
+    @ignore(DeprecationWarning)
     def getCallTip(self, command='', *args, **kwargs):
         """Return call tip text for a command.
         
@@ -2169,12 +2170,10 @@ class Interpreter(interpreter.Interpreter):
         (override) Ignore ValueError: no signature found for builtin
                    if the unwrapped function is a builtin function.
         """
-        with warnings.catch_warnings():
-            warnings.simplefilter('ignore', DeprecationWarning)
-            try:
-                return interpreter.Interpreter.getCallTip(self, command, *args, **kwargs)
-            except ValueError:
-                return interpreter.Interpreter.getCallTip(self) # dummy
+        try:
+            return interpreter.Interpreter.getCallTip(self, command, *args, **kwargs)
+        except ValueError:
+            return interpreter.Interpreter.getCallTip(self) # dummy
 
 
 class Nautilus(Shell, EditorInterface):

mwx/plugins/frame_listview.py

@@ -72,7 +72,6 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
              'Lbutton dblclick' : (0, self.OnShowItems), # -> frame_shown
                 'enter pressed' : (0, self.OnShowItems), # -> frame_shown
                'delete pressed' : (0, self.OnRemoveItems), # -> frame_removed/shown
-                   'f2 pressed' : (0, self.OnEditAnnotation),
                   'C-a pressed' : (0, self.OnSelectAllItems),
                   'C-o pressed' : (0, self.OnLoadItems),
                   'C-s pressed' : (0, self.OnSaveItems),
@@ -97,26 +96,17 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         }
         self.Target.handler.append(self.context)
         
-        def copy_info(all=True):
-            frames = self.Target.all_frames
-            if frames:
-                frame = frames[self.focused_item]
-                if all:
-                    text = pformat(frame.attributes, sort_dicts=0)
-                else:
-                    text = "{}\n{}".format(frame.name, frame.annotation)
-                Clipboard.write(text)
-        
         self.menu = [
-            (101, "&Edit annotation", "Edit annotation", Icon('pencil'),
-                self.OnEditAnnotation),
+            (100, "Edit localunit", Icon('image'),
+                self.OnEditUnit,
+                lambda v: v.Enable(self.focused_item != -1)),
+                
+            (101, "Edit annotation", Icon('pencil'),
+                self.OnEditAnnotation,
+                lambda v: v.Enable(self.focused_item != -1)),
             (),
             (102, "Copy info", Icon('copy'),
-                lambda v: copy_info(0),
-                lambda v: v.Enable(len(list(self.selected_items)))),
-                
-            (103, "Copy ALL data", Icon('copy', '+'),
-                lambda v: copy_info(1),
+                self.OnCopyInfo,
                 lambda v: v.Enable(len(list(self.selected_items)))),
         ]
         self.Bind(wx.EVT_CONTEXT_MENU,
@@ -183,26 +173,40 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         self.parent.parent.load_index(view=self.Target)
     
     def OnSaveItems(self, evt):
-        frames = self.Target.all_frames
-        selected_frames = [frames[j] for j in self.selected_items]
+        selected_frames = [self.Target.all_frames[j] for j in self.selected_items]
         if selected_frames:
             self.parent.message("Exporting {} frames.".format(len(selected_frames)))
             self.parent.parent.save_index(frames=selected_frames)
         else:
             self.parent.message("No frame selected.")
     
+    def OnCopyInfo(self, evt):
+        selected_frames = [self.Target.all_frames[j] for j in self.selected_items]
+        if selected_frames:
+            text = ''
+            for frame in selected_frames:
+                text += pformat(frame.attributes, sort_dicts=0) # ALL attributes
+                ## text += '{}\n{}\n'.format(frame.name, frame.annotation)
+            Clipboard.write(text)
+        else:
+            self.parent.message("No frame selected.")
+    
+    def OnEditUnit(self, evt):
+        frame = self.Target.all_frames[self.focused_item]
+        with wx.TextEntryDialog(self, frame.name,
+                'Enter localunit', repr(frame.localunit)) as dlg:
+            if dlg.ShowModal() == wx.ID_OK:
+                frame.unit = eval(dlg.Value or 'None')
+    
     def OnEditAnnotation(self, evt):
-        frames = self.Target.all_frames
-        if frames:
-            frame = frames[self.focused_item]
-            with wx.TextEntryDialog(self, frame.name,
-                    'Enter an annotation', frame.annotation) as dlg:
-                if dlg.ShowModal() == wx.ID_OK:
-                    frame.annotation = dlg.Value
+        frame = self.Target.all_frames[self.focused_item]
+        with wx.TextEntryDialog(self, frame.name,
+                'Enter an annotation', frame.annotation) as dlg:
+            if dlg.ShowModal() == wx.ID_OK:
+                frame.annotation = dlg.Value
     
     def OnItemSelected(self, evt):
-        frames = self.Target.all_frames
-        frame = frames[evt.Index]
+        frame = self.Target.all_frames[evt.Index]
         self.parent.message(frame.pathname)
         evt.Skip()
     

mwx/utilus.py

@@ -37,6 +37,16 @@ def ignore(*category):
         yield
 
 
+def warn(message, category=None):
+    frame = inspect.currentframe().f_back # previous call stack frame
+    skip = [frame.f_code.co_filename]
+    stacklevel = 1
+    while frame.f_code.co_filename in skip:
+        frame = frame.f_back
+        stacklevel += 1
+    return warnings.warn(message, category, stacklevel+1)
+
+
 def atom(v):
     return not hasattr(v, '__name__')
 
@@ -434,13 +444,12 @@ def find_modules(force=False, verbose=True):
             lm = eval(o.read()) # read and evaluate module list
         
         ## Check additional packages and modules
-        verbose = False
+        ## verbose = False
         for info in walk_packages_no_import(['.']):
             _callback('.', info.name)
     else:
-        print("Please wait a moment "
-              "while Py{} gathers a list of all available modules... "
-              "(This is executed once)".format(sys.winver))
+        print(f"Please wait a moment while Py{sys.winver} gathers a list of "
+               "all available modules... (This is executed once)")
         
         lm = list(sys.builtin_module_names)
         
@@ -684,7 +693,6 @@ class FSM(dict):
                               "  action : {}".format(typename(act)),
                               "  args   : {}".format(args),
                               "  kwargs : {}".format(kwargs))
-                    traceback.print_exc()
             self.__matched_pattern = None
             return retvals
         
@@ -728,12 +736,11 @@ class FSM(dict):
     
     @staticmethod
     def dump(*args):
-        print(*args, sep='\n', file=sys.__stderr__)
         fn = get_rootpath("deb-dump.log")
         with open(fn, 'a') as o:
             print(time.strftime('!!! %Y/%m/%d %H:%M:%S'), file=o)
-            print(*args, sep='\n', end='\n', file=o)
-            print(traceback.format_exc(), file=o)
+            print(*args, traceback.format_exc(), sep='\n', file=o)
+        print(*args, traceback.format_exc(), sep='\n', file=sys.__stderr__)
     
     @staticmethod
     def duplicate(context):
@@ -810,11 +817,8 @@ class FSM(dict):
         assert isinstance(event, str)
         assert callable(action) or action is None
         
-        def warn(msg):
-            warnings.warn(msg, stacklevel=3)
-        
         if state not in self:
-            warn("- FSM warning: [{!r}] context newly created.".format(state))
+            warn(f"- FSM [{state!r}] context newly created.")
             self[state] = SSM() # new context
         
         context = self[state]
@@ -823,16 +827,16 @@ class FSM(dict):
         
         if event in context:
             if state2 != context[event][0]:
-                warn("- FSM warning: transaction may conflict.\n"
-                     "  The state {2!r} and the original state is not the same."
-                     "  {0!r} : {1!r} --> {2!r}".format(event, state, state2))
+                warn(f"- FSM transaction may conflict.\n"
+                     f"  The state {state2!r} is different from the original state."
+                     f"  {event!r} : {state!r} --> {state2!r}")
                 pass
                 context[event][0] = state2 # update transition
         else:
             ## if state2 not in self:
-            ##     warn("- FSM warning: transaction may contradict\n"
-            ##          "  The state {2!r} is not found in the contexts."
-            ##          "  {0!r} : {1!r} --> {2!r}".format(event, state, state2))
+            ##     warn(f"- FSM transaction may contradict\n"
+            ##          f"  The state {state2!r} is not found in the contexts."
+            ##          f"  {event!r} : {state!r} --> {state2!r}")
             ##     pass
             context[event] = [state2] # new event:transaction
         
@@ -844,8 +848,8 @@ class FSM(dict):
             try:
                 transaction.append(action)
             except AttributeError:
-                warn("- FSM warning: cannot append new transaction ({!r} : {!r})\n"
-                     "  The transaction must be a list, not a tuple".format(state, event))
+                warn(f"- FSM cannot append new transaction ({state!r} : {event!r})\n"
+                     f"  The transaction must be a list, not a tuple")
         return action
     
     def unbind(self, event, action=None, state=None):
@@ -858,16 +862,13 @@ class FSM(dict):
         """
         assert callable(action) or action is None
         
-        def warn(msg):
-            warnings.warn(msg, stacklevel=3)
-        
         if state not in self:
-            warn("- FSM warning: [{!r}] context does not exist.".format(state))
+            warn(f"- FSM [{state!r}] context does not exist.")
             return
         
         context = self[state]
         if event not in context:
-            warn("- FSM warning: No such transaction ({!r} : {!r})".format(state, event))
+            warn(f"- FSM has no such transaction ({state!r} : {event!r})")
             return
         
         transaction = context[event]
@@ -881,8 +882,8 @@ class FSM(dict):
                 transaction.remove(action)
                 return True
             except AttributeError:
-                warn("- FSM warning: removing action from context ({!r} : {!r})\n"
-                     "  The transaction must be a list, not a tuple".format(state, event))
+                warn(f"- FSM removing action from context ({state!r} : {event!r})\n"
+                     f"  The transaction must be a list, not a tuple")
         return False
 
 
@@ -964,7 +965,7 @@ class TreeList(object):
             else:
                 ls.append([key, value]) # append to items:list
         except (ValueError, TypeError, AttributeError) as e:
-            print(f"- TreeList:warning {e!r}: {key=!r}")
+            warn(f"- TreeList:warning {e!r}: {key=!r}")
     
     def _delf(self, ls, key):
         if '/' in key:

mwx/wxmon.py

@@ -3,12 +3,11 @@
 
 *** Inspired by wx.lib.eventwatcher ***
 """
-import warnings
 import wx
 import wx.lib.eventwatcher as ew
 from wx.lib.mixins.listctrl import ListCtrlAutoWidthMixin
 
-from .utilus import where
+from .utilus import where, ignore
 from .controls import Icon, Clipboard
 from .framework import CtrlInterface, Menu
 
@@ -176,8 +175,7 @@ class EventMonitor(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         source = ew._makeSourceString(obj) + " id=0x{:X}".format(id(evt))
         stamp = 1
         
-        with warnings.catch_warnings():
-            warnings.simplefilter('ignore', DeprecationWarning)
+        with ignore(DeprecationWarning):
             attribs = ew._makeAttribString(evt)
         
         data = self.__items
@@ -232,7 +230,7 @@ class EventMonitor(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
             if self.IsSelected(i):
                 event, name, *_, attribs = self.__items[i]
                 text += "{}\t{}\n{}\n\n".format(event, name, attribs)
-        Clipboard.write(text.strip('\n'))
+        Clipboard.write(text[:-1])
     
     def OnSortItems(self, evt): #<wx._controls.ListEvent>
         n = self.ItemCount

mwx/wxwil.py

@@ -145,7 +145,7 @@ class LocalsWatcher(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
             if self.IsSelected(i):
                 key, vstr = self.__items[i]
                 text += "{} = {}\n".format(key, vstr)
-        Clipboard.write(text.strip('\n'))
+        Clipboard.write(text)
     
     def OnSortItems(self, evt): #<wx._controls.ListEvent>
         n = self.ItemCount

{mwxlib-0.96.0.dist-info → mwxlib-0.96.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.96.0
+Version: 0.96.4
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto

mwxlib-0.96.4.dist-info/RECORD

@@ -0,0 +1,28 @@
+mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
+mwx/bookshelf.py,sha256=CjcgtHC33KR5mHp1lW6Bqfndpzr7hC8ICkFihw4kM3g,5134
+mwx/controls.py,sha256=JGoDEqfa0m5unISRcAdTxqCXihfuFo1mnLQcMimpGdc,48445
+mwx/framework.py,sha256=bP9D868lzBecp1ZRYEv_GupYtior0AoiK6M8B-yxBvw,75249
+mwx/graphman.py,sha256=eNL1Uja1m4g8ER3emArTFPZllvxEjvdnZTc1y8QMciE,71267
+mwx/images.py,sha256=gyvqW4TLWdJMKmsaWiPiV_PuHJM1GbHgeELERLwGzg8,45291
+mwx/matplot2.py,sha256=-G7z0Osozm9NjLfXvX5UcdFviwbNUktjbd904_g-PqQ,33516
+mwx/matplot2g.py,sha256=22rpdkqJQEJADINPaG5htACutbt8oG1ewO8LMpxaqH4,65237
+mwx/matplot2lg.py,sha256=MDbkO0vn5yi9rwTBCBJ4rsIHcWyoGXeNTbp0xfrvTdM,27381
+mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
+mwx/nutshell.py,sha256=HNo8ZuhLZPKd_Cg4s9NN-KfuSXHRP_jaw1s59GVXkN4,136971
+mwx/utilus.py,sha256=jTjeunx_9-HrjdWaceX1Xeq3pHMS4M7M9ma2i4uhKJY,37369
+mwx/wxmon.py,sha256=f3V24EF7kdMlYF7usLYK9QE5KU6fSu0jVqsvwAiA-Ag,12647
+mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
+mwx/wxwil.py,sha256=0bzSTfMEjllJheKxZPb4p8Luz6Il3V29bCLBty72U2o,5576
+mwx/wxwit.py,sha256=yU6XeCCWRBP7CLmpphjT072PfXAL30DNaxoChDX2p0I,7322
+mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
+mwx/plugins/ffmpeg_view.py,sha256=wZXRgsiPyIphcA8hvXQoE7NZp4cc_YBOO0ZpuKmUJKE,9369
+mwx/plugins/fft_view.py,sha256=HcnBr-y_yFdSfASPRzMLANta4SwSDShd65QWnCU3XhM,2665
+mwx/plugins/frame_listview.py,sha256=Li993CV0pPY23Jb8cGQkc3wVeDlHWLEe8RuDbNZeB8s,10351
+mwx/plugins/line_profile.py,sha256=--9NIc3x5EfRB3L59JvD7rzENQHyiYfu7wWJo6AuMkA,820
+mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
+mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
+mwxlib-0.96.4.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.96.4.dist-info/METADATA,sha256=z1bx81IMuasnA9ZGE1vUidxqqh7cOC_LmB-Rdrqd0xw,1925
+mwxlib-0.96.4.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+mwxlib-0.96.4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.96.4.dist-info/RECORD,,

{mwxlib-0.96.0.dist-info → mwxlib-0.96.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.0)
+Generator: setuptools (70.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

mwxlib-0.96.0.dist-info/RECORD

@@ -1,28 +0,0 @@
-mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
-mwx/bookshelf.py,sha256=DAhMQk3_J4rdE50adBMFu5wNz3WdMh_zzJ37O9ncceo,5103
-mwx/controls.py,sha256=IAT3l3-azlPFtMc2VGNMiQhI390ExW0S4CgjEOKFI4s,48200
-mwx/framework.py,sha256=Z-WbpepmraX_7wCq4jWpOCeDhUrUO5NlOmFLf2RjoLk,75666
-mwx/graphman.py,sha256=4SRwCMs4-sS3n23FthythhuG9dBJ8TLz_TVyoYAbdoA,70639
-mwx/images.py,sha256=gyvqW4TLWdJMKmsaWiPiV_PuHJM1GbHgeELERLwGzg8,45291
-mwx/matplot2.py,sha256=-G7z0Osozm9NjLfXvX5UcdFviwbNUktjbd904_g-PqQ,33516
-mwx/matplot2g.py,sha256=Ii0y4Ebod-9EJ-WPaCyZ-voM5uC3MTDmNktJD7OiTtA,65496
-mwx/matplot2lg.py,sha256=pcu1oDPE_BlpFqNGPPKf9vpTuDs_h_u3OTRAJx5-Sds,27392
-mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=pbsQATwt906lOXGFWJmuwZIwU_ve78o46I2g5zNjvG4,137050
-mwx/utilus.py,sha256=Uwj6vbNUUztwOswPG75xtsT2y_PZqh3QiJraxmA9iT0,37401
-mwx/wxmon.py,sha256=6es-jVz9Ht7vZnG7VBJcaNYLHY0PnZtij60SXcZRTeY,12727
-mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
-mwx/wxwil.py,sha256=zP1-5Fpi1wpDQU977229zIH6QRuSkkyfuAlNKWjGoGg,5588
-mwx/wxwit.py,sha256=yU6XeCCWRBP7CLmpphjT072PfXAL30DNaxoChDX2p0I,7322
-mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
-mwx/plugins/ffmpeg_view.py,sha256=wZXRgsiPyIphcA8hvXQoE7NZp4cc_YBOO0ZpuKmUJKE,9369
-mwx/plugins/fft_view.py,sha256=HcnBr-y_yFdSfASPRzMLANta4SwSDShd65QWnCU3XhM,2665
-mwx/plugins/frame_listview.py,sha256=RaYOj-YKrpLqhT8TkBRDX1TQnSPv90V185j8OjrWJTs,10108
-mwx/plugins/line_profile.py,sha256=--9NIc3x5EfRB3L59JvD7rzENQHyiYfu7wWJo6AuMkA,820
-mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
-mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwxlib-0.96.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.96.0.dist-info/METADATA,sha256=3UowIlnhpmH3yDgustsBu7iviC9fFKYIWtspEFsWYNs,1925
-mwxlib-0.96.0.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-mwxlib-0.96.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.96.0.dist-info/RECORD,,