mwxlib 0.96.8__py3-none-any.whl → 0.97.1__py3-none-any.whl

mwx/bookshelf.py

@@ -1,8 +1,8 @@
 #! python3
-from functools import partial
 import re
 import wx
 
+from .utilus import funcall as _F
 from .framework import CtrlInterface, postcall
 
 
@@ -20,7 +20,7 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         self.parent = parent
         self.target = None
         
-        self.context = { # DNA<EditorTreeCtrl>
+        self.context = { # DNA<EditorBook>
             None : {
                    'buffer_new' : [ None, self.on_buffer_new ],
                  'buffer_saved' : [ None, ],
@@ -36,34 +36,38 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnSelChanged)
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
         
-        @self.handler.bind('enter pressed')
-        def enter(evt):
+        def enter():
             data = self.GetItemData(self.Selection)
             if data:
                 data.SetFocus()
         
-        @self.handler.bind('f5 pressed')
-        def refresh(evt, clear=False):
+        def refresh(clear=False):
             self.build_tree(clear)
-            if self.target:
-                self.target.current_editor.SetFocus()
-                wx.CallAfter(self.SetFocus)
-        
-        self.handler.bind('S-f5 pressed', partial(refresh, clear=1))
+            wx.CallAfter(self.SetFocus)
         
-        @self.handler.bind('delete pressed')
-        def delete(evt):
+        def delete():
             data = self.GetItemData(self.Selection)
             if data:
                 data.parent.kill_buffer(data) # -> focus moves
                 wx.CallAfter(self.SetFocus)
         
-        @self.handler.bind('*button* pressed')
-        @self.handler.bind('*button* released')
         def dispatch(evt):
-            """Fork mouse events to the parent."""
+            """Fork events to the parent."""
             self.parent.handler(self.handler.current_event, evt)
             evt.Skip()
+        
+        self.handler.update({ # DNA<EditorTreeCtrl>
+            None : {
+             '*button* pressed' : [ None, dispatch ],
+            '*button* released' : [ None, dispatch ],
+            },
+            0 : {
+                'enter pressed' : (0, _F(enter)),
+               'delete pressed' : (0, _F(delete)),
+                   'f5 pressed' : (0, _F(refresh, clear=0)),
+                 'S-f5 pressed' : (0, _F(refresh, clear=1)),
+            },
+        })
     
     def OnDestroy(self, evt):
         if evt.EventObject is self:
@@ -128,19 +132,18 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
     ## Actions for bookshelf interfaces
     ## --------------------------------
     
-    ## @postcall
     def on_buffer_new(self, buf):
         self.build_tree(clear=0)
     
-    ## @postcall
     def on_buffer_deleted(self, buf):
         self.Delete(buf.__itemId)
     
+    ## Note: [buffer_activated][EVT_SET_FOCUS] > [buffer_new] の順で呼ばれる
+    ##       buf.__itemId がない場合がある (delete_buffer 直後など)
     @postcall
     def on_buffer_selected(self, buf):
         self.SelectItem(buf.__itemId)
     
-    @postcall
     def on_buffer_filename(self, buf):
         self.SetItemText(buf.__itemId, buf.caption_prefix + buf.name)
     

mwx/controls.py

@@ -1225,7 +1225,7 @@ class Indicator(wx.Control):
         self.__value = int(v)
         self.Refresh()
     
-    def update_design(self, **kwargs):
+    def redesign(self, **kwargs):
         """Update multiple design properties at once.
         
         This method is useful for changing colors, spacing, radius, etc.

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.96.8"
+__version__ = "0.97.1"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -19,7 +19,7 @@ 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 get_rootpath, ignore, warn
 from .utilus import FSM, TreeList, apropos, typename, where, mro, pp
 
 
@@ -54,16 +54,15 @@ def deb(target=None, loop=True, locals=None, **kwargs):
     kwargs.setdefault("ensureClose", True)
     
     app = wx.GetApp() or wx.App()
-    try:
-        frame = ShellFrame(None, target, **kwargs)
-        frame.Show()
-        frame.rootshell.SetFocus()
-        if locals:
-            frame.rootshell.locals.update(locals)
+    frame = ShellFrame(None, target, **kwargs)
+    frame.Show()
+    frame.rootshell.SetFocus()
+    if locals:
+        frame.rootshell.locals.update(locals)
+    if not loop:
         return frame
-    finally:
-        if loop and not app.GetMainLoop():
-            app.MainLoop()
+    if not app.GetMainLoop():
+        return app.MainLoop()
 
 
 def postcall(f):
@@ -159,7 +158,7 @@ _speckeys = {
 
 _speckeys_wxkmap = dict((v, k) for k, v in _speckeys.items())
 
-def keyspec(key):
+def getKeyState(key):
     """Returns state of speckey (cf. wx.GetKeyState)."""
     try:
         return wx.GetKeyState(_speckeys_wxkmap[key])
@@ -193,10 +192,9 @@ def hotkey(evt):
 
 
 def regulate_key(key):
-    return (key.replace("ctrl+",  "C-") # modifier keys abbreviation
-               .replace("alt+",   "M-")
-               .replace("shift+", "S-")
-               .replace("win+", "win-")
+    return (key.replace("ctrl-",  "C-") # modifier keys abbreviation
+               .replace("alt-",   "M-")
+               .replace("shift-", "S-")
                .replace("M-C-", "C-M-") # modifier key regulation C-M-S-
                .replace("S-M-", "M-S-")
                .replace("S-C-", "C-S-"))
@@ -310,6 +308,11 @@ class KeyCtrlInterfaceMixin:
         else:
             self.handler.update({map: {key: [state, f]}})
         return action
+    
+    @ignore(UserWarning)
+    def undefine_key(self, keymap):
+        """Delete [map key (pressed)] context."""
+        self.define_key(keymap, None)
 
 
 class CtrlInterface(KeyCtrlInterfaceMixin):
@@ -343,8 +346,8 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
         self.Bind(wx.EVT_KILL_FOCUS, inactivate)
         
         self.Bind(wx.EVT_CHAR_HOOK, self.on_hotkey_press)
-        self.Bind(wx.EVT_KEY_DOWN, self.on_hotkey_dndrag)
-        self.Bind(wx.EVT_KEY_UP, self.on_hotkey_release)
+        self.Bind(wx.EVT_KEY_DOWN, self.on_hotkey_down)
+        self.Bind(wx.EVT_KEY_UP, self.on_hotkey_up)
         
         self.Bind(wx.EVT_MOUSEWHEEL, self.on_mousewheel)
         
@@ -376,20 +379,20 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
             evt.Skip()
             return
         key = hotkey(evt)
-        self.__key = regulate_key(key + '+')
+        self.__key = regulate_key(key + '-')
         if self.handler('{} pressed'.format(key), evt) is None:
             evt.Skip()
     
-    def on_hotkey_dndrag(self, evt): #<wx._core.KeyEvent>
+    def on_hotkey_down(self, evt): #<wx._core.KeyEvent>
         """Called when a key is pressed while dragging.
         Specifically called when the mouse is being captured.
         """
         if self.__isDragging:
             self.on_hotkey_press(evt)
         else:
-            evt.Skip() # for TextCtrl
+            evt.Skip()
     
-    def on_hotkey_release(self, evt): #<wx._core.KeyEvent>
+    def on_hotkey_up(self, evt): #<wx._core.KeyEvent>
         """Called when a key is released."""
         key = hotkey(evt)
         self.__key = ''
@@ -408,7 +411,7 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
         if self.handler('{} pressed'.format(evt.key), evt) is None:
             evt.Skip()
     
-    def on_motion(self, evt):
+    def on_motion(self, evt): #<wx._core.MouseEvent>
         """Called on mouse motion events.
         Trigger event: 'key+[LMR]drag begin/motion/end'
         """

mwx/graphman.py

@@ -214,13 +214,10 @@ class Thread(object):
         Use ``check`` method where you want to quit.
         """
         def _stop():
-            try:
-                busy = wx.BusyInfo("One moment please, "
-                                   "waiting for threads to die...")
+            with wx.BusyInfo("One moment please, "
+                             "waiting for threads to die..."):
                 self.handler('thread_quit', self)
                 self.worker.join(1)
-            finally:
-                del busy
         if self.running:
             self.active = 0
             wx.CallAfter(_stop) # main-thread で終了させる
@@ -685,7 +682,7 @@ class Frame(mwx.Frame):
                 lambda v: self.save_frame(),
                 lambda v: v.Enable(self.__view.frame is not None)),
                 
-            (wx.ID_SAVEAS, "&Save as TIFFs", "Save buffers as a statck-tiff", Icon('saveall'),
+            (wx.ID_SAVEAS, "&Save as TIFFs", "Save buffers as a multi-page tiff", Icon('saveall'),
                 lambda v: self.save_buffers_as_tiffs(),
                 lambda v: v.Enable(self.__view.frame is not None)),
             (),
@@ -831,6 +828,9 @@ class Frame(mwx.Frame):
         
         ## Accepts DnD
         self.SetDropTarget(MyFileDropLoader(self.graph, self))
+        
+        ## Script editor for plugins (external call)
+        self.Editor = "notepad"
     
     sync_switch = True
     
@@ -845,17 +845,6 @@ class Frame(mwx.Frame):
                 b.OnDraw(None)
                 b.canvas.draw_idle()
     
-    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)
-        subprocess.Popen(cmd)
-        self.message(cmd)
-    
     def set_title(self, frame):
         ssn = os.path.basename(self.session_file or '--')
         ssn, _ = os.path.splitext(ssn)
@@ -906,6 +895,8 @@ class Frame(mwx.Frame):
         evt.Skip()
     
     def Destroy(self):
+        ## for name in list(self.plugins):
+        ##     self.unload_plug(name) # => plug.Destroy
         self._mgr.UnInit()
         return mwx.Frame.Destroy(self)
     
@@ -1302,48 +1293,39 @@ class Frame(mwx.Frame):
     
     def unload_plug(self, name):
         """Unload plugin and detach the pane from UI manager."""
-        try:
-            plug = self.get_plug(name)
-            if not plug:
-                return False
-            
-            name = plug.__module__
-            if name not in self.plugins:
-                return False
-            
-            del self.plugins[name]
-            
-            if plug.__Menu_item:
-                menu, sep, tail = plug.menukey.rpartition('/')
-                menu = menu or Layer.MENU
-                self.menubar[menu].remove(plug.__Menu_item)
-                self.menubar.update(menu)
-            
-            if isinstance(plug.Parent, aui.AuiNotebook):
-                nb = plug.Parent
-                j = nb.GetPageIndex(plug)
-                nb.RemovePage(j) # just remove page
-                ## nb.DeletePage(j) # Destroys plug object too.
-            else:
-                nb = None
-                self._mgr.DetachPane(plug)
-                self._mgr.Update()
-            
-            plug.handler('page_closed', plug) # (even if not shown)
-            plug.Destroy()
-            
-            if nb and not nb.PageCount:
-                self._mgr.DetachPane(nb) # detach notebook pane
-                self._mgr.Update()
-                nb.Destroy()
-            
-        except Exception as e:
-            traceback.print_exc()
-            wx.CallAfter(wx.MessageBox,
-                         f"{e}\n\n" + traceback.format_exc(),
-                         f"Error in unloading {name!r}",
-                         style=wx.ICON_ERROR)
-            return False
+        plug = self.get_plug(name)
+        if not plug:
+            return
+        
+        name = plug.__module__
+        if name not in self.plugins:
+            return
+        
+        del self.plugins[name]
+        
+        if plug.__Menu_item:
+            menu, sep, tail = plug.menukey.rpartition('/')
+            menu = menu or Layer.MENU
+            self.menubar[menu].remove(plug.__Menu_item)
+            self.menubar.update(menu)
+        
+        if isinstance(plug.Parent, aui.AuiNotebook):
+            nb = plug.Parent
+            j = nb.GetPageIndex(plug)
+            nb.RemovePage(j) # just remove page
+            ## nb.DeletePage(j) # Destroys plug object too.
+        else:
+            nb = None
+            self._mgr.DetachPane(plug)
+            self._mgr.Update()
+        
+        plug.handler('page_closed', plug) # (even if not shown)
+        plug.Destroy()
+        
+        if nb and not nb.PageCount:
+            self._mgr.DetachPane(nb) # detach notebook pane
+            self._mgr.Update()
+            nb.Destroy()
     
     def reload_plug(self, name):
         plug = self.get_plug(name)
@@ -1360,11 +1342,16 @@ class Frame(mwx.Frame):
             return self.load_plug(plug.__module__, force=1, session=session)
         return False
     
+    @ignore(ResourceWarning)
     def edit_plug(self, name):
         plug = self.get_plug(name)
         if not plug:
             return
-        self.edit(self.plugins[plug.__module__])
+        ## this = inspect.getmodule(plug)
+        this = self.plugins[plug.__module__]
+        cmd = '{} "{}"'.format(self.Editor, this.__file__)
+        subprocess.Popen(cmd)
+        self.message(cmd)
     
     def inspect_plug(self, name):
         """Dive into the process to inspect plugs in the shell.
@@ -1707,14 +1694,14 @@ class Frame(mwx.Frame):
             return None
     
     def save_buffers_as_tiffs(self, path=None, frames=None):
-        """Export buffers to a file as a multi-page tiff."""
+        """Save buffers to a file as a multi-page tiff."""
         if not frames:
             frames = self.selected_view.all_frames
             if not frames:
                 return None
         
         if not path:
-            with wx.FileDialog(self, "Save frames as stack-tiff",
+            with wx.FileDialog(self, "Save buffers as a multi-page tiff",
                     defaultFile="Stack-image",
                     wildcard="TIF file (*.tif)|*.tif",
                     style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:
@@ -1724,23 +1711,20 @@ class Frame(mwx.Frame):
         try:
             name = os.path.basename(path)
             self.message("Saving {!r}...".format(name))
-            busy = wx.BusyInfo("One moment please, "
-                               "now saving {!r}...".format(name))
-            
-            stack = [Image.fromarray(x.buffer.astype(int)) for x in frames]
-            stack[0].save(path,
-                          save_all=True,
-                          compression="tiff_deflate", # cf. tiff_lzw
-                          append_images=stack[1:])
-            
+            with wx.BusyInfo("One moment please, "
+                             "now saving {!r}...".format(name)):
+                stack = [Image.fromarray(x.buffer.astype(int)) for x in frames]
+                stack[0].save(path,
+                              save_all=True,
+                              compression="tiff_deflate", # cf. tiff_lzw
+                              append_images=stack[1:])
             self.message("\b done.")
+            wx.MessageBox("{} files successfully saved into\n{!r}.".format(len(stack), path))
             return True
         except Exception as e:
             self.message("\b failed.")
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
             return False
-        finally:
-            del busy
     
     ## --------------------------------
     ## load/save session

mwx/matplot2.py

@@ -141,8 +141,8 @@ class MatplotPanel(wx.Panel):
         ## self.canvas.mpl_connect('draw_event', lambda v: self.handler('canvas_drawn', v))
         
         self.canvas.Bind(wx.EVT_CHAR_HOOK, self.on_hotkey_press)
-        self.canvas.Bind(wx.EVT_KEY_DOWN, self.on_hotkey_dndrag)
-        self.canvas.Bind(wx.EVT_KEY_UP, self.on_hotkey_release)
+        self.canvas.Bind(wx.EVT_KEY_DOWN, self.on_hotkey_down)
+        self.canvas.Bind(wx.EVT_KEY_UP, self.on_hotkey_up)
         
         self.canvas.Bind(wx.EVT_MOUSE_AUX1_DOWN, lambda v: self.handler('Xbutton1 pressed', v))
         self.canvas.Bind(wx.EVT_MOUSE_AUX2_DOWN, lambda v: self.handler('Xbutton2 pressed', v))
@@ -528,11 +528,11 @@ class MatplotPanel(wx.Panel):
     def on_hotkey_press(self, evt): #<wx._core.KeyEvent>
         """Called when a key is pressed."""
         key = hotkey(evt)
-        self.__key = regulate_key(key + '+')
+        self.__key = regulate_key(key + '-')
         if self.handler('{} pressed'.format(key), evt) is None:
             evt.Skip()
     
-    def on_hotkey_dndrag(self, evt): #<wx._core.KeyEvent>
+    def on_hotkey_down(self, evt): #<wx._core.KeyEvent>
         """Called when a key is pressed while dragging.
         Specifically called when the mouse is being captured.
         """
@@ -541,7 +541,7 @@ class MatplotPanel(wx.Panel):
         else:
             evt.Skip()
     
-    def on_hotkey_release(self, evt): #<wx._core.KeyEvent>
+    def on_hotkey_up(self, evt): #<wx._core.KeyEvent>
         """Called when a key is released."""
         key = hotkey(evt)
         self.__key = ''

mwx/matplot2g.py

@@ -228,7 +228,6 @@ class AxesImagePhantom(object):
     
     @unit.setter
     def unit(self, v):
-        u = self.unit
         if v is None:
             v = self.parent.unit
             self.__localunit = None
@@ -273,7 +272,7 @@ class AxesImagePhantom(object):
         return self.parent.index(self)
     
     def update_buffer(self, buf=None):
-        """Update buffer and the image."""
+        """Update buffer and the image (internal use only)."""
         if buf is not None:
             self.__buf = _to_buffer(buf)
         
@@ -287,7 +286,7 @@ class AxesImagePhantom(object):
         self.parent.handler('frame_modified', self)
     
     def update_extent(self):
-        """Update logical extent of the image."""
+        """Update logical extent of the image (internal use only)."""
         h, w = self.__buf.shape[:2]
         ux, uy = self.xy_unit
         w *= ux/2
@@ -397,7 +396,7 @@ class GraphPlot(MatplotPanel):
                'pageup pressed' : [ None, self.OnPageUp ],
              'pagedown pressed' : [ None, self.OnPageDown ],
                   'M-a pressed' : [ None, _F(self.fit_to_canvas) ],
-                  'C-a pressed' : [ None, _F(self.update_axis) ],
+                  'C-a pressed' : [ None, _F(self.fit_to_axes) ],
                   'C-i pressed' : [ None, _F(self.invert_cmap) ],
                   'C-k pressed' : [ None, _F(self.kill_buffer) ],
                 'C-S-k pressed' : [ None, _F(self.kill_buffer_all) ],
@@ -809,7 +808,6 @@ class GraphPlot(MatplotPanel):
         else:
             if v == self.__unit:  # no effect unless unit changes
                 return
-            u = self.__unit
             self.__unit = v
             for art in self.__Arts:
                 art.update_extent()
@@ -825,8 +823,8 @@ class GraphPlot(MatplotPanel):
     def kill_buffer_all(self):
         del self[:]
     
-    def update_axis(self):
-        """Reset display range (xylim's), update home position."""
+    def fit_to_axes(self):
+        """Reset the view limits to the current frame extent."""
         if self.frame:
             self.axes.axis(self.frame.get_extent()) # reset xlim and ylim
             self.toolbar.update()
@@ -834,7 +832,7 @@ class GraphPlot(MatplotPanel):
             self.draw()
     
     def fit_to_canvas(self):
-        """fit display range (xylim's) to canvas."""
+        """Reset the view limits to the canvas range."""
         x, y = self.xlim, self.ylim
         w, h = self.canvas.GetSize()
         r = h/w
@@ -1116,7 +1114,7 @@ class GraphPlot(MatplotPanel):
             self.select(i - 1)
     
     def OnHomePosition(self, evt):
-        self.update_axis()
+        self.fit_to_axes()
     
     def OnEscapeSelection(self, evt):
         xs, ys = self.Selector

mwx/nutshell.py

@@ -1749,7 +1749,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         )
         self.parent = parent #: parent<ShellFrame> is not Parent<AuiNotebook>
         self.Name = name
-        self.default_name = "*{}*".format(name.lower())
+        self.default_name = "*{}*".format(name.lower()) # e.g. '*scratch*'
         self.default_buffer = self.create_buffer(self.default_name)
         
         self.Bind(aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.OnPageClose)

mwx/plugins/ffmpeg_view.py

@@ -1,13 +1,15 @@
 #! python3
 """FFmpeg wrapper.
 """
+from functools import partial
 from subprocess import Popen, PIPE
 import numpy as np
 import os
 import wx
 import wx.media
 
-from mwx.graphman import Layer, Frame
+from mwx.framework import _F, hotkey
+from mwx.graphman import Layer
 from mwx.controls import LParam, Icon, Button, TextCtrl
 
 
@@ -87,7 +89,6 @@ class Plugin(Layer):
         )
         self.mc.ShowPlayerControls()
         self.mc.Bind(wx.media.EVT_MEDIA_LOADED, self.OnMediaLoaded)
-        self.mc.Bind(wx.media.EVT_MEDIA_PAUSE, self.OnMediaPause)
         
         self.mc.SetDropTarget(MyFileDropLoader(self))
         
@@ -128,6 +129,27 @@ class Plugin(Layer):
         ]
         
         self.parent.handler.bind("unknown_format", self.load_media)
+        
+        self.handler.update({ # DNA<ffmpeg_viewer>
+            0 : {
+                         'play' : (1, ),
+                'space pressed' : (1, _F(self.mc.Play)),
+            },
+            1 : {
+                         'stop' : (0, ),
+                        'pause' : (0, ),
+                'space pressed' : (1, _F(self.mc.Pause)),
+            },
+        })
+        
+        self.mc.Bind(wx.media.EVT_MEDIA_PAUSE, partial(self.handler, 'pause'))
+        self.mc.Bind(wx.media.EVT_MEDIA_PLAY, partial(self.handler, 'play'))
+        self.mc.Bind(wx.media.EVT_MEDIA_STOP, partial(self.handler, 'stop'))
+        
+        ## self.mc.Bind(wx.EVT_KEY_DOWN, self.on_hotkey_down)
+        ## self.mc.Bind(wx.EVT_KEY_UP, self.on_hotkey_up)
+        self.mc.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
+        self.mc.Bind(wx.EVT_KEY_UP, self.OnKeyUp)
     
     def Destroy(self):
         try:
@@ -136,15 +158,20 @@ class Plugin(Layer):
         finally:
             return Layer.Destroy(self)
     
+    def OnKeyDown(self, evt):
+        if self.handler('{} pressed'.format(hotkey(evt)), evt) is None:
+            evt.Skip()
+    
+    def OnKeyUp(self, evt):
+        if self.handler('{} released'.format(hotkey(evt)), evt) is None:
+            evt.Skip()
+    
     def OnMediaLoaded(self, evt):
         self.ss.range = (0, self.video_dur, 0.01)
         self.to.range = (0, self.video_dur, 0.01)
         self.Show()
         evt.Skip()
     
-    def OnMediaPause(self, evt):
-        evt.Skip()
-    
     def load_media(self, path=None):
         if path is None:
             with wx.FileDialog(self, "Choose a media file",

mwx/plugins/fft_view.py

@@ -42,8 +42,8 @@ class Plugin(Layer):
         self.parent.define_key('C-S-f', self.newifft)
     
     def Destroy(self):
-        self.parent.define_key('C-f', None)
-        self.parent.define_key('C-S-f', None)
+        self.parent.undefine_key('C-f')
+        self.parent.undefine_key('C-S-f')
         return Layer.Destroy(self)
     
     def newfft(self):

mwx/plugins/frame_listview.py

@@ -67,7 +67,7 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
             self.InsertItem(j, str(j))
             self.UpdateInfo(frame) # update all --> 計算が入ると時間がかかる
         
-        self.handler.update({
+        self.handler.update({ # DNA<frame_listview>
             0 : {
              'Lbutton dblclick' : (0, self.OnShowItems), # -> frame_shown
                 'enter pressed' : (0, self.OnShowItems), # -> frame_shown
@@ -84,7 +84,7 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         self.Bind(wx.EVT_LIST_COL_CLICK, self.OnSortItems)
         self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected)
         
-        self.context = { # bound to the target
+        self.context = { # DNA<GraphPlot>
             None: {
                   'frame_shown' : [ None, self.on_frame_shown ],
                  'frame_hidden' : [ None, self.on_frame_hidden ],

mwx/wxwit.py

@@ -7,6 +7,7 @@ import wx
 import wx.lib.inspection as it
 
 from .controls import Icon
+from .utilus import typename
 from .framework import CtrlInterface, Menu, filling
 
 
@@ -176,7 +177,7 @@ class Inspector(it.InspectionTree, CtrlInterface):
                 lambda v: watch(obj),
                 lambda v: v.Enable(obj is not None)),
                 
-            (1, "&Dive into {!r}".format(obj), Icon('core'),
+            (1, "&Dive into {!r}".format(typename(obj)), Icon('core'),
                 lambda v: dive(obj),
                 lambda v: v.Enable(obj is not None)),
         ])

{mwxlib-0.96.8.dist-info → mwxlib-0.97.1.dist-info}/METADATA

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

mwxlib-0.97.1.dist-info/RECORD

@@ -0,0 +1,28 @@
+mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
+mwx/bookshelf.py,sha256=SiDYw0bMW-dHrPl2eP4ZEoQAn17f9XeEk8_0XbYw9DQ,5319
+mwx/controls.py,sha256=ebF16EOoDWndVdBh_x2TKLZ4WevkH91QkKWyEivfCjY,48373
+mwx/framework.py,sha256=ffCTDK7wMnAct-kaNXK3FoL8Bm0vECPDxXO1ordG2Og,75300
+mwx/graphman.py,sha256=NLklcxzTKklaL_FXpl5qW2apwAb3YuHH_NSr--PlqMQ,70612
+mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
+mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
+mwx/matplot2g.py,sha256=95J4tyA6VgKrTN7zPPGoo_f24kYAqKB5BOBordExNUg,64443
+mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
+mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
+mwx/nutshell.py,sha256=zrye6tLuGgyCC-Od323o71bauGDKFnO8Zsabs0JMqjs,137383
+mwx/utilus.py,sha256=8GK_2mGY08DVN5_SGWynLKQEJsCKqvqWTDToar1XozM,37333
+mwx/wxmon.py,sha256=f3V24EF7kdMlYF7usLYK9QE5KU6fSu0jVqsvwAiA-Ag,12647
+mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
+mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
+mwx/wxwit.py,sha256=ifxMwdIz-QhDEr8vyAztToF8VVSxKNXlq4Ap1awBZvo,7362
+mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
+mwx/plugins/ffmpeg_view.py,sha256=1s7QqIbOpqNrSwbNoc4wQQNo8o1ho5JfXLuseAhgzK4,10441
+mwx/plugins/fft_view.py,sha256=xxTDD-_z4l18u4t2ybPB3xAMIslJmJ0gQlTxEqJUhNI,2782
+mwx/plugins/frame_listview.py,sha256=hbApzZWa9-BmQthu7uZBlBbGbtf4iJ_prO8IhxoGMs8,10421
+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.97.1.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.97.1.dist-info/METADATA,sha256=2iRI3XivGubsXjavm_XGa1fkwoFx5MjiWFbWnNqhrko,1880
+mwxlib-0.97.1.dist-info/WHEEL,sha256=rWxmBtp7hEUqVLOnTaDOPpR-cZpCDkzhhcBce-Zyd5k,91
+mwxlib-0.97.1.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.97.1.dist-info/RECORD,,

{mwxlib-0.96.8.dist-info → mwxlib-0.97.1.dist-info}/WHEEL

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

mwxlib-0.96.8.dist-info/RECORD

@@ -1,28 +0,0 @@
-mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
-mwx/bookshelf.py,sha256=CjcgtHC33KR5mHp1lW6Bqfndpzr7hC8ICkFihw4kM3g,5134
-mwx/controls.py,sha256=s6yJzQyYnjCzcjXa6nbTJncxzpMI0E5zYWPn3-cFy5Q,48378
-mwx/framework.py,sha256=WdKCaMnp3S0_PbpAfK2AxfUZgriUMFPAP2I4yGzZoVA,75227
-mwx/graphman.py,sha256=DtTnz2fW78eAIWC1QV8nMuSddiIsjb4cSnXb3BkTpdI,71043
-mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
-mwx/matplot2.py,sha256=NcNOIhOzrzU6smRtCnHZxJenkrHq0R4D7bWp7PF4QVA,32913
-mwx/matplot2g.py,sha256=ydqAiM_gw9DwjOOc_akKeVsVKPD8KfXu8KFJx32dlZ0,64453
-mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
-mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=cdrg3cuF6AVU2OuR3QswSiTWrTsGIVaqrBSMuxJIjdE,137364
-mwx/utilus.py,sha256=8GK_2mGY08DVN5_SGWynLKQEJsCKqvqWTDToar1XozM,37333
-mwx/wxmon.py,sha256=f3V24EF7kdMlYF7usLYK9QE5KU6fSu0jVqsvwAiA-Ag,12647
-mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
-mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
-mwx/wxwit.py,sha256=yU6XeCCWRBP7CLmpphjT072PfXAL30DNaxoChDX2p0I,7322
-mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
-mwx/plugins/ffmpeg_view.py,sha256=QjNqnvPEd9vCwfATU2BOO75fIOFD5LQ-Wf-BBhvZNZs,9368
-mwx/plugins/fft_view.py,sha256=HVptnn1dq-Dg7AzXKJXq1dfKiy38catlrMbJkvyLM98,2790
-mwx/plugins/frame_listview.py,sha256=7LDAYbl5NvmD4Ehc690IrTbcRgCALRWeLVVOT9cm9Do,10404
-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.8.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.96.8.dist-info/METADATA,sha256=eNdwrk8WxGhWphg4UbZrKiMynpJ1_f17-8NpqR2F-j0,1880
-mwxlib-0.96.8.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-mwxlib-0.96.8.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.96.8.dist-info/RECORD,,