mwxlib 0.96.4__py3-none-any.whl → 0.96.5__py3-none-any.whl

mwx/controls.py

@@ -16,11 +16,6 @@ import numpy as np
 from numpy import nan, inf  # noqa: necessary to eval
 
 
-def _Tip(*tips):
-    """Concatenate tips with newline char."""
-    return '\n'.join(filter(None, tips)).strip()
-
-
 class Param(object):
     """Standard Parameter
     
@@ -44,7 +39,7 @@ class Param(object):
             - underflow -> when value underflows
     """
     def __init__(self, name, range=None, value=None, fmt=None,
-                 handler=None, updater=None, tip=None):
+                 handler=None, updater=None):
         self.knobs = []
         self.name = name
         self.range = range
@@ -66,7 +61,9 @@ class Param(object):
            'overflow' : [],
           'underflow' : [],
         })
-        self._tooltip = _Tip(tip, handler.__doc__, updater.__doc__)
+        ## Concatenate tips with newline char.
+        tips = (handler.__doc__, updater.__doc__)
+        self._tooltip = '\n'.join(filter(None, tips)).strip()
     
     def __str__(self, v=None):
         v = self.value if v is None else v
@@ -1000,15 +997,14 @@ class Button(pb.PlateButton):
         self.SetBitmap(_Icon(v))
         self.Refresh()
     
-    def __init__(self, parent, label='',
-                 handler=None, icon=None, tip='', **kwargs):
+    def __init__(self, parent, label='', handler=None, icon=None, **kwargs):
         kwargs.setdefault('style', pb.PB_STYLE_DEFAULT | pb.PB_STYLE_SQUARE)
         pb.PlateButton.__init__(self, parent, -1, label, **kwargs)
         
         if handler:
             self.Bind(wx.EVT_BUTTON, _F(handler))
         
-        self.ToolTip = _Tip(tip, handler.__doc__)
+        self.ToolTip = handler.__doc__
         self.icon = icon
     
     def SetBitmap(self, bmp):
@@ -1048,14 +1044,13 @@ class ToggleButton(wx.ToggleButton):
             self.SetBitmap(_Icon(v))
         self.Refresh()
     
-    def __init__(self, parent, label='',
-                 handler=None, icon=None, tip='', **kwargs):
+    def __init__(self, parent, label='', handler=None, icon=None, **kwargs):
         wx.ToggleButton.__init__(self, parent, -1, label, **kwargs)
         
         if handler:
             self.Bind(wx.EVT_TOGGLEBUTTON, _F(handler))
         
-        self.ToolTip = _Tip(tip, handler.__doc__)
+        self.ToolTip = handler.__doc__
         self.icon = icon
 
 
@@ -1087,20 +1082,20 @@ class TextCtrl(wx.Control):
     def icon(self, v):
         self._btn.icon = v
     
-    def __init__(self, parent, label='',
-                 handler=None, updater=None, size=(-1,-1),
-                 icon=None, tip='', readonly=False, **kwargs):
+    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))
         
-        tooltip = _Tip(tip, handler.__doc__, updater.__doc__)
-        
         self._ctrl = wx.TextCtrl(self, **kwargs)
-        self._btn = Button(self, label, None, icon, tooltip,
+        self._btn = Button(self, label, None, icon,
                            size=(-1,-1) if label or icon else (0,0))
+        self._ctrl.ToolTip = handler.__doc__
+        self._btn.ToolTip = updater.__doc__
+        
         self.SetSizer(
             pack(self, (
                 (self._btn, 0, wx.ALIGN_CENTER | wx.LEFT | wx.RIGHT, 0),
@@ -1164,20 +1159,20 @@ class Choice(wx.Control):
     def icon(self, v):
         self._btn.icon = v
     
-    def __init__(self, parent, label='',
-                 handler=None, updater=None, size=(-1,-1),
-                 icon=None, tip='', readonly=False, **kwargs):
+    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))
         
-        tooltip = _Tip(tip, handler.__doc__, updater.__doc__)
-        
         self._ctrl = wx.ComboBox(self, **kwargs)
-        self._btn = Button(self, label, None, icon, tooltip,
+        self._btn = Button(self, label, None, icon,
                            size=(-1,-1) if label or icon else (0,0))
+        self._ctrl.ToolTip = handler.__doc__
+        self._btn.ToolTip = updater.__doc__
+        
         self.SetSizer(
             pack(self, (
                 (self._btn, 0, wx.ALIGN_CENTER | wx.LEFT | wx.RIGHT, 0),

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.96.4"
+__version__ = "0.96.5"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -1594,7 +1594,7 @@ class ShellFrame(MiniFrame):
         if isinstance(editor, str):
             editor = getattr(self, editor, None)
         if editor:
-            return editor.load_file(filename, lineno, verbose=0)
+            return editor.load_file(filename, lineno)
     
     def load(self, filename, lineno=0, show=True):
         """Load file @where the object is defined.
@@ -1615,7 +1615,7 @@ class ShellFrame(MiniFrame):
                 filename, ln = m.groups()
                 lineno = int(ln)
         editor = self.find_editor(filename) or self.Log
-        ret = editor.load_file(filename, lineno, verbose=1)
+        ret = editor.load_file(filename, lineno)
         if ret:
             self.popup_window(editor, show)
         return ret

mwx/graphman.py

@@ -1268,8 +1268,8 @@ class Frame(mwx.Frame):
                                          .Name(title).Caption(title)
                                          .FloatingSize(size).MinSize(size).Show(0))
             j = nb.GetPageIndex(plug)
-            tip = "[{}]\n{}".format(plug.__module__, plug.__doc__)
-            nb.SetPageToolTip(j, tip.strip())
+            tips = "[{}]\n{}".format(plug.__module__, plug.__doc__)
+            nb.SetPageToolTip(j, tips.strip())
         else:
             nb = None
             size = plug.GetSize()

mwx/images.py

@@ -178,6 +178,23 @@ colour_grey = PyEmbeddedImage(
     b'r7rzc2YUF8aOx3m0NYJWAPe76VmttzK1bzsbW0dAKwAAAID/tYu/URIDsoEAAAAASUVORK5C'
     b'YII=')
 
+#----------------------------------------------------------------------
+connect = PyEmbeddedImage(
+    b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'
+    b'RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJ+SURBVBgZlcFLSBRhAAfw/858'
+    b's860aygiptIp9NChoDzkxYNUYIcO0TUIOghFUNElvEad6lBkdEqCIugi3QQfLR2yQumBaPh+'
+    b'7Li7o/uanfmes1972IOEQv5+Ma01DuPRh+U+StlEhSsZUnElprXGQd6kdomUsoOJaiflojXk'
+    b'4mIM+pZjaXCp8GslTwkOMDLlOVyoCamiXhkpVCOJRDyGpG2CCYlsgSPvh4TgACGVt21L97Y0'
+    b'meBCg0kNyiW28wHiJrC8VYAo0wsE+3g1vtRdquYeHyXHUfAldkohKJcIuUSjbWI5XYKXLQ5/'
+    b'fnk1RbDHyJTnSKHeCbF6SbVMGCteH5pxAk7cQLbAQZmAGbOQccuQZTqGGoK615M5woX6aRPd'
+    b'ZTkn4a+7kehMmdOzMmptaDOTNkEuzxE3gaAcQITMQ42BugpVHUzIrqRjwCJVOA3nzPLvMzKS'
+    b'cujPxnK04RbRdIQgYBxhIYSs0DRqDNSFnHUKIUG5xKZXQTweg5Potmyde9hz/quZ9RbgukWs'
+    b'LWQQlvxFFQkXNQbqKgFvDRhHyCRCKrC27cOxYmhrPksyP5rQMzAPd3FJZVdzoyrip+cn7yvU'
+    b'ENSVQnajvclCSAUqlIMyCa8oYVsmoPsxM/pJRVVxam7ywTz2IKi5+WLmXqNjXI4TA5lCgIRt'
+    b'wjI1GqwYhJBY39hFLt0+NPtxcB7/IIPPvt9N2MaTRNwAZQKWqbGeLmFnxwf1GZhPwXz+RXH2'
+    b'HPsgPuVP25qT0DrCZtbHpltEwQuGlRBjEedexFVaCenOjd9R2Acp+RQb2xFMaKS3iiju+v3T'
+    b'b69N4T8RGtBjK/lSRoWKKsYGvr2/nsIh/AUG0IfiieuuUQAAAABJRU5ErkJggg==')
+
 #----------------------------------------------------------------------
 copy = PyEmbeddedImage(
     b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAA'
@@ -209,6 +226,24 @@ core = PyEmbeddedImage(
     b'AQgglIQEcp6GhgaDtrY22JmgAAT5HRQOnz9/BqsB5Y2dO3eCNHOAYh8ggOAGgJyKbhgygAUa'
     b'VDMjTBwggMAGTJ48+flvIJCWlpYjlH2RNYMAQIABANLKHICUilYLAAAAAElFTkSuQmCC')
 
+#----------------------------------------------------------------------
+disconnect = PyEmbeddedImage(
+    b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'
+    b'RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAKuSURBVDjLlZLLS5RRGMbf7zrz'
+    b'ebdw8FaSqJAbF0GgRBvptinoPxDKRdDKQjBw2TKClgVJCwmUyMBKydDKS9TCME2tRhs1cZwZ'
+    b'57ud853bfB0HiiAVOvBuDuf5ve/7nEcJwxAOOgPTtk4Fr6ZU1OCAVyBCm2Td9jEdcxG5pBwE'
+    b'eDyZtaRwjAvWSpkAxjkITsGKqJBIuvB903upH9QdE3rd1MLW0gIVCMsBoYq8U8H2CUQNBdJZ'
+    b'p33fCe6PbJo+4XZVmRHFhEDKCXaB4Accii0NFlfT8GNt56a6X/er56qog/Cd1aQjRRQictas'
+    b'R8B2EXgIQyblAbX95X9WeDSRPiriz3oZY1pvZ2dH590Z7GB+q7LcjBZHVdhMBaCpEfBsCXDR'
+    b'9p8V+t9lLGlUP7PXLxyJbkUMw4DZ2dm+rq6ujjPdz09xTEZrY8VWYZEh/WAwNxWHwEV1eYDs'
+    b'qsuOCxFDaYRQwGZ8ljeUE31+fr4PY3xFVulM5mQzC4LRypoSy037kEykvuZytDnvAQ5oNSa8'
+    b'scAE0JQcGIeb9LcrJl02Tj+U4gcIoanG8MU35qKzK58SaCux9ZSLoGVxvJvnPfAQrQEQEhTC'
+    b'RhpBYVQB61CNyZY+v6qvrzdisRgMDg6O1+kjbUt+23EpTPz2LA9wMa7QFJBuhxIWQHKHQWmB'
+    b'DrXHGozJuTfQ4sWBEDI9NDSUkc8zf5ueB9gubiqyVJBacBDZXQm2MhSiugZW7QkYfj/NuGi5'
+    b'ttd3a9uxi6bM9FhFmak5fgCmHEXqQFcVEDkBiZVt+edhz8fh7om9AHrWxV5JgWoImXMfE1jb'
+    b'sMHd8QF7AQQyONjxp4UQ9/YLnJ710JgaGucXUi6sr2cY84MeQfmyCOg2p3RD5PjPL69v8H0B'
+    b'yEWXnSR7IoPSzjEt+jDQQeE/zi9kq6pv7shelwAAAABJRU5ErkJggg==')
+
 #----------------------------------------------------------------------
 exit = PyEmbeddedImage(
     b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'

mwx/plugins/ffmpeg_view.py

@@ -106,7 +106,7 @@ class Plugin(Layer):
                         updater=self.get_crop,
                         )
         
-        self.snp = Button(self, handler=self.snapshot, icon='clock')
+        self.snp = Button(self, handler=self.snapshot, icon='clip')
         self.exp = Button(self, handler=self.export, icon='save')
         
         self.rw = Button(self, handler=lambda v: self.seekdelta(-100), icon='|<-')

mwx/utilus.py

@@ -444,7 +444,7 @@ def find_modules(force=False, verbose=True):
             lm = eval(o.read()) # read and evaluate module list
         
         ## Check additional packages and modules
-        ## verbose = False
+        verbose = False
         for info in walk_packages_no_import(['.']):
             _callback('.', info.name)
     else:
@@ -827,17 +827,15 @@ class FSM(dict):
         
         if event in context:
             if state2 != context[event][0]:
-                warn(f"- FSM transaction may conflict.\n"
-                     f"  The state {state2!r} is different from the original state."
-                     f"  {event!r} : {state!r} --> {state2!r}")
+                warn(f"- FSM transaction may conflict ({event!r} : {state!r} --> {state2!r}).\n"
+                     f"  The state {state2!r} is different from the original state.")
                 pass
                 context[event][0] = state2 # update transition
         else:
-            ## if state2 not in self:
-            ##     warn(f"- FSM transaction may contradict\n"
-            ##          f"  The state {state2!r} is not found in the contexts."
-            ##          f"  {event!r} : {state!r} --> {state2!r}")
-            ##     pass
+            if state2 not in self:
+                warn(f"- FSM transaction may contradict ({event!r} : {state!r} --> {state2!r}).\n"
+                     f"  The state {state2!r} is not found in the contexts.")
+                pass
             context[event] = [state2] # new event:transaction
         
         transaction = context[event]
@@ -848,8 +846,8 @@ class FSM(dict):
             try:
                 transaction.append(action)
             except AttributeError:
-                warn(f"- FSM cannot append new transaction ({state!r} : {event!r})\n"
-                     f"  The transaction must be a list, not a tuple")
+                warn(f"- FSM cannot append new transaction ({state!r} : {event!r}).\n"
+                     f"  The transaction must be a list, not a tuple.")
         return action
     
     def unbind(self, event, action=None, state=None):
@@ -868,7 +866,7 @@ class FSM(dict):
         
         context = self[state]
         if event not in context:
-            warn(f"- FSM has no such transaction ({state!r} : {event!r})")
+            warn(f"- FSM has no such transaction ({state!r} : {event!r}).")
             return
         
         transaction = context[event]
@@ -882,7 +880,7 @@ class FSM(dict):
                 transaction.remove(action)
                 return True
             except AttributeError:
-                warn(f"- FSM removing action from context ({state!r} : {event!r})\n"
+                warn(f"- FSM removing action from context ({state!r} : {event!r}).\n"
                      f"  The transaction must be a list, not a tuple")
         return False
 
@@ -965,7 +963,7 @@ class TreeList(object):
             else:
                 ls.append([key, value]) # append to items:list
         except (ValueError, TypeError, AttributeError) as e:
-            warn(f"- TreeList:warning {e!r}: {key=!r}")
+            warn(f"- TreeList {e!r}: {key=!r}")
     
     def _delf(self, ls, key):
         if '/' in key:

{mwxlib-0.96.4.dist-info → mwxlib-0.96.5.dist-info}/METADATA

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

{mwxlib-0.96.4.dist-info → mwxlib-0.96.5.dist-info}/RECORD

@@ -1,28 +1,28 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
 mwx/bookshelf.py,sha256=CjcgtHC33KR5mHp1lW6Bqfndpzr7hC8ICkFihw4kM3g,5134
-mwx/controls.py,sha256=JGoDEqfa0m5unISRcAdTxqCXihfuFo1mnLQcMimpGdc,48445
-mwx/framework.py,sha256=bP9D868lzBecp1ZRYEv_GupYtior0AoiK6M8B-yxBvw,75249
-mwx/graphman.py,sha256=eNL1Uja1m4g8ER3emArTFPZllvxEjvdnZTc1y8QMciE,71267
-mwx/images.py,sha256=gyvqW4TLWdJMKmsaWiPiV_PuHJM1GbHgeELERLwGzg8,45291
+mwx/controls.py,sha256=CAfptYrYxHg1qix3MInXuSp3epI33gpQxf183jLPTvo,48321
+mwx/framework.py,sha256=9-FMc30KMYYkYCuql8k8Wa8ynjj6GTbMamZV_x5GVgs,75227
+mwx/graphman.py,sha256=XoD_wbt5wrmiRf8Q3lpn_eklakE2K-rLfpzfXG1L-Pc,71269
+mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
 mwx/matplot2.py,sha256=-G7z0Osozm9NjLfXvX5UcdFviwbNUktjbd904_g-PqQ,33516
 mwx/matplot2g.py,sha256=22rpdkqJQEJADINPaG5htACutbt8oG1ewO8LMpxaqH4,65237
 mwx/matplot2lg.py,sha256=MDbkO0vn5yi9rwTBCBJ4rsIHcWyoGXeNTbp0xfrvTdM,27381
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
 mwx/nutshell.py,sha256=HNo8ZuhLZPKd_Cg4s9NN-KfuSXHRP_jaw1s59GVXkN4,136971
-mwx/utilus.py,sha256=jTjeunx_9-HrjdWaceX1Xeq3pHMS4M7M9ma2i4uhKJY,37369
+mwx/utilus.py,sha256=d-cDI4n4S-v-Gya2ekbVURq686BQfFZ7S2i63wIKHQg,37298
 mwx/wxmon.py,sha256=f3V24EF7kdMlYF7usLYK9QE5KU6fSu0jVqsvwAiA-Ag,12647
 mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
 mwx/wxwil.py,sha256=0bzSTfMEjllJheKxZPb4p8Luz6Il3V29bCLBty72U2o,5576
 mwx/wxwit.py,sha256=yU6XeCCWRBP7CLmpphjT072PfXAL30DNaxoChDX2p0I,7322
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
-mwx/plugins/ffmpeg_view.py,sha256=wZXRgsiPyIphcA8hvXQoE7NZp4cc_YBOO0ZpuKmUJKE,9369
+mwx/plugins/ffmpeg_view.py,sha256=QjNqnvPEd9vCwfATU2BOO75fIOFD5LQ-Wf-BBhvZNZs,9368
 mwx/plugins/fft_view.py,sha256=HcnBr-y_yFdSfASPRzMLANta4SwSDShd65QWnCU3XhM,2665
 mwx/plugins/frame_listview.py,sha256=Li993CV0pPY23Jb8cGQkc3wVeDlHWLEe8RuDbNZeB8s,10351
 mwx/plugins/line_profile.py,sha256=--9NIc3x5EfRB3L59JvD7rzENQHyiYfu7wWJo6AuMkA,820
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwxlib-0.96.4.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.96.4.dist-info/METADATA,sha256=z1bx81IMuasnA9ZGE1vUidxqqh7cOC_LmB-Rdrqd0xw,1925
-mwxlib-0.96.4.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-mwxlib-0.96.4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.96.4.dist-info/RECORD,,
+mwxlib-0.96.5.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.96.5.dist-info/METADATA,sha256=7bmBbSe5QXryHXNY8gbPkgx7wMUMIl-wGVn_esBg5fU,1925
+mwxlib-0.96.5.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+mwxlib-0.96.5.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.96.5.dist-info/RECORD,,