mwxlib 1.4.5__py3-none-any.whl → 1.4.8__py3-none-any.whl

mwx/controls.py

@@ -2,6 +2,7 @@
 """mwxlib param controller and wx custom controls.
 """
 from itertools import chain
+import inspect
 import wx
 import wx.lib.platebtn as pb
 import wx.lib.scrolledpanel as scrolled
@@ -68,7 +69,8 @@ class Param:
            'overflow' : [],
           'underflow' : [],
         })
-        self._tooltip = _Tip(handler.__doc__, updater.__doc__)
+        self._tooltip = _Tip(handler.__doc__,
+                             updater.__doc__)
     
     def __str__(self, v=None):
         if v is None:
@@ -293,7 +295,6 @@ class Knob(wx.Panel):
         style   : style of label
                   None -> static text (default)
                   button -> label with flat button
-                  chkbox -> label with checkbox
                   checkbox -> label with checkbox
         cw      : width of control
         lw      : width of label
@@ -313,6 +314,15 @@ class Knob(wx.Panel):
         self.update_range()
         self.update_ctrl()
     
+    @property
+    def button(self):
+        if isinstance(self._label, pb.PlateButton):
+            return self._label
+    
+    @property
+    def control(self):
+        return self._ctrl
+    
     def __init__(self, parent, param, type=None,
                  style=None, cw=-1, lw=-1, tw=-1, h=22, **kwargs):
         wx.Panel.__init__(self, parent, **kwargs)
@@ -335,9 +345,11 @@ class Knob(wx.Panel):
         label = self.__par.name + '  '
         
         if style == 'chkbox' or style == 'checkbox':
+            ## Keep margin for the checkbox: lw += 16
             self._label = wx.CheckBox(self, label=label, size=(lw,-1))
             self._label.Bind(wx.EVT_CHECKBOX, self.OnCheck)
         elif style == 'button':
+            ## Keep margin for the button: lw += 16
             self._label = pb.PlateButton(self, label=label, size=(lw,-1),
                                          style=pb.PB_STYLE_DEFAULT|pb.PB_STYLE_SQUARE)
             self._label.Bind(wx.EVT_BUTTON, self.OnPress)
@@ -668,17 +680,18 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
         
         self.Sizer.Add(sizer, expand>1, p | wx.ALL, border)
         
-        ## Register object and parameter groups
-        def _flatiter(a):
-            for c in a:
+        ## Register objects and parameter groups
+        def _flatiter(objects):
+            for c in objects:
                 if isinstance(c, tuple):
                     yield from _flatiter(c)
                 elif isinstance(c, wx.Object):
                     yield c
         self.__groups.append(list(_flatiter(objs)))
         
-        def _variter(a):
-            for c in a:
+        ## Parameters : Knob.param or widgets that have a `value`.
+        def _variter(objects):
+            for c in objects:
                 if isinstance(c, Knob):
                     yield c.param
                 elif hasattr(c, 'value'):
@@ -689,6 +702,8 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
         self.show(-1, visible)
         self.fold(-1, not show)
         self.Sizer.Fit(self)
+        
+        return self.__groups[-1]
     
     ## --------------------------------
     ## 外部入出力／クリップボード通信
@@ -860,8 +875,8 @@ class Icon(wx.Bitmap):
             '!!!' : wx.ART_ERROR,
               '+' : wx.ART_PLUS,
               '-' : wx.ART_MINUS,
-              'x' : wx.ART_DELETE,
-              't' : wx.ART_TICK_MARK,
+              ## 'x' : wx.ART_DELETE,
+              ## 't' : wx.ART_TICK_MARK,
               '~' : wx.ART_GO_HOME,
            'undo' : wx.ART_UNDO,
            'redo' : wx.ART_REDO,
@@ -901,18 +916,17 @@ class Icon(wx.Bitmap):
             except Exception:
                 art = Icon.provided_arts.get(key)
                 bmp = wx.ArtProvider.GetBitmap(art or key, wx.ART_OTHER, size)
+            ## Note: The result could be a zero-shaped bitmap.
             return bmp
-        
-        ## Note: null (0-shaped) bitmap fails with AssertionError from 4.1.1
         elif key == '':
+            ## Note: A zero-shaped bitmap fails with AssertionError since 4.1.1
             bmp = wx.Bitmap(size)
             with wx.MemoryDC(bmp) as dc:
                 dc.SetBackground(wx.Brush('black'))
                 dc.Clear()
             bmp.SetMaskColour('black') # return dummy-sized blank bitmap
             return bmp
-        
-        return wx.NullBitmap # The standard wx controls accept this,
+        return wx.NullBitmap # The standard wx controls accept this.
 
     @staticmethod
     def _getBitmap2(back, fore, size=None, subsize=3/4):
@@ -922,6 +936,8 @@ class Icon(wx.Bitmap):
             subsize = wx.Size(size) * subsize
         back = Icon._getBitmap1(back, size)
         fore = Icon._getBitmap1(fore, subsize)
+        if back.Size == (0, 0) or fore.Size == (0, 0):
+            return back
         x = size[0] - subsize[0]
         y = size[1] - subsize[1]
         with wx.MemoryDC(back) as dc:
@@ -975,8 +991,7 @@ class ClassicButton(wx.Button):
         
         if handler:
             self.Bind(wx.EVT_BUTTON, _F(handler))
-        
-        self.SetToolTip(_Tip(handler.__doc__))
+            self.SetToolTip(_Tip(handler.__doc__))
         if icon:
             self.SetBitmap(Icon(icon))
 
@@ -996,8 +1011,7 @@ class Button(pb.PlateButton):
         
         if handler:
             self.Bind(wx.EVT_BUTTON, _F(handler))
-        
-        self.SetToolTip(_Tip(handler.__doc__))
+            self.SetToolTip(_Tip(handler.__doc__))
         if icon:
             self.SetBitmap(Icon(icon))
     
@@ -1029,8 +1043,7 @@ class ToggleButton(wx.ToggleButton):
         
         if handler:
             self.Bind(wx.EVT_TOGGLEBUTTON, _F(handler))
-        
-        self.SetToolTip(_Tip(handler.__doc__))
+            self.SetToolTip(_Tip(handler.__doc__))
         if icon:
             try:
                 self.SetBitmap(Icon(icon[0]))
@@ -1058,19 +1071,20 @@ class TextBox(wx.Control):
     
     value = Value #: internal use only
     
+    button = property(lambda self: self._btn)
+    control = property(lambda self: self._ctrl)
+    
     def __init__(self, parent, label='', handler=None, updater=None,
                  icon=None, readonly=False, size=(-1,-1), **kwargs):
         wx.Control.__init__(self, parent, size=size, style=wx.BORDER_NONE)
         
         kwargs['style'] = (kwargs.get('style', 0)
-                            | wx.TE_PROCESS_ENTER
-                            | (wx.TE_READONLY if readonly else 0))
+                                    | wx.TE_PROCESS_ENTER
+                                    | (wx.TE_READONLY if readonly else 0))
         
         self._ctrl = wx.TextCtrl(self, **kwargs)
         self._btn = Button(self, label, None, icon,
                            size=(-1,-1) if label or icon else (0,0))
-        self._ctrl.SetToolTip(_Tip(handler.__doc__))
-        self._btn.SetToolTip(_Tip(updater.__doc__))
         
         self.SetSizer(
             pack(self, (
@@ -1081,9 +1095,11 @@ class TextBox(wx.Control):
         if handler:
             self._handler = _F(handler)
             self._ctrl.Bind(wx.EVT_TEXT_ENTER, lambda v: self._handler(self))
+            self._ctrl.SetToolTip(_Tip(handler.__doc__))
         if updater:
             self._updater = _F(updater)
             self._btn.Bind(wx.EVT_BUTTON, lambda v: self._updater(self))
+            self._btn.SetToolTip(_Tip(updater.__doc__))
         
         self.Bind(wx.EVT_NAVIGATION_KEY, self.OnNavKey)
     
@@ -1134,19 +1150,20 @@ class Choice(wx.Control):
         lambda self,v: self._ctrl.SetItems(v),
         doc="combobox items:list")
     
+    button = property(lambda self: self._btn)
+    control = property(lambda self: self._ctrl)
+    
     def __init__(self, parent, label='', handler=None, updater=None,
                  icon=None, readonly=False, size=(-1,-1), **kwargs):
         wx.Control.__init__(self, parent, size=size, style=wx.BORDER_NONE)
         
         kwargs['style'] = (kwargs.get('style', 0)
-                            | wx.TE_PROCESS_ENTER
-                            | (wx.CB_READONLY if readonly else 0))
+                                    | wx.TE_PROCESS_ENTER
+                                    | (wx.CB_READONLY if readonly else 0))
         
         self._ctrl = wx.ComboBox(self, **kwargs)
         self._btn = Button(self, label, None, icon,
                            size=(-1,-1) if label or icon else (0,0))
-        self._ctrl.SetToolTip(_Tip(handler.__doc__))
-        self._btn.SetToolTip(_Tip(updater.__doc__))
         
         self.SetSizer(
             pack(self, (
@@ -1158,10 +1175,12 @@ class Choice(wx.Control):
             self._handler = _F(handler)
             self._ctrl.Bind(wx.EVT_TEXT_ENTER, lambda v: self._handler(self))
             self._ctrl.Bind(wx.EVT_COMBOBOX, lambda v: self._handler(self))
+            self._ctrl.SetToolTip(_Tip(handler.__doc__))
         self._ctrl.Bind(wx.EVT_TEXT_ENTER, self.OnTextEnter)
         if updater:
             self._updater = _F(updater)
             self._btn.Bind(wx.EVT_BUTTON, lambda v: self._updater(self))
+            self._btn.SetToolTip(_Tip(updater.__doc__))
         
         self.Bind(wx.EVT_NAVIGATION_KEY, self.OnNavKey)
     

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.4.5"
+__version__ = "1.4.8"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager

mwx/graphman.py

@@ -381,10 +381,10 @@ class LayerInterface(CtrlInterface):
                 lambda v: reset_params(v, checked_only=wx.GetKeyState(wx.WXK_SHIFT)),
                 lambda v: v.Enable(bool(self.parameters))),
             (),
-            (wx.ID_EDIT, "&Edit module", "Edit module", Icon('pen'),
-                lambda v: self.parent.edit_plug(self.__module__),
-                lambda v: v.Enable(self.editable)),
-                
+            ## (wx.ID_EDIT, "&Edit module", "Edit module", Icon('pen'),
+            ##     lambda v: self.parent.edit_plug(self.__module__),
+            ##     lambda v: v.Enable(self.editable)),
+            ##     
             (mwx.ID_(201), "&Reload module", "Reload module", Icon('load'),
                 lambda v: self.parent.reload_plug(self.__module__),
                 lambda v: v.Enable(self.reloadable
@@ -843,9 +843,6 @@ class Frame(mwx.Frame):
         
         ## Accepts DnD
         self.SetDropTarget(MyFileDropLoader(self.graph, self))
-        
-    ## Script editor for plugins (external call)
-    EDITOR = "notepad"
     
     SYNC_SWITCH = True
     
@@ -1339,13 +1336,13 @@ class Frame(mwx.Frame):
             if shell.target is plug:
                 shell.handler('shell_activated', shell)
     
-    @ignore(ResourceWarning)
-    def edit_plug(self, name):
-        plug = self.get_plug(name)
-        if not plug:
-            return
-        
-        Popen([self.EDITOR, inspect.getmodule(plug).__file__])
+    ## Script editor for plugins (external call)
+    ## EDITOR = "notepad"
+    ## 
+    ## @ignore(ResourceWarning)
+    ## def edit_plug(self, name):
+    ##     plug = self.get_plug(name)
+    ##     Popen([self.EDITOR, inspect.getmodule(plug).__file__])
     
     def inspect_plug(self, name):
         """Dive into the process to inspect plugs in the shell.

mwx/images.py

@@ -652,6 +652,22 @@ w = PyEmbeddedImage(
     b'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWfIwBngDGCYAAAAASUVO'
     b'RK5CYII=')
 
+#----------------------------------------------------------------------
+x = PyEmbeddedImage(
+    b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'
+    b'RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIhSURBVDjLlZPrThNRFIWJicmJ'
+    b'z6BWiYbIkYDEG0JbBiitDQgm0PuFXqSAtKXtpE2hNuoPTXwSnwtExd6w0pl2OtPlrphKLSXh'
+    b'x07OZM769qy19wwAGLhM1ddC184+d18QMzoq3lfsD3LZ7Y3XbE5DL6Atzuyilc5Ciyd7IHVf'
+    b'gNcDYTQ2tvDr5crn6uLSvX+Av2Lk36FFpSVENDe3OxDZu8apO5rROJDLo30+Nlvj5RnTlVNA'
+    b'Ks1aCVFr7b4BPn6Cls21AWgEQlz2+Dl1h7IdA+i97A/geP65WhbmrnZZ0GIJpr6OqZqYAd5/'
+    b'gJpKox4Mg7pD2YoC2b0/54rJQuJZdm6Izcgma4TW1WZ0h+y8BfbyJMwBmSxkjw+VObNanp5h'
+    b'/adwGhaTXF4NWbLj9gEONyCmUZmd10pGgf1/vwcgOT3tUQE0DdicwIod2EmSbwsKE1P8QoDk'
+    b'cHPJ5YESjgBJkYQpIEZ2KEB51Y6y3ojvY+P8XEDN7uKS0w0ltA7QGCWHCxSWWpwyaCeLy0Bk'
+    b'A7UXyyg8fIzDoWHeBaDN4tQdSvAVdU1Aok+nsNTipIEVnkywo/FHatVkBoIhnFisOBoZxcGt'
+    b'Qd4B0GYJNZsDSiAEadUBCkstPtN3Avs2Msa+Dt9XfxoFSNYF/Bh9gP0bOqHLAm2WUF1YQskw'
+    b'rVFYPWkf3h1iXwbvqGfFPSGW9Eah8HSS9fuZDnS32f71m8KFY7xs/QZyu6TH2+2+FAAAAABJ'
+    b'RU5ErkJggg==')
+
 #----------------------------------------------------------------------
 xo = PyEmbeddedImage(
     b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEWywNxcVlwcHhwUEhQE'

mwx/nutshell.py

@@ -32,19 +32,6 @@ from .utilus import split_words, split_parts, split_tokens, find_modules
 from .framework import CtrlInterface, AuiNotebook, Menu
 
 
-## Monkey-patch for wx.py.introspect.getRoot with terminator '('.
-getRoot = introspect.getRoot
-def _getRoot(command, terminator=None):
-    """Return the rightmost root portion of an arbitrary Python command."""
-    if terminator == '(':
-        words = split_words(command, reverse=1)
-        for word in words:
-            if word == terminator:
-                return next(words, '')
-    return getRoot(command, terminator) # original
-introspect.getRoot = _getRoot
-
-
 ## URL pattern (flag = re.M | re.A)
 ## url_re = r"https?://[\w/:%#$&?()~.=+-]+"
 url_re = r"https?://[\w/:%#$&?!@~.,;=+-]+"  # excluding ()
@@ -925,15 +912,15 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     def expr_at_caret(self):
         """A syntax unit (expression) at the caret-line."""
         p = q = self.cpos
-        lsty = self.get_style(p-1)
-        rsty = self.get_style(p)
-        if lsty == rsty == 'moji': # inside string
+        lst = self.get_style(p-1)
+        rst = self.get_style(p)
+        if lst == rst == 'moji': # inside string
             ## styles = {'moji'}
             return ''
-        elif lsty == 'suji' or rsty == 'suji':
+        elif lst == 'suji' or rst == 'suji':
             styles = {'suji'}
-        elif lsty in ('word', 'dot', 'moji', 'rparen')\
-          or rsty in ('word', 'dot', 'moji', 'lparen'):
+        elif lst in ('word', 'dot', 'moji', 'rparen')\
+          or rst in ('word', 'dot', 'moji', 'lparen'):
             styles = {'word', 'dot', 'moji', 'paren'}
         else:
             return ''
@@ -2011,9 +1998,9 @@ class Buffer(EditorInterface, EditWindow):
     
     def OnEnterDot(self, evt):
         p = self.cpos
-        st = self.get_style(p-1)
+        lst = self.get_style(p-1)
         rst = self.get_style(p)
-        if st not in ('moji', 'word', 'rparen') or rst == 'word':
+        if lst not in ('moji', 'word', 'rparen') or rst == 'word':
             self.handler('quit', evt) # don't enter autocomp
         evt.Skip()
     
@@ -3132,13 +3119,13 @@ class Nautilus(EditorInterface, Shell):
             self.handler('quit', evt)
             return
         p = self.cpos
-        st = self.get_style(p-1)
+        lst = self.get_style(p-1)
         rst = self.get_style(p)
         if p == self.bolc:
             self.ReplaceSelection('self') # replace [.] --> [self.]
-        elif st in ('space', 'sep', 'lparen'):
+        elif lst in ('space', 'sep', 'lparen'):
             self.ReplaceSelection('self')
-        elif st not in ('moji', 'word', 'rparen') or rst == 'word':
+        elif lst not in ('moji', 'word', 'rparen') or rst == 'word':
             self.handler('quit', evt) # don't enter autocomp
         evt.Skip()
     

mwx/utilus.py

@@ -999,13 +999,13 @@ def get_fullargspec(f):
         ## ...(details)...
         ## ```
         doc = inspect.getdoc(f)
-        if doc is None:
-            return None
-        m = re.match(r"(\w+)\s*\((.*?)\)", doc.strip(), re.S)
-        if not m:
-            return None
+        for word in split_parts(doc or ''): # Search pattern for `func(argspec)`.
+            if word.startswith('('):
+                argspec = word[1:-1]
+                break
         else:
-            name, argspec = m.groups()
+            return None # no argument spec information
+        if argspec:
             argparts = ['']
             for part in split_parts(argspec): # Separate argument parts with commas.
                 if not part.strip():

{mwxlib-1.4.5.dist-info → mwxlib-1.4.8.dist-info}/METADATA

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

{mwxlib-1.4.5.dist-info → mwxlib-1.4.8.dist-info}/RECORD

@@ -1,16 +1,16 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=MXjrm_ryRGHvOFKu8wb10qz_oka70xW2yFbYjBMYfns,8140
-mwx/controls.py,sha256=RssTROprNfgnRMiWVOoSSd8Fy0qwZ8DCrYM2f5Wgr4E,48610
-mwx/framework.py,sha256=DO2VrF_SOS6Gdr22PZclHChWr2oRQfW__7-1xxr97Cc,76830
-mwx/graphman.py,sha256=_8_DaG3qhhZByoh5wboyYQlAsm7GlPoR8wT-RNMx4Cw,70627
-mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
+mwx/controls.py,sha256=_YYcSn2X4sgWOfHiOtBoPCMWtr9ZCfd5QM0O84cPtio,49421
+mwx/framework.py,sha256=Qxxi5ximgB4l-I2cWTMTKYFRD0j-uXKP0M5FVj3-_W8,76830
+mwx/graphman.py,sha256=anyTeJUTuqL1JnPdw7eJA5spbZQiCxBDCkd8GuUX8eI,70601
+mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
 mwx/matplot2.py,sha256=Htwegq6N5G7oKSRCuajik5Dixd93i8PKVbkL7Azy99M,33150
 mwx/matplot2g.py,sha256=4BBHlvfhg1796hu1nTCsTA82YRkZhwUnfcHCBf5ZGO8,65083
 mwx/matplot2lg.py,sha256=cb0EZXivccDQu4oFj5ddSUF9pEE4f5UuFJJK2ELItww,27404
 mwx/mgplt.py,sha256=8mXbHpCmm7lz3XbAxOg7IVC7DaSGBEby1UfTlMl9kjk,5604
-mwx/nutshell.py,sha256=4GDfGCHvHptpLqJIUVAfCMyI6V2KFcgji8S0PWMviL0,142385
+mwx/nutshell.py,sha256=_qUA89Xu7PZKbDO5XjMSfXfwj9MiNOGJjWi-pdrfYAA,141900
 mwx/testsuite.py,sha256=Zk75onPSEn2tf0swS3l-vIn6yTXGB7allIyvJsPHj20,1229
-mwx/utilus.py,sha256=iAqtDbkVuFsSuS71leUd-mHH0ETRQ3GLnII7O2wcw3I,38065
+mwx/utilus.py,sha256=ObXYWsDVn5DmjvwVQgP2HGAhrdxlDrwL7g9pMCDbU7U,38127
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
 mwx/wxpdb.py,sha256=ih2iLcOgYnUX849YXO4niIYue6amuoG7nWdpr-X1jFw,18839
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
@@ -22,7 +22,7 @@ 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.4.5.dist-info/METADATA,sha256=004S_ou1NJHL8BynaX391SwQ5vamthk4oifMNz8yUrE,7433
-mwxlib-1.4.5.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-mwxlib-1.4.5.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.4.5.dist-info/RECORD,,
+mwxlib-1.4.8.dist-info/METADATA,sha256=6dosmSNJ_AVOVaurY8hLbmyxKhMIiCn7rzWdbQmP0zU,7433
+mwxlib-1.4.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+mwxlib-1.4.8.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.4.8.dist-info/RECORD,,

{mwxlib-1.4.5.dist-info → mwxlib-1.4.8.dist-info}/WHEEL

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