mwxlib 0.98.0__py3-none-any.whl → 0.98.5__py3-none-any.whl

mwx/controls.py

@@ -9,7 +9,7 @@ import wx.lib.scrolledpanel as scrolled
 from . import images
 from .utilus import SSM
 from .utilus import funcall as _F
-from .framework import pack, Menu
+from .framework import pack, Menu, postcall
 
 import numpy as np
 from numpy import nan, inf  # noqa: necessary to eval
@@ -20,7 +20,7 @@ def _Tip(*tips):
     return '\n'.join(filter(None, tips)).strip()
 
 
-class Param(object):
+class Param:
     """Standard Parameter
     
     Args:
@@ -438,6 +438,8 @@ class Knob(wx.Panel):
         self.label.SetLabel(v.name + t)
         self.label.Refresh()
     
+    ## Note: wxAssertionError in text.SetValue
+    @postcall
     def update_ctrl(self, valid=True, notify=False):
         """Called when value is being changed (internal use only)."""
         v = self.__par
@@ -724,8 +726,7 @@ class ControlPanel(scrolled.ScrolledPanel):
                 except AttributeError:
                     p.value = v
                 except Exception as e: # failed to eval
-                    print(f"- Failed to reset {p!r}:", e)
-                    pass
+                    print(f"- Failed to reset {p!r}.", e)
     
     reset_params = set_params #: for backward compatibility
     

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.98.0"
+__version__ = "0.98.5"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -222,8 +222,6 @@ class KeyCtrlInterfaceMixin:
         spec-map    : 'C-c'
         esc-map     : 'escape'
     """
-    message = print # override this in subclass
-    
     @postcall
     def post_message(self, *args, **kwargs):
         return self.message(*args, **kwargs)
@@ -332,17 +330,22 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
     """
     handler = property(lambda self: self.__handler)
     
+    message = print # override this in subclass
+    
     def __init__(self):
         self.__key = ''
         self.__button = ''
         self.__isDragging = False
-        self.__handler = FSM({None:{}, 0:{}})
+        self.__handler = FSM({ # DNA<CtrlInterface>
+                None : {
+                },
+                0 : {
+                },
+            },
+        )
         
         _M = self._mouse_handler
-        
-        def _N(event, evt):
-            if self.handler(event, evt) is None:
-                evt.Skip()
+        _N = self._normal_handler
         
         def activate(evt):
             self.handler('focus_set', evt)
@@ -383,7 +386,7 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
         self.Bind(wx.EVT_MOUSE_AUX2_DCLICK, lambda v: _M('Xbutton2 dblclick', v))
         
         self.Bind(wx.EVT_MOUSE_CAPTURE_LOST, lambda v: _N('capture_lost', v))
-        self.Bind(wx.EVT_MOUSE_CAPTURE_CHANGED, lambda v: _N('capture_lost', v))
+        self.Bind(wx.EVT_MOUSE_CAPTURE_CHANGED, lambda v: _N('capture_changed', v))
     
     def on_hotkey_press(self, evt): #<wx._core.KeyEvent>
         """Called when a key is pressed."""
@@ -461,6 +464,10 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
             self.SetFocusIgnoringChildren() # let the panel accept keys
         except AttributeError:
             pass
+    
+    def _normal_handler(self, event, evt): #<wx._core.Event>
+        if self.handler(event, evt) is None:
+            evt.Skip()
 
 
 ## --------------------------------
@@ -763,15 +770,10 @@ class Frame(wx.Frame, KeyCtrlInterfaceMixin):
                     evt.Skip()
         self.Bind(wx.EVT_CHAR_HOOK, hook_char)
         
-        def close(evt):
-            """Close the window."""
-            self.Close()
-        
         self.__handler = FSM({ # DNA<Frame>
                 None : {
                 },
                 0 : {
-                  'M-q pressed' : (0, close),
                 },
             },
         )
@@ -829,15 +831,10 @@ 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(evt):
-            """Close the window."""
-            self.Close()
-        
         self.__handler = FSM({ # DNA<MiniFrame>
                 None : {
                 },
                 0 : {
-                  'M-q pressed' : (0, close),
                 },
             },
         )
@@ -1010,7 +1007,7 @@ class AuiNotebook(aui.AuiNotebook):
             self._mgr.LoadPerspective(frames)
             self._mgr.Update()
         except Exception as e:
-            print("- Failed to load perspective:", e)
+            print("- Failed to load perspective.", e)
         finally:
             self.Parent.Thaw()
 
@@ -1278,16 +1275,14 @@ class ShellFrame(MiniFrame):
         
         @self.Scratch.define_key('C-j')
         def eval_line(evt):
-            shell = self.current_shell
-            self.Scratch.buffer.py_eval_line(shell.globals, shell.locals)
-            evt.Skip(False)
+            self.Scratch.buffer.eval_line()
+            evt.Skip(False) # Don't skip explicitly.
         
         @self.Scratch.define_key('C-S-j')
         @self.Scratch.define_key('M-j')
         def eval_buffer(evt):
-            shell = self.current_shell
-            self.Scratch.buffer.py_exec_region(shell.globals, shell.locals)
-            evt.Skip(False)
+            self.Scratch.buffer.exec_region()
+            evt.Skip(False) # Don't skip explicitly.
         
         ## Session
         self.SESSION_FILE = get_rootpath(".debrc")
@@ -1298,7 +1293,9 @@ class ShellFrame(MiniFrame):
             os.path.abspath(debrc) if debrc else self.SESSION_FILE)
     
     def load_session(self, filename):
-        """Load session from file."""
+        """Load session from file.
+        Buffers, pointers, and the entire layout are loaded.
+        """
         def _fload(editor, filename):
             try:
                 buffer = editor.default_buffer or editor.new_buffer()
@@ -1325,7 +1322,9 @@ class ShellFrame(MiniFrame):
             self.Position = (0, 0)
     
     def save_session(self):
-        """Save session to file."""
+        """Save session to file.
+        Buffers, pointers, and the entire layout are saved.
+        """
         def _fsave(editor, filename):
             try:
                 buffer = editor.default_buffer
@@ -1340,20 +1339,20 @@ class ShellFrame(MiniFrame):
         with open(self.SESSION_FILE, 'w', encoding='utf-8', newline='') as o:
             o.write("#! Session file (This file is generated automatically)\n")
             
-            for book in self.all_editors:
+            for book in (self.Scratch, self.Log):
                 for buf in book.all_buffers:
                     if buf.mtdelta is not None:
-                        o.write("self._load({!r}, {!r}, {!r})\n"
-                                .format(buf.filename, buf.markline+1, book.Name))
+                        o.write("self.{}.load_file({!r}, {})\n"
+                                .format(book.Name, buf.filename, buf.markline+1))
             o.write('\n'.join((
                 "self.SetSize({})".format(self.Size),
                 "self.SetPosition({})".format(self.Position),
-                "self.ghost.SetSelection({})".format(self.ghost.Selection),
-                "self.watcher.SetSelection({})".format(self.watcher.Selection),
+                "self.Scratch.loadPerspective({!r})".format(self.Scratch.savePerspective()),
+                "self.Log.loadPerspective({!r})".format(self.Log.savePerspective()),
                 ## Note: Perspectives should be called after all pages have been added.
-                "wx.CallAfter(self._mgr.LoadPerspective, {!r})".format(self._mgr.SavePerspective()),
-                "wx.CallAfter(self.ghost.loadPerspective, {!r})".format(self.ghost.savePerspective()),
-                "wx.CallAfter(self.watcher.loadPerspective, {!r})".format(self.watcher.savePerspective()),
+                "self.ghost.loadPerspective({!r})".format(self.ghost.savePerspective()),
+                "self.watcher.loadPerspective({!r})".format(self.watcher.savePerspective()),
+                "self._mgr.LoadPerspective({!r})".format(self._mgr.SavePerspective()),
                 "self._mgr.Update()\n",
             )))
     
@@ -1547,9 +1546,8 @@ class ShellFrame(MiniFrame):
         pane = self._mgr.GetPane(win)
         if pane.IsDocked():
             if not self.console.IsShown():
-                self._mgr.RestoreMaximizedPane()
-                self._mgr.Update()
-                return
+                self._mgr.RestoreMaximizedPane() # いったん表示切替
+                self._mgr.Update()               # 更新後に best_size 取得
         if pane.IsShown():
             pane.best_size = win.Size
         self.popup_window(win, not pane.IsShown())
@@ -1597,7 +1595,7 @@ class ShellFrame(MiniFrame):
         self.indicator.Value = 1
         self.message("Quit")
     
-    def _load(self, filename, lineno, editor):
+    def _load(self, filename, lineno, editor): # for backward compatibility
         """Load file in the session (internal use only)."""
         if isinstance(editor, str):
             editor = getattr(self, editor, None)

mwx/graphman.py

@@ -50,7 +50,7 @@ def split_paths(obj):
     return os.path.split(obj)
 
 
-class Thread(object):
+class Thread:
     """Thread manager for graphman.Layer
     
     The worker:thread runs the given target.
@@ -342,7 +342,6 @@ class LayerInterface(CtrlInterface):
                  'thread_error' : [ None ], # failed in error
                    'page_shown' : [ None, _F(self.Draw, True)  ],
                   'page_closed' : [ None, _F(self.Draw, False) ],
-                  'page_hidden' : [ None, _F(self.Draw, False) ],
             },
             0 : {
                   'C-c pressed' : (0, _F(copy_params)),
@@ -387,7 +386,6 @@ class LayerInterface(CtrlInterface):
                   lambda v: Menu.Popup(self, self.menu))
         
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
-        self.Bind(wx.EVT_SHOW, self.OnShow)
         
         try:
             self.Init()
@@ -427,15 +425,6 @@ class LayerInterface(CtrlInterface):
             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))
@@ -443,16 +432,19 @@ class LayerInterface(CtrlInterface):
     def IsShown(self):
         """Returns True if the window is physically visible on the screen.
         
-        Note: This method is overridden to be equivalent to IsShownOnScreen,
-              as the object may be a page within a notebook.
+        (override) Equivalent to ``IsShownOnScreen``.
+                   Note: The instance could be a page within a notebook.
         """
         ## return self.pane.IsShown()
         return self.IsShownOnScreen()
     
-    def Show(self, show=True, interactive=False):
-        """Show associated pane (override) window."""
-        ## Note: This might be called from a thread.
-        wx.CallAfter(self.parent.show_pane, self, show, interactive)
+    def Show(self, show=True):
+        """Shows or hides the window.
+        
+        (override) Show associated pane window.
+                   Note: This might be called from a thread.
+        """
+        wx.CallAfter(self.parent.show_pane, self, show)
     
     Drawn = property(
         lambda self: self.IsDrawn(),
@@ -478,21 +470,16 @@ class LayerInterface(CtrlInterface):
             if canvas:
                 canvas.draw_idle()
         except Exception as e:
-            print(f"- Failed to draw Arts of {self.__module__}:", e)
+            print(f"- Failed to draw Arts of {self.__module__}.", e)
             del self.Arts
 
 
-class Layer(ControlPanel, LayerInterface):
+class Layer(LayerInterface, ControlPanel):
     """Graphman.Layer
     """
     def __init__(self, parent, session=None, **kwargs):
         ControlPanel.__init__(self, parent, **kwargs)
         LayerInterface.__init__(self, parent, session)
-    
-    ## Explicit (override) precedence
-    IsShown = LayerInterface.IsShown
-    Shown = LayerInterface.Shown
-    Show = LayerInterface.Show
 
 
 class Graph(GraphPlot):
@@ -942,9 +929,6 @@ class Frame(mwx.Frame):
                 pane.Float()
                 show = True
         
-        ## Fork page shown/closed events to emulatie EVT_SHOW => plug.on_show.
-        ## cf. >>> win.EventHandler.ProcessEvent(wx.ShowEvent(win.Id, show))
-        ## 
         ## Note: We need to distinguish cases whether:
         ##       - pane.window is AuiNotebook or normal Panel,
         ##       - pane.window is floating (win.Parent is AuiFloatingFrame) or docked.
@@ -1023,6 +1007,7 @@ class Frame(mwx.Frame):
                 plug.handler('page_closed', plug)
         else:
             win.handler('page_closed', win)
+        evt.Skip()
     
     ## --------------------------------
     ## Plugin <Layer> interface
@@ -1070,15 +1055,10 @@ class Frame(mwx.Frame):
             module.Plugin = cls
             return cls
         
-        class _Plugin(cls, LayerInterface):
+        class _Plugin(LayerInterface, cls):
             def __init__(self, parent, session=None, **kwargs):
                 cls.__init__(self, parent, **kwargs)
                 LayerInterface.__init__(self, parent, session)
-            
-            ## Explicit (override) precedence
-            IsShown = LayerInterface.IsShown
-            Shown = LayerInterface.Shown
-            Show = LayerInterface.Show
         
         _Plugin.__module__ = cls.__module__ = module.__name__
         _Plugin.__name__ = cls.__name__ + str("~")
@@ -1110,7 +1090,7 @@ class Frame(mwx.Frame):
             else:
                 module = import_module(name)
         except Exception as e:
-            print(f"- Unable to load {root!r}:", e)
+            print(f"- Unable to load {root!r}.", e)
             return False
         
         ## the module must have a class `Plugin`.
@@ -1172,7 +1152,7 @@ class Frame(mwx.Frame):
         
         module = self.load_module(root)
         if not module:
-            return module # False (failed to import)
+            return False # failed to import
         
         try:
             name = module.Plugin.__module__
@@ -1328,18 +1308,21 @@ class Frame(mwx.Frame):
     
     def reload_plug(self, name):
         plug = self.get_plug(name)
-        if not plug:
+        if not plug or not plug.reloadable:
             return
-        if plug.reloadable:
-            session = {}
-            try:
-                print("Reloading {}...".format(plug))
-                plug.save_session(session)
-            except Exception:
-                traceback.print_exc()
-                print("- Failed to save session of", plug)
-            return self.load_plug(plug.__module__, force=1, session=session)
-        return False
+        session = {}
+        try:
+            print("Reloading {}...".format(plug))
+            plug.save_session(session)
+        except Exception:
+            traceback.print_exc()
+            print("- Failed to save session of", plug)
+        self.load_plug(plug.__module__, force=1, session=session)
+        
+        ## Update shell.target --> new plug
+        for shell in self.shellframe.all_shells:
+            if shell.target is plug:
+                shell.handler('shell_activated', shell)
     
     @ignore(ResourceWarning)
     def edit_plug(self, name):
@@ -1398,12 +1381,16 @@ class Frame(mwx.Frame):
     
     def load_index(self, filename=None, view=None):
         """Load frames :ref to the Index file.
+        
+        If no view given, the currently selected view is chosen.
         """
         if not view:
             view = self.selected_view
         
         if not filename:
+            fn = view.frame.pathname if view.frame else ''
             with wx.FileDialog(self, "Select index file to import",
+                    defaultDir=os.path.dirname(fn or ''),
                     defaultFile=self.ATTRIBUTESFILE,
                     wildcard="Index (*.index)|*.index|"
                              "ALL files (*.*)|*.*",
@@ -1431,15 +1418,16 @@ class Frame(mwx.Frame):
     def save_index(self, filename=None, frames=None):
         """Save frames :ref to the Index file.
         """
+        view = self.selected_view
         if not frames:
-            frames = self.selected_view.all_frames
+            frames = view.all_frames
             if not frames:
                 return None
         
         if not filename:
-            fn = next((x.pathname for x in frames if x.pathname), '')
+            fn = view.frame.pathname if view.frame else ''
             with wx.FileDialog(self, "Select index file to export",
-                    defaultDir=os.path.dirname(fn),
+                    defaultDir=os.path.dirname(fn or ''),
                     defaultFile=self.ATTRIBUTESFILE,
                     wildcard="Index (*.index)|*.index",
                     style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:
@@ -1463,8 +1451,8 @@ class Frame(mwx.Frame):
                     frame.name = os.path.basename(fn) # new name and pathname
                 output_frames.append(frame)
                 print(' ', self.message("\b done."))
-            except (PermissionError, OSError):
-                print('-', self.message("\b failed."))
+            except (PermissionError, OSError) as e:
+                print('-', self.message("\b failed.", e))
         
         frames = output_frames
         res, mis = self.write_attributes(filename, frames)
@@ -1504,7 +1492,7 @@ class Frame(mwx.Frame):
         except FileNotFoundError:
             pass
         except Exception as e:
-            print("- Failed to read attributes:", e)
+            print("- Failed to read attributes.", e)
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
         finally:
             return res, mis # finally raises no exception
@@ -1526,7 +1514,7 @@ class Frame(mwx.Frame):
                 print(pformat(tuple(new.items())), file=o)
             
         except Exception as e:
-            print("- Failed to write attributes:", e)
+            print("- Failed to write attributes.", e)
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
         finally:
             return new, mis # finally raises no exception
@@ -1607,7 +1595,10 @@ class Frame(mwx.Frame):
             paths = [paths]
         
         if paths is None:
+            fn = view.frame.pathname if view.frame else ''
             with wx.FileDialog(self, "Open image files",
+                    defaultDir=os.path.dirname(fn or ''),
+                    defaultFile='',
                     wildcard='|'.join(self.wildcards),
                     style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST
                                     |wx.FD_MULTIPLE) as dlg:
@@ -1653,16 +1644,17 @@ class Frame(mwx.Frame):
     
     def save_buffer(self, path=None, frame=None):
         """Save buffer of the frame to a file.
-        
-        If no view given, the currently selected view is chosen.
         """
+        view = self.selected_view
         if not frame:
-            frame = self.selected_view.frame
+            frame = view.frame
             if not frame:
                 return None
         
         if not path:
+            fn = view.frame.pathname if view.frame else ''
             with wx.FileDialog(self, "Save buffer as",
+                    defaultDir=os.path.dirname(fn or ''),
                     defaultFile=re.sub(r'[\/:*?"<>|]', '_', frame.name),
                     wildcard='|'.join(self.wildcards),
                     style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:

mwx/matplot2g.py

@@ -110,7 +110,7 @@ def _Property(name):
         lambda self:   delattr(self.parent, name))
 
 
-class AxesImagePhantom(object):
+class AxesImagePhantom:
     """Phantom of frame facade
     
     Args:
@@ -957,7 +957,7 @@ class GraphPlot(MatplotPanel):
             self.message("Write buffer to clipboard.")
         except Exception as e:
             traceback.print_exc()
-            self.message("- Failed to write to clipboard:", e)
+            self.message("- Failed to write to clipboard.", e)
     
     def read_buffer_from_clipboard(self):
         """Read buffer data from clipboard."""
@@ -974,7 +974,7 @@ class GraphPlot(MatplotPanel):
                 self.load(Clipboard.imread())
         except Exception as e:
             traceback.print_exc()
-            self.message("- No data in clipboard:", e)
+            self.message("- No data in clipboard.", e)
     
     def destroy_colorbar(self):
         if self.cbar:

mwx/mgplt.py

@@ -12,7 +12,7 @@ from . import framework as mwx
 from .controls import ControlPanel
 
 
-class Gnuplot(object):
+class Gnuplot:
     """Gnuplot - gnuplot:pipe wrapper
     """
     debug = 0

mwx/nutshell.py

@@ -10,7 +10,6 @@ import traceback
 import inspect
 import builtins
 import operator
-import dis
 import pydoc
 import keyword
 import linecache
@@ -72,14 +71,22 @@ def ask(f, prompt="Enter value", type=str):
 
 
 class AutoCompInterfaceMixin:
-    """Auto completion interface.
+    """Auto-complete mode interface.
+    
+    Mode name           Mode vars.
+    --------------------------------
+    [1] history-comp    history (an instance variable of the Shell)
+    [2] word-comp       -
+    [3] apropos-comp    -
+    [4] text-comp       fragmwords
+    [5] module-comp     modules
     
     Note:
         This class is mixed-in ``wx.py.editwindow.EditWindow``.
     """
-    modules = set() # to be used in module-comp mode
-    
-    fragmwords = set(keyword.kwlist + dir(builtins)) # to be used in text-comp mode
+    history = []     # used in history-comp mode
+    modules = set()  # used in module-comp mode
+    fragmwords = set(keyword.kwlist + dir(builtins)) # used in text-comp mode
     
     def __init__(self):
         ## cf. sys.modules
@@ -94,13 +101,13 @@ class AutoCompInterfaceMixin:
         (override) Snip the tip of max N lines if it is too long.
                    Keep the tip for calltip-click event.
         """
-        self._calltip_pos = pos
-        self._calltip = tip
+        self._calltips = [pos, tip, False]
         lines = tip.splitlines()
-        if len(lines) > N > 0:
+        if N and len(lines) > N > 0:
             lines[N+1:] = ["\n...(snip) This tips are too long... "
                            "Click to show more details."]
             tip = '\n'.join(lines)
+            self._calltips[-1] = True # snipped (needs to be shown)
         super().CallTipShow(pos, tip)
     
     def autoCallTipShow(self, command, insertcalltip=True):
@@ -135,7 +142,7 @@ class AutoCompInterfaceMixin:
                 self.message("- {} : {!r}".format(e, text))
     
     def call_helpTip(self, evt):
-        """Show tooltips for the selected topic."""
+        """Show a calltip for the selected function."""
         if self.CallTipActive():
             self.CallTipCancel()
         
@@ -167,8 +174,11 @@ class AutoCompInterfaceMixin:
             n = len(self.__comp_hint)
             p = self.cpos
             if not self.SelectedText:
-                p, self.anchor, sty = self.get_following_atom(p) # word-right-selection
-            self.ReplaceSelection(word[n:]) # Modify (or insert) the selected range
+                p, q, sty = self.get_following_atom(p) # word-right-selection
+                if sty == 'word':
+                    self.anchor = q
+            with self.off_undocollection():
+                self.ReplaceSelection(word[n:])
             self.cpos = p # backward selection to the point
             self.__comp_ind = j
         except IndexError:
@@ -257,7 +267,7 @@ class AutoCompInterfaceMixin:
                     self.message("[module]>>> loading {}...".format(text))
                     modules = set(dir(import_module(text)))
                 except ImportError as e:
-                    self.message("\b failed:", e)
+                    self.message("\b failed.", e)
                     return
                 else:
                     ## Add unimported module names.
@@ -349,7 +359,7 @@ class AutoCompInterfaceMixin:
             self.message("- {} : {!r}".format(e, text))
 
 
-class EditorInterface(CtrlInterface):
+class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     """Interface of Python code editor.
     
     Note:
@@ -357,6 +367,7 @@ class EditorInterface(CtrlInterface):
     """
     def __init__(self):
         CtrlInterface.__init__(self)
+        AutoCompInterfaceMixin.__init__(self)
         
         def dispatch(evt):
             """Fork events to the parent."""
@@ -407,8 +418,8 @@ class EditorInterface(CtrlInterface):
                 'C-S-; pressed' : (0, _F(self.comment_out_line)),
                   'C-: pressed' : (0, _F(self.uncomment_line)),
                 'C-S-: pressed' : (0, _F(self.uncomment_line)),
-                  'select_line' : (100, self.on_linesel_begin),
-                 'select_lines' : (100, self.on_linesel_next),
+                  'select_line' : (11, self.on_linesel_begin),
+                 'select_lines' : (11, self.on_linesel_next),
             },
             10 : {
                          'quit' : (0, self.on_itext_exit),
@@ -417,8 +428,8 @@ class EditorInterface(CtrlInterface):
                  'down pressed' : (10, skip),
                 'enter pressed' : (0, self.on_itext_selection),
             },
-            100 : {
-                  '*Ldrag move' : (100, self.on_linesel_motion),
+            11 : {
+                  '*Ldrag move' : (11, self.on_linesel_motion),
                  'capture_lost' : (0, self.on_linesel_end),
              'Lbutton released' : (0, self.on_linesel_end),
             },
@@ -880,6 +891,7 @@ class EditorInterface(CtrlInterface):
     ## --------------------------------
     ## Python syntax and indentation
     ## --------------------------------
+    
     def on_indent_line(self, evt):
         if self.SelectedText:
             evt.Skip()
@@ -1184,10 +1196,10 @@ class EditorInterface(CtrlInterface):
         """
         n = self.LinesOnScreen() # lines completely visible
         m = n//2 if ln is None else ln % n if ln < n else n # ln[0:n]
-        vl = self.calc_vline(self.cline)
+        vl = self._calc_vline(self.cline)
         self.ScrollToLine(vl - m)
     
-    def calc_vline(self, line):
+    def _calc_vline(self, line):
         """Virtual line numberin the buffer window."""
         pos = self.PositionFromLine(line)
         w, h = self.PointFromPosition(pos)
@@ -1199,7 +1211,7 @@ class EditorInterface(CtrlInterface):
         """
         n = self.LinesOnScreen() # lines completely visible
         hl = self.FirstVisibleLine
-        vl = self.calc_vline(line)
+        vl = self._calc_vline(line)
         if vl < hl:
             self.ScrollToLine(vl)
         elif vl > hl + n - 1:
@@ -1212,7 +1224,7 @@ class EditorInterface(CtrlInterface):
         """
         n = self.LinesOnScreen() # lines completely visible
         hl = self.FirstVisibleLine
-        vl = self.calc_vline(line)
+        vl = self._calc_vline(line)
         if not hl + offset < vl < hl + n - 1 - offset:
             self.ScrollToLine(vl - n//2)
     
@@ -1505,16 +1517,6 @@ class EditorInterface(CtrlInterface):
             else:
                 self.anchor = q
     
-    @contextmanager
-    def off_readonly(self):
-        """Set buffer to be writable (ReadOnly=False) temporarily."""
-        r = self.ReadOnly
-        try:
-            self.ReadOnly = 0
-            yield
-        finally:
-            self.ReadOnly = r
-    
     @contextmanager
     def save_attributes(self, **kwargs):
         """Save buffer attributes (e.g. ReadOnly=False)."""
@@ -1527,6 +1529,14 @@ class EditorInterface(CtrlInterface):
             for k, v in kwargs.items():
                 setattr(self, k, v)
     
+    def off_readonly(self):
+        """Disables buffer read-only lock temporarily."""
+        return self.save_attributes(ReadOnly=False)
+    
+    def off_undocollection(self):
+        """Disables buffer undo stack temporarily."""
+        return self.save_attributes(UndoCollection=False)
+    
     ## --------------------------------
     ## Edit: comment / insert / kill
     ## --------------------------------
@@ -1633,7 +1643,7 @@ class EditorInterface(CtrlInterface):
         self.ReplaceSelection('')
 
 
-class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
+class Buffer(EditorInterface, EditWindow):
     """Python code buffer.
     
     Attributes:
@@ -1759,7 +1769,6 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
     def __init__(self, parent, filename=None, **kwargs):
         EditWindow.__init__(self, parent, **kwargs)
         EditorInterface.__init__(self)
-        AutoCompInterfaceMixin.__init__(self)
         
         self.parent = parent
         self.__filename = filename
@@ -1788,18 +1797,18 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
         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():
-            ##     self.AutoCompCancel() # may delete selection
             if self.CanEdit():
-                self.ReplaceSelection("")
+                with self.off_undocollection():
+                    self.ReplaceSelection("")
             self.message("")
         
         def clear_autocomp(evt):
-            ## """Clear Autocomp, selection, and message."""
+            ## """Clear autocomp, selection, and message."""
             if self.AutoCompActive():
                 self.AutoCompCancel()
             if self.CanEdit():
-                self.ReplaceSelection("")
+                with self.off_undocollection():
+                    self.ReplaceSelection("")
             self.message("")
         
         def fork(evt):
@@ -1833,10 +1842,9 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
                    '* released' : (0, skip, dispatch),
                'escape pressed' : (-1, self.on_enter_escmap),
                   'C-h pressed' : (0, self.call_helpTip),
-                    '. pressed' : (2, skip),
+                    '. pressed' : (2, self.OnEnterDot),
                   'M-. pressed' : (2, self.call_word_autocomp),
                   'M-/ pressed' : (3, self.call_apropos_autocomp),
-                  'M-m pressed' : (5, self.call_module_autocomp),
             },
             2 : { # word auto completion AS-mode
                          'quit' : (0, clear_autocomp),
@@ -1892,34 +1900,6 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
              '*[LR]win pressed' : (3, ),
              '*f[0-9]* pressed' : (3, ),
             },
-            5 : { # module auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
-                  'tab pressed' : (0, clear, skip),
-                'enter pressed' : (0, clear, skip),
-               'escape pressed' : (0, clear_autocomp),
-                   'up pressed' : (5, skip, self.on_completion_backward),
-                 'down pressed' : (5, skip, self.on_completion_forward),
-                '*left pressed' : (5, skip),
-               '*left released' : (5, self.call_module_autocomp),
-               '*right pressed' : (5, skip),
-              '*right released' : (5, self.call_module_autocomp),
-          '[a-z0-9_.,] pressed' : (5, skip),
-         '[a-z0-9_.,] released' : (5, self.call_module_autocomp),
-            'S-[a-z\\] pressed' : (5, skip),
-           'S-[a-z\\] released' : (5, self.call_module_autocomp),
-                  '\\ released' : (5, self.call_module_autocomp),
-                  'M-m pressed' : (5, _F(self.call_module_autocomp, force=1)),
-              '*delete pressed' : (5, skip),
-           '*backspace pressed' : (5, skip),
-          '*backspace released' : (5, self.call_module_autocomp),
-        'C-S-backspace pressed' : (5, ),
-                 '*alt pressed' : (5, ),
-                '*ctrl pressed' : (5, ),
-               '*shift pressed' : (5, ),
-             '*[LR]win pressed' : (5, ),
-             '*f[0-9]* pressed' : (5, ),
-            },
         })
         
         self.show_folder()
@@ -1944,7 +1924,9 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
     def OnCallTipClick(self, evt):
         if self.CallTipActive():
             self.CallTipCancel()
-        self.CallTipShow(self._calltip_pos, self._calltip, N=-1)
+        pos, tip, more = self._calltips
+        if more:
+            self.CallTipShow(pos, tip, N=None)
         evt.Skip()
     
     def OnIndicatorClick(self, evt):
@@ -1982,6 +1964,14 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
         self.update_caption()
         evt.Skip()
     
+    def OnEnterDot(self, evt):
+        p = self.cpos
+        st = self.get_style(p-1)
+        rst = self.get_style(p)
+        if st not in ('moji', 'word', 'rparen') or rst == 'word':
+            self.handler('quit', evt) # don't enter autocomp
+        evt.Skip()
+    
     def on_activated(self, buf):
         """Called when the buffer is activated."""
         self.update_caption()
@@ -2074,6 +2064,9 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
         dispatcher.send(signal='Interpreter.push',
                         sender=self, command=None, more=False)
     
+    def eval_line(self):
+        self.py_eval_line(self.globals, self.locals)
+    
     def py_eval_line(self, globals=None, locals=None):
         if self.CallTipActive():
             self.CallTipCancel()
@@ -2090,6 +2083,9 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
                 return
         self.message(status)
     
+    def exec_region(self):
+        self.py_exec_region(self.globals, self.locals)
+    
     def py_exec_region(self, globals=None, locals=None, filename=None):
         if not filename:
             filename = self.filename
@@ -2122,23 +2118,6 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
             self.handler('buffer_region_executed', self)
             self.message("Evaluated {!r} successfully.".format(filename))
             self.AnnotationClearAll()
-    
-    def py_get_region(self, line):
-        """Line numbers of code head and tail containing the line.
-        
-        Requires a code object.
-        If the code doesn't exist, return the folding region.
-        """
-        if not self.code:
-            return self.get_region(line)
-        lc, le = 0, self.LineCount
-        linestarts = list(dis.findlinestarts(self.code))
-        for i, ln in reversed(linestarts):
-            if line >= ln-1:
-                lc = ln-1
-                break
-            le = ln-1
-        return lc, le
 
 
 class EditorBook(AuiNotebook, CtrlInterface):
@@ -2424,7 +2403,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 return True
             return False
         except Exception as e:
-            self.post_message(f"Failed to load {filename!r}:", e)
+            self.post_message(f"Failed to load {filename!r}.", e)
             self.delete_buffer(buf)
             return False
     
@@ -2432,6 +2411,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         """Open the specified file."""
         if not filename:
             with wx.FileDialog(self, "Open buffer",
+                    defaultDir=os.path.dirname(self.buffer.filename),
                     wildcard='|'.join(self.wildcards),
                     style=wx.FD_OPEN|wx.FD_MULTIPLE) as dlg:
                 if dlg.ShowModal() == wx.ID_OK:
@@ -2466,7 +2446,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 return True
             return False
         except Exception as e:
-            self.post_message(f"Failed to save {filename!r}:", e)
+            self.post_message(f"Failed to save {filename!r}.", e)
             return False
     
     def load_buffer(self, buf=None):
@@ -2499,6 +2479,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         """Confirm the saveas with the dialog."""
         buf = buf or self.buffer
         with wx.FileDialog(self, "Save buffer as",
+                defaultDir=os.path.dirname(self.buffer.filename),
                 defaultFile=re.sub(r'[\/:*?"<>|]', '_', buf.name),
                 wildcard='|'.join(self.wildcards),
                 style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:
@@ -2541,11 +2522,10 @@ class EditorBook(AuiNotebook, CtrlInterface):
 class Interpreter(interpreter.Interpreter):
     """Interpreter based on code.InteractiveInterpreter.
     """
-    def __init__(self, *args, **kwargs):
-        parent = kwargs.pop('interpShell')
+    def __init__(self, interpShell, *args, **kwargs):
         interpreter.Interpreter.__init__(self, *args, **kwargs)
         
-        self.parent = parent
+        self.parent = interpShell
         self.globals = self.locals
     
     def runcode(self, code):
@@ -2609,7 +2589,7 @@ class Interpreter(interpreter.Interpreter):
             return interpreter.Interpreter.getCallTip(self) # dummy
 
 
-class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
+class Nautilus(EditorInterface, Shell):
     """Nautilus in the Shell.
     
     Facade objects for accessing the APIs:
@@ -2642,24 +2622,24 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
         ``*`` denotes the original syntax defined in wx.py.shell,
         for which, at present version, enabled with USE_MAGIC switch being on.
     
-    Autocomp-key bindings::
+    Auto-complete key bindings::
     
         C-up        : [0] retrieve previous history
         C-down      : [0] retrieve next history
-        C-j(J), M-j : [0] call tooltip of eval (for the word selected or focused)
-        C-h(H), M-h : [0] call tooltip of help (for the func selected or focused)
-        TAB         : [1] history-comp-mode
-        M-p         : [1] retrieve previous history in comp-mode
-        M-n         : [1] retrieve next history in comp-mode
-        M-.         : [2] word-comp-mode
-        M-/         : [3] apropos-comp-mode
-        M-,         : [4] text-comp-mode
-        M-m         : [5] module-comp-mode
+        C-j, M-j    : [0] tooltip of eval (for the selected or focused word)
+        C-h, M-h    : [0] calltip of help (for the selected or focused func)
+        TAB         : [1] history-comp
+        M-p         : [1] retrieve previous history in history-comp mode
+        M-n         : [1] retrieve next history in history-comp mode
+        M-.         : [2] word-comp
+        M-/         : [3] apropos-comp
+        M-,         : [4] text-comp
+        M-m         : [5] module-comp
         
         Autocomps are incremental when pressed any alnums,
                   and decremental when backspace.
     
-    Enter-key bindings::
+    Enter key bindings::
     
         C-enter     : insert-line-break
         M-enter     : duplicate-command
@@ -2719,7 +2699,9 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
             raise TypeError("primitive objects cannot be targeted")
         
         self.__target = obj
-        self.interp.locals = obj.__dict__
+        self.locals = obj.__dict__
+        self.globals = obj.__dict__
+        self.globals.update(self.__globals)
         try:
             obj.self = obj
             obj.this = inspect.getmodule(obj)
@@ -2752,9 +2734,9 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
     @globals.deleter
     def globals(self): # internal use only
         self.interp.globals = self.__target.__dict__
+        self.interp.globals.update(self.__globals)
     
-    ## (override)
-    wrap = EditorInterface.wrap
+    __globals = {}
     
     def __init__(self, parent, target, name="root",
                  introText=None,
@@ -2763,14 +2745,13 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
                  **kwargs):
         Shell.__init__(self, parent,
                  locals=target.__dict__,
-                 interpShell=self,
+                 interpShell=self, # **kwds of InterpClass
                  InterpClass=Interpreter,
                  introText=introText,
                  startupScript=startupScript,
-                 execStartupScript=execStartupScript, # if True, executes ~/.py
+                 execStartupScript=execStartupScript, # executes ~/.py
                  **kwargs)
         EditorInterface.__init__(self)
-        AutoCompInterfaceMixin.__init__(self)
         
         self.parent = parent #: parent<ShellFrame> is not Parent<AuiNotebook>
         self.target = target
@@ -2802,28 +2783,20 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
         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():
-            ##     self.AutoCompCancel() # may delete selection
             if self.CanEdit():
-                self.ReplaceSelection("")
+                with self.off_undocollection():
+                    self.ReplaceSelection("")
             self.message("")
         
         def clear_autocomp(evt):
-            ## """Clear Autocomp, selection, and message."""
+            ## """Clear autocomp, selection, and message."""
             if self.AutoCompActive():
                 self.AutoCompCancel()
             if self.CanEdit():
-                self.ReplaceSelection("")
+                with self.off_undocollection():
+                    self.ReplaceSelection("")
             self.message("")
         
-        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', evt)
-            evt.Skip()
-        
         def fork(evt):
             self.handler.fork(self.handler.current_event, evt)
         
@@ -2866,7 +2839,6 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
               'C-enter pressed' : (0, _F(self.insertLineBreak)),
             'C-S-enter pressed' : (0, _F(self.insertLineBreak)),
                '*enter pressed' : (0, ), # -> OnShowCompHistory 無効
-                 'left pressed' : (0, self.OnBackspace),
                   'C-[ pressed' : (0, _F(self.goto_previous_mark_arrow)),
                 'C-S-[ pressed' : (0, _F(self.goto_previous_mark_arrow, selection=1)),
                   'C-] pressed' : (0, _F(self.goto_next_mark_arrow)),
@@ -2937,7 +2909,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
            'S-[a-z\\] released' : (2, self.call_word_autocomp),
                   '\\ released' : (2, self.call_word_autocomp),
               '*delete pressed' : (2, skip),
-           '*backspace pressed' : (2, skip_autocomp),
+           '*backspace pressed' : (2, self.OnBackspace),
           '*backspace released' : (2, self.call_word_autocomp),
         'C-S-backspace pressed' : (2, ),
                   'C-j pressed' : (2, self.eval_line),
@@ -2965,7 +2937,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
            'S-[a-z\\] released' : (3, self.call_apropos_autocomp),
                   '\\ released' : (3, self.call_apropos_autocomp),
               '*delete pressed' : (3, skip),
-           '*backspace pressed' : (3, skip_autocomp),
+           '*backspace pressed' : (3, self.OnBackspace),
           '*backspace released' : (3, self.call_apropos_autocomp),
         'C-S-backspace pressed' : (3, ),
                   'C-j pressed' : (3, self.eval_line),
@@ -2993,7 +2965,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
            'S-[a-z\\] released' : (4, self.call_text_autocomp),
                   '\\ released' : (4, self.call_text_autocomp),
               '*delete pressed' : (4, skip),
-           '*backspace pressed' : (4, skip_autocomp),
+           '*backspace pressed' : (4, self.OnBackspace),
           '*backspace released' : (4, self.call_text_autocomp),
         'C-S-backspace pressed' : (4, ),
                   'C-j pressed' : (4, self.eval_line),
@@ -3022,7 +2994,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
                   '\\ released' : (5, self.call_module_autocomp),
                   'M-m pressed' : (5, _F(self.call_module_autocomp, force=1)),
               '*delete pressed' : (5, skip),
-           '*backspace pressed' : (5, skip_autocomp),
+           '*backspace pressed' : (5, self.OnBackspace),
           '*backspace released' : (5, self.call_module_autocomp),
         'C-S-backspace pressed' : (5, ),
                  '*alt pressed' : (5, ),
@@ -3070,7 +3042,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
     def OnCallTipClick(self, evt):
         if self.CallTipActive():
             self.CallTipCancel()
-        self.parent.handler('add_help', self._calltip)
+        self.parent.handler('add_help', self._calltips[1])
         evt.Skip()
     
     def OnDrag(self, evt): #<wx._core.StyledTextEvent>
@@ -3098,12 +3070,11 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
         evt.Skip()
     
     def OnBackspace(self, evt):
-        """Called when backspace (or left key) pressed.
-        Backspace-guard from Autocomp eating over a prompt whitespace
+        """Called when backspace pressed.
+        Backspace-guard from autocomp eating over a prompt whitespace.
         """
         if self.cpos == self.bolc:
-            ## do not skip to prevent autocomp eats prompt,
-            ## so not to backspace over the latest non-continuation prompt
+            self.handler('quit', evt) # don't eat backward prompt
             return
         evt.Skip()
     
@@ -3175,7 +3146,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
             self.ReplaceSelection('self')
         elif st not in ('moji', 'word', 'rparen') or rst == 'word':
             self.handler('quit', evt) # don't enter autocomp
-        self.ReplaceSelection('.') # just write down a dot.
+        evt.Skip()
     
     def on_enter_escmap(self, evt):
         self.__caret_mode = self.CaretPeriod
@@ -3225,7 +3196,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
     def magic(self, cmd):
         """Called before command pushed.
         
-        (override) disable old magic: `f x --> f(x)`
+        (override) Disable old magic: `f x --> f(x)`.
         """
         if cmd:
             if cmd[0:2] == '??': cmd = 'help({})'.format(cmd[2:])
@@ -3483,7 +3454,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
         (override) Add globals when executing su:startupScript.
                    Fix history point.
         """
-        ## self.globals = self.locals
+        keys = set(self.locals.keys()) # check for locals map changes
         self.promptPosEnd = self.TextLength # fix history point
         if su and os.path.isfile(su):
             self.push("print('Startup script executed:', {0!r})\n".format(su))
@@ -3493,6 +3464,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
         else:
             self.push("")
             self.interp.startupScript = None
+        self.__globals = {k: self.locals[k] for k in (self.locals.keys() - keys)}
     
     def Paste(self, rectangle=False):
         """Replace selection with clipboard contents.
@@ -3639,8 +3611,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
         self.EnsureCaretVisible()
     
     def eval_line(self, evt):
-        """Evaluate the selected word or line.
-        """
+        """Evaluate the selected word or line."""
         if self.CallTipActive():
             self.CallTipCancel()
         

mwx/plugins/ffmpeg_view.py

@@ -122,7 +122,7 @@ class Plugin(Layer):
             (1, "&Load file", Icon('open'),
                 lambda v: self.load_media()),
                 
-            (2, "&Snapshot", Icon('clock'),
+            (2, "&Snapshot", Icon('clip'),
                 lambda v: self.snapshot(),
                 lambda v: v.Enable(self._path is not None)),
             (),
@@ -175,7 +175,7 @@ class Plugin(Layer):
     def load_media(self, path=None):
         if path is None:
             with wx.FileDialog(self, "Choose a media file",
-                style=wx.FD_OPEN|wx.FD_CHANGE_DIR|wx.FD_FILE_MUST_EXIST) as dlg:
+                    style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST) as dlg:
                 if dlg.ShowModal() != wx.ID_OK:
                     return None
                 path = dlg.Path

mwx/utilus.py

@@ -886,7 +886,7 @@ class FSM(dict):
         return False
 
 
-class TreeList(object):
+class TreeList:
     """Interface class for tree list control.
     
     >>> list[item:(key,value)]

{mwxlib-0.98.0.dist-info → mwxlib-0.98.5.dist-info}/METADATA

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

{mwxlib-0.98.0.dist-info → mwxlib-0.98.5.dist-info}/RECORD

@@ -1,28 +1,28 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
 mwx/bookshelf.py,sha256=Y4xI2SrEO22DrI1hyyfFx7DfFZA8znOzX9RWMPsA2BE,5137
-mwx/controls.py,sha256=K4GJB81TXv5q0faTELQgbUmtMQBRIM9yINJdTI0xA3g,47556
-mwx/framework.py,sha256=kKG4rcBiq-PD5v1sHLtI1XRTve0wugG6JwwNbMv5Pa8,75509
-mwx/graphman.py,sha256=Cyhl_Da_HGBfk721gu1r5iwSH9L3yPEG8Fzmc2gx-EU,70462
+mwx/controls.py,sha256=jhru4HiIijb3QJz2elGt0in9soaR3xilgHsfItYY0JI,47595
+mwx/framework.py,sha256=I4Hvu2swHbgvbjqVXNnuU2V8kkxKmK6eRktqQa5D0cE,75518
+mwx/graphman.py,sha256=A53ufapRAysL0wTCr1anrg_T_PqpumonnYn-swaC598,70165
 mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
 mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
-mwx/matplot2g.py,sha256=wiZFDFuQe3ax71fmyeR_9hvAmgT-4nVfZ30UByv8Nv8,64379
+mwx/matplot2g.py,sha256=3hS0ilXCif0mZkSufE_Rf-taRs3m1hIxiIFMuioYYuc,64371
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
-mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=iVJGFh45ZtXs_g8LGi1UNI6H-3jI2pDkYNc2eF3T-7k,142853
-mwx/utilus.py,sha256=mmqB4P_3mTi7SrFleMiN1599Jm0Us0XKnNA6v2xglSs,37333
+mwx/mgplt.py,sha256=r56SFryorIgO12mvHJY-z6uwWsaPEqk6pHYwKWqbTY4,5663
+mwx/nutshell.py,sha256=vz3RTrIECi9LpjgAj2jKAIjMCeJ7ZvJ8mbH3phBxuvg,141423
+mwx/utilus.py,sha256=B76pDg6_kW8FMNdQ6xO0Bwy4KJ0laY98Gg6N3iqV7c8,37325
 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/ffmpeg_view.py,sha256=epO_26sPmdDyr_lApa2Jtgxp-yCEdW0OEz0_QbrFEuM,10427
 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=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-0.98.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.98.0.dist-info/METADATA,sha256=qAaHXqyArN_ZNCNoeukt6YxYGPQ-n8h9JIgfAcKuBnU,1880
-mwxlib-0.98.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-mwxlib-0.98.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.98.0.dist-info/RECORD,,
+mwxlib-0.98.5.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.98.5.dist-info/METADATA,sha256=nGXEgL3ckNH2HlXpYXQsjteMpc8MhQWDZ_5DtjAtp2A,1880
+mwxlib-0.98.5.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+mwxlib-0.98.5.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.98.5.dist-info/RECORD,,

{mwxlib-0.98.0.dist-info → mwxlib-0.98.5.dist-info}/WHEEL

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