mwxlib 0.96.7__py3-none-any.whl → 0.97.0__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,41 @@ 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):
             data = self.GetItemData(self.Selection)
             if data:
                 data.SetFocus()
         
-        @self.handler.bind('f5 pressed')
         def refresh(evt, 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))
-        
-        @self.handler.bind('delete pressed')
         def delete(evt):
             data = self.GetItemData(self.Selection)
             if data:
-                data.parent.kill_buffer(data) # -> focus moves
+                if data.mtdelta or data.Text:
+                    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, enter),
+               'delete pressed' : (0, delete),
+                   'f5 pressed' : (0, refresh),
+                 'S-f5 pressed' : (0, _F(refresh, clear=1)),
+            },
+        })
     
     def OnDestroy(self, evt):
         if evt.EventObject is self:

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.96.7"
+__version__ = "0.97.0"
 __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
 
 
@@ -193,10 +193,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 +309,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 +347,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 +380,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 +412,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'
         """
@@ -1630,9 +1634,9 @@ class ShellFrame(MiniFrame):
         if isinstance(obj, wx.Object):
             self.monitor.watch(obj)
             self.popup_window(self.monitor)
-        elif hasattr(obj, '__dict__'):
+        if hasattr(obj, '__dict__'):
             self.linfo.watch(obj.__dict__)
-            self.ginfo.watch({})
+            self.ginfo.watch(None)
             self.popup_window(self.linfo)
     
     def highlight(self, obj, *args, **kwargs):

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 で終了させる
@@ -541,19 +538,6 @@ class Graph(GraphPlot):
         if self.infobar.IsShown():
             self.infobar.ShowMessage(frame.annotation)
     
-    def get_frame_visible(self):
-        if self.frame:
-            return self.frame.get_visible()
-        return False
-    
-    def set_frame_visible(self, v):
-        if self.frame:
-            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()
     
@@ -698,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)),
             (),
@@ -823,11 +807,13 @@ class Frame(mwx.Frame):
         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()
+            def _display(view, show):
+                if view.frame:
+                    view.frame.set_visible(show)
+                    if show:
+                        view.draw()
+            _display(self.graph, show)
+            _display(self.output, show)
             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))
@@ -842,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
     
@@ -856,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)
@@ -917,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)
     
@@ -943,9 +923,10 @@ class Frame(mwx.Frame):
             return
         
         ## Set the graph and output window sizes to half & half.
+        ## ドッキング時に再計算される
         if name == "output" or name is self.output:
             w, h = self.graph.GetClientSize()
-            pane.best_size = (w//2, h) # ドッキング時に再計算される
+            pane.best_size = (w//2 - 3, h) # 分割線幅補正 -12pix (Windows only ?)
         
         ## Force Layer windows to show.
         if interactive:
@@ -1312,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)
@@ -1370,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.
@@ -1717,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:
@@ -1734,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

@@ -100,10 +100,7 @@ class MatplotPanel(wx.Panel):
         self.toolbar.Show(0)
         
         ## modeline bar
-        self.modeline = wx.StaticText(self, label="", style=wx.ST_NO_AUTORESIZE)
-        self.modeline.write = self.modeline.SetLabel
-        self.modeline.read = self.modeline.GetLabel
-        self.modeline.SetToolTip("")
+        self.modeline = wx.StaticText(self, style=wx.ST_NO_AUTORESIZE)
         
         self.modeline.Bind(wx.EVT_MOTION, self.on_modeline_tip)
         self.modeline.Bind(wx.EVT_LEFT_DOWN, lambda v: self.canvas.SetFocus())
@@ -144,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))
@@ -390,7 +387,7 @@ class MatplotPanel(wx.Panel):
     def on_modeline_tip(self, evt): #<wx._core.MouseEvent>
         flag = self.modeline.HitTest(evt.Position)
         if flag == wx.HT_WINDOW_INSIDE:
-            self.modeline.SetToolTip(self.modeline.read())
+            self.modeline.ToolTip = self.modeline.Label
         evt.Skip()
     
     def on_focus_set(self, evt): #<wx._core.FocusEvent>
@@ -531,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.
         """
@@ -544,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 = ''
@@ -655,17 +652,6 @@ class MatplotPanel(wx.Panel):
         del self.Selector
         self.canvas.draw_idle()
     
-    ## def OnShiftLimit(self, evt, r=0.1):
-    ##     w = self.xlim[1] - self.xlim[0]
-    ##     h = self.ylim[1] - self.ylim[0]
-    ##     if 'up' in evt.key: self.ylim += h * r
-    ##     elif 'down' in evt.key: self.ylim -= h * r
-    ##     elif 'left' in evt.key: self.xlim -= w * r
-    ##     elif 'right' in evt.key: self.xlim += w * r
-    ##     if 1:
-    ##         self.toolbar.push_current()
-    ##         self.draw()
-    
     def zoomlim(self, lim, M, c=None):
         ## The limitation of zoom is necessary; If the axes is enlarged too much,
         ## the processing speed will significantly slow down.

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
@@ -359,33 +358,6 @@ class AxesImagePhantom(object):
         x = l + (nx + 0.5) * ux
         y = t - (ny + 0.5) * uy # Y ピクセルインデクスは座標と逆
         return (x, y)
-    
-    def calc_point(self, x, y, centred=True, inaxes=False):
-        """Computes the nearest pixelated point from a point (x, y).
-        If centred, correct the points to the center of the nearest pixel.
-        If inaxes, restrict the points in image area.
-        """
-        if isinstance(x, (list, tuple)):
-            x = np.array(x)
-            y = np.array(y)
-        l,r,b,t = self.__art.get_extent()
-        if inaxes:
-            x[x < l] = l
-            x[x > r] = r
-            y[y < b] = b
-            y[y > t] = t
-        nx, ny = self.xytopixel(x, y)
-        ux, uy = self.xy_unit
-        if centred:
-            x = l + (nx + 0.5) * ux
-            y = t - (ny + 0.5) * uy
-            if inaxes:
-                x[x > r] -= ux
-                y[y < b] += uy
-        else:
-            x = l + nx * ux
-            y = t - ny * uy
-        return (x, y)
 
 
 class GraphPlot(MatplotPanel):
@@ -589,6 +561,8 @@ class GraphPlot(MatplotPanel):
         
         self.modeline.Show(1)
         self.Layout()
+        
+        self.writeln()
     
     def clear(self):
         MatplotPanel.clear(self)
@@ -834,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()
@@ -907,13 +880,12 @@ class GraphPlot(MatplotPanel):
     
     def trace_point(self, x, y, type=NORMAL):
         """Puts (override) a message of points x and y."""
-        if self.frame:
+        frame = self.frame
+        if frame:
             if not hasattr(x, '__iter__'): # called from OnMotion
-                nx, ny = self.frame.xytopixel(x, y)
-                z = self.frame.xytoc(x, y)
-                self.message(
-                    "[{:-4d},{:-4d}] "
-                    "({:-8.3f},{:-8.3f}) value: {}".format(nx, ny, x, y, z))
+                nx, ny = frame.xytopixel(x, y)
+                z = frame.xytoc(x, y)
+                self.message(f"[{nx:-4d},{ny:-4d}] ({x:-8.3f},{y:-8.3f}) value: {z}")
                 return
             
             if len(x) == 0: # no selection
@@ -923,43 +895,41 @@ class GraphPlot(MatplotPanel):
                 return self.trace_point(x[0], y[0], type)
             
             if len(x) == 2: # 2-Selector trace line (called from Selector:setter)
-                nx, ny = self.frame.xytopixel(x, y)
+                nx, ny = frame.xytopixel(x, y)
                 dx = x[1] - x[0]
                 dy = y[1] - y[0]
                 a = np.arctan2(dy, dx) * 180/pi
                 lu = np.hypot(dy, dx)
                 li = np.hypot(nx[1]-nx[0], ny[1]-ny[0])
-                self.message("[Line] "
-                    "Length: {:.1f} pixel ({:g}u) "
-                    "Angle: {:.1f} deg".format(li, lu, a))
+                self.message(f"[Line] Length: {li:.1f} pixel ({lu:g}u) Angle: {a:.1f} deg")
             
             elif type == REGION: # N-Selector trace polygon (called from Region:setter)
-                nx, ny = self.frame.xytopixel(x, y)
+                nx, ny = frame.xytopixel(x, y)
                 xo, yo = min(nx), min(ny) # top-left
                 xr, yr = max(nx), max(ny) # bottom-right
-                self.message("[Region] "
-                    "crop={}:{}:{}:{}".format(xr-xo, yr-yo, xo, yo)) # (W:H:left:top)
+                self.message(f"[Region] crop={xr-xo}:{yr-yo}:{xo}:{yo}") # (W:H:left:top)
     
     def writeln(self):
         """Puts (override) attributes of current frame to the modeline."""
         if not self.modeline.IsShown():
             return
-        if self.frame:
-            self.modeline.write(
-            "[{page}/{maxpage}] -{a}- {name} ({data.dtype}:{cmap}{bins}) "
-            "[{data.shape[1]}:{data.shape[0]}] {x} [{unit:g}/pixel]".format(
+        frame = self.frame
+        if frame:
+            self.modeline.SetLabel(
+                "[{page}/{maxpage}] -{a}- {name} ({data.dtype}:{cmap}{bins}) "
+                "[{data.shape[1]}:{data.shape[0]}] {x} [{unit:g}/pixel]".format(
                 page = self.__index,
              maxpage = len(self),
-                name = self.frame.name,
-                data = self.frame.buffer,
-                cmap = self.frame.get_cmap().name,
-                bins = ' bin{}'.format(self.frame.binning) if self.frame.binning > 1 else '',
-                unit = self.frame.unit,
-                   x = '**' if self.frame.localunit else '--',
-                   a = '%%' if not self.frame.buffer.flags.writeable else '--'))
+                name = frame.name,
+                data = frame.buffer,
+                cmap = frame.get_cmap().name,
+                bins = ' bin{}'.format(frame.binning) if frame.binning > 1 else '',
+                unit = frame.unit,
+                   x = '**' if frame.localunit else '--',
+                   a = '%%' if not frame.buffer.flags.writeable else '--'))
         else:
-            self.modeline.write(
-            "[{page}/{maxpage}] ---- No buffer (-:-) [-:-] -- [{unit:g}/pixel]".format(
+            self.modeline.SetLabel(
+                "[{page}/{maxpage}] ---- No buffer (-:-) [-:-] -- [{unit:g}/pixel]".format(
                 page = '-',
              maxpage = len(self),
                 unit = self.__unit))
@@ -973,15 +943,16 @@ class GraphPlot(MatplotPanel):
     
     def write_buffer_to_clipboard(self):
         """Write buffer data to clipboard."""
-        if not self.frame:
+        frame = self.frame
+        if not frame:
             self.message("No frame")
             return
         try:
-            name = self.frame.name
-            data = self.frame.roi
+            name = frame.name
+            data = frame.roi
             GraphPlot.clipboard_name = name
             GraphPlot.clipboard_data = data
-            bins, vlim, img = imconvert(data, self.frame.vlim)
+            bins, vlim, img = imconvert(data, frame.vlim)
             Clipboard.imwrite(img)
             self.message("Write buffer to clipboard.")
         except Exception as e:
@@ -1034,10 +1005,6 @@ class GraphPlot(MatplotPanel):
             self.handler.bind('frame_shown', self.update_colorbar)
         else:
             self.message("- A frame must exist to create a colorbar.")
-            ## self['*dummy*'] = np.random.rand(2,2) # dummy
-            ## self.create_colorbar()
-            ## del self['*dummy*']
-            pass
     
     ## --------------------------------
     ## matplotlib interfaces
@@ -1047,9 +1014,9 @@ class GraphPlot(MatplotPanel):
         """Pickup image and other arts.
         Called (maybe) after mouse buttons are pressed.
         """
-        ## canvas 全体に有効だが，分割された axes (colorbar 領域など) は無効
-        ## image と plot が重なっている場合，plot -> image の順に呼び出される
-        ##  多重呼び出しが起きないように isPicked フラグで排他制御する
+        ## canvas 全体に有効だが，分割された axes (colorbar 領域など) は無効．
+        ## image - plot が重なっている場合，plot -> image の順に呼び出される．
+        ## 多重呼び出しが起きないように __isPicked フラグで排他制御する．
         
         if evt.mouseevent.button != 1 or not evt.artist.get_visible():
             return
@@ -1118,15 +1085,16 @@ class GraphPlot(MatplotPanel):
         """Called before canvas.draw (overridden)."""
         if not self.interpolation_mode:
             return
-        if self.frame:
+        frame = self.frame
+        if frame:
             ## [dots/pixel] = [dots/u] * [u/pixel]
-            dots = self.ddpu[0] * self.frame.unit * self.frame.binning
+            dots = self.ddpu[0] * frame.unit * frame.binning
             
-            if self.frame.get_interpolation() == 'nearest' and dots < 1:
-                self.frame.set_interpolation(self.interpolation_mode)
+            if frame.get_interpolation() == 'nearest' and dots < 1:
+                frame.set_interpolation(self.interpolation_mode)
                 
-            elif self.frame.get_interpolation() != 'nearest' and dots > 1:
-                self.frame.set_interpolation('nearest')
+            elif frame.get_interpolation() != 'nearest' and dots > 1:
+                frame.set_interpolation('nearest')
     
     def OnMotion(self, evt):
         """Called when mouse moves in axes (overridden)."""
@@ -1135,13 +1103,15 @@ class GraphPlot(MatplotPanel):
     
     def OnPageDown(self, evt):
         """Next page."""
-        if self.frame and self.__index < len(self)-1:
-            self.select(self.__index + 1)
+        i = self.__index
+        if i is not None and i < len(self)-1:
+            self.select(i + 1)
     
     def OnPageUp(self, evt):
         """Previous page."""
-        if self.frame and self.__index > 0:
-            self.select(self.__index - 1)
+        i = self.__index
+        if i is not None and i > 0:
+            self.select(i - 1)
     
     def OnHomePosition(self, evt):
         self.update_axis()
@@ -1152,14 +1122,6 @@ class GraphPlot(MatplotPanel):
         if len(xs) > 1:
             self.handler('line_removed', self.frame)
     
-    ## def zoomlim(self, lim, M, c=None): # virtual call from OnZoom, OnScrollZoom
-    ##     if c is None:
-    ##         c = (lim[1] + lim[0]) / 2
-    ##     y = c - M * (c - lim)
-    ##     if self.frame:
-    ##         if abs(y[1] - y[0]) > self.frame.unit or M > 1:
-    ##             return y
-    
     def OnXAxisPanZoom(self, evt, c=None):
         org = self.p_event
         M = np.exp(-(evt.x - org.x)/100)
@@ -1184,11 +1146,33 @@ class GraphPlot(MatplotPanel):
     ## Selector interface
     ## --------------------------------
     
-    def calc_point(self, x, y, centred=True):
-        """Restrict point (x, y) in image area.
-        If centred, correct the point to the center of the nearest pixel.
+    def calc_point(self, x, y, centred=True, inaxes=False):
+        """Computes the nearest pixelated point from a point (x, y).
+        If centred, correct the points to the center of the nearest pixel.
+        If inaxes, restrict the points in image area.
         """
-        return self.frame.calc_point(x, y, centred)
+        frame = self.frame
+        if isinstance(x, (list, tuple)):
+            x = np.array(x)
+            y = np.array(y)
+        l,r,b,t = frame.get_extent()
+        if inaxes:
+            x[x < l] = l
+            x[x > r] = r
+            y[y < b] = b
+            y[y > t] = t
+        nx, ny = frame.xytopixel(x, y)
+        ux, uy = frame.xy_unit
+        if centred:
+            x = l + (nx + 0.5) * ux
+            y = t - (ny + 0.5) * uy
+            if inaxes:
+                x[x > r] -= ux
+                y[y < b] += uy
+        else:
+            x = l + nx * ux
+            y = t - ny * uy
+        return (x, y)
     
     def calc_shiftpoint(self, xo, yo, x, y, centred=True):
         """Restrict point (x, y) from (xo, yo) in pi/8 step angles.

mwx/matplot2lg.py

@@ -59,8 +59,9 @@ class LinePlot(MatplotPanel):
         
         ## Note for matplotlib >= 3.9.0:
         ## axhspan and axvspan now return Rectangles, not Polygons.
-        #<matplotlib.patches.Rectangle>
+        
         #<matplotlib.patches.Polygon>
+        #<matplotlib.patches.Rectangle>
         self.__vspan = self.axes.axvspan(0, 0,
             color='none', ls='dashed', lw=1, ec='black', visible=0, zorder=2)
     
@@ -331,15 +332,17 @@ class Histogram(LinePlot):
         frame = self.__frame
         if frame:
             x, y = frame.__data
-            i, j = x.searchsorted(self.region) if self.region is not None else np.uint8(self.xlim)
-            self.modeline.write(
-            "[--] ---- {name} ({type}:{mode}) [{bins[0]}:{bins[1]}]".format(
+            if self.region is not None:
+                i, j = x.searchsorted(self.region)
+            else:
+                i, j = np.uint8(self.xlim)
+            self.modeline.SetLabel(
+                "[--] ---- {name} ({type}:) [{}:{}]".format(i, j,
                 name = frame.name,
                 type = frame.buffer.dtype,
-                mode = "bincount",
-                bins = (i, j)))
+                ))
         else:
-            self.modeline.write("")
+            self.modeline.SetLabel("")
     
     ## --------------------------------
     ## Motion/Drag actions (override)
@@ -349,7 +352,10 @@ class Histogram(LinePlot):
         if self.__frame:
             x, y = self.__frame.__data
             if len(x) > 1:
-                i, j = x.searchsorted(self.region) if self.region is not None else (0,-1)
+                if self.region is not None:
+                    i, j = x.searchsorted(self.region)
+                else:
+                    i, j = (0, -1)
                 self.__fil.set_xy(list(chain([(x[i],0)], zip(x[i:j],y[i:j]), [(x[j-1],0)])))
             else:
                 self.__fil.set_xy([(0,0)])
@@ -601,19 +607,19 @@ class LineProfile(LinePlot):
             return
         frame = self.__frame
         if frame:
-            self.modeline.write(
-            "[--] -{a}- {name} ({type}:{mode}) "
-            "[{length}:{width}] {x} [{unit:g}/pixel]".format(
+            self.modeline.SetLabel(
+                "[--] -{a}- {name} ({type}:{mode}) "
+                "[{length}:{width}] {x} [{unit:g}/pixel]".format(
                 name = frame.name,
                 type = frame.buffer.dtype,
-                mode = "nearest",
+                mode = "logic" if self.__logicp else "pixel",
                width = self.__linewidth,
               length = len(self.plotdata[0]),
-                unit = frame.unit if self.__logicp else 1,
-                   x = '++' if self.__logicp else '--',
+                unit = frame.unit,
+                   x = '**' if frame.localunit else '--',
                    a = '%%' if not frame.buffer.flags.writeable else '--'))
         else:
-            self.modeline.write("")
+            self.modeline.SetLabel("")
     
     def write_data_to_clipboard(self):
         """Write plot data to clipboard."""

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/wxwil.py

@@ -69,11 +69,8 @@ class LocalsWatcher(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
     def watch(self, locals):
         self.clear()
         if not isinstance(locals, dict):
-            ## wx.MessageBox("Cannot watch the locals.\n\n"
-            ##               "- {!r} is not a dict object.".format(locals))
             self.unwatch()
             return
-        busy = wx.BusyCursor()
         self.target = locals
         try:
             self.Freeze()

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.7.dist-info → mwxlib-0.97.0.dist-info}/METADATA

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

mwxlib-0.97.0.dist-info/RECORD

@@ -0,0 +1,28 @@
+mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
+mwx/bookshelf.py,sha256=UgyVYHiYUL2wEvVw110vWnvkJBtXgYAE5hvz9MMLRsU,5333
+mwx/controls.py,sha256=s6yJzQyYnjCzcjXa6nbTJncxzpMI0E5zYWPn3-cFy5Q,48378
+mwx/framework.py,sha256=cXyfw0-PdkONYMHM-h9OsVIsOnDO3C1f4aDC5aYBP4o,75332
+mwx/graphman.py,sha256=VktL6fnYt2BBo-r7UVgVcqVd7IIOY9vpGBDNLNie088,70606
+mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
+mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
+mwx/matplot2g.py,sha256=jSyRTW9oUqAKA9L9Rcujxy1QLoFOVg411HjVNElexzQ,64401
+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.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.97.0.dist-info/METADATA,sha256=3nBiqPuPWhRv2W2keE3GqrTbXBNP9N0iWDOPDKPh6DA,1880
+mwxlib-0.97.0.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+mwxlib-0.97.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.97.0.dist-info/RECORD,,

{mwxlib-0.96.7.dist-info → mwxlib-0.97.0.dist-info}/WHEEL

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

mwxlib-0.96.7.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=t1d0wXned_XQV5uFYZEdzFhE3d-eCvFb0GIn3W0Uz9E,75227
-mwx/graphman.py,sha256=XoD_wbt5wrmiRf8Q3lpn_eklakE2K-rLfpzfXG1L-Pc,71269
-mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
-mwx/matplot2.py,sha256=-G7z0Osozm9NjLfXvX5UcdFviwbNUktjbd904_g-PqQ,33516
-mwx/matplot2g.py,sha256=22rpdkqJQEJADINPaG5htACutbt8oG1ewO8LMpxaqH4,65237
-mwx/matplot2lg.py,sha256=4KEkl5407P_D4xHKmar6j_cfIBBCEGkm7wC_3CzgxRI,27303
-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=0bzSTfMEjllJheKxZPb4p8Luz6Il3V29bCLBty72U2o,5576
-mwx/wxwit.py,sha256=yU6XeCCWRBP7CLmpphjT072PfXAL30DNaxoChDX2p0I,7322
-mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
-mwx/plugins/ffmpeg_view.py,sha256=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.7.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.96.7.dist-info/METADATA,sha256=dJYCzwaGevIma7TaUYe9whPB1wOXX_-V6rRmUvJgq6g,1880
-mwxlib-0.96.7.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-mwxlib-0.96.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.96.7.dist-info/RECORD,,