mwxlib 1.0.6__py3-none-any.whl → 1.1.0__py3-none-any.whl

mwx/controls.py

@@ -426,7 +426,7 @@ class Knob(wx.Panel):
                 self.ctrl.SetItems(items)
                 self.ctrl.SetStringSelection(str(v))
         else:
-            self.ctrl.SetRange(0, len(v)-1) #<wx.Slider> <wx.SpinButton>
+            self.ctrl.SetRange(0, len(v)-1) #<wx.Slider> #<wx.SpinButton>
     
     def update_label(self):
         """Called when label is being changed (internal use only)."""
@@ -482,7 +482,7 @@ class Knob(wx.Panel):
             v.index = j
             v.reset(v.value)
     
-    def OnScroll(self, evt): #<wx._core.ScrollEvent><wx._controls.SpinEvent><wx._core.CommandEvent>
+    def OnScroll(self, evt): #<wx._core.ScrollEvent> #<wx._controls.SpinEvent> #<wx._core.CommandEvent>
         v = self.__par
         j = self.ctrl.GetValue()
         if j != v.index:

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.0.6"
+__version__ = "1.1.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -261,26 +261,33 @@ class KeyCtrlInterfaceMixin:
             },
         })
     
+    builtins.enter = "Enter extension mode."
+    builtins.exit = "Exit extension mode."
+    
     def pre_command_hook(self, evt):
-        """Called when entering extension mode (internal use only)."""
+        ## """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:
-            ## or any other of pre-selection-p?
+          or isinstance(wnd, stc.StyledTextCtrl) and wnd.SelectedText:
             self.handler('quit', evt)
         else:
             self.message(evt.key + '-')
         evt.Skip()
+    pre_command_hook.__name__ = str('enter')
     
     def post_command_hook(self, evt):
-        """Called when exiting extension mode (internal use only)."""
+        ## """Called when exiting extension mode (internal use only)."""
+        ## Check if the event has reached a top-level window.
+        if isinstance(self, wx.TopLevelWindow):
+            return
         keymap = self.handler.previous_state
         if keymap:
             self.message("{} {}".format(keymap, evt.key))
         else:
             self.message(evt.key)
         evt.Skip()
+    post_command_hook.__name__ = str('exit')
     
     def define_key(self, keymap, action=None, *args, **kwargs):
         """Define [map key (pressed)] action.
@@ -729,11 +736,6 @@ class Frame(wx.Frame, KeyCtrlInterfaceMixin):
     
     message = property(lambda self: self.statusbar)
     
-    def post_command_hook(self, evt):
-        ## (override) Don't skip events as a TopLevelWindow.
-        pass
-    post_command_hook.__name__ = str('noskip')
-    
     def __init__(self, *args, **kwargs):
         wx.Frame.__init__(self, *args, **kwargs)
         
@@ -808,11 +810,6 @@ class MiniFrame(wx.MiniFrame, KeyCtrlInterfaceMixin):
     
     message = property(lambda self: self.statusbar)
     
-    def post_command_hook(self, evt):
-        ## (override) Don't skip events as a TopLevelWindow.
-        pass
-    post_command_hook.__name__ = str('noskip')
-    
     def __init__(self, *args, **kwargs):
         wx.MiniFrame.__init__(self, *args, **kwargs)
         

mwx/graphman.py

@@ -261,6 +261,12 @@ class LayerInterface(CtrlInterface):
     ## thread_type = Thread
     thread = None
     
+    ## layout helper function (internal use only)
+    pack = mwx.pack
+    
+    ## funcall = interactive_call (internal use only)
+    funcall = staticmethod(_F)
+    
     ## for debug (internal use only)
     pane = property(lambda self: self.parent.get_pane(self))
     

mwx/matplot2.py

@@ -160,6 +160,12 @@ class MatplotPanel(wx.Panel):
             if self.handler.fork(self.handler.current_event, evt) is None:
                 evt.Skip()
         
+        def skip(evt): #<wx._core.KeyEvent> #<matplotlib.backend_bases.MouseEvent>
+            try:
+                evt.Skip()
+            except AttributeError:
+                pass
+        
         self.__handler = FSM({ # DNA<MatplotPanel>
                 None : {
                   'canvas_draw' : [ None, self.OnDraw ], # before canvas.draw
@@ -188,6 +194,7 @@ class MatplotPanel(wx.Panel):
                 'space pressed' : (PAN, self.OnPanBegin),
                  'ctrl pressed' : (PAN, self.OnPanBegin),
                     'z pressed' : (ZOOM, self.OnZoomBegin),
+                    '* pressed' : (NORMAL, skip),
                  'xaxis motion' : (XAXIS, self.OnAxisEnter),
                  'yaxis motion' : (YAXIS, self.OnAxisEnter),
                 'y2axis motion' : (YAXIS, self.OnAxisEnter),

mwx/nutshell.py

@@ -1785,16 +1785,6 @@ class Buffer(EditorInterface, EditWindow):
         """
         return self.mtdelta is not None and self.mtdelta > 0
     
-    def pre_command_hook(self, evt):
-        self.parent.handler(self.handler.current_event, evt)
-        return EditorInterface.pre_command_hook(self, evt)
-    pre_command_hook.__name__ = str('pre_command_dispatch') # alias
-    
-    def post_command_hook(self, evt):
-        self.parent.handler(self.handler.current_event, evt)
-        return EditorInterface.post_command_hook(self, evt)
-    post_command_hook.__name__ = str('post_command_dispatch') # alias
-    
     def __init__(self, parent, filename, **kwargs):
         EditWindow.__init__(self, parent, **kwargs)
         EditorInterface.__init__(self)
@@ -2647,10 +2637,9 @@ class Nautilus(EditorInterface, Shell):
     
         - quoteback : x`y --> y=x  | x`y`z --> z=y=x
         - pullback  : x@y --> y(x) | x@y@z --> z(y(x))
-        - apropos   : x.y? [not] p --> shows apropos (not-)matched by predicates p
-                      equiv. apropos(x, y [,ignorecase ?:True,??:False] [,pred=p])
-                      ``y`` can contain regular expressions except for a dot.
-                      ``y`` can contain abbreviations: \\a:[a-z], \\A:[A-Z] .
+        - apropos   : x.y? [not] p --> shows items (not) matched by predicate p
+                      equiv. apropos(x, y [,ignorecase ?:True,??:False] [,pred=p]).
+                      ``y`` can contain regular expressions, but no dots or backslashes.
                       ``p`` can be atom, callable, type (e.g., int, str, ...),
                       and any predicates such as inspect.isclass.
         

mwx/testsuite.py

@@ -0,0 +1,58 @@
+#! python3
+"""Test suite for App, Frame, and ControlPanel.
+
+Get the wx.App or wx.Frame instance and start the main-loop if needed.
+
+Usage:
+    with testApp() as app:
+        frm = wx.Frame(None)
+        frm.Show()
+
+Is equivlent to:
+    app = wx.App()
+    frm = wx.Frame(None)
+    frm.Show()
+    app.MainLoop()
+"""
+from contextlib import contextmanager
+import wx
+
+__all__ = ["testApp", "testFrame", "Plugman", "ControlPanel"]
+
+
+@contextmanager
+def testApp():
+    app = wx.GetApp() or wx.App()
+    yield app
+    if not app.GetMainLoop():
+        app.MainLoop()
+## wx.App.run = staticmethod(testApp)
+
+
+@contextmanager
+def testFrame(**kwargs):
+    with testApp():
+        frm = wx.Frame(None, **kwargs)
+        yield frm
+        frm.Show()
+## wx.Frame.run = staticmethod(testFrame)
+
+
+@contextmanager
+def Plugman(**kwargs):
+    import mwx.graphman
+    with testApp():
+        frm = mwx.graphman.Frame(None, **kwargs)
+        yield frm
+        frm.Show()
+
+
+@contextmanager
+def ControlPanel(**kwargs):
+    import mwx
+    with testApp():
+        frm = mwx.Frame(None)
+        panel = mwx.ControlPanel(frm, **kwargs)
+        yield panel
+        panel.Sizer.Fit(frm)
+        frm.Show()

mwx/utilus.py

@@ -138,9 +138,6 @@ def apropos(obj, rexpr='', ignorecase=True, alias=None, pred=None, locals=None):
     """
     name = alias or typename(obj)
     
-    rexpr = (rexpr.replace('\\a','[a-z0-9]')  #\a: identifier chars (custom rule)
-                  .replace('\\A','[A-Z0-9]')) #\A: 
-    
     if isinstance(pred, str):
         pred = predicate(pred, locals)
     
@@ -326,9 +323,9 @@ def split_tokens(text, comment=True):
         j, k = 1, 0
         for type, string, start, end, line in tokens:
             l, m = start
-            if type in (0,5,6) or not string:
+            if type in (tokenize.ENDMARKER, tokenize.INDENT, tokenize.DEDENT):
                 continue
-            if type == 61 and not comment:
+            if type == tokenize.COMMENT and not comment:
                 token = next(tokens)  # eats a trailing token
                 string = token.string # cr/lf or ''
                 if m == 0:

{mwxlib-1.0.6.dist-info → mwxlib-1.1.0.dist-info}/METADATA

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

{mwxlib-1.0.6.dist-info → mwxlib-1.1.0.dist-info}/RECORD

@@ -1,15 +1,16 @@
 mwx/__init__.py,sha256=psabnAMei5VzB2TsB2qBNLrIZMX0LiqjlXCpNGmDejk,668
 mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
-mwx/controls.py,sha256=iXNTk4ge6sHStenjxC7bFKgQHvqxMwfb82IbgiDmtEk,47944
-mwx/framework.py,sha256=Y0YBqjcbfPMTqal_-vN9LPAXaHVNTYbxQ1UpMbVAb_8,75818
-mwx/graphman.py,sha256=mDnhy3jAzZCo8_p6ZcA-NDPMuOyW_R2r_fuxUIAM7D8,69669
+mwx/controls.py,sha256=cNZkgwSv90lPIz61FvMtYxHIt8hJD_RQYXxsgTQIdLc,47949
+mwx/framework.py,sha256=eDCdsCjn0-dgeGh4RjTmkoKCyQa96_YXSWF6zFped4Y,75759
+mwx/graphman.py,sha256=04bEw7TEIs6X1QrgqBSLJoIhJnW5TwHTW_wZOvJYSwo,69840
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
-mwx/matplot2.py,sha256=zA56jIdRUdzu-wrmPai1PSOjzqV2Erqw2yFKW-jwdA8,32901
+mwx/matplot2.py,sha256=RuVWXC2A_qgZRNmBBptbHDn5MyxaWBqp3ru4bP_lDE0,33150
 mwx/matplot2g.py,sha256=4G5uZJZzATEC3QEVZ4pGHetEDfu5NJNUFyeAaQScK5s,64495
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=M5rt-H7Uq1OHnlFvMA4a3945UBvppbR9L_mw8NL_YZ0,5602
-mwx/nutshell.py,sha256=9QeJXQluEmZSB0B8rGSH9SU_WvjCymmDdU0DKd3fkko,142076
-mwx/utilus.py,sha256=Yyw8L1f-ikhyd7wtFXYtsOswofWxmB4GAmLOZnhUXeU,37388
+mwx/nutshell.py,sha256=MLE667zDFB2iZSpW1m0AwLxRAh6HUYLMyl4OLV_VXAI,141532
+mwx/testsuite.py,sha256=gPoqnBzG4wnON785Pn5lEuWFgenrY6KhPH-e1WZbKfA,1234
+mwx/utilus.py,sha256=sZehJJHBQ7aGpzEMClmowqExVO7esyVMK7Tk-MJO6tQ,37293
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
 mwx/wxpdb.py,sha256=--TQr-_zs9dWPYV2V4s3Zr4abvN14o5wD8anT9frHUg,18875
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
@@ -21,8 +22,8 @@ mwx/plugins/frame_listview.py,sha256=gowjQ-ARNonMkDSXkQgPKq4U9YBJ-vQ0jK2krBVOdCs
 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.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.0.6.dist-info/METADATA,sha256=p5q3rC09GOoq4pW_UWNKP7Z1SvrX24kKCy-I19tKmts,7259
-mwxlib-1.0.6.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-mwxlib-1.0.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.0.6.dist-info/RECORD,,
+mwxlib-1.1.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.1.0.dist-info/METADATA,sha256=JHue3ApnAKemSra3UbiHgzXbe0pk7pkwoSMEF_jOTco,7259
+mwxlib-1.1.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+mwxlib-1.1.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.1.0.dist-info/RECORD,,