mwxlib 1.6.4__py3-none-any.whl → 1.6.5__py3-none-any.whl

mwx/framework.py

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

mwx/graphman.py

@@ -488,7 +488,7 @@ class Layer(LayerInterface, KnobCtrlPanel):
         LayerInterface.__init__(self, parent, session)
 
 
-def _register__dummy_plug__(cls, module, flag):
+def _register__dummy_plug__(cls, module):
     if issubclass(cls, LayerInterface):
         ## warn(f"Duplicate iniheritance of LayerInterface by {cls}.")
         module.Plugin = cls
@@ -501,7 +501,6 @@ def _register__dummy_plug__(cls, module, flag):
         Show = LayerInterface.Show
         IsShown = LayerInterface.IsShown
     
-    _Plugin.reloadable = getattr(cls, "reloadable", flag)
     _Plugin.__module__ = module.__name__
     _Plugin.__qualname__ = cls.__qualname__ + "~"
     _Plugin.__name__ = cls.__name__ + "~"
@@ -1125,14 +1124,14 @@ class Frame(mwx.Frame):
             ## Register dummy plug; Add module.Plugin <Layer>.
             if not hasattr(module, 'Plugin'):
                 if inspect.isclass(root):
-                    _register__dummy_plug__(root, module, loadable)
-                    module.__dummy_plug__ = root
+                    module.__dummy_plug__ = root.__name__
+                    root.reloadable = loadable
+                    _register__dummy_plug__(root, module)
             else:
-                if hasattr(module, '__dummy_plug__'):     # Reloading dummy plug...
-                    cls = module.__dummy_plug__           # old class (imported)
-                    root = getattr(module, cls.__name__)  # new class (reloaded)
-                    _register__dummy_plug__(root, module, loadable)
-                    module.__dummy_plug__ = root
+                if hasattr(module, '__dummy_plug__'):
+                    root = getattr(module, module.__dummy_plug__)
+                    root.reloadable = loadable
+                    _register__dummy_plug__(root, module)
         
         ## Note: name (module.__name__) != Plugin.__module__ if module is a package.
         try:

mwx/testsuite.py

@@ -17,7 +17,7 @@ Is equivalent to:
 from contextlib import contextmanager
 import wx
 
-__all__ = ["testApp", "testFrame", "register_plug"]
+__all__ = ["testApp", "testFrame"]
 
 
 @contextmanager
@@ -31,22 +31,8 @@ def testApp():
 
 @contextmanager
 def testFrame(**kwargs):
-    with testApp() as app:
+    with testApp():
         frm = wx.Frame(None, **kwargs)
         yield frm
         frm.Show()
-        app.SetTopWindow(frm)
 ## wx.Frame.run = staticmethod(testFrame)
-
-
-def register_plug(cls=None, **kwargs):
-    if cls is None:
-        return lambda f: register(f, **kwargs)
-    
-    from mwx.graphman import Frame
-    with testApp() as app:
-        frm = app.GetTopWindow() or Frame(None)
-        frm.load_plug(cls, force=1, show=1, **kwargs)
-        frm.Show()
-        app.SetTopWindow(frm)
-    return cls

{mwxlib-1.6.4.dist-info → mwxlib-1.6.5.dist-info}/METADATA

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

{mwxlib-1.6.4.dist-info → mwxlib-1.6.5.dist-info}/RECORD

@@ -1,15 +1,15 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=yW17nMNPXKHM7LLXLpr9DaRhyFHz_OBAZ_DsuEK2QzA,8387
 mwx/controls.py,sha256=B9f_A0ev3SPf75K-LIZCusMLeDGYz1O3cMml7IOrDrM,49870
-mwx/framework.py,sha256=T-6ILuhLC7wQ0jB4CcovzLxzQ3NwtbfCIRMwfJxg6qE,77463
-mwx/graphman.py,sha256=Omv14il6ufr_RZayTJiPY-6fX-jAt6g5erGw4OuZlqA,70199
+mwx/framework.py,sha256=S07VXuto0GulB48mVJurs5GsEIRPkvmWPE37l1IgeRI,77463
+mwx/graphman.py,sha256=7y2pNi0pOR7MuSFOaINuz4PNRXAuRXyp5ChMaWpQXBU,70042
 mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
 mwx/matplot2.py,sha256=cjdN12RENqWFw1v9QyO05XQc6dK3Pn_ltdC3OfmhGfg,32995
 mwx/matplot2g.py,sha256=0gxjl7UKx8QGRI2thpniA7dQu9fpHGG0mvl7Ml2exrc,65474
 mwx/matplot2lg.py,sha256=jE-LYPEVaEapQN8L-eviRyEx4Lw-8GyLGzZotrIZShU,27413
 mwx/mgplt.py,sha256=SVUJ0ls4gC9xulbWxK2qqmDxf0uBCflvwoPkxoF5s3M,5566
 mwx/nutshell.py,sha256=JHFiY-X1pEdFBzSQRXO_loIhJyPuWljWhhGzie3m7TU,147552
-mwx/testsuite.py,sha256=Sd4w4UGmD6bFrKQlAOSJBGio3uDgnLQgzXS1CbY86rw,1199
+mwx/testsuite.py,sha256=pBB7ZNicI_thrg6LmNPgUOgfMWwRoAaYWN1nFy6t6S4,790
 mwx/utilus.py,sha256=JOYBTHoo_GmYykX72PgiPzgD2M-1pcOR8gMBLc2bnck,39016
 mwx/wxmon.py,sha256=aS6lSjDm0PxIhfyBPtg-wIP0v-R3g2K5a3k2mclWSrQ,12798
 mwx/wxpdb.py,sha256=ehRawAnqQberUeDN9j_-drWYQzu23w5UeQyto4nj53g,18812
@@ -22,7 +22,7 @@ mwx/plugins/frame_listview.py,sha256=yd2NCgspqGfTNhj1wxuW8r1zapIm7vNzVX2iytk8CDM
 mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=vWCJoHd_oyXOeXTHtXGY7wfNQeNAZhV3GZu4xlc8GDY,16867
-mwxlib-1.6.4.dist-info/METADATA,sha256=ZafN1sf9Ovxith57qzq87MOYTCEkWFctSAhfIZpux2E,7381
-mwxlib-1.6.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mwxlib-1.6.4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.6.4.dist-info/RECORD,,
+mwxlib-1.6.5.dist-info/METADATA,sha256=PyFl4mr1WzMpVnXtqD2FKECHGPz8-t48mUwkuwjgsgw,7381
+mwxlib-1.6.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mwxlib-1.6.5.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.6.5.dist-info/RECORD,,