mwxlib 0.79.9__py3-none-any.whl → 0.80.0__py3-none-any.whl

mwx/controls.py

@@ -5,8 +5,6 @@
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
 from itertools import chain
-import numpy as np
-from numpy import nan, inf
 import wx
 import wx.lib.platebtn as pb
 import wx.lib.scrolledpanel as scrolled
@@ -15,6 +13,9 @@ from . import images
 from .utilus import SSM
 from .framework import pack, Menu, CtrlInterface
 
+import numpy as np
+from numpy import nan, inf
+
 
 class Param(object):
     """Standard Parameter

mwx/framework.py

@@ -4,7 +4,7 @@
 
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
-__version__ = "0.79.9"
+__version__ = "0.80.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -952,7 +952,7 @@ class ShellFrame(MiniFrame):
                                  stdout=self.__shell.interp.stdout,
                                  skip=[Debugger.__module__,
                                        EventMonitor.__module__,
-                                       ## FSM.__module__,
+                                       FSM.__module__,
                                        'fnmatch', 'warnings', 'bdb', 'pdb',
                                        'wx.core', 'wx.lib.eventwatcher',
                                        ],

mwx/graphman.py

@@ -19,20 +19,14 @@ import platform
 import re
 import wx
 from wx import aui
-try:
-    from mwx import framework as mwx
-    from mwx.utilus import funcall as _F
-    from mwx.controls import ControlPanel, Icon
-    from mwx.framework import CtrlInterface
-    from mwx.matplot2g import GraphPlot
-    from mwx.matplot2lg import Histogram
-except ImportError:
-    from . import framework as mwx
-    from .utilus import funcall as _F
-    from .controls import ControlPanel, Icon
-    from .framework import CtrlInterface
-    from .matplot2g import GraphPlot
-    from .matplot2lg import Histogram
+
+from . import framework as mwx
+from .utilus import funcall as _F
+from .controls import ControlPanel, Icon
+from .framework import CtrlInterface
+from .matplot2g import GraphPlot
+from .matplot2lg import Histogram
+
 from matplotlib import cm
 from matplotlib import colors
 ## from matplotlib import pyplot as plt
@@ -1681,7 +1675,7 @@ class Frame(mwx.Frame):
         if flush:
             del self.graph[:]
             del self.output[:]
-            for name in list(self.plugins): # OrderedDict mutated during iteration
+            for name in list(self.plugins): # plugins:dict mutates during iteration
                 self.unload_plug(name)
         
         self.statusbar("Loading session from {!r}...".format(f))
@@ -1784,15 +1778,7 @@ if __name__ == "__main__":
     ## frm.load_plug("demo.template.py", show=1, force=1)
     ## frm.load_plug("demo/template.py", show=1, force=1)
     
-    frm.load_plug(r"C:\usr\home\lib\python\demo\template.py", show=1, dock=0)
-    
-    ## sys.path.append(r"C:\usr\home\lib\python\Lib\wxpyNautilus\plugins")
-    ## frm.require("viewfft")
-    ## frm.require("viewframe")
-    ## frm.require("lineprofile")
-    ## frm.require("ffmpeg_viewer")
-    ## frm.load_plug("randn.py", show=1, dock=0)
+    frm.load_plug(r"C:\usr\home\lib\python\demo\template.py", show=1, dock=4)
     
-    frm.shellframe.debugger.skip.remove(mwx.FSM.__module__)
     frm.Show()
     app.MainLoop()

mwx/matplot2.py

@@ -4,12 +4,10 @@
 
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
-import sys
 import wx
-try:
-    from mwx import framework as mwx
-except ImportError:
-    from . import framework as mwx
+
+from . import framework as mwx
+
 import matplotlib; matplotlib.use('wxagg') # noqa
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
 from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as Toolbar
@@ -21,6 +19,7 @@ from matplotlib.figure import Figure
 from matplotlib import cm
 import numpy as np
 
+
 ## state constants
 NORMAL = 'Normal'
 DRAGGING = '-dragging'

mwx/matplot2g.py

@@ -5,18 +5,13 @@
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
 import traceback
-import sys
 import wx
-try:
-    from mwx import framework as mwx
-    from mwx.utilus import funcall as _F
-    from mwx.matplot2 import MatplotPanel
-    from mwx.matplot2 import NORMAL, DRAGGING, PAN, ZOOM, MARK, LINE, REGION
-except ImportError:
-    from . import framework as mwx
-    from .utilus import funcall as _F
-    from .matplot2 import MatplotPanel
-    from .matplot2 import NORMAL, DRAGGING, PAN, ZOOM, MARK, LINE, REGION
+
+from . import framework as mwx
+from .utilus import funcall as _F
+from .matplot2 import MatplotPanel
+from .matplot2 import NORMAL, DRAGGING, PAN, ZOOM, MARK, LINE, REGION
+
 from matplotlib import cm
 from matplotlib import patches
 from PIL import Image

mwx/matplot2lg.py

@@ -5,18 +5,13 @@
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
 from itertools import chain
-import sys
 import wx
-try:
-    from mwx import framework as mwx
-    from mwx.utilus import funcall as _F
-    from mwx.matplot2 import MatplotPanel
-    from mwx.matplot2 import NORMAL, MARK, LINE, REGION
-except ImportError:
-    from . import framework as mwx
-    from .utilus import funcall as _F
-    from .matplot2 import MatplotPanel
-    from .matplot2 import NORMAL, MARK, LINE, REGION
+
+from . import framework as mwx
+from .utilus import funcall as _F
+from .matplot2 import MatplotPanel
+from .matplot2 import NORMAL, MARK, LINE, REGION
+
 from matplotlib import patches
 import numpy as np
 from scipy import signal

mwx/utilus.py

@@ -4,7 +4,6 @@
 
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
-from collections import OrderedDict
 from functools import wraps
 from bdb import BdbQuit
 import traceback
@@ -396,7 +395,7 @@ def get_rootpath(f):
 ## Finite State Machine
 ## --------------------------------
 
-class SSM(OrderedDict):
+class SSM(dict):
     """Single State Machine/Context of FSM
     """
     def __call__(self, event, *args, **kwargs):
@@ -664,7 +663,7 @@ class FSM(dict):
         context = self[state]
         ast = []
         bra = []
-        for event in list(context): #? OrderedDict mutated during iteration
+        for event in list(context): # context mutates during iteration
             if re.search(r"\[.+\]", event):
                 bra.append((event, context.pop(event))) # event key has '[]'
             elif '*' in event or '?' in event:
@@ -709,8 +708,10 @@ class FSM(dict):
                         continue
                     for act in transaction[1:]:
                         self.unbind(event, act, k)
-                    if not any(callable(x) for x in transaction):
-                        self[k].pop(event) # remove null event:transaction
+        ## cleanup
+        for k, v in list(self.items()): # self mutates during iteration
+            if not v:
+                del self[k]
     
     def define(self, event, action=None, state=None, state2=None):
         self.unbind(event, None, state)

{mwxlib-0.79.9.dist-info → mwxlib-0.80.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.79.9
+Version: 0.80.0
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto <komoto@jeol.co.jp>

mwxlib-0.80.0.dist-info/RECORD

@@ -0,0 +1,22 @@
+mwx/__init__.py,sha256=CxhKHOhig62F8p6GvP5gii-VvQtSjp9yWJpHvC_Kans,2592
+mwx/controls.py,sha256=d5ZRw21nXxV06QHV5Y9t85Lqm3pLZRoPS27YknC_H54,42455
+mwx/framework.py,sha256=m4iGorLqvdUnsr_6aP3uECEMe55WXAcc5vZY2EdRL98,69041
+mwx/graphman.py,sha256=M5hUEW4hZDlXTOvROab2te68HWb6OVgxakz8Z4iEEy0,69214
+mwx/images.py,sha256=9e8X7OpJ6Z3fF3ez17P_qk2D1NMO10-lN8TCtulAqT0,46248
+mwx/matplot2.py,sha256=OnG33VYvNY9tPbTiUdhM1bibnMwx8Z91hq2Wv7az78s,36000
+mwx/matplot2g.py,sha256=yfF4r6juclU1I1k41lGb_VwxRmp0ktuD8az-wQ26MsE,67727
+mwx/matplot2lg.py,sha256=Dnz_U7K_QkPmsJd18WzZ6PkaTOtWu_IwOgkfEdJv4d0,27606
+mwx/mgplt.py,sha256=49_wpFZUEKErQmtobqrlNKDjWlAsdLft-izlqSyGPD0,6878
+mwx/nutshell.py,sha256=EO4s_67Dk4EiI7h-3vHOzWyI9WnaXl4QQmsVkF7s5Xk,133557
+mwx/utilus.py,sha256=3VaUX_hclVLYixOyDC-4gxxug9_4kMzCTQcDuHs3REA,34863
+mwx/wxmon.py,sha256=Odmh13Ek4oJo9V5uFCTemoWlsPyZt4ITTmYZiKl_BKI,11405
+mwx/wxpdb.py,sha256=WweNxRCaJa3DAO8mkpU57sluTk4oxBEZm44AVBR4vSI,18700
+mwx/wxwil.py,sha256=BUfEF0Nc1E-mVC3Vdz6k1E-2s5J0PO6qEzRQ6lfyePI,5246
+mwx/wxwit.py,sha256=M_jRGJOZge2B4Cq1OsAHqnGjeg56UI-v1BolDybPR-o,7246
+mwx/py/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mwx/py/filling.py,sha256=NnQnfUVol-Nz4QYZUKFIyRX-Yxp54m5n54Yxza3Iwho,16655
+mwxlib-0.80.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.80.0.dist-info/METADATA,sha256=8cua-4t5PPXlX-lsmZ587VDduSYK6DdMSieqonWiLQg,1995
+mwxlib-0.80.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+mwxlib-0.80.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.80.0.dist-info/RECORD,,

mwxlib-0.79.9.dist-info/RECORD

@@ -1,22 +0,0 @@
-mwx/__init__.py,sha256=CxhKHOhig62F8p6GvP5gii-VvQtSjp9yWJpHvC_Kans,2592
-mwx/controls.py,sha256=69NdDoPHdQKiPp9NF-5GbZNwJ_qnEHx5SCAwUg0R9rc,42453
-mwx/framework.py,sha256=257ry6mrde8KPRIspUKqduwATcKmg0di-8SGx2_2LoY,69044
-mwx/graphman.py,sha256=MIN4Ddd-Dc2F_F4DBYJxjcQ3gN661uv2WG7xLYEHxJ0,69846
-mwx/images.py,sha256=9e8X7OpJ6Z3fF3ez17P_qk2D1NMO10-lN8TCtulAqT0,46248
-mwx/matplot2.py,sha256=8eRrf6G4On-wi2F-SizQbOcNFWoJG4P8172PU4ke3mQ,36075
-mwx/matplot2g.py,sha256=swRhA5uYY4o87tTxIhg-neJ4K4xPpC9ySM3QkRtdRb0,67979
-mwx/matplot2lg.py,sha256=Uybj8ZpK8N3E7KmTog4Mipf03am6Z6gknautOtC39QY,27837
-mwx/mgplt.py,sha256=49_wpFZUEKErQmtobqrlNKDjWlAsdLft-izlqSyGPD0,6878
-mwx/nutshell.py,sha256=EO4s_67Dk4EiI7h-3vHOzWyI9WnaXl4QQmsVkF7s5Xk,133557
-mwx/utilus.py,sha256=6NHnkUQjqXCjM9EPz2t5x0D5tRBEs85zBATou7DZWJA,34910
-mwx/wxmon.py,sha256=Odmh13Ek4oJo9V5uFCTemoWlsPyZt4ITTmYZiKl_BKI,11405
-mwx/wxpdb.py,sha256=WweNxRCaJa3DAO8mkpU57sluTk4oxBEZm44AVBR4vSI,18700
-mwx/wxwil.py,sha256=BUfEF0Nc1E-mVC3Vdz6k1E-2s5J0PO6qEzRQ6lfyePI,5246
-mwx/wxwit.py,sha256=M_jRGJOZge2B4Cq1OsAHqnGjeg56UI-v1BolDybPR-o,7246
-mwx/py/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mwx/py/filling.py,sha256=NnQnfUVol-Nz4QYZUKFIyRX-Yxp54m5n54Yxza3Iwho,16655
-mwxlib-0.79.9.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.79.9.dist-info/METADATA,sha256=U1xGFlmwaFmZNkSu07b8zp871GLO-Gsd2-ZXfXwJaaw,1995
-mwxlib-0.79.9.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-mwxlib-0.79.9.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.79.9.dist-info/RECORD,,