mwxlib 0.99.9__py3-none-any.whl → 1.0.0__py3-none-any.whl

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.99.9"
+__version__ = "1.0.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -165,22 +165,6 @@ _speckeys = {
 
 _speckeys_wxkmap = dict((v, k) for k, v in _speckeys.items())
 
-def getKeyState(key):
-    """Returns state of speckey (cf. wx.GetKeyState)."""
-    try:
-        return wx.GetKeyState(_speckeys_wxkmap[key])
-    except KeyError:
-        pass
-
-
-def setKeyState(key, state):
-    """Makes you feel like having pressed/released speckey."""
-    vk = wx.UIActionSimulator()
-    if state:
-        vk.KeyDown(_speckeys_wxkmap[key])
-    else:
-        vk.KeyUp(_speckeys_wxkmap[key])
-
 
 def hotkey(evt):
     """Interpret evt.KeyCode as hotkey:str and overwrite evt.key.
@@ -226,10 +210,29 @@ 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)
     
+    @staticmethod
+    def getKeyState(key):
+        """Returns state of speckey (cf. wx.GetKeyState)."""
+        try:
+            return wx.GetKeyState(_speckeys_wxkmap[key])
+        except KeyError:
+            pass
+    
+    @staticmethod
+    def setKeyState(key, state):
+        """Makes you feel like having pressed/released speckey."""
+        vk = wx.UIActionSimulator()
+        if state:
+            vk.KeyDown(_speckeys_wxkmap[key])
+        else:
+            vk.KeyUp(_speckeys_wxkmap[key])
+    
     def make_keymap(self, keymap):
         """Make a basis of extension map in the handler.
         """
@@ -259,9 +262,8 @@ class KeyCtrlInterfaceMixin:
         })
     
     def pre_command_hook(self, evt):
-        """Enter extension mode.
-        Check text selection for [C-c/C-x].
-        """
+        """Called when entering extension mode (internal use only)."""
+        ## Check text selection for [C-c/C-x].
         wnd = wx.Window.FindFocus()
         if isinstance(wnd, wx.TextEntry) and wnd.StringSelection\
         or isinstance(wnd, stc.StyledTextCtrl) and wnd.SelectedText:
@@ -272,6 +274,7 @@ class KeyCtrlInterfaceMixin:
         evt.Skip()
     
     def post_command_hook(self, evt):
+        """Called when exiting extension mode (internal use only)."""
         keymap = self.handler.previous_state
         if keymap:
             self.message("{} {}".format(keymap, evt.key))
@@ -334,8 +337,6 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
     """
     handler = property(lambda self: self.__handler)
     
-    message = print # override this in subclass
-    
     def __init__(self):
         self.__key = ''
         self.__button = ''
@@ -1736,6 +1737,8 @@ class ShellFrame(MiniFrame):
         self.popup_window(self.linfo)
         self.add_log("<-- Beginning of debugger\r\n")
         self.indicator.Value = 2
+        if wx.IsBusy():
+            wx.EndBusyCursor()
     
     def on_debug_next(self, frame):
         """Called from cmdloop."""
@@ -1772,6 +1775,8 @@ class ShellFrame(MiniFrame):
         del shell.locals
         del shell.globals
         self.indicator.Value = 1
+        if wx.IsBusy():
+            wx.EndBusyCursor()
     
     def set_hookable(self, editor, traceable=True):
         """Bind pointer to set/unset trace."""

mwx/graphman.py

@@ -166,8 +166,8 @@ class Thread:
             msg += '\n\n'
         try:
             self.event.clear() # suspend
-            if wx.MessageBox(msg +
-                    "Do you want to terminate the process?",
+            if wx.MessageBox(  # Confirm terminatation.
+                    msg + "Do you want to terminate the process?",
                     style=wx.OK|wx.CANCEL|wx.ICON_WARNING) == wx.OK:
                 self.Stop()
                 return False
@@ -574,8 +574,9 @@ class MyFileDropLoader(wx.FileDropTarget):
         for fn in filenames:
             name, ext = os.path.splitext(fn)
             if ext == '.py' or os.path.isdir(fn):
-                self.loader.load_plug(fn, show=1, floating_pos=pos,
-                                      force=wx.GetKeyState(wx.WXK_ALT))
+                self.loader.load_plug(fn, show=1,
+                                          floating_pos=pos,
+                                          force=wx.GetKeyState(wx.WXK_ALT))
             elif ext == '.jssn':
                 self.loader.load_session(fn)
             elif ext == '.index':
@@ -946,6 +947,7 @@ class Frame(mwx.Frame):
             shown = plug.IsShown()
         except AttributeError:
             shown = pane.IsShown()
+        
         if show and not shown:
             if isinstance(win, aui.AuiNotebook):
                 j = win.GetPageIndex(plug)
@@ -962,6 +964,11 @@ class Frame(mwx.Frame):
             else:
                 win.handler('page_closed', win)
         
+        if pane.dock_direction:
+            pane.Dock()
+        else:
+            pane.Float()
+        
         ## Modify the floating position of the pane when displayed.
         ## Note: This is a known bug in wxWidgets 3.17 -- 3.20,
         ##       and will be fixed in wxPython 4.2.1.
@@ -972,39 +979,27 @@ class Frame(mwx.Frame):
         self._mgr.Update()
         return (show != shown)
     
-    def update_pane(self, name, show=False, **kwargs):
-        """Update the layout of the pane.
+    def update_pane(self, name, **props):
+        """Update the layout of the pane (internal use only).
         
         Note:
             This is called automatically from load_plug,
             and should not be called directly from user.
         """
         pane = self.get_pane(name)
-        
-        pane.dock_layer = kwargs.get('layer', 0)
-        pane.dock_pos = kwargs.get('pos', 0)
-        pane.dock_row = kwargs.get('row', 0)
-        pane.dock_proportion = kwargs.get('prop') or pane.dock_proportion
-        pane.floating_pos = kwargs.get('floating_pos') or pane.floating_pos
-        pane.floating_size = kwargs.get('floating_size') or pane.floating_size
+        for k, v in props.items():
+            if v is not None:
+                setattr(pane, k, v)
         
         plug = self.get_plug(name)
         if plug:
             dock = plug.dockable
-            if not isinstance(dock, bool): # prior to kwargs
-                kwargs.update(dock=dock)
+            if not isinstance(dock, bool):
+                pane.dock_direction = dock
             if not plug.caption:
                 pane.CaptionVisible(False)       # no caption bar
                 pane.Gripper(dock not in (0, 5)) # show a grip when docked
             pane.Dockable(dock)
-        
-        dock = kwargs.get('dock')
-        pane.dock_direction = dock or 0
-        if dock:
-            pane.Dock()
-        else:
-            pane.Float()
-        return self.show_pane(name, show)
     
     def OnPaneClose(self, evt): #<wx.aui.AuiManagerEvent>
         pane = evt.GetPane()
@@ -1113,9 +1108,9 @@ class Frame(mwx.Frame):
                 self.register(cls, module)
         return module
     
-    def load_plug(self, root, force=False, session=None,
-                  show=False, dock=False, layer=0, pos=0, row=0, prop=10000,
-                  floating_pos=None, floating_size=None, **kwargs):
+    def load_plug(self, root, force=False, session=None, show=False,
+                        dock=0, floating_pos=None, floating_size=None,
+                        **kwargs):
         """Load plugin.
         
         Args:
@@ -1126,10 +1121,6 @@ class Frame(mwx.Frame):
             session : Conditions for initializing the plug and starting session
             show    : the pane is shown after loaded
             dock    : dock_direction (1:top, 2:right, 3:bottom, 4:left, 5:center)
-            layer   : dock_layer
-            pos     : dock_pos
-            row     : dock_row position
-            prop    : dock_proportion < 1e6 ?
             floating_pos: posision of floating window
             floating_size: size of floating window
             
@@ -1141,14 +1132,16 @@ class Frame(mwx.Frame):
         Note:
             The root module must have a class Plugin <Layer>
         """
-        props = dict(show=show, dock=dock, layer=layer, pos=pos, row=row, prop=prop,
-                     floating_pos=floating_pos, floating_size=floating_size)
+        props = dict(dock_direction=dock,
+                     floating_pos=floating_pos,
+                     floating_size=floating_size)
         
         _dirname, name = split_paths(root)
         
         plug = self.get_plug(name)
         if plug and not force:
             self.update_pane(name, **props)
+            self.show_pane(name, show)
             try:
                 if session:
                     plug.load_session(session)
@@ -1178,15 +1171,11 @@ class Frame(mwx.Frame):
                 if name not in self.plugins:
                     raise NameError("Plugin name must not be the same as any other panes")
                 
+                show = show or pane.IsShown()
                 props.update(
-                    show = show or pane.IsShown(),
-                    dock = pane.IsDocked() and pane.dock_direction,
-                    layer = pane.dock_layer,
-                    pos = pane.dock_pos,
-                    row = pane.dock_row,
-                    prop = pane.dock_proportion,
-                    floating_pos = floating_pos or pane.floating_pos[:], # copy (pane unloaded)
-                    floating_size = floating_size or pane.floating_size[:], # copy
+                    dock_direction = pane.IsDocked() and pane.dock_direction,
+                    floating_pos = floating_pos or pane.floating_pos[:], # copy unloading pane
+                    floating_size = floating_size or pane.floating_size[:], # copy unloading pane
                 )
         except (AttributeError, NameError) as e:
             traceback.print_exc()
@@ -1248,6 +1237,7 @@ class Frame(mwx.Frame):
         plug.Name = name
         
         self.update_pane(name, **props)
+        self.show_pane(name, show)
         
         ## Create a menu
         plug.__Menu_item = None

mwx/images.py

@@ -135,6 +135,19 @@ clock = PyEmbeddedImage(
     b'vqHBv3R3pmbxzgwz4Z+EaTXtwqIogrzjxIJ4QVVV1UyihxgjFv3/K09Bu/lEkBgg5rLZH+fT'
     b'5dvfn7iFAAAAAElFTkSuQmCC')
 
+#----------------------------------------------------------------------
+cog = PyEmbeddedImage(
+    b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAAK/INwWK6QAAABl0'
+    b'RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGSSURBVCjPVVFNSwJhEF78Ad79'
+    b'Cf6PvXQRsotUlzKICosuRYmR2RJR0KE6lBFFZVEbpFBSqKu2rum6llFS9HHI4iUhT153n6Zt'
+    b'IWMOM+/MM88z7wwH7s9Ub16SJcnbmrNcxVm2q7Z8/QPvEOtntpj92NkCqITLepEpjix7xQti'
+    b'LOoQ2b6+E7YAN/5nfOEJ2WbKqOIOJ4bYVMEQx4LfBBQDsvFMhUcCVU1/CxVXmDBGA5ZETrhD'
+    b'CQVcYAPbyEJBhvrnBVPiSpNr6cYDNCQwo4zzU/ySckkgDYuNuVpI42T9k4gLKGMPs/xPzzov'
+    b'QiY2hQYe0jlJfyNNhTqiWDYBq/wBMcSRpnyPzu1oS7WtxjVBSthU1vgVksiQ3Dn6Gp5ah2YO'
+    b'KQo5GiuHPA6xT1EKpxQNCNYejgIR457KKio0S56YckjSa9jo//3mrj+BV0QQagqGTOo+Y7gZ'
+    b'If1puP3WHoLhEb2PjTlCTCWGXtbp8DCX3hZuOdaIc9A+aQvWk4ihq95p67a7nP+u+Ws+r0dq'
+    b'l9z/zv0NCYhdCPKZ7oYAAAAASUVORK5CYII=')
+
 #----------------------------------------------------------------------
 colour = PyEmbeddedImage(
     b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'

mwx/matplot2g.py

@@ -21,7 +21,7 @@ from .matplot2 import MatplotPanel
 from .matplot2 import NORMAL, DRAGGING, PAN, ZOOM, MARK, LINE, REGION
 
 
-def _imcv(src):
+def _to_cvtype(src):
     """Convert the image to a type that can be applied to the cv2 function.
     Note:
         CV2 normally accepts uint8/16 and float32/64.
@@ -31,33 +31,18 @@ def _imcv(src):
     return src
 
 
-def _to_buffer(img):
-    if isinstance(img, Image.Image):
-        ## return np.asarray(img) # ref
-        return np.array(img) # copy
-    
-    if isinstance(img, wx.Bitmap):
-        img = img.ConvertToImage()
-    
-    if isinstance(img, wx.Image):
-        w, h = img.GetSize()
-        buf = np.frombuffer(img.GetDataBuffer(), dtype='uint8')
-        return buf.reshape(h, w, 3)
-    return img
-
-
 def _to_array(x):
     if isinstance(x, (list, tuple)):
         x = np.array(x)
     return x
 
 
-def imconvert(src, cutoff=0, threshold=None, binning=1):
-    """Convert buffer to image<uint8>
+def _to_image(src, cutoff=0, threshold=None, binning=1):
+    """Convert buffer to image <uint8>
     
     >>> dst = (src-a) * 255 / (b-a)
     
-    cf. convertScaleAbs(src[, dst[, alpha[, beta]]]) -> dst<uint8>
+    cf. convertScaleAbs(src[, dst[, alpha[, beta]]]) -> dst <uint8>
     
         >>> dst = |src * alpha + beta|
             alpha = 255 / (b-a)
@@ -80,13 +65,13 @@ def imconvert(src, cutoff=0, threshold=None, binning=1):
     
     if bins > 1:
         ## src = src[::bins,::bins]
-        src = _imcv(src)
+        src = _to_cvtype(src)
         src = cv2.resize(src, None, fx=1/bins, fy=1/bins, interpolation=cv2.INTER_AREA)
     
-    if src.dtype == np.uint8:
-        return bins, (0,255), src
+    if src.dtype == np.uint8: # RGB or gray image <uint8>
+        return bins, (0, 255), src
     
-    if hasattr(cutoff, '__iter__'):
+    if hasattr(cutoff, '__iter__'): # cutoff vlim:list is specified.
         a, b = cutoff
     elif cutoff > 0:
         a = np.percentile(src, cutoff)
@@ -133,8 +118,17 @@ class AxesImagePhantom:
         self.__aspect_ratio = aspect
         self.__attributes = attributes
         self.__attributes['localunit'] = self.__localunit
-        self.__buf = _to_buffer(buf)
-        bins, vlim, img = imconvert(self.__buf,
+        if isinstance(buf, Image.Image):
+            buf = np.array(buf)         # copy buffer to array
+        if isinstance(buf, wx.Bitmap):
+            buf = buf.ConvertToImage()  # bitmap to image
+        if isinstance(buf, wx.Image):   # image to RGB array
+            w, h = buf.GetSize()
+            buf = np.frombuffer(buf.GetDataBuffer(), dtype='uint8').reshape(h, w, 3)
+        if buf.ndim > 2:
+            buf = cv2.cvtColor(buf, cv2.COLOR_RGB2GRAY) # RGB to grayscale
+        self.__buf = buf
+        bins, vlim, img = _to_image(self.__buf,
                 cutoff = self.parent.score_percentile,
              threshold = self.parent.nbytes_threshold,
         )
@@ -279,9 +273,8 @@ class AxesImagePhantom:
     def update_buffer(self, buf=None):
         """Update buffer and the image (internal use only)."""
         if buf is not None:
-            self.__buf = _to_buffer(buf)
-        
-        bins, vlim, img = imconvert(self.__buf,
+            self.__buf = buf
+        bins, vlim, img = _to_image(self.__buf,
                 cutoff = self.parent.score_percentile,
              threshold = self.parent.nbytes_threshold,
         )
@@ -951,7 +944,7 @@ class GraphPlot(MatplotPanel):
             data = frame.roi
             GraphPlot.clipboard_name = name
             GraphPlot.clipboard_data = data
-            bins, vlim, img = imconvert(data, frame.vlim)
+            bins, vlim, img = _to_image(data, frame.vlim)
             Clipboard.imwrite(img)
             self.message("Write buffer to clipboard.")
         except Exception as e:
@@ -965,12 +958,12 @@ class GraphPlot(MatplotPanel):
             data = GraphPlot.clipboard_data
             if name:
                 self.message("Read buffer from clipboard.")
-                self.load(data)
                 GraphPlot.clipboard_name = None
                 GraphPlot.clipboard_data = None
             else:
                 self.message("Read image from clipboard.")
-                self.load(Clipboard.imread())
+                data = Clipboard.imread()
+            self.load(data)
         except Exception as e:
             traceback.print_exc()
             self.message("- No data in clipboard.", e)

mwx/nutshell.py

@@ -49,7 +49,6 @@ py_where_re = r'> +([^*?"<>|\r\n]+?):([0-9]+)'
 py_break_re = r'at ([^*?"<>|\r\n]+?):([0-9]+)'
 
 ## Custom constants in wx.stc
-stc.STC_P_WORD3 = 20 # deprecated
 stc.STC_STYLE_CARETLINE = 40
 stc.STC_STYLE_ANNOTATION = 41
 
@@ -635,9 +634,9 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         
         self.IndicatorSetStyle(11, stc.STC_INDIC_STRAIGHTBOX)
         self.IndicatorSetUnder(11, True)
-        self.IndicatorSetAlpha(11, 255)
-        self.IndicatorSetOutlineAlpha(11, 255)
-        self.IndicatorSetForeground(11, "yellow")
+        self.IndicatorSetAlpha(11, 60)
+        self.IndicatorSetOutlineAlpha(11, 60)
+        self.IndicatorSetForeground(11, "light gray")
         
         self.IndicatorSetStyle(2, stc.STC_INDIC_DOTS)
         self.IndicatorSetForeground(2, "light gray")
@@ -804,11 +803,11 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.mark = self.cpos
     
     def set_pointer(self):
-        if self.pointer == self.cline:
+        if self.pointer == self.cline: # toggle
             self.pointer = -1
         else:
-            self.pointer = self.cline
-            self.red_pointer = -1
+            self.pointer = self.cline  # reset
+        self.red_pointer = -1
     
     def exchange_point_and_mark(self):
         p = self.cpos
@@ -1419,15 +1418,15 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         def _format(ln):
             return "{:4d} {}".format(ln+1, self.GetLine(ln).strip())
         
-        pts = self.StyleGetSize(stc.STC_STYLE_DEFAULT)
-        self.StyleSetSize(stc.STC_STYLE_DEFAULT, pts-1)
+        ## pts = self.StyleGetSize(stc.STC_STYLE_DEFAULT)
+        ## self.StyleSetSize(stc.STC_STYLE_DEFAULT, pts-1)
         
         self.AutoCompSetSeparator(ord('\n'))
         self.AutoCompShow(0, '\n'.join(map(_format, self.__itextlines)))
         self.AutoCompSelect("{:4d}".format(self.cline+1))
         self.Bind(stc.EVT_STC_AUTOCOMP_SELECTION, self.on_itext_selection)
         
-        self.StyleSetSize(stc.STC_STYLE_DEFAULT, pts)
+        ## self.StyleSetSize(stc.STC_STYLE_DEFAULT, pts)
     
     def on_itext_exit(self, evt):
         """Called when exiting filter_text mode."""
@@ -2144,7 +2143,6 @@ class Buffer(EditorInterface, EditWindow):
                 self.AnnotationSetStyle(lx, stc.STC_STYLE_ANNOTATION)
                 self.AnnotationSetText(lx, msg)
             self.message(e)
-            ## print(msg, file=sys.__stderr__)
         else:
             self.code = code
             del self.pointer # Reset pointer (debugger hook point).
@@ -2583,19 +2581,21 @@ class Interpreter(interpreter.Interpreter):
         interpreter.Interpreter.showtraceback(self)
         
         t, v, tb = sys.exc_info()
-        v.lineno = tb.tb_next.tb_lineno
-        v.filename = tb.tb_next.tb_frame.f_code.co_filename
+        while tb.tb_next:
+            tb = tb.tb_next
+        v.lineno = tb.tb_lineno
+        v.filename = tb.tb_frame.f_code.co_filename
         try:
             self.parent.handler('interp_error', v)
         except AttributeError:
             pass
     
-    def showsyntaxerror(self, filename=None):
+    def showsyntaxerror(self, filename=None, **kwargs):
         """Display the syntax error that just occurred.
         
         (override) Pass the syntax error info to the parent:shell.
         """
-        interpreter.Interpreter.showsyntaxerror(self, filename)
+        interpreter.Interpreter.showsyntaxerror(self, filename, **kwargs)
         
         t, v, tb = sys.exc_info()
         try:
@@ -2711,7 +2711,6 @@ class Nautilus(EditorInterface, Shell):
             obj.this = inspect.getmodule(obj)
             obj.shell = self # overwrite the facade <wx.py.shell.ShellFacade>
         except AttributeError:
-            ## print("- cannot overwrite target vars:", e)
             pass
         self.parent.handler('title_window', obj)
     
@@ -3206,8 +3205,8 @@ class Nautilus(EditorInterface, Shell):
         Note:
             This is called before run, execute, and original magic.
         """
-        sep1 = "`@=;#"                # [`] no ops, no spaces, no comma
-        sep2 = "`@=+-/*%<>&|^~,; \t#" # [@] ops, delims, and whitespaces
+        sep1 = "`@=;\r\n#"                # [`] no ops, no spaces, no comma
+        sep2 = "`@=+-/*%<>&|^~,; \t\r\n#" # [@] ops, delims, and whitespaces
         
         def _popiter(ls, f):
             pred = f if callable(f) else re.compile(f).match
@@ -3276,9 +3275,10 @@ class Nautilus(EditorInterface, Shell):
         Delete target shell to prevent referencing the dead shell.
         """
         def _del():
+            obj = self.target
             try:
-                if not self.target.shell:
-                    del self.target.shell # delete the facade <wx.py.shell.ShellFacade>
+                if not obj.shell:
+                    del obj.shell # delete the facade <wx.py.shell.ShellFacade>
             except AttributeError:
                 pass
         wx.CallAfter(_del)
@@ -3288,11 +3288,14 @@ class Nautilus(EditorInterface, Shell):
         Reset localvars assigned for the shell target.
         """
         self.trace_position()
-        self.parent.handler('title_window', self.target)
+        obj = self.target
         try:
-            self.target.shell = self # overwrite the facade <wx.py.shell.ShellFacade>
+            obj.self = obj
+            obj.this = inspect.getmodule(obj)
+            obj.shell = self # overwrite the facade <wx.py.shell.ShellFacade>
         except AttributeError:
             pass
+        self.parent.handler('title_window', obj)
     
     def on_inactivated(self, shell):
         """Called when shell:self is inactivated.
@@ -3328,7 +3331,7 @@ class Nautilus(EditorInterface, Shell):
     
     def on_interp_error(self, e):
         ln = self.LineFromPosition(self.bolc)
-        self.pointer = ln + e.lineno - 1
+        self.red_pointer = ln + e.lineno - 1
     
     ## --------------------------------
     ## Attributes of the shell
@@ -3652,11 +3655,11 @@ class Nautilus(EditorInterface, Shell):
                 lines = [int(ln) for fn, ln in err if fn == filename]
                 if lines:
                     region = self.get_region(self.cline)
-                    self.pointer = region[0] + lines[-1] - 1
+                    lx = region[0] + lines[-1] - 1
+                    self.red_pointer = lx
                 self.message(e)
-                ## print(msg, file=sys.__stderr__)
             else:
-                del self.pointer
+                del self.red_pointer
                 self.message("Evaluated {!r} successfully.".format(filename))
         else:
             self.message("No region")

mwx/plugins/ffmpeg_view.py

@@ -77,7 +77,6 @@ class Plugin(Layer):
     """Media loader using FFMpeg (installation required).
     """
     menukey = "Plugins/Extensions/FFMpeg viewer"
-    ## menukey = "FFMpeg/"
     dockable = False
     
     def Init(self):

mwx/plugins/fft_view.py

@@ -26,7 +26,7 @@ class Plugin(Layer):
         Rectangular regions will result in distorted patterns.
         長方形のリージョンは歪んだパターンになるので要注意
     """
-    menukey = "Plugins/Extensions/&FFT view"
+    menukey = "Plugins/Extensions/&FFT view\tAlt+f"
     caption = "FFT view"
     
     def Init(self):

mwx/plugins/frame_listview.py

@@ -243,7 +243,7 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
 class Plugin(Layer):
     """Property list of Graph buffers.
     """
-    menukey = "Plugins/Extensions/&Buffer listbox\tCtrl+b"
+    menukey = "Plugins/Extensions/&Buffer listbox\tAlt+b"
     caption = "Property list"
     dockable = False
     

mwx/plugins/line_profile.py

@@ -8,7 +8,7 @@ from mwx.matplot2lg import LineProfile
 class Plugin(Layer):
     """Line profile of the currently selected buffers.
     """
-    menukey = "Plugins/Extensions/&Line profile\tCtrl+l"
+    menukey = "Plugins/Extensions/&Line profile\tAlt+l"
     caption = "Line profile"
     dockable = False
     

mwx/wxpdb.py

@@ -295,10 +295,6 @@ class Debugger(Pdb):
         self.__hookpoint = None
         self.indents = ' ' * 2
         self.stdin.input = '' # clear stdin buffer
-        def _continue():
-            if wx.IsBusy():
-                wx.EndBusyCursor()
-        wx.CallAfter(_continue)
     
     def on_debug_mark(self, frame):
         """Called when interaction."""
@@ -365,11 +361,6 @@ class Debugger(Pdb):
         
         ## Note: Required to terminate the reader of threading pdb.
         self.send_input('\n')
-        
-        def _continue():
-            if wx.IsBusy():
-                wx.EndBusyCursor()
-        wx.CallAfter(_continue)
     
     def on_trace_hook(self, frame):
         """Called when a breakppoint is reached."""

mwx/wxwit.py

@@ -217,8 +217,6 @@ def dump(widget=None):
 def watchit(widget=None, **kwargs):
     """Wx.py tool for watching widget tree structure and events."""
     from wx.lib.inspection import InspectionTool
-    if widget:
-        kwargs.update(locals=widget.__dict__)
     it = InspectionTool()
     it.Init(**kwargs)
     it.Show(widget)

{mwxlib-0.99.9.dist-info → mwxlib-1.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.99.9
+Version: 1.0.0
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto
@@ -39,22 +39,17 @@ These instructions will get you a copy of the project up and running on your loc
 - ~~Python 2.7~~ (PY2 support has ended since 0.50)
 - ~~Python 3.5~~ (PY35 support has ended since 0.70)
 - ~~Python 3.7~~ (PY37 support has ended since 0.80)
-- Python 3.8 -- 3.9 (deprecated since 0.90)
-    - wxpython >= 4.1.1
+- ~~Python 3.8 -- 3.9~~ (Deprecated since 0.90)
+- Python 3.10 -- 3.12
+    - wxpython >= 4.2.2 (recommended)
     - numpy
     - pillow
     - matplotlib
     - opencv-python
-- Python 3.10 -- 3.11
-    - wxpython >= 4.2.1
-    - numpy
-    - pillow
-    - matplotlib
-    - opencv-python
-- Python 3.12
-    - A version of wxpython for PY312 has not yet released on PyPi.
-        * You can download the snapshot from https://wxpython.org/Phoenix/snapshot-builds/,
-        * or the latest snapshot from Azure Pipelines https://alldunn.visualstudio.com/wxPython-CI/_build?definitionId=2&_a=summary
+- Python 3.13
+    - There are some bugs in mwxlib that remain unfixed.
+    - A version of wxpython for PY313 has released on PyPi.
+        * You can also download the snapshot from https://wxpython.org/Phoenix/snapshot-builds/,
 
 
 ### Installing

mwxlib-1.0.0.dist-info/RECORD

@@ -0,0 +1,28 @@
+mwx/__init__.py,sha256=psabnAMei5VzB2TsB2qBNLrIZMX0LiqjlXCpNGmDejk,668
+mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
+mwx/controls.py,sha256=LZqee9K8uPxs-Iqcp1zMMNBjFpGPrHbcMaIBuBOL7oo,47647
+mwx/framework.py,sha256=vtufV2jjqdTr2CRhbJYY_NbJMtqft9uKCzZR12dfgk0,75809
+mwx/graphman.py,sha256=1GGBk4kJYRQ7zkvO2rvHxHoINrIfHSB7cabQKWhTyaI,69669
+mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
+mwx/matplot2.py,sha256=zA56jIdRUdzu-wrmPai1PSOjzqV2Erqw2yFKW-jwdA8,32901
+mwx/matplot2g.py,sha256=xQeHKHAZkLZ2tY-rlTXEIKue1Iw9Vo73l6z_3GSQVCQ,64422
+mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
+mwx/mgplt.py,sha256=M5rt-H7Uq1OHnlFvMA4a3945UBvppbR9L_mw8NL_YZ0,5602
+mwx/nutshell.py,sha256=pNGLBlVYz6D4LNjosCjXaopcITkQ2-qGVQ6zGmVJJYQ,141850
+mwx/utilus.py,sha256=Yyw8L1f-ikhyd7wtFXYtsOswofWxmB4GAmLOZnhUXeU,37388
+mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
+mwx/wxpdb.py,sha256=--TQr-_zs9dWPYV2V4s3Zr4abvN14o5wD8anT9frHUg,18875
+mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
+mwx/wxwit.py,sha256=1hHtMi2YEy2T_LnUpwdmrIdtCuvxMOFyykqnbq6jLP0,7294
+mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
+mwx/plugins/ffmpeg_view.py,sha256=ZKkSLpyuzpVuRbaPib04rChzlwAifNp3pcgxABeqE4k,10693
+mwx/plugins/fft_view.py,sha256=08A_Y73XirV7kXpwf-v0mUA0Hr0MOfdMXv3tvL1hvWA,2789
+mwx/plugins/frame_listview.py,sha256=gowjQ-ARNonMkDSXkQgPKq4U9YBJ-vQ0jK2krBVOdCs,10420
+mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
+mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
+mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
+mwxlib-1.0.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.0.0.dist-info/METADATA,sha256=IyWzRxDY-vYI_37c6GQ5WgZFAc93d5vfuqaGY8_s3dI,7259
+mwxlib-1.0.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+mwxlib-1.0.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.0.0.dist-info/RECORD,,

{mwxlib-0.99.9.dist-info → mwxlib-1.0.0.dist-info}/WHEEL

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

mwxlib-0.99.9.dist-info/RECORD

@@ -1,28 +0,0 @@
-mwx/__init__.py,sha256=psabnAMei5VzB2TsB2qBNLrIZMX0LiqjlXCpNGmDejk,668
-mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
-mwx/controls.py,sha256=LZqee9K8uPxs-Iqcp1zMMNBjFpGPrHbcMaIBuBOL7oo,47647
-mwx/framework.py,sha256=nJ22_22Hk2U8xSbHOszluJdSMDwYsw6XjI3lOiprcJc,75501
-mwx/graphman.py,sha256=qX5aHEw4u9iGR8lNpZkXDnGPVMhyAH6NnBapiaUbKZw,70265
-mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
-mwx/matplot2.py,sha256=zA56jIdRUdzu-wrmPai1PSOjzqV2Erqw2yFKW-jwdA8,32901
-mwx/matplot2g.py,sha256=gCXa8X1MEMP7n_mG73h3SkWKuNZOfjVKUTWNRXXK11c,64310
-mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
-mwx/mgplt.py,sha256=M5rt-H7Uq1OHnlFvMA4a3945UBvppbR9L_mw8NL_YZ0,5602
-mwx/nutshell.py,sha256=zJULq1K8WiOBUncMpXE8HbunqUULa9MUt0hBET5jmgs,141810
-mwx/utilus.py,sha256=Yyw8L1f-ikhyd7wtFXYtsOswofWxmB4GAmLOZnhUXeU,37388
-mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
-mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
-mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
-mwx/wxwit.py,sha256=l7uq6NgGBhay-uAE1pQgWziSAGO9QZPJ4EpEBw1P9xU,7357
-mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
-mwx/plugins/ffmpeg_view.py,sha256=Mmen75o6LyA5QEHB8sCFSPCIPvEaALKzrgomym3fGAU,10721
-mwx/plugins/fft_view.py,sha256=xxTDD-_z4l18u4t2ybPB3xAMIslJmJ0gQlTxEqJUhNI,2782
-mwx/plugins/frame_listview.py,sha256=yEYPCdLHLSMTJwTv6iYAh3Lo4lJvYfp5BxTLP3FhW9Y,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.99.9.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.99.9.dist-info/METADATA,sha256=1-yAjrG-AehfMfbbEyPN3eMtrGErVkNft7OHtTkwSU0,7411
-mwxlib-0.99.9.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-mwxlib-0.99.9.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.99.9.dist-info/RECORD,,