mwxlib 0.95.0__py3-none-any.whl → 0.95.3__py3-none-any.whl

mwx/__init__.py

@@ -8,12 +8,12 @@ from .framework import Frame, MiniFrame, ShellFrame, deb
 
 ## Controls
 ## from . import controls
-## from .controls import Param, LParam, Knob, ControlPanel, Clipboard, Icon
-## from .controls import Button, ToggleButton, TextCtrl, Choice, Gauge, Indicator
+from .controls import Param, LParam, Knob, ControlPanel, Clipboard, Icon
+from .controls import Button, ToggleButton, TextCtrl, Choice, Gauge, Indicator
 
 ## Plugman
 ## from . import graphman
-## from .graphman import Frame, Layer, Thread, Graph
+## from .graphman import Frame as ViewFrame, Layer, Thread, Graph
 
 ## Matplot
 ## from .matplot2 import MatplotPanel
@@ -23,5 +23,4 @@ from .framework import Frame, MiniFrame, ShellFrame, deb
 ## from .matplot2lg import LineProfile
 
 ## Gnuplot
-## from .mgplt import Gnuplot
-## from .mgplt import GnuplotFrame
+## from .mgplt import Gnuplot, GnuplotFrame

mwx/bookshelf.py

@@ -36,13 +36,13 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
         
         @self.handler.bind('enter pressed')
-        def enter(v):
+        def enter(evt):
             data = self.GetItemData(self.Selection)
             if data:
                 data.SetFocus()
         
         @self.handler.bind('f5 pressed')
-        def refresh(v, clear=False):
+        def refresh(evt, clear=False):
             self.build_tree(clear)
             if self.target:
                 self.target.current_editor.SetFocus()
@@ -51,7 +51,7 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         self.handler.bind('S-f5 pressed', partial(refresh, clear=1))
         
         @self.handler.bind('delete pressed')
-        def delete(v):
+        def delete(evt):
             data = self.GetItemData(self.Selection)
             if data:
                 data.parent.kill_buffer(data) # -> focus moves
@@ -59,10 +59,10 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         
         @self.handler.bind('*button* pressed')
         @self.handler.bind('*button* released')
-        def dispatch(v):
+        def dispatch(evt):
             """Fork mouse events to the parent."""
-            self.parent.handler(self.handler.current_event, v)
-            v.Skip()
+            self.parent.handler(self.handler.current_event, evt)
+            evt.Skip()
     
     def OnDestroy(self, evt):
         if evt.EventObject is self:

mwx/controls.py

@@ -688,21 +688,21 @@ class ControlPanel(scrolled.ScrolledPanel):
         self.Sizer.Add(sizer, expand>1, p | wx.ALL, border)
         
         ## Register object and parameter groups
-        def flatiter(a):
+        def _flatiter(a):
             for c in a:
                 if isinstance(c, tuple):
-                    yield from flatiter(c)
+                    yield from _flatiter(c)
                 elif isinstance(c, wx.Object):
                     yield c
-        self.__groups.append(list(flatiter(objs)))
+        self.__groups.append(list(_flatiter(objs)))
         
-        def variter(a):
+        def _variter(a):
             for c in a:
                 if isinstance(c, Knob):
                     yield c.param
                 elif hasattr(c, 'value'):
                     yield c
-        self.__params.append(list(variter(objs)))
+        self.__params.append(list(_variter(objs)))
         
         ## Set appearance of the layout group
         self.show(-1, visible)
@@ -877,12 +877,44 @@ if 1:
             if isinstance(v, wx.lib.embeddedimage.PyEmbeddedImage)
     }
 
-def Icon(key, size=None):
-    """Returns an iconic bitmap with the specified size (w,h).
+class Icon(wx.Bitmap):
+    """Returns 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.
+    
+    Note:
+        A null (0-shaped) bitmap fails with AssertionError from 4.1.1
     """
+    provided_arts = _provided_arts
+    custom_images = _custom_images
+    
+    def __init__(self, *args, **kwargs):
+        try:
+            bmp = _getBitmap1(*args, **kwargs)
+        except TypeError:
+            bmp = _getBitmap2(*args, **kwargs)
+        wx.Bitmap.__init__(self, bmp)
+
+    @staticmethod
+    def iconify(icon, w, h):
+        ## if wx.VERSION >= (4,1,0):
+        try:
+            import wx.svg
+            import requests
+            url = "https://api.iconify.design/{}.svg".format(icon.replace(':', '/'))
+            res = requests.get(url, timeout=3.0)
+            img = wx.svg.SVGimage.CreateFromBytes(res.content)
+            bmp = img.ConvertToScaledBitmap(wx.Size(w, h))
+        except Exception:
+            print("- Failed to load iconify.design/{}".format(icon))
+            bmp = wx.NullBitmap
+        return bmp
+
+Icon2 = Icon # for backward compatibility
+
+
+def _getBitmap1(key, size=None):
     if key:
         try:
             art = _custom_images.get(key) # None => AttributeError
@@ -907,20 +939,16 @@ def Icon(key, size=None):
             del dc
         bmp.SetMaskColour('black') # return dummy-sized blank bitmap
         return bmp
-    
     return wx.NullBitmap # The standard wx controls accept this,
 
-Icon.provided_arts = _provided_arts
-Icon.custom_images = _custom_images
 
-
-def Icon2(back, fore, size=None, subsize=0.6):
+def _getBitmap2(back, fore, size=None, subsize=3/4):
     if not size:
         size = (16,16)
     if isinstance(subsize, float):
         subsize = wx.Size(size) * subsize
-    back = Icon(back, size)
-    fore = Icon(fore, subsize)
+    back = _getBitmap1(back, size)
+    fore = _getBitmap1(fore, subsize)
     x = size[0] - subsize[0]
     y = size[1] - subsize[1]
     dc = wx.MemoryDC(back)
@@ -929,21 +957,6 @@ def Icon2(back, fore, size=None, subsize=0.6):
     return back
 
 
-def Iconify(icon, w, h):
-    ## if wx.VERSION >= (4,1,0):
-    try:
-        import wx.svg
-        import requests
-        url = "https://api.iconify.design/{}.svg".format(icon.replace(':', '/'))
-        res = requests.get(url, timeout=3.0)
-        img = wx.svg.SVGimage.CreateFromBytes(res.content)
-        bmp = img.ConvertToScaledBitmap(wx.Size(w, h))
-        return bmp
-    except Exception:
-        print("- Failed to load iconify.design/{}".format(icon))
-        pass
-
-
 def _Icon(v):
     if isinstance(v, (str, bytes)):
         return Icon(v)

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.95.0"
+__version__ = "0.95.3"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -225,8 +225,8 @@ class KeyCtrlInterfaceMixin:
         """
         assert isinstance(keymap, str)
         
-        def _Pass(v):
-            self.message("{} {}".format(keymap, v.key))
+        def _Pass(evt):
+            self.message("{} {}".format(keymap, evt.key))
         _Pass.__name__ = str('pass')
         
         state = self.handler.default_state
@@ -758,7 +758,7 @@ class Frame(wx.Frame, KeyCtrlInterfaceMixin):
                     evt.Skip()
         self.Bind(wx.EVT_CHAR_HOOK, hook_char)
         
-        def close(v):
+        def close(evt):
             """Close the window."""
             self.Close()
         
@@ -824,7 +824,7 @@ class MiniFrame(wx.MiniFrame, KeyCtrlInterfaceMixin):
         ## To default close >>> self.Unbind(wx.EVT_CLOSE)
         self.Bind(wx.EVT_CLOSE, lambda v: self.Show(0))
         
-        def close(v):
+        def close(evt):
             """Close the window."""
             self.Close()
         
@@ -1222,16 +1222,16 @@ class ShellFrame(MiniFrame):
             evt.Skip()
         self.Bind(wx.EVT_SIZE, on_size)
         
-        def fork_debugger(v):
+        def fork_debugger(evt):
             """Fork key events to the debugger."""
-            self.debugger.handler(self.handler.current_event, v)
+            self.debugger.handler(self.handler.current_event, evt)
             if self.debugger.handler.current_state:
                 if self.debugger.tracing:
                     self.message("Current status is tracing. Press [C-g] to quit.")
                 elif not self.debugger.busy:
                     self.message("Current status is inconsistent. Press [C-g] to quit.")
                     self.indicator.Value = 7
-            v.Skip()
+            evt.Skip()
         
         self.handler.update({ # DNA<ShellFrame>
             None : {

mwx/graphman.py

@@ -382,24 +382,8 @@ class LayerInterface(CtrlInterface):
         self.Bind(wx.EVT_CONTEXT_MENU,
                   lambda v: mwx.Menu.Popup(self, self.menu))
         
-        def destroy(v):
-            if v.EventObject is self:
-                if self.thread and self.thread.active:
-                    self.thread.active = 0
-                    self.thread.Stop()
-                del self.Arts
-            v.Skip()
-        self.Bind(wx.EVT_WINDOW_DESTROY, destroy)
-        
-        def on_show(v):
-            if not self:
-                return
-            if v.IsShown():
-                self.handler('page_shown', self)
-            elif isinstance(self.Parent, aui.AuiNotebook):
-                self.handler('page_hidden', self)
-            v.Skip()
-        self.Bind(wx.EVT_SHOW, on_show)
+        self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
+        self.Bind(wx.EVT_SHOW, self.OnShow)
         
         try:
             self.Init()
@@ -431,6 +415,23 @@ class LayerInterface(CtrlInterface):
         if self.parameters:
             session['params'] = self.parameters
     
+    def OnDestroy(self, evt):
+        if evt.EventObject is self:
+            if self.thread and self.thread.active:
+                self.thread.active = 0
+                self.thread.Stop()
+            del self.Arts
+        evt.Skip()
+    
+    def OnShow(self, evt):
+        if not self:
+            return
+        if evt.IsShown():
+            self.handler('page_shown', self)
+        elif isinstance(self.Parent, aui.AuiNotebook):
+            self.handler('page_hidden', self)
+        evt.Skip()
+    
     Shown = property(
         lambda self: self.IsShown(),
         lambda self,v: self.Show(v))
@@ -540,8 +541,11 @@ class Graph(GraphPlot):
     
     def set_frame_visible(self, v):
         if self.frame:
-            self.frame.set_visible(v)
-            self.draw()
+            if self.frame.get_visible() != v:
+                self.frame.set_visible(v)
+                return True
+            return False
+        return None
     
     def get_markups_visible(self):
         return self.marked.get_visible()
@@ -728,10 +732,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_(20), "Show &Image", "Show/Hide image", wx.ITEM_CHECK, Icon('image'),
-                lambda v: self.__view.set_frame_visible(v.IsChecked()),
-                lambda v: v.Check(self.__view.get_frame_visible())),
-                
             (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())),
@@ -806,21 +806,31 @@ class Frame(mwx.Frame):
         })
         
         ## Add main-menu to context-menu
-        self.graph.menu += self.menubar["Edit"][2:8]
-        self.output.menu += self.menubar["Edit"][2:8]
+        self.graph.menu += self.menubar["Edit"][2:7]
+        self.output.menu += self.menubar["Edit"][2:7]
         
         self._mgr.Bind(aui.EVT_AUI_PANE_CLOSE, self.OnPaneClose)
         
         self.Bind(wx.EVT_ACTIVATE, self.OnActivate)
         self.Bind(wx.EVT_CLOSE, self.OnClose)
         
+        def on_move(evt, show):
+            self.graph.set_frame_visible(show)
+            self.output.set_frame_visible(show)
+            if show:
+                self.graph.draw()
+                self.output.draw()
+            evt.Skip()
+        self.Bind(wx.EVT_MOVE_START, lambda v :on_move(v, show=0))
+        self.Bind(wx.EVT_MOVE_END, lambda v :on_move(v, show=1))
+        
         ## Custom Key Bindings
         self.define_key('* C-g', self.Quit)
         
         @self.shellframe.define_key('* C-g')
-        def quit(v):
+        def quit(evt):
             """Dispatch quit to the main Frame."""
-            self.handler('C-g pressed', v)
+            self.handler('C-g pressed', evt)
         
         ## Accepts DnD
         self.SetDropTarget(MyFileDropLoader(self.graph, self))
@@ -1305,7 +1315,7 @@ class Frame(mwx.Frame):
                 nb = plug.Parent
                 j = nb.GetPageIndex(plug)
                 nb.RemovePage(j) # just remove page
-                ## nb.DeletePage(j) # cf. destroy plug object too
+                ## nb.DeletePage(j) # Destroys plug object too.
             else:
                 nb = None
                 self._mgr.DetachPane(plug)
@@ -1366,6 +1376,7 @@ class Frame(mwx.Frame):
             plug = _plug
         init(shell)
         self.shellframe.Show()
+        self.shellframe.load(plug)
     
     def OnLoadPlugins(self, evt):
         with wx.FileDialog(self, "Load a plugin file",
@@ -1804,14 +1815,18 @@ class Frame(mwx.Frame):
                 o.write("self.load_plug({!r}, session={})\n".format(path, session or None))
             o.write("self._mgr.LoadPerspective({!r})\n".format(self._mgr.SavePerspective()))
             
-            ## stack-frame
-            paths = [x.pathname for x in self.graph.all_frames if x.pathname]
-            if paths:
-                o.write("self.load_frame(\n{}, self.graph)\n".format(
-                        pformat(paths, width=160)))
-                
-                frame = self.graph.frame # restore currently selected frame
-                if frame and frame.pathname:
-                    o.write("self.graph.select({!r})\n".format(frame.name))
+            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")
+                try:
+                    index = paths.index(view.frame.pathname)
+                    o.write(f"self.{name}.select({index})\n")
+                except Exception:
+                    pass
+            
+            _save(self.graph)
+            _save(self.output)
         
         self.message("\b done.")

mwx/matplot2.py

@@ -143,9 +143,9 @@ class MatplotPanel(wx.Panel):
         ## The context menus is disabled and never skip to the next handler.
         self.canvas.Bind(wx.EVT_CONTEXT_MENU, lambda v: self.handler('context_menu', v))
         
-        def fork(v):
-            if self.handler.fork(self.handler.current_event, v) is None:
-                v.Skip()
+        def fork(evt):
+            if self.handler.fork(self.handler.current_event, evt) is None:
+                evt.Skip()
         
         self.__handler = mwx.FSM({ # DNA<MatplotPanel>
                 None : {
@@ -446,6 +446,7 @@ class MatplotPanel(wx.Panel):
             x, y = [x], [y]
         self.selected.set_visible(1)
         self.selected.set_data(x, y)
+        self.handler('selector_drawn', self.frame)
         self.draw(self.selected)
         self.trace_point(*v)
     
@@ -453,6 +454,7 @@ class MatplotPanel(wx.Panel):
     def Selector(self):
         self.selected.set_visible(0)
         self.selected.set_data([], [])
+        self.handler('selector_removed', self.frame)
         self.draw(self.selected)
     
     ## --------------------------------

mwx/matplot2g.py

@@ -327,7 +327,7 @@ class AxesImagePhantom(object):
         """Convert xydata (x,y) -> [nx,ny] pixel.
         If cast, convert pixel-based lengths to pixel numbers.
         """
-        def pixel_cast(n):
+        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.",
@@ -341,7 +341,7 @@ class AxesImagePhantom(object):
         nx = (x - l) / ux
         ny = (t - y) / uy # Y ピクセルインデクスは座標と逆
         if cast:
-            return (pixel_cast(nx), pixel_cast(ny))
+            return (_cast(nx), _cast(ny))
         return (nx-0.5, ny-0.5)
     
     def xyfrompixel(self, nx, ny=None):
@@ -393,7 +393,7 @@ class GraphPlot(MatplotPanel):
     def __init__(self, *args, **kwargs):
         MatplotPanel.__init__(self, *args, **kwargs)
         
-        def _draw(v):
+        def _draw(evt):
             self.canvas.draw_idle()
         
         self.handler.update({ # DNA<GraphPlot>
@@ -780,7 +780,7 @@ class GraphPlot(MatplotPanel):
     def index(self, j):
         if isinstance(j, str):
             names = [art.name for art in self.__Arts]
-            return names.index(j) # -> ValueError: `j` is not in list
+            return names.index(j)
         return self.__Arts.index(j)
     
     def find_frame(self, j):

mwx/matplot2lg.py

@@ -98,8 +98,7 @@ class LinePlot(MatplotPanel):
         self.__annotations = []
         
         #<matplotlib.text.Annotation>
-        def annotation(v, xy, xytext, xycoords='data',
-                textcoords='offset points', **arrowprops):
+        def _A(v, xy, xytext, xycoords='data', textcoords='offset points', **arrowprops):
             return self.axes.annotate(
                     '' if v is None else '{:g}'.format(v),
                     xy, xytext, xycoords, textcoords, arrowprops, size='small')
@@ -109,14 +108,14 @@ class LinePlot(MatplotPanel):
             x = (b + a) / 2
             y = self.ylim[0] + 20/self.ddpu[1]
             if (b - a) > 60/self.ddpu[0]:
-                p = annotation(b-a, (x,y), (-20,8), arrowstyle='-') # wide space
+                p = _A(b-a, (x,y), (-20,8), arrowstyle='-') # wide space
             else:
-                p = annotation(b-a, (x,y), (16,16), arrowstyle='-', # narrow space
+                p = _A(b-a, (x,y), (16,16), arrowstyle='-', # narrow space
                         connectionstyle="angle,angleA=0,angleB=90,rad=8")
             self.__annotations = [
-                annotation(a, (a,y), (-54,-3), arrowstyle='->'),
-                annotation(b, (b,y), ( 16,-3), arrowstyle='->'),
-                annotation(None, (a,y), (b,y), textcoords='data', arrowstyle='<->'),
+                _A(a, (a,y), (-54,-3), arrowstyle='->'),
+                _A(b, (b,y), ( 16,-3), arrowstyle='->'),
+                _A(None, (a,y), (b,y), textcoords='data', arrowstyle='<->'),
                 p,
             ]
     
@@ -232,11 +231,12 @@ class Histogram(LinePlot):
         }
         self.modeline.Show(0)
         
-        def destroy(v):
-            for graph in self.__graphs:
-                self.detach(graph)
-            v.Skip()
-        self.Bind(wx.EVT_WINDOW_DESTROY, destroy)
+        self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
+    
+    def OnDestroy(self, evt):
+        for graph in self.__graphs:
+            self.detach(graph)
+        evt.Skip()
     
     def clear(self):
         LinePlot.clear(self)
@@ -450,11 +450,12 @@ class LineProfile(LinePlot):
                 lambda v: v.Check(not self.__logicp)),
         ]
         
-        def destroy(v):
-            for graph in self.__graphs:
-                self.detach(graph)
-            v.Skip()
-        self.Bind(wx.EVT_WINDOW_DESTROY, destroy)
+        self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
+    
+    def OnDestroy(self, evt):
+        for graph in self.__graphs:
+            self.detach(graph)
+        evt.Skip()
     
     def clear(self):
         LinePlot.clear(self)

mwx/nutshell.py

@@ -79,9 +79,9 @@ class EditorInterface(CtrlInterface):
     def __init__(self):
         CtrlInterface.__init__(self)
         
-        def dispatch(v):
+        def dispatch(evt):
             """Fork events to the parent."""
-            self.parent.handler(self.handler.current_event, v)
+            self.parent.handler(self.handler.current_event, evt)
         
         self.make_keymap('C-x')
         self.make_keymap('C-c')
@@ -1082,9 +1082,6 @@ class EditorInterface(CtrlInterface):
         """Goto char position with selection."""
         if pos is None or pos < 0:
             return
-        ## if pos < 0:
-        ##     pos += self.TextLength + 1 # Counts end-of-buffer (+1:\0)
-        ##     return
         org = self.cpos
         if org == pos:
             return
@@ -1095,7 +1092,7 @@ class EditorInterface(CtrlInterface):
             
             if interactive:
                 ## Update the caret position/status manually.
-                ## To update caret status, shake L/R w/o modifier #TODO: better idea?
+                ## To update caret status, shake L/R w/o modifier
                 ## Don't do this if selection is active.
                 vk = wx.UIActionSimulator()
                 modkeys = [k for k in (wx.WXK_CONTROL, wx.WXK_ALT, wx.WXK_SHIFT)
@@ -1296,7 +1293,7 @@ class EditorInterface(CtrlInterface):
     @can_edit
     def kill_line(self):
         p = self.eol
-        if p == self.cpos:
+        if p == self.cpos: # caret at end of line
             if self.get_char(p) == '\r': p += 1
             if self.get_char(p) == '\n': p += 1
         self.Replace(self.cpos, p, '')
@@ -1304,11 +1301,7 @@ class EditorInterface(CtrlInterface):
     @can_edit
     def backward_kill_line(self):
         p = self.bol
-        text, lp = self.CurLine
-        if text[:lp] == sys.ps2: # caret at the prompt head
-            p -= len(sys.ps2)
-            lp -= len(sys.ps2)
-        if text[:lp] == '' and p: # caret at the beginning of the line
+        if p == self.cpos > 0: # caret at beginning of line
             if self.get_char(p-1) == '\n': p -= 1
             if self.get_char(p-1) == '\r': p -= 1
         self.Replace(p, self.cpos, '')
@@ -1476,19 +1469,19 @@ class Buffer(EditWindow, EditorInterface):
         self.Bind(stc.EVT_STC_SAVEPOINTLEFT, self.OnSavePointLeft)
         self.Bind(stc.EVT_STC_SAVEPOINTREACHED, self.OnSavePointReached)
         
-        def activate(v):
+        def activate(evt):
             self.handler('buffer_activated', self)
-            v.Skip()
+            evt.Skip()
         self.Bind(wx.EVT_SET_FOCUS, activate)
         
-        def inactivate(v):
+        def inactivate(evt):
             self.handler('buffer_inactivated', self)
-            v.Skip()
+            evt.Skip()
         self.Bind(wx.EVT_KILL_FOCUS, inactivate)
         
-        def dispatch(v):
+        def dispatch(evt):
             """Fork events to the parent."""
-            self.parent.handler(self.handler.current_event, v)
+            self.parent.handler(self.handler.current_event, evt)
         
         ## Note: Key events are not propagated from Buffer to EditorBook.
         ## They are explicitly dispatched from buffer.handler to editor.handler.
@@ -1751,16 +1744,11 @@ class EditorBook(AuiNotebook, CtrlInterface):
         self.Bind(aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.OnPageClose)
         self.Bind(aui.EVT_AUINOTEBOOK_PAGE_CLOSED, self.OnPageClosed)
         
-        def destroy(v):
-            obj = v.EventObject
-            if isinstance(obj, Buffer):
-                self.handler('buffer_deleted', obj)
-            v.Skip()
-        self.Bind(wx.EVT_WINDOW_DESTROY, destroy)
+        self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
         
-        def dispatch(v):
+        def dispatch(evt):
             """Fork events to the parent."""
-            self.parent.handler(self.handler.current_event, v)
+            self.parent.handler(self.handler.current_event, evt)
         
         self.make_keymap('C-x')
         self.make_keymap('C-c')
@@ -1784,6 +1772,12 @@ class EditorBook(AuiNotebook, CtrlInterface):
             },
         })
     
+    def OnDestroy(self, evt):
+        obj = evt.EventObject
+        if isinstance(obj, Buffer):
+            self.handler('buffer_deleted', obj)
+        evt.Skip()
+    
     def OnPageClose(self, evt): #<wx._aui.AuiNotebookEvent>
         nb = evt.EventObject
         buf = nb.all_buffers[evt.Selection]
@@ -2362,38 +2356,23 @@ class Nautilus(Shell, EditorInterface):
         
         self.Bind(stc.EVT_STC_UPDATEUI, self.OnUpdate) # skip to brace matching
         self.Bind(stc.EVT_STC_CALLTIP_CLICK, self.OnCallTipClick)
+        self.Bind(stc.EVT_STC_START_DRAG, self.OnDrag)
+        self.Bind(stc.EVT_STC_DRAG_OVER, self.OnDragging)
+        self.Bind(stc.EVT_STC_DO_DROP, self.OnDragging)
         
-        def on_drag(v): #<wx._core.StyledTextEvent>
-            EditorInterface.dnd_flag = (v.Position < self.bolc) # copy
-            v.Skip()
-        self.Bind(stc.EVT_STC_START_DRAG, on_drag)
-        
-        def on_dragging(v): #<wx._core.StyledTextEvent>
-            if v.Position < self.bolc:
-                v.DragResult = wx.DragNone # Don't drop (as readonly)
-            elif EditorInterface.dnd_flag:
-                v.DragResult = wx.DragCopy # Don't move
-            v.Skip()
-        self.Bind(stc.EVT_STC_DRAG_OVER, on_dragging)
-        self.Bind(stc.EVT_STC_DO_DROP, on_dragging)
-        
-        def destroy(v):
-            if v.EventObject is self:
-                self.handler('shell_deleted', self)
-            v.Skip()
-        self.Bind(wx.EVT_WINDOW_DESTROY, destroy)
-        
-        def activate(v):
+        self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
+        
+        def activate(evt):
             self.handler('shell_activated', self)
-            v.Skip()
+            evt.Skip()
         self.Bind(wx.EVT_SET_FOCUS, activate)
         
-        def inactivate(v):
+        def inactivate(evt):
             self.handler('shell_inactivated', self)
-            v.Skip()
+            evt.Skip()
         self.Bind(wx.EVT_KILL_FOCUS, inactivate)
         
-        def clear(v):
+        def clear(evt):
             ## """Clear selection and message, no skip."""
             ## *do not* clear autocomp, so that the event can skip to AutoComp properly.
             ## if self.AutoCompActive():
@@ -2402,7 +2381,7 @@ class Nautilus(Shell, EditorInterface):
                 self.ReplaceSelection("")
             self.message("")
         
-        def clear_autocomp(v):
+        def clear_autocomp(evt):
             ## """Clear Autocomp, selection, and message."""
             if self.AutoCompActive():
                 self.AutoCompCancel()
@@ -2410,20 +2389,20 @@ class Nautilus(Shell, EditorInterface):
                 self.ReplaceSelection("")
             self.message("")
         
-        def skip_autocomp(v):
+        def skip_autocomp(evt):
             ## """Don't eat backward prompt whitespace."""
             ## Prevent autocomp from eating prompts.
             ## Quit to avoid backspace over the last non-continuation prompt.
             if self.cpos == self.bolc:
-                self.handler('quit', v)
-            v.Skip()
+                self.handler('quit', evt)
+            evt.Skip()
         
-        def fork(v):
-            self.handler.fork(self.handler.current_event, v)
+        def fork(evt):
+            self.handler.fork(self.handler.current_event, evt)
         
-        def dispatch(v):
+        def dispatch(evt):
             """Fork events to the parent."""
-            self.parent.handler(self.handler.current_event, v)
+            self.parent.handler(self.handler.current_event, evt)
         
         self.handler.update({ # DNA<Nautilus>
             None : {
@@ -2454,6 +2433,8 @@ class Nautilus(Shell, EditorInterface):
                'escape pressed' : (-1, self.on_enter_escmap),
                 'space pressed' : (0, self.OnSpace),
            '*backspace pressed' : (0, self.OnBackspace),
+          'C-backspace pressed' : (0, _F(self.backward_kill_word)),
+          'S-backspace pressed' : (0, _F(self.backward_kill_line)),
                 'enter pressed' : (0, self.OnEnter),
               'C-enter pressed' : (0, _F(self.insertLineBreak)),
             'C-S-enter pressed' : (0, _F(self.insertLineBreak)),
@@ -2646,6 +2627,11 @@ class Nautilus(Shell, EditorInterface):
         _text, lp = self.CurLine
         self.message("{:>6d}:{} ({})".format(self.cline, lp, self.cpos), pane=-1)
     
+    def OnDestroy(self, evt):
+        if evt.EventObject is self:
+            self.handler('shell_deleted', self)
+        evt.Skip()
+    
     def OnUpdate(self, evt): #<wx._stc.StyledTextEvent>
         if evt.Updated & (stc.STC_UPDATE_SELECTION | stc.STC_UPDATE_CONTENT):
             self.trace_position()
@@ -2667,6 +2653,17 @@ class Nautilus(Shell, EditorInterface):
             self.CallTipCancel()
         evt.Skip()
     
+    def OnDrag(self, evt): #<wx._core.StyledTextEvent>
+        EditorInterface.dnd_flag = (evt.Position < self.bolc) # copy
+        evt.Skip()
+    
+    def OnDragging(self, evt): #<wx._core.StyledTextEvent>
+        if evt.Position < self.bolc:
+            evt.DragResult = wx.DragNone # Don't drop (as readonly)
+        elif EditorInterface.dnd_flag:
+            evt.DragResult = wx.DragCopy # Don't move
+        evt.Skip()
+    
     def OnSpace(self, evt):
         """Called when space pressed."""
         if not self.CanEdit():
@@ -2690,6 +2687,30 @@ class Nautilus(Shell, EditorInterface):
             return
         evt.Skip()
     
+    @can_edit
+    def backward_kill_line(self):
+        p = max(self.bol, self.bolc) # for debugger mode: bol <= bolc
+        text, lp = self.CurLine
+        if text[:lp] == sys.ps2:
+            self.Replace(p - lp, p, '') # eats ps2:prompt
+            return
+        if p == self.cpos > 0: # caret at beginning of line
+            if self.get_char(p-1) == '\n': p -= 1
+            if self.get_char(p-1) == '\r': p -= 1
+        self.Replace(p, self.cpos, '')
+    
+    @can_edit
+    def backward_kill_word(self):
+        p = self.cpos
+        text, lp = self.CurLine
+        if text[:lp] == sys.ps2:
+            self.goto_char(p - lp) # skips ps2:prompt
+        self.WordLeft()
+        q = max(self.bol, self.bolc) # for debugger mode: bol <= bolc
+        if self.cpos < q:
+            self.goto_char(q) # Don't skip back prompt
+        self.Replace(self.cpos, p, '')
+    
     def OnEnter(self, evt):
         """Called when enter pressed."""
         if not self.CanEdit():

mwx/plugins/frame_listview.py

@@ -7,7 +7,7 @@ from wx import aui
 from wx.lib.mixins.listctrl import ListCtrlAutoWidthMixin
 
 from mwx.framework import CtrlInterface, Menu, StatusBar
-from mwx.controls import Icon, Icon2, Clipboard
+from mwx.controls import Icon, Clipboard
 from mwx.graphman import Layer
 
 
@@ -97,7 +97,7 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         }
         self.Target.handler.append(self.context)
         
-        def copy(all=True):
+        def copy_info(all=True):
             frames = self.Target.all_frames
             if frames:
                 frame = frames[self.focused_item]
@@ -112,11 +112,11 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
                 self.OnEditAnnotation),
             (),
             (102, "Copy info", Icon('copy'),
-                lambda v: copy(0),
+                lambda v: copy_info(0),
                 lambda v: v.Enable(len(list(self.selected_items)))),
                 
-            (103, "Copy ALL data", Icon2('copy', '+'),
-                lambda v: copy(),
+            (103, "Copy ALL data", Icon('copy', '+'),
+                lambda v: copy_info(1),
                 lambda v: v.Enable(len(list(self.selected_items)))),
         ]
         self.Bind(wx.EVT_CONTEXT_MENU,
@@ -266,10 +266,9 @@ class Plugin(Layer):
             expand=2, border=0, vspacing=0,
         )
         
-        def on_focus_set(v):
+        def on_focus_set(evt):
             self.parent.select_view(self.nb.CurrentPage.Target)
-            v.Skip()
-        
+            evt.Skip()
         self.nb.Bind(wx.EVT_CHILD_FOCUS, on_focus_set)
     
     def attach(self, target, caption):

mwx/plugins/line_profile.py

@@ -18,10 +18,10 @@ class Plugin(Layer):
         self.layout((self.plot,), expand=2, border=0)
         
         @self.handler.bind('page_shown')
-        def activate(v):
+        def activate(evt):
             self.plot.attach(*self.parent.graphic_windows)
             self.plot.linplot(self.parent.selected_view.frame)
         
         @self.handler.bind('page_closed')
-        def deactivate(v):
+        def deactivate(evt):
             self.plot.detach(*self.parent.graphic_windows)

mwx/utilus.py

@@ -483,13 +483,13 @@ class SSM(dict):
         return "<{} object at 0x{:X}>".format(self.__class__.__name__, id(self))
     
     def __str__(self):
-        def lstr(v):
+        def _lstr(v):
             def _name(a):
                 if callable(a):
                     return typename(a, docp=1, qualp=0)
                 return repr(a)
             return ', '.join(_name(a) for a in v)
-        return '\n'.join("{:>32} : {}".format(str(k), lstr(v)) for k, v in self.items())
+        return '\n'.join("{:>32} : {}".format(str(k), _lstr(v)) for k, v in self.items())
     
     def bind(self, event, action=None):
         """Append a transaction to the context."""

mwx/wxmon.py

@@ -58,13 +58,13 @@ class EventMonitor(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         
         @self.handler.bind('*button* pressed')
         @self.handler.bind('*button* released')
-        def dispatch(v):
+        def dispatch(evt):
             """Fork events to the parent."""
-            self.parent.handler(self.handler.current_event, v)
-            v.Skip()
+            self.parent.handler(self.handler.current_event, evt)
+            evt.Skip()
         
         @self.handler.bind('C-c pressed')
-        def copy(v):
+        def copy(evt):
             self.copy()
     
     def OnDestroy(self, evt):
@@ -219,10 +219,10 @@ class EventMonitor(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
     def blink(self, i):
         if self.GetItemBackgroundColour(i) != wx.Colour('yellow'):
             self.SetItemBackgroundColour(i, "yellow")
-            def reset_color():
+            def _reset_color():
                 if self and i < self.ItemCount:
                     self.SetItemBackgroundColour(i, 'white')
-            wx.CallAfter(wx.CallLater, 1000, reset_color)
+            wx.CallAfter(wx.CallLater, 1000, _reset_color)
     
     def copy(self):
         if not self.SelectedItemCount:

mwx/wxpdb.py

@@ -107,9 +107,9 @@ class Debugger(Pdb):
             self.parent.handler('add_help', pdb.__doc__)
         pdb.help = _help
         
-        def dispatch(v):
+        def dispatch(evt):
             """Fork events to the parent."""
-            self.parent.handler(self.handler.current_event, v)
+            self.parent.handler(self.handler.current_event, evt)
         
         self.__handler = FSM({ # DNA<Debugger>
             0 : {

mwx/wxwil.py

@@ -49,13 +49,13 @@ class LocalsWatcher(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         
         @self.handler.bind('*button* pressed')
         @self.handler.bind('*button* released')
-        def dispatch(v):
+        def dispatch(evt):
             """Fork events to the parent."""
-            self.parent.handler(self.handler.current_event, v)
-            v.Skip()
+            self.parent.handler(self.handler.current_event, evt)
+            evt.Skip()
         
         @self.handler.bind('C-c pressed')
-        def copy(v):
+        def copy(evt):
             self.copy()
         
         dispatcher.connect(receiver=self._update, signal='Interpreter.push')
@@ -132,10 +132,10 @@ class LocalsWatcher(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
     def blink(self, i):
         if self.GetItemBackgroundColour(i) != wx.Colour('yellow'):
             self.SetItemBackgroundColour(i, "yellow")
-            def reset_color():
+            def _reset_color():
                 if self and i < self.ItemCount:
                     self.SetItemBackgroundColour(i, 'white')
-            wx.CallAfter(wx.CallLater, 1000, reset_color)
+            wx.CallAfter(wx.CallLater, 1000, _reset_color)
     
     def copy(self):
         if not self.SelectedItemCount:

mwx/wxwit.py

@@ -43,18 +43,18 @@ class Inspector(it.InspectionTree, CtrlInterface):
         
         @self.handler.bind('*button* pressed')
         @self.handler.bind('*button* released')
-        def dispatch(v):
+        def dispatch(evt):
             """Fork events to the parent."""
-            self.parent.handler(self.handler.current_event, v)
-            v.Skip()
+            self.parent.handler(self.handler.current_event, evt)
+            evt.Skip()
         
         @self.handler.bind('f4 pressed')
-        def highlight(v):
+        def highlight(evt):
             if self.target:
                 self.highlighter.HighlightCurrentItem(self)
         
         @self.handler.bind('f5 pressed')
-        def refresh(v):
+        def refresh(evt):
             self.BuildTree(self.target)
     
     def OnDestroy(self, evt):

{mwxlib-0.95.0.dist-info → mwxlib-0.95.3.dist-info}/METADATA

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

mwxlib-0.95.3.dist-info/RECORD

@@ -0,0 +1,28 @@
+mwx/__init__.py,sha256=SNSLQc0IGuE6LDT5mzaAxXRgcH_k6cRVS3gXzFQqdZM,814
+mwx/bookshelf.py,sha256=DAhMQk3_J4rdE50adBMFu5wNz3WdMh_zzJ37O9ncceo,5103
+mwx/controls.py,sha256=JBMUbDgHFf4Dx0PofCdnoQExBnGjxiAeSGkdS_0Qgo4,47673
+mwx/framework.py,sha256=t-d8fgYP_fJ9vTxJ9ZZ7POWK7RNds_-q-iGhEI6IVHU,75531
+mwx/graphman.py,sha256=PacQF1Of6oaqw26uFoXaAK9IrwggGRwoJe9uCP5JZ28,70373
+mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
+mwx/matplot2.py,sha256=nA7RLW1tf5kQfrenFnrAF900DbrpOUldc3SGaJgJKi0,32794
+mwx/matplot2g.py,sha256=faKpuBdp4H_g-HKfRdxV17AwHtXcfRi2F0myE3cjM04,65393
+mwx/matplot2lg.py,sha256=gI_L_GofQrg5TIgZFMgYu8-7IRoe6VCRG3Ub35ChSpQ,27177
+mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
+mwx/nutshell.py,sha256=mGWw2biIKyunTMyrRbLHNdmFLpxVCIP5UTsaeS2m4gw,136594
+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=7jR7WPu0-ZxTA6F_SQc7ZjlR9mNO21GFfriTZqV6Ly0,7344
+mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
+mwx/plugins/ffmpeg_view.py,sha256=vUYNybIJsF1JGkDzjBgDyBQvDh8e1oKHlEMY5Fwc8L4,9399
+mwx/plugins/fft_view.py,sha256=evj2kCe6N10JQczW8IajgLVrUWOihQaHQ2xiBzAsAl4,2675
+mwx/plugins/frame_listview.py,sha256=fY27r_8ttf2hi-T0CPgY_LGbH9xKkQmSIqgaALMyVCM,10112
+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.95.3.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.95.3.dist-info/METADATA,sha256=zRgIwaO-S04HK4GufhqvHET5KYJTKeyIfct8i36pHXw,1925
+mwxlib-0.95.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mwxlib-0.95.3.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.95.3.dist-info/RECORD,,

mwxlib-0.95.0.dist-info/RECORD

@@ -1,28 +0,0 @@
-mwx/__init__.py,sha256=2D6y5mnxxp5qNbBb0-Mng40JeUKCGbqohfcuHdihZx4,829
-mwx/bookshelf.py,sha256=U_UQUJkOqugAXYm2HpgqTIWPBREKLzJzRvJWCEWnT3c,5091
-mwx/controls.py,sha256=prp1NhZqv1XANhi2PPxW9jtrgwj_02XMOOyyzZ48klM,47185
-mwx/framework.py,sha256=9WFR5E68rqxFzRcyZ1SSzPGNw5LCexu6TuUeJ9DSKTE,75517
-mwx/graphman.py,sha256=9MG0BzQh5lDDadyPPXps2M0hf6mPN3G0MQbBGdplY_I,70027
-mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
-mwx/matplot2.py,sha256=qaF_gvLoLn-TimLbRR59KUavNr1ZpZQdSMqjzJk47rk,32682
-mwx/matplot2g.py,sha256=mDaD367wjq6xsyIDX9ot8jLwYYGayoavWMhqsQVBHac,65442
-mwx/matplot2lg.py,sha256=tg8u7w4DxiJdPN-E197NOmbQpc_1gZkgDHYv_xUhbFA,27224
-mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=4yFPmBfjUGyx9GGXEvKadWsPkIHwOloNp44UCGu7f9U,135788
-mwx/utilus.py,sha256=FTJhVFmx6TAE5rvZ_nfxZgyyaW4zMpXEz74v72X6m7Y,37399
-mwx/wxmon.py,sha256=Qk86VbuuW2rR46pqEYLur13G_aloWz5SVv6sib30YY0,12717
-mwx/wxpdb.py,sha256=2z3ZD9Oo1H-ONBHlaprkB9hrTmAI7o03sqO46ppEFE4,19129
-mwx/wxwil.py,sha256=JK1du4i1RVMbDLqN8jLRDSu_JhKEp4mhHVMElzo4yoE,5578
-mwx/wxwit.py,sha256=MQxXR6VqqT25K6dTQ1U_42SMq1yJT6y54xrMq-OMOaQ,7334
-mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
-mwx/plugins/ffmpeg_view.py,sha256=vUYNybIJsF1JGkDzjBgDyBQvDh8e1oKHlEMY5Fwc8L4,9399
-mwx/plugins/fft_view.py,sha256=evj2kCe6N10JQczW8IajgLVrUWOihQaHQ2xiBzAsAl4,2675
-mwx/plugins/frame_listview.py,sha256=T-2xSv_D2bk9fJ64aiSEe1rJRTeqaIpLVAYEUXW5vz8,10110
-mwx/plugins/line_profile.py,sha256=WJB5z7F53yg4dII2R36IFZvtkSOGWT669b1HmAAXSnQ,816
-mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
-mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwxlib-0.95.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.95.0.dist-info/METADATA,sha256=ybRT30kEPrD9gLt1a8MReKmNeSGbYiqLPfe3N79UABM,1925
-mwxlib-0.95.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.95.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.95.0.dist-info/RECORD,,