mwxlib 1.6.0__py3-none-any.whl → 1.6.2__py3-none-any.whl

mwx/framework.py

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

mwx/graphman.py

@@ -9,6 +9,7 @@ from pprint import pformat
 import threading
 import traceback
 import inspect
+import types
 import sys
 import os
 import platform
@@ -487,15 +488,9 @@ class Layer(LayerInterface, KnobCtrlPanel):
         LayerInterface.__init__(self, parent, session)
 
 
-def register(cls, module=None):
-    """Register dummy plug; Add module.Plugin <Layer>.
-    """
-    if not module:
-        module = inspect.getmodule(cls) # rebase module or __main__
-    
+def _register__dummy_plug__(cls, module):
     if issubclass(cls, LayerInterface):
-        cls.__module__ = module.__name__ # __main__ to module
-        warn(f"Duplicate iniheritance of LayerInterface by {cls}.")
+        ## warn(f"Duplicate iniheritance of LayerInterface by {cls}.")
         module.Plugin = cls
         return cls
     
@@ -504,8 +499,8 @@ def register(cls, module=None):
             cls.__init__(self, parent, **kwargs)
             LayerInterface.__init__(self, parent, session)
     
-    _Plugin.__module__ = cls.__module__ = module.__name__
-    _Plugin.__name__ = cls.__name__ + str("~")
+    _Plugin.__module__ = module.__name__
+    _Plugin.__name__ = cls.__name__ + "~"
     _Plugin.__doc__ = cls.__doc__
     module.Plugin = _Plugin
     return _Plugin
@@ -1005,6 +1000,13 @@ class Frame(mwx.Frame):
     ## --------------------------------
     plugins = property(lambda self: self.__plugins)
     
+    def register(self, cls=None, **kwargs):
+        """Decorator of plugin class register."""
+        if cls is None:
+            return lambda f: self.register(f, **kwargs)
+        self.load_plug(cls, force=1, show=1, **kwargs)
+        return cls
+    
     def require(self, name):
         """Get named plug window.
         If not found, try to load it once.
@@ -1027,13 +1029,14 @@ class Frame(mwx.Frame):
             if name in self.plugins:
                 return self.plugins[name].__plug__
         elif isinstance(name, LayerInterface):
-            return name
+            ## return name
+            return next((x for x in self.get_all_plugs() if x is name), None)
     
     def get_all_plugs(self):
         for name, module in self.plugins.items():
             yield module.__plug__
     
-    def load_plug(self, root, force=False, session=None, show=False,
+    def load_plug(self, root, session=None, force=False, show=False,
                         dock=0, floating_pos=None, floating_size=None,
                         **kwargs):
         """Load plugin.
@@ -1042,14 +1045,12 @@ class Frame(mwx.Frame):
             root: Plugin <Layer> module, or name of the module.
                   Any wx.Window object can be specified (as dummy-plug).
                   However, do not use this mode in release versions.
-            force: force loading even if it is already loaded
             session: Conditions for initializing the plug and starting session
-            
+            force: force loading even if it is already loaded
             show: the pane is shown after loaded
             dock: dock_direction (1:top, 2:right, 3:bottom, 4:left, 5:center)
             floating_pos: posision of floating window
             floating_size: size of floating window
-            
             **kwargs: keywords for Plugin <Layer>
         
         Returns:
@@ -1062,22 +1063,20 @@ class Frame(mwx.Frame):
                      floating_pos=floating_pos,
                      floating_size=floating_size)
         
-        if inspect.ismodule(root):  # @TODO: Change root module name
-            name = root.__file__
-            ## name = root.__name__
+        if inspect.ismodule(root):
+            name = root.__name__
         elif inspect.isclass(root):
-            name = inspect.getsourcefile(root)
+            name = root.__module__
         else:
             name = root
-        dirname_, name = os.path.split(name)  # if the name is full path,...
+        dirname_, name = os.path.split(name)  # if the name is full-path:str
         if name.endswith(".py"):
             name = name[:-3]
         
         if not force:
-            ## 文字列参照 (root:str) による重複ロードを避ける
+            ## 文字列参照 (full-path) による重複ロードを避ける
             module = next((v for v in self.plugins.values() if root == v.__file__), None)
             if module:
-                ## print(f"- {name!r} is already loaded as {module.__name__!r}.")
                 plug = module.__plug__
             else:
                 plug = self.get_plug(name)
@@ -1107,20 +1106,25 @@ class Frame(mwx.Frame):
                 module = reload(sys.modules[name])
             else:
                 module = import_module(name)
+        except ModuleNotFoundError:
+            module = types.ModuleType(name)  # dummy module (cannot reload)
+            module.__file__ = "<scratch>"
+            ## sys.modules[name] = module
         except Exception:
             traceback.print_exc()  # Unable to load the module.
             return False
+        
+        ## Register dummy plug; Add module.Plugin <Layer>.
+        if not hasattr(module, 'Plugin'):
+            if inspect.isclass(root):
+                _register__dummy_plug__(root, module)
+                module.__dummy_plug__ = root
         else:
-            if not hasattr(module, 'Plugin'):
-                if isinstance(root, type):
-                    ## warn(f"Use dummy plug for {name!r}.")
-                    module.__dummy_plug__ = root
-                    register(root, module)
-            else:
-                if hasattr(module, '__dummy_plug__'):
-                    root = module.__dummy_plug__          # old class (imported)
-                    cls = getattr(module, root.__name__)  # new class (reloaded)
-                    register(cls, module)
+            if hasattr(module, '__dummy_plug__'):
+                cls = module.__dummy_plug__          # old class (imported)
+                cls = getattr(module, cls.__name__)  # new class (reloaded)
+                _register__dummy_plug__(cls, module)
+                module.__dummy_plug__ = cls
         
         ## Note: name (module.__name__) != Plugin.__module__ if module is a package.
         try:
@@ -1150,8 +1154,8 @@ class Frame(mwx.Frame):
             show = show or pane.IsShown()
             props.update(
                 dock_direction = pane.IsDocked() and pane.dock_direction,
-                floating_pos = floating_pos or pane.floating_pos[:], # copy unloading pane
-                floating_size = floating_size or pane.floating_size[:], # copy unloading pane
+                floating_pos = floating_pos or pane.floating_pos[:],  # copy unloading pane
+                floating_size = floating_size or pane.floating_size[:],  # copy unloading pane
             )
             self.unload_plug(name)
         
@@ -1276,11 +1280,17 @@ class Frame(mwx.Frame):
         
         session = {}
         try:
-            print("Reloading {}...".format(plug))
+            print(f"Reloading {plug}...")
             plug.save_session(session)
         except Exception:
             traceback.print_exc()  # Failed to save the plug session.
+        
         self.load_plug(plug.__module__, force=1, session=session)
+        
+        ## Update shell.target --> new plug
+        for shell in self.shellframe.get_all_shells():
+            if shell.target is plug:
+                shell.handler('shell_activated', shell)
     
     def inspect_plug(self, name):
         """Dive into the process to inspect plugs in the shell."""
@@ -1290,6 +1300,7 @@ class Frame(mwx.Frame):
             return
         
         shell = self.shellframe.clone_shell(plug)
+        name = plug.Name  # init(shell) で名前を参照するため再定義する
         
         @shell.handler.bind("shell_activated")
         def init(shell):
@@ -1336,7 +1347,7 @@ class Frame(mwx.Frame):
         
         if not filename:
             default_path = view.frame.pathname if view.frame else None
-            with wx.FileDialog(self, "Select index file to import",
+            with wx.FileDialog(self, "Select index file to load",
                     defaultDir=os.path.dirname(default_path or ''),
                     defaultFile=self.ATTRIBUTESFILE,
                     wildcard="Index (*.index)|*.index|"
@@ -1739,7 +1750,10 @@ class Frame(mwx.Frame):
             
             for name, module in self.plugins.items():
                 plug = self.get_plug(name)
-                name = module.__file__  # Replace the name with full path.
+                name = module.__file__  # Replace the name with full-path.
+                if not plug or not os.path.exists(name):
+                    print(f"Skipping dummy plugin {name!r}...")
+                    continue
                 if hasattr(module, '__path__'):  # is the module a package?
                     name = os.path.dirname(name)
                 session = {}
@@ -1747,7 +1761,7 @@ class Frame(mwx.Frame):
                     plug.save_session(session)
                 except Exception:
                     traceback.print_exc()  # Failed to save the plug session.
-                o.write("self.load_plug({!r}, session={})\n".format(name, session or None))
+                o.write("self.load_plug({!r}, session={})\n".format(name, session))
             o.write("self._mgr.LoadPerspective({!r})\n".format(self._mgr.SavePerspective()))
             
             def _save(view):

mwx/testsuite.py

@@ -17,7 +17,7 @@ Is equivalent to:
 from contextlib import contextmanager
 import wx
 
-__all__ = ["testApp", "testFrame", "testPlugin", "testPanel"]
+__all__ = ["testApp", "testFrame"]
 
 
 @contextmanager
@@ -36,23 +36,3 @@ def testFrame(**kwargs):
         yield frm
         frm.Show()
 ## wx.Frame.run = staticmethod(testFrame)
-
-
-@contextmanager
-def testPanel(**kwargs):
-    import mwx
-    with testApp():
-        frm = mwx.Frame(None)
-        panel = mwx.ControlPanel(frm, **kwargs)
-        yield panel
-        panel.Sizer.Fit(frm)
-        frm.Show()
-
-
-@contextmanager
-def testPlugin(**kwargs):
-    import mwx.graphman
-    with testApp():
-        frm = mwx.graphman.Frame(None, **kwargs)
-        yield frm
-        frm.Show()

{mwxlib-1.6.0.dist-info → mwxlib-1.6.2.dist-info}/METADATA

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

{mwxlib-1.6.0.dist-info → mwxlib-1.6.2.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=xVov9uy6gheXOphdorERXQ-Pivj2I3Ir3N0t829gkKM,77463
-mwx/graphman.py,sha256=Cmg0mwIGTAHtdXArFxJXPZC7yPGvSvAZexw7zgp02L8,69099
+mwx/framework.py,sha256=8E9hGW9YPJBpv55ZvPrIQnVcNeDtWP-RRvgXOJbvYXc,77463
+mwx/graphman.py,sha256=l6SjyjZj0_aDj-_dwNDlVI6aD3BQqbhoLe95NAzAEqo,69699
 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=Sa5PKSiXxT74Mj_vE9fUinxkfm5Xtg1MGGUjwbRH-yY,147552
-mwx/testsuite.py,sha256=0Q_n_XOOsZ8lsLWUkuO8QW00hts9wEQfnUKMpf0BAyU,1235
+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.0.dist-info/METADATA,sha256=ZLDHrIHbEvcB3Ee4lLQxk6ZnDFkL5aXN3gT5QdkcyBc,7381
-mwxlib-1.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mwxlib-1.6.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.6.0.dist-info/RECORD,,
+mwxlib-1.6.2.dist-info/METADATA,sha256=RshZtfKDFUVVMf92eAGQhe08pmtZjPR3ClIhuYOpGRc,7381
+mwxlib-1.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mwxlib-1.6.2.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.6.2.dist-info/RECORD,,