mwxlib 1.5.12__py3-none-any.whl → 1.6.0__py3-none-any.whl

mwx/controls.py

@@ -26,18 +26,18 @@ class Param:
     """Standard Parameter
     
     Args:
-        name    : label
-        range   : list of values
-        value   : std_value (default is None)
-        fmt     : text formatter or format:str (default is '%g')
-                  `hex` specifies hexadecimal format
-        handler : called when knob is handled.
-        updater : called when button is pressed.
-        checker : called when tick turns on/off.
+        name:  label
+        range: list of values
+        value: std_value (default is None)
+        fmt:   text formatter or format:str (default is '%g')
+               `hex` specifies hexadecimal format
+        handler: called when knob is handled.
+        updater: called when button is pressed.
+        checker: called when tick turns on/off.
     
     Attributes:
-        knobs       : knob list
-        callback    : single state machine that handles following events
+        knobs: knob list
+        callback: single state machine that handles following events
         
             - control -> when index is changed by knobs or reset (handler)
             - updated -> when button is pressed (updater)
@@ -224,18 +224,18 @@ class LParam(Param):
     """Linear Parameter
     
     Args:
-        name    : label
-        range   : range params [min:max:step]
-        value   : std_value (default is None)
-        fmt     : text formatter or format:str (default is '%g')
-                  `hex` specifies hexadecimal format
-        handler : called when knob is handled.
-        updater : called when button is pressed.
-        checker : called when tick turns on/off.
+        name:  label
+        range: range params [min:max:step]
+        value: std_value (default is None)
+        fmt:   text formatter or format:str (default is '%g')
+               `hex` specifies hexadecimal format
+        handler: called when knob is handled.
+        updater: called when button is pressed.
+        checker: called when tick turns on/off.
     
     Attributes:
-        knobs       : knob list
-        callback    : single state machine that handles following events
+        knobs: knob list
+        callback: single state machine that handles following events
         
             - control -> when index is changed by knobs or reset (handler)
             - updated -> when button is pressed (updater)
@@ -295,16 +295,16 @@ class Knob(wx.Panel):
     [Mbutton] resets to the std. value if it exists.
     
     Args:
-        param   : <Param> or <LParam> object
-        type    : control type (slider[*], [hv]spin, choice, None)
-        style   : style of label
-                  None -> static text (default)
-                  button -> label with flat button
-                  checkbox -> label with checkbox
-        cw      : width of control
-        lw      : width of label
-        tw      : width of textbox
-        h       : height of widget (defaults to 22)
+        param: <Param> or <LParam> object
+        type:  control type (slider[*], [hv]spin, choice, None)
+        style: style of label
+               None -> static text (default)
+               button -> label with flat button
+               checkbox -> label with checkbox
+        cw: width of control
+        lw: width of label
+        tw: width of textbox
+        h:  height of widget (defaults to 22)
     """
     @property
     def param(self):
@@ -654,18 +654,19 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
         """Do layout (cf. Layout).
         
         Args:
-            items   : list of Params, wx.Objects, tuple of sizing, or None
-            title   : box header string (default is None - no box)
-            row     : number of row to arange widgets
-            expand  : (0) fixed size
-                      (1) to expand horizontally
-                      (2) to expand horizontally and vertically
-            border  : size of outline border
+            items:    list of Params, wx.Objects, tuple of sizing, or None
+            title:    box header string (default is None - no box)
+            row:      number of row to arange widgets
+            expand:   expansion flag
+                      - (0) fixed size
+                      - (1) to expand horizontally
+                      - (2) to expand horizontally and vertically
+            border:   size of outline border
             hspacing: horizontal spacing among packed objs inside the group
             vspacing: vertical spacing among packed objs inside the group
-            show    : fold or unfold the boxed group
-            visible : Hide the boxed group if False
-            align   : alignment flag (wx.ALIGN_*) default is ALIGN_LEFT
+            show:     Fold or unfold the boxed group.
+            visible:  Hide the boxed group if False.
+            align:    alignment flag (wx.ALIGN_*) default is ALIGN_LEFT
             **kwargs: extra keyword arguments given for Knob
         """
         objs = [Knob(self, c, **kwargs) if isinstance(c, Param)
@@ -999,9 +1000,9 @@ class ClassicButton(wx.Button):
     """Classic button
     
     Args:
-        label   : button label
-        handler : event handler when the button is pressed
-        icon    : key:str or bitmap for button icon
+        label:    button label
+        handler:  event handler when the button is pressed
+        icon:     key:str or bitmap for button icon
         **kwargs: keywords for wx.lib.platebtn.PlateButton
     """
     def __init__(self, parent, label='', handler=None, icon=None, **kwargs):
@@ -1018,9 +1019,9 @@ class Button(pb.PlateButton):
     """Flat button
     
     Args:
-        label   : button label
-        handler : event handler when the button is pressed
-        icon    : key:str or bitmap for button icon
+        label:    button label
+        handler:  event handler when the button is pressed
+        icon:     key:str or bitmap for button icon
         **kwargs: keywords for wx.lib.platebtn.PlateButton
     """
     def __init__(self, parent, label='', handler=None, icon=None, **kwargs):
@@ -1049,9 +1050,9 @@ class ToggleButton(wx.ToggleButton):
     """Togglable button
     
     Args:
-        label   : button label
-        handler : event handler when the button is pressed
-        icon    : key:str or bitmap for button icon
+        label:    button label
+        handler:  event handler when the button is pressed
+        icon:     key:str or bitmap for button icon
         **kwargs: keywords for wx.ToggleButton
     
     Note:
@@ -1075,10 +1076,10 @@ class TextBox(wx.Control):
     """Text control
     
     Args:
-        label   : button label
-        handler : event handler when text is entered
-        updater : event handler when the button is pressed
-        icon    : key:str or bitmap for button icon
+        label:    button label
+        handler:  event handler when text is entered
+        updater:  event handler when the button is pressed
+        icon:     key:str or bitmap for button icon
         readonly: flag:bool (equiv. style=wx.TE_READONLY)
         **kwargs: keywords for wx.TextCtrl
                   e.g., value:str
@@ -1140,10 +1141,10 @@ class Choice(wx.Control):
     """Editable Choice (ComboBox) control
     
     Args:
-        label   : button label
-        handler : event handler when text is entered or item is selected
-        updater : event handler when the button is pressed
-        icon    : key:str or bitmap for button icon
+        label:    button label
+        handler:  event handler when text is entered or item is selected
+        updater:  event handler when the button is pressed
+        icon:     key:str or bitmap for button icon
         readonly: flag:bool (equiv. style=wx.CB_READONLY)
         **kwargs: keywords for wx.ComboBox
                   e.g., choices:list
@@ -1230,8 +1231,8 @@ class Indicator(wx.Control):
     """Traffic light indicator
     
     Args:
-        colors  : list of colors (default is tricolour) cf. wx.ColourDatabase
-        value   : initial value
+        colors:   list of colors (default is tricolour) cf. wx.ColourDatabase
+        value:    initial value
         **kwargs: keywords for wx.Control
     """
     @property
@@ -1348,8 +1349,8 @@ class Gauge(wx.Control):
     """Rainbow gauge
     
     Args:
-        range   : maximum value
-        value   : initial value
+        range:    maximum value
+        value:    initial value
         **kwargs: keywords for wx.Control
     """
     @property

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.5.12"
+__version__ = "1.6.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -28,19 +28,19 @@ def deb(target=None, loop=True, locals=None, **kwargs):
     """Dive into the process.
     
     Args:
-        target  : Object or module (default None).
-                  If None, the target is set to `__main__`.
-        loop    : If True, the app and the mainloop will be created.
-        locals  : Additional context of the shell
+        target: Object or module (default None).
+                If None, the target is set to `__main__`.
+        loop:   If True, the app and the mainloop will be created.
+        locals: Additional context of the shell
         
         **kwargs: ShellFrame and Nautilus arguments
         
-            - session           : file name of the session. Defaults to None.
-            - standalone        : True => EVT_CLOSE will close the window.
-                                  False => EVT_CLOSE will hide the window.
-            - introText         : introductory of the shell
-            - startupScript     : startup script file (default None)
-            - execStartupScript : True => Execute the startup script.
+            - session: file name of the session. Defaults to None.
+            - standalone: True => EVT_CLOSE will close the window.
+                          False => EVT_CLOSE will hide the window.
+            - introText: introductory of the shell
+            - startupScript: startup script file (default None)
+            - execStartupScript: True => Execute the startup script.
     
     Note:
         This will execute the startup script $(PYTHONSTARTUP).
@@ -504,7 +504,7 @@ def pack(self, items, orient=wx.HORIZONTAL, style=None, label=None):
         )
     
     Args:
-        items   : wx objects (with some packing parameters)
+        items: wx objects (with some packing parameters)
         
             - (obj, 1) -> sized with ratio 1 (parallel to `orient`)
             - (obj, 1, wx.EXPAND) -> expanded with ratio 1 (perpendicular to `orient`)
@@ -513,9 +513,9 @@ def pack(self, items, orient=wx.HORIZONTAL, style=None, label=None):
             - (-1,-1) -> padding space
             - None -> phantom
         
-        orient  : HORIZONTAL or VERTICAL
-        label   : StaticBox label
-        style   : Sizer option (proportion, flag, border)
+        orient: HORIZONTAL or VERTICAL
+        label:  StaticBox label
+        style:  Sizer option (proportion, flag, border)
         
             - flag-expansion -> EXPAND, SHAPED
             - flag-border -> TOP, BOTTOM, LEFT, RIGHT, ALL
@@ -554,8 +554,8 @@ class Menu(wx.Menu):
     """Construct the menu.
     
     Args:
-        menulist : list of MenuItem args
-        owner    : window object to bind handlers
+        owner: window object to bind handlers
+        menulist: list of MenuItem args
     
     (id, text, hint, style, icon,  ... Menu.Append arguments
        action, updater, highlight) ... Menu Event handlers
@@ -697,8 +697,8 @@ class StatusBar(wx.StatusBar):
     """Construct the statusbar with read/write interfaces.
     
     Attributes:
-        field   : list of field widths
-        pane    : index of status text field
+        field: list of field widths
+        pane: index of status text field
     """
     def __init__(self, *args, **kwargs):
         wx.StatusBar.__init__(self, *args, **kwargs)
@@ -726,9 +726,9 @@ class Frame(wx.Frame, KeyCtrlInterfaceMixin):
     """Frame extension class.
     
     Attributes:
-        menubar     : MenuBar
-        statusbar   : StatusBar
-        shellframe  : mini-frame of the shell
+        menubar: MenuBar
+        statusbar: StatusBar
+        shellframe: mini-frame of the shell
     """
     handler = property(lambda self: self.__handler)
     
@@ -799,8 +799,8 @@ class MiniFrame(wx.MiniFrame, KeyCtrlInterfaceMixin):
     """MiniFrame extension class.
     
     Attributes:
-        menubar     : MenuBar
-        statusbar   : StatusBar (not shown by default)
+        menubar: MenuBar
+        statusbar: StatusBar (not shown by default)
     """
     handler = property(lambda self: self.__handler)
     
@@ -1051,27 +1051,28 @@ class ShellFrame(MiniFrame):
     """MiniFrame of the Shell.
     
     Args:
-        target  : target object of the rootshell.
-                  If None, it will be __main__.
-        session : file name of the session. Defaults to None.
-                  If None, no session will be created or saved.
-                  If `''`, the default session (.debrc) will be loaded.
-        standalone  : flag for the shell standalone.
-                      If True, EVT_CLOSE will close the window.
-                      Otherwise the window will be only hidden.
-        **kwargs    : Nautilus arguments
+        target: target object of the rootshell.
+                If None, it will be __main__.
+        session: file name of the session. Defaults to None.
+                 If None, no session will be created or saved.
+                 If `''`, the default session (.debrc) will be loaded.
+        standalone: flag for the shell standalone.
+                    If True, EVT_CLOSE will close the window.
+                    Otherwise the window will be only hidden.
+        **kwargs: Nautilus arguments
     
     Attributes:
-        console     : Notebook of shells
-        ghost       : Notebook of editors/buffers
-        watcher     : Notebook of global/locals watcher
-        Scratch     : Book of scratch (tooltip)
-        Help        : Book of help
-        Log         : Book of logging
-        monitor     : wxmon.EventMonitor object
-        inspector   : wxwit.Inspector object
-        debugger    : wxpdb.Debugger object
-        ginfo/linfo : globals/locals list
+        console:    Notebook of shells
+        ghost:      Notebook of editors/buffers
+        watcher:    Notebook of global/locals watcher
+        Scratch:    Book of scratch (tooltip)
+        Help:       Book of help
+        Log:        Book of logging
+        monitor:    wxmon.EventMonitor object
+        inspector:  wxwit.Inspector object
+        debugger:   wxpdb.Debugger object
+        ginfo:      globals list
+        linfo:      locals list
     
     Built-in utility::
     
@@ -1611,10 +1612,10 @@ class ShellFrame(MiniFrame):
         """Load file @where the object is defined.
         
         Args:
-            filename : target filename:str or object.
-                       It also supports <'filename:lineno'> format.
-            lineno   : Set mark to lineno on load.
-            show     : Show the page.
+            filename: target filename:str or object.
+                      It also supports <'filename:lineno'> format.
+            lineno: Set mark to lineno on load.
+            show: Show the page.
         """
         if not isinstance(filename, str):
             filename = where(filename)

mwx/graphman.py

@@ -43,19 +43,19 @@ class Thread:
     The worker:thread runs the given target.
     
     Attributes:
-        target  : A target method of the Layer.
-        result  : A variable that retains the last retval of f.
-        worker  : Reference of the worker thread.
-        owner   : Reference of the handler owner (was typ. f.__self__).
-                  If None, the thread_event is handled by its own handler.
-        event   : A common event flag to interrupt the process.
+        target: A target method of the Layer.
+        result: A variable that retains the last retval of f.
+        worker: Reference of the worker thread.
+        owner: Reference of the handler owner (was typ. f.__self__).
+               If None, the thread_event is handled by its own handler.
+        event: A common event flag to interrupt the process.
     
     There are two flags to check the thread status:
     
-     - active   : A flag of being kept going.
-                  Check this to see the worker is running and intended being kept going.
-     - running  : A flag of being running now.
-                  Watch this to verify the worker is alive after it has been inactivated.
+     - active: A flag of being kept going.
+               Check this to see the worker is running and intended being kept going.
+     - running: A flag of being running now.
+                Watch this to verify the worker is alive after it has been inactivated.
     
     The event object can be used to suspend/resume the thread:
     
@@ -144,8 +144,8 @@ class Thread:
         Confirm whether to terminate the thread.
         
         Returns:
-            True  : [OK] if terminating.
-            False : [CANCEL] otherwise.
+            True:  [OK] if terminating.
+            False: [CANCEL] otherwise.
         
         Note:
             Use ``check`` method where you want to pause.
@@ -515,8 +515,8 @@ class Graph(GraphPlot):
     """GraphPlot (override) to better make use for graph manager
     
     Attributes:
-        parent : Parent window (usually mainframe)
-        loader : mainframe
+        parent: Parent window (usually mainframe)
+        loader: mainframe
     """
     def __init__(self, parent, loader=None, **kwargs):
         GraphPlot.__init__(self, parent, **kwargs)
@@ -554,25 +554,13 @@ class Graph(GraphPlot):
         if self.infobar.IsShown():
             self.infobar.ShowMessage(frame.annotation)
     
-    def get_markups_visible(self):
-        return self.marked.get_visible()
-    
-    def set_markups_visible(self, v):
-        self.selected.set_visible(v)
-        self.marked.set_visible(v)
-        self.rected.set_visible(v)
-        self.update_art_of_mark()
-    
-    def remove_markups(self):
-        del self.selector
-        del self.markers
-        del self.region
-    
     def hide_layers(self):
         for plug in self.parent.get_all_plugs():
             for art in plug.Arts:
                 art.set_visible(0)
-        self.remove_markups()
+        del self.selector
+        del self.markers
+        del self.region
         self.draw()
 
 
@@ -580,8 +568,8 @@ class MyFileDropLoader(wx.FileDropTarget):
     """File Drop interface
     
     Args:
-        target : target view to drop in, e.g. frame, graph, pane, etc.
-        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)
@@ -740,13 +728,6 @@ class Frame(mwx.Frame):
             (wx.ID_PASTE, "&Paste\t(C-v)", "Paste buffer from clipboard", Icon('paste'),
                 lambda v: self.__view.read_buffer_from_clipboard()),
             (),
-            (mwx.ID_(21), "Toggle &markers", "Show/Hide markups", wx.ITEM_CHECK, Icon('+'),
-                lambda v: self.__view.set_markups_visible(v.IsChecked()),
-                lambda v: v.Check(self.__view.get_markups_visible())),
-                
-            (mwx.ID_(22), "&Remove markers", "Remove markups", Icon('-'),
-                lambda v: self.__view.remove_markups()),
-            (),
             (mwx.ID_(23), "Hide all &layers", "Hide all layers", Icon('xr'),
                 lambda v: self.__view.hide_layers()),
             (),
@@ -756,14 +737,14 @@ class Frame(mwx.Frame):
                 
             (mwx.ID_(25), "&Invert color\t(C-i)", "Invert colormap", wx.ITEM_CHECK,
                 lambda v: self.__view.invert_cmap(),
-                lambda v: v.Check(self.__view.get_cmap()[-2:] == "_r")),
+                lambda v: v.Check(self.__view.get_cmapstr()[-2:] == "_r")),
         ]
         
         def _cmenu(i, name):
             return (mwx.ID_(30 + i), "&" + name, name, wx.ITEM_CHECK,
-                lambda v: self.__view.set_cmap(name),
-                lambda v: v.Check(self.__view.get_cmap() == name
-                               or self.__view.get_cmap() == name+"_r"),
+                lambda v: self.__view.set_cmapstr(name),
+                lambda v: v.Check(self.__view.get_cmapstr() == name
+                               or self.__view.get_cmapstr() == name+"_r"),
             )
         colours = [c for c in dir(cm) if c[-2:] != "_r"
                     and isinstance(getattr(cm, c), colors.LinearSegmentedColormap)]
@@ -771,8 +752,8 @@ class Frame(mwx.Frame):
         self.menubar["Edit"] += [
             (),
             ## (mwx.ID_(26), "Default Color", "gray", wx.ITEM_CHECK,
-            ##     lambda v: self.__view.set_cmap('gray'),
-            ##     lambda v: v.Check(self.__view.get_cmap()[:4] == "gray")),
+            ##     lambda v: self.__view.set_cmapstr('gray'),
+            ##     lambda v: v.Check(self.__view.get_cmapstr()[:4] == "gray")),
             ##     
             ("Standard colors",
                 [_cmenu(i, c) for i, c in enumerate(colours) if c.islower()]),
@@ -814,8 +795,8 @@ class Frame(mwx.Frame):
         })
         
         ## Add main-menu to context-menu
-        self.graph.menu += self.menubar["Edit"][2:7]
-        self.output.menu += self.menubar["Edit"][2:7]
+        self.graph.menu += self.menubar["Edit"][2:4]
+        self.output.menu += self.menubar["Edit"][2:4]
         
         self._mgr.Bind(aui.EVT_AUI_PANE_CLOSE, self.OnPaneClose)
         
@@ -915,7 +896,7 @@ class Frame(mwx.Frame):
         """Get named pane or notebook pane.
         
         Args:
-            name : str or plug object.
+            name: str or plug object.
         """
         plug = self.get_plug(name)
         if plug:
@@ -1058,13 +1039,14 @@ class Frame(mwx.Frame):
         """Load plugin.
         
         Args:
-            root    : Plugin <Layer> module, or name of the module.
-                      Any wx.Window object can be specified (as dummy-plug).
-                      However, do not use this mode in release versions.
-            force   : force loading even if it is already loaded
-            session : Conditions for initializing the plug and starting session
-            show    : the pane is shown after loaded
-            dock    : dock_direction (1:top, 2:right, 3:bottom, 4:left, 5:center)
+            root: Plugin <Layer> module, or name of the module.
+                  Any wx.Window object can be specified (as dummy-plug).
+                  However, do not use this mode in release versions.
+            force: force loading even if it is already loaded
+            session: Conditions for initializing the plug and starting session
+            
+            show: the pane is shown after loaded
+            dock: dock_direction (1:top, 2:right, 3:bottom, 4:left, 5:center)
             floating_pos: posision of floating window
             floating_size: size of floating window
             
@@ -1080,9 +1062,9 @@ class Frame(mwx.Frame):
                      floating_pos=floating_pos,
                      floating_size=floating_size)
         
-        if inspect.ismodule(root):
+        if inspect.ismodule(root):  # @TODO: Change root module name
             name = root.__file__
-            ## name = root.__name__  @TODO: Change root module name
+            ## name = root.__name__
         elif inspect.isclass(root):
             name = inspect.getsourcefile(root)
         else:
@@ -1092,13 +1074,14 @@ class Frame(mwx.Frame):
             name = name[:-3]
         
         if not force:
-            ## 文字列参照 (root:str) による重複ロードを避ける @TODO: Change root module name
-            ## for mod in self.plugins.values():
-            ##     if root == mod.__file__:
-            ##         print(f"- {name!r} is already loaded as {mod.__name__!r}.")
-            ##         return None
+            ## 文字列参照 (root:str) による重複ロードを避ける
+            module = next((v for v in self.plugins.values() if root == v.__file__), None)
+            if module:
+                ## print(f"- {name!r} is already loaded as {module.__name__!r}.")
+                plug = module.__plug__
+            else:
+                plug = self.get_plug(name)
             ## Check if the named plug is already loaded.
-            plug = self.get_plug(name)
             if plug:
                 self.update_pane(name, **props)
                 self.show_pane(name, show)
@@ -1756,10 +1739,9 @@ class Frame(mwx.Frame):
             
             for name, module in self.plugins.items():
                 plug = self.get_plug(name)
-                if '.' not in name:
-                    name = module.__file__  # Replace the name with full path.
-                    if hasattr(module, '__path__'):  # is the module a package?
-                        name = os.path.dirname(name)
+                name = module.__file__  # Replace the name with full path.
+                if hasattr(module, '__path__'):  # is the module a package?
+                    name = os.path.dirname(name)
                 session = {}
                 try:
                     plug.save_session(session)

mwx/matplot2.py

@@ -71,11 +71,11 @@ class MatplotPanel(wx.Panel):
     """MPL panel for general graph
     
     Attributes:
-        figure      : <matplotlib.figure.Figure>
-        canvas      : <matplotlib.backends.backend_wxagg.FigureCanvasWxAgg>
-        toolbar     : <matplotlib.backends.backend_wx.NavigationToolbar2Wx>
-        cursor      : <matplotlib.widgets.Cursor>
-        selected    : Selected points <matplotlib.lines.Line2D>
+        figure:  <matplotlib.figure.Figure>
+        canvas:  <matplotlib.backends.backend_wxagg.FigureCanvasWxAgg>
+        toolbar: <matplotlib.backends.backend_wx.NavigationToolbar2Wx>
+        cursor:  <matplotlib.widgets.Cursor>
+        selected: Selected points <matplotlib.lines.Line2D>
     """
     handler = property(lambda self: self.__handler)
     

mwx/matplot2g.py

@@ -51,7 +51,8 @@ def _to_buffer(img):
     if not isinstance(img, np.ndarray):
         raise ValueError("targets must be arrays or images.")
     
-    assert img.ndim > 1, "targets must be 2d arrays."
+    if img.ndim < 2:
+        raise ValueError("targets must be 2d arrays.")
     
     if img.ndim > 2:
         return cv2.cvtColor(img, cv2.COLOR_RGB2GRAY)
@@ -70,9 +71,9 @@ def _to_image(src, cutoff=0, threshold=None, binning=1):
             beta = -a * alpha
     
     Args:
-        cutoff      : cutoff score [%] to cut the lo/hi limits
-        threshold   : limit bytes of image (to make matplotlib light)
-        binning     : minimum binning number of src array
+        cutoff: cutoff score [%] to cut the lo/hi limits
+        threshold: limit bytes of image (to make matplotlib light)
+        binning: minimum binning number of src array
     """
     if src.dtype in (np.complex64, np.complex128): # maybe fft pattern
         src = np.log(1 + abs(src))
@@ -118,9 +119,9 @@ class AxesImagePhantom:
     """Phantom of frame facade
     
     Args:
-        buf     : buffer
-        name    : buffer name
-        show    : show immediately when loaded
+        buf:  buffer
+        name: buffer name
+        show: show immediately when loaded
         **kwargs: frame attributes
     
     Note:
@@ -324,13 +325,19 @@ class AxesImagePhantom:
             sx = slice(max(0, nx[0]), nx[1])  # nx slice
             sy = slice(max(0, ny[1]), ny[0])  # ny slice 反転 (降順)
             return self.__buf[sy, sx]
-        return self.__buf
+        return None
     
     @roi.setter
     def roi(self, v):
-        self.roi[:] = v # cannot broadcast input array into different shape
+        if not self.parent.region.size:
+             raise ValueError("region is not selected.")
+        self.roi[:] = v  # cannot broadcast input array into different shape
         self.update_buffer()
     
+    @property
+    def roi_or_buffer(self):
+        return self.roi if self.parent.region.size else self.buffer
+    
     @property
     def buffer(self):
         return self.__buf
@@ -565,7 +572,7 @@ class GraphPlot(MatplotPanel):
             (),
             (mwx.ID_(500), "&Invert Color", "Invert colormap", wx.ITEM_CHECK,
                 lambda v: self.invert_cmap(),
-                lambda v: v.Check(self.get_cmap()[-2:] == "_r")),
+                lambda v: v.Check(self.get_cmapstr()[-2:] == "_r")),
             (),
             (wx.ID_CLOSE, "&Kill buffer\t(C-k)", "Kill buffer", _Icon(wx.ART_DELETE),
                 lambda v: self.kill_buffer(),
@@ -631,13 +638,13 @@ class GraphPlot(MatplotPanel):
         """Load a buffer with a name.
         
         Args:
-            buf     : buffer array.
-            name    : buffer name (default to *temp*).
-            pos     : Insertion position in the frame list.
-            show    : Show immediately when loaded.
+            buf:  buffer array.
+            name: buffer name (default to *temp*).
+            pos:  Insertion position in the frame list.
+            show: Show immediately when loaded.
             **kwargs: frame attributes.
         """
-        assert buf is not None, "Load buffer must be an array or string (not None)"
+        assert buf is not None, "Load buffer must be an array or path:str (not None)"
         
         if isinstance(buf, str):
             buf = Image.open(buf)
@@ -898,12 +905,12 @@ class GraphPlot(MatplotPanel):
             self.handler('frame_deselected', self.frame)
             self.on_picker_lock(evt)
     
-    def get_cmap(self):
+    def get_cmapstr(self):
         if self.frame:
             return self.frame.get_cmap().name
         return ''
     
-    def set_cmap(self, name):
+    def set_cmapstr(self, name):
         if self.frame:
             self.frame.set_cmap(name)
             self.handler('frame_cmapped', self.frame)
@@ -912,7 +919,7 @@ class GraphPlot(MatplotPanel):
     def invert_cmap(self):
         if self.frame:
             name = self.frame.get_cmap().name
-            self.set_cmap(name + "_r" if name[-2:] != "_r" else name[:-2])
+            self.set_cmapstr(name + "_r" if name[-2:] != "_r" else name[:-2])
     
     def trace_point(self, x, y, type=NORMAL):
         """Puts (override) a message of points x and y."""
@@ -985,7 +992,7 @@ class GraphPlot(MatplotPanel):
             return
         
         name = frame.name
-        data = frame.roi
+        data = frame.roi_or_buffer
         GraphPlot.clipboard_name = name
         GraphPlot.clipboard_data = data
         bins, vlim, img = _to_image(data, frame.cuts)

mwx/matplot2lg.py

@@ -217,8 +217,8 @@ class Histogram(LinePlot):
     常に整数ビット画像となるので，高速なビンづめ法で計算する
     
     Attributes:
-        __graphs : list of attached graph <matplot2g.GraphPlot>
-        __frame  : reference to the current frame
+        __graphs: list of attached graph <matplot2g.GraphPlot>
+        __frame: reference to the current frame
     """
     def __init__(self, *args, **kwargs):
         LinePlot.__init__(self, *args, **kwargs)
@@ -387,10 +387,10 @@ class LineProfile(LinePlot):
     """LinePlot panel for line profile (Multi-graph : Single-frame)
     
     Attributes:
-        __graphs    : list of attached graph <matplot2g.GraphPlot>
-        __frame     : reference to the current frame
-        __logicp    : line axis in logical unit
-        __linewidth : line width to integrate [pixel]
+        __graphs: list of attached graph <matplot2g.GraphPlot>
+        __frame: reference to the current frame
+        __logicp: line axis in logical unit
+        __linewidth: line width to integrate [pixel]
     """
     def __init__(self, *args, **kwargs):
         LinePlot.__init__(self, *args, **kwargs)

mwx/nutshell.py

@@ -1821,11 +1821,6 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
 
 class Buffer(EditorInterface, EditWindow):
     """Python code buffer.
-    
-    Attributes:
-        name     : buffer-name (basename)
-        filename : buffer-file-name
-        code     : code object
     """
     @property
     def message(self):
@@ -1833,12 +1828,14 @@ class Buffer(EditorInterface, EditWindow):
     
     @property
     def name(self):
+        """buffer-name (basename)."""
         return os.path.basename(self.__filename or '')
     
     Name = name # page.window.Name for save/loadPerspective
     
     @property
     def filename(self):
+        """buffer-file-name."""
         return self.__filename
     
     def update_filestamp(self, fn):
@@ -1863,10 +1860,10 @@ class Buffer(EditorInterface, EditWindow):
         """Timestamp delta (for checking external mod).
         
         Returns:
-            None : no file
-            = 0  : a file (even if not found)
-            > 0  : a file edited externally
-            < 0  : a url file
+            None: no file
+            = 0:  a file (even if not found)
+            > 0:  a file edited externally
+            < 0:  a url file
         """
         try:
             return self.__path.stat().st_mtime - self.__mtime
@@ -2269,11 +2266,11 @@ class EditorBook(AuiNotebook, CtrlInterface):
     """Python code editor.
     
     Args:
-        name : Window.Name (e.g. 'Scratch')
+        name: Window.Name (e.g. 'Scratch')
     
     Attributes:
-        default_name   : default buffer name (e.g. '*scratch*')
-        default_buffer : default buffer
+        default_name: default buffer name (e.g. '*scratch*')
+        default_buffer: default buffer
     """
     @property
     def message(self):
@@ -2358,7 +2355,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         """Set multiple properties at once to the buffer(s).
         
         Args:
-            buf : a buffer to apply (if None, applies to all buffers).
+            buf: a buffer to apply (if None, applies to all buffers).
             **kwargs: default style.
             
                 ReadOnly        = False
@@ -3460,12 +3457,12 @@ class Nautilus(EditorInterface, Shell):
     
     @property
     def bolc(self):
-        "Beginning of command-line."
+        """Beginning of command-line."""
         return self.promptPosEnd
     
     @property
     def eolc(self):
-        "End of command-line."
+        """End of command-line."""
         return self.TextLength
     
     @property

mwx/plugins/ffmpeg_view.py

@@ -216,7 +216,7 @@ class Plugin(Layer):
             tc.value = round(self.mc.Tell()) / 1000
     
     def set_crop(self):
-        """Set crop area (W:H:Left:Top) to roi."""
+        """Set crop area (W:H:Left:Top) to ROI."""
         if not self._path:
             return
         frame = self.graph.frame
@@ -232,7 +232,7 @@ class Plugin(Layer):
                 self.message("Failed to evaluate crop text.")
     
     def get_crop(self):
-        """Get crop area (W:H:Left:Top) from roi."""
+        """Get crop area (W:H:Left:Top) from ROI."""
         if not self._path:
             return
         crop = ''

mwx/plugins/fft_view.py

@@ -51,7 +51,7 @@ class Plugin(Layer):
         frame = self.graph.frame
         if frame:
             self.message("FFT execution...")
-            src = fftcrop(frame.roi)
+            src = fftcrop(frame.roi_or_buffer)
             h, w = src.shape
             
             dst = fftshift(fft2(src))
@@ -60,8 +60,7 @@ class Plugin(Layer):
             u = 1 / w
             if self.pchk.Value:
                 u /= frame.unit
-            self.output.load(dst, "*fft of {}*".format(frame.name),
-                                  localunit=u)
+            self.output.load(dst, f"*fft of {frame.name}*", localunit=u)
             self.message("\b done")
     
     def newifft(self):
@@ -69,18 +68,17 @@ class Plugin(Layer):
         frame = self.output.frame
         if frame:
             self.message("iFFT execution...")
-            src = frame.roi
+            src = frame.buffer  # Don't crop fft region
             h, w = src.shape
             
             if self.ftor.check:
                 y, x = np.ogrid[-h/2:h/2, -w/2:w/2]
                 mask = np.hypot(y, x) > w / self.ftor.value
-                src = src.copy() # apply mask to the copy
+                src = src.copy()  # apply mask to the copy
                 src[mask] = 0
             
             dst = ifft2(ifftshift(src))
             
             self.message("\b Loading image...")
-            self.graph.load(dst.real, "*ifft of {}*".format(frame.name),
-                                      localunit=1/w/frame.unit)
+            self.graph.load(dst.real, f"*ifft of {frame.name}*", localunit=1/w/frame.unit)
             self.message("\b done")

mwx/py/filling.py

@@ -212,6 +212,7 @@ class FillingTree(wx.TreeCtrl):
     def display(self, rooting=True):
         """Display the current item data.
         Called when an item/branch needs to be updated.
+        
         Args:
             rooting: True if the current item must be updated
                      False otherwise to reduce overheads.

mwx/utilus.py

@@ -980,12 +980,12 @@ def get_fullargspec(f):
     information from the docstring. If it fails, it returns None.
     
     Returns:
-        args            : a list of the parameter names.
-        varargs         : the name of the  * parameter or None.
-        varkwargs       : the name of the ** parameter or None.
-        defaults        : a dict mapping names from args to defaults.
-        kwonlyargs      : a list of keyword-only parameter names.
-        kwonlydefaults  : a dict mapping names from kwonlyargs to defaults.
+        args:           a list of the parameter names.
+        varargs:        the name of the  * parameter or None.
+        varkwargs:      the name of the ** parameter or None.
+        defaults:       a dict mapping names from args to defaults.
+        kwonlyargs:     a list of keyword-only parameter names.
+        kwonlydefaults: a dict mapping names from kwonlyargs to defaults.
     
     Note:
         `self` parameter is not reported for bound methods.

mwx/wxmon.py

@@ -16,8 +16,8 @@ class EventMonitor(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
     """Event monitor
     
     Attributes:
-        parent : shellframe
-        target : widget to monitor
+        parent: shellframe
+        target: widget to monitor
     """
     def __init__(self, parent, **kwargs):
         wx.ListCtrl.__init__(self, parent,

mwx/wxpdb.py

@@ -30,14 +30,15 @@ class Debugger(Pdb):
     """Graphical debugger with extended Pdb
     
     Args:
-        parent  : shellframe
-        stdin   : shell.interp.stdin
-        stdout  : shell.interp.stdout
+        parent: shellframe
+        stdin:  shell.interp.stdin
+        stdout: shell.interp.stdout
     
     Attributes:
-        editor  : Notebook to show the stack frames
+        editor: Notebook to show the stack frames
+    
+    Key bindings::
     
-    Key bindings:
         C-g     : quit
         C-q     : quit
         C-n     : next   (step-over)

mwx/wxwil.py

@@ -20,8 +20,8 @@ class LocalsWatcher(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
     """Locals info watcher
     
     Attributes:
-        parent : shellframe
-        target : locals:dict to watch
+        parent: shellframe
+        target: locals:dict to watch
     """
     def __init__(self, parent, **kwargs):
         wx.ListCtrl.__init__(self, parent,

mwx/wxwit.py

@@ -15,8 +15,8 @@ class Inspector(it.InspectionTree, CtrlInterface):
     """Widget inspection tool
     
     Attributes:
-        parent : shellframe
-        target : widget to inspect
+        parent: shellframe
+        target: widget to inspect
     """
     def __init__(self, parent, *args, **kwargs):
         it.InspectionTree.__init__(self, parent, *args, **kwargs)

{mwxlib-1.5.12.dist-info → mwxlib-1.6.0.dist-info}/METADATA

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

mwxlib-1.6.0.dist-info/RECORD

@@ -0,0 +1,28 @@
+mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
+mwx/bookshelf.py,sha256=yW17nMNPXKHM7LLXLpr9DaRhyFHz_OBAZ_DsuEK2QzA,8387
+mwx/controls.py,sha256=B9f_A0ev3SPf75K-LIZCusMLeDGYz1O3cMml7IOrDrM,49870
+mwx/framework.py,sha256=xVov9uy6gheXOphdorERXQ-Pivj2I3Ir3N0t829gkKM,77463
+mwx/graphman.py,sha256=Cmg0mwIGTAHtdXArFxJXPZC7yPGvSvAZexw7zgp02L8,69099
+mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
+mwx/matplot2.py,sha256=cjdN12RENqWFw1v9QyO05XQc6dK3Pn_ltdC3OfmhGfg,32995
+mwx/matplot2g.py,sha256=0gxjl7UKx8QGRI2thpniA7dQu9fpHGG0mvl7Ml2exrc,65474
+mwx/matplot2lg.py,sha256=jE-LYPEVaEapQN8L-eviRyEx4Lw-8GyLGzZotrIZShU,27413
+mwx/mgplt.py,sha256=SVUJ0ls4gC9xulbWxK2qqmDxf0uBCflvwoPkxoF5s3M,5566
+mwx/nutshell.py,sha256=Sa5PKSiXxT74Mj_vE9fUinxkfm5Xtg1MGGUjwbRH-yY,147552
+mwx/testsuite.py,sha256=0Q_n_XOOsZ8lsLWUkuO8QW00hts9wEQfnUKMpf0BAyU,1235
+mwx/utilus.py,sha256=JOYBTHoo_GmYykX72PgiPzgD2M-1pcOR8gMBLc2bnck,39016
+mwx/wxmon.py,sha256=aS6lSjDm0PxIhfyBPtg-wIP0v-R3g2K5a3k2mclWSrQ,12798
+mwx/wxpdb.py,sha256=ehRawAnqQberUeDN9j_-drWYQzu23w5UeQyto4nj53g,18812
+mwx/wxwil.py,sha256=_74m3jEUu3ktjHKHWEEK34ck439u9A0PhDDxFVTA0_Y,5404
+mwx/wxwit.py,sha256=W7wP9loxw0dAdk5-NWMIHt19Og1h-3vFzz-8BPicHB4,7348
+mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
+mwx/plugins/ffmpeg_view.py,sha256=TZX4hoB4z8vJ2yO_aXHOkc7kHxRASVLchY5TRkqPbrU,10982
+mwx/plugins/fft_view.py,sha256=k_Ow7osBR-nXyiqAPFdEsd7B3Q-87By3INntJMZxahc,2742
+mwx/plugins/frame_listview.py,sha256=yd2NCgspqGfTNhj1wxuW8r1zapIm7vNzVX2iytk8CDM,10618
+mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
+mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
+mwx/py/filling.py,sha256=vWCJoHd_oyXOeXTHtXGY7wfNQeNAZhV3GZu4xlc8GDY,16867
+mwxlib-1.6.0.dist-info/METADATA,sha256=ZLDHrIHbEvcB3Ee4lLQxk6ZnDFkL5aXN3gT5QdkcyBc,7381
+mwxlib-1.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mwxlib-1.6.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.6.0.dist-info/RECORD,,

mwxlib-1.5.12.dist-info/RECORD

@@ -1,28 +0,0 @@
-mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
-mwx/bookshelf.py,sha256=yW17nMNPXKHM7LLXLpr9DaRhyFHz_OBAZ_DsuEK2QzA,8387
-mwx/controls.py,sha256=Mpzpp2eWyS_X7RjxTJay1-Fldchk-x-rUBpUhHSG-5w,49924
-mwx/framework.py,sha256=XFzMG6Jah0hROirGBGjmZHsv12986GV2-bjT4sl0D5w,77574
-mwx/graphman.py,sha256=AjXd8Hyb-lCEkPuCz1C19aEi6dnt3DW8N0b89cVYITU,69905
-mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
-mwx/matplot2.py,sha256=5Z-m9KXtSXpzBQs3swqPbfl_mfVdDoPaWKqpiepfau8,33019
-mwx/matplot2g.py,sha256=hLBYWjXPc2jgtKPTQWCdieIegQvS4jjUUaedV4qDLoE,65255
-mwx/matplot2lg.py,sha256=fpxOX18vonUTpA_nAr-wBhQ_2YNsL_nfxdCDliuP1sU,27430
-mwx/mgplt.py,sha256=SVUJ0ls4gC9xulbWxK2qqmDxf0uBCflvwoPkxoF5s3M,5566
-mwx/nutshell.py,sha256=CX-NK3kOEi3JHhjKh39R2_m1po1SvMxraaDk2xt6q-Y,147617
-mwx/testsuite.py,sha256=0Q_n_XOOsZ8lsLWUkuO8QW00hts9wEQfnUKMpf0BAyU,1235
-mwx/utilus.py,sha256=dsJ_wsEjqm-B75It-lwVCAiCPyPXZerngm_6TCUEmRU,39028
-mwx/wxmon.py,sha256=NIksW_CZv7Kw4dod8tWVwakO4iJuvE8hJSAcjkYfLaE,12800
-mwx/wxpdb.py,sha256=kKzEGivjoZ9zGcB3ttYsAym4putyilmXZXj-5CGaivQ,18813
-mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
-mwx/wxwit.py,sha256=mTH92bWw1F3ycaq4EoxVD_4hIxy2fbKZZbQg3f1ZD1Y,7350
-mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
-mwx/plugins/ffmpeg_view.py,sha256=GT3mAP7cvAgkzHyA0Em_FP8wiWS-dRekUyBgaXIBQCc,10982
-mwx/plugins/fft_view.py,sha256=Hsho8y-42hG3htQAJ9ct1347NHJ8qPvN4snq_1jYOxw,2793
-mwx/plugins/frame_listview.py,sha256=yd2NCgspqGfTNhj1wxuW8r1zapIm7vNzVX2iytk8CDM,10618
-mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
-mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
-mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-1.5.12.dist-info/METADATA,sha256=h77mRadmYbztrngMyjSysNdiM9fGxuQcbIN9zCpRpcY,7382
-mwxlib-1.5.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mwxlib-1.5.12.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.5.12.dist-info/RECORD,,