mwxlib 1.5.11__py3-none-any.whl → 1.5.12__py3-none-any.whl

mwx/framework.py

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

mwx/graphman.py

@@ -569,8 +569,7 @@ class Graph(GraphPlot):
         del self.region
     
     def hide_layers(self):
-        for name in self.parent.plugins:
-            plug = self.parent.get_plug(name)
+        for plug in self.parent.get_all_plugs():
             for art in plug.Arts:
                 art.set_visible(0)
         self.remove_markups()
@@ -881,8 +880,7 @@ class Frame(mwx.Frame):
             elif ret == wx.ID_CANCEL:
                 evt.Veto()
                 return
-        n = sum(bool(plug.thread and plug.thread.active)
-                for plug in (self.get_plug(name) for name in self.plugins))
+        n = sum(bool(plug.thread and plug.thread.active) for plug in self.get_all_plugs())
         if n:
             s = 's' if n > 1 else ''
             if wx.MessageBox( # Confirm closing the thread.
@@ -1050,6 +1048,10 @@ class Frame(mwx.Frame):
         elif isinstance(name, LayerInterface):
             return name
     
+    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,
                         dock=0, floating_pos=None, floating_size=None,
                         **kwargs):
@@ -1079,7 +1081,8 @@ class Frame(mwx.Frame):
                      floating_size=floating_size)
         
         if inspect.ismodule(root):
-            name = root.__file__  # @TODO root.__name__
+            name = root.__file__
+            ## name = root.__name__  @TODO: Change root module name
         elif inspect.isclass(root):
             name = inspect.getsourcefile(root)
         else:
@@ -1088,17 +1091,23 @@ class Frame(mwx.Frame):
         if name.endswith(".py"):
             name = name[:-3]
         
-        ## Check if the plug is already loaded or needs to be reloaded.
-        plug = self.get_plug(name)
-        if plug and not force:
-            self.update_pane(name, **props)
-            self.show_pane(name, show)
-            try:
-                if session:
-                    plug.load_session(session)
-            except Exception:
-                traceback.print_exc()  # Failed to load the plug session.
-            return None
+        if not force:
+            ## 文字列参照 (root:str) による重複ロードを避ける @TODO: Change root module name
+            ## for mod in self.plugins.values():
+            ##     if root == mod.__file__:
+            ##         print(f"- {name!r} is already loaded as {mod.__name__!r}.")
+            ##         return None
+            ## Check if the named plug is already loaded.
+            plug = self.get_plug(name)
+            if plug:
+                self.update_pane(name, **props)
+                self.show_pane(name, show)
+                try:
+                    if session:
+                        plug.load_session(session)
+                except Exception:
+                    traceback.print_exc()  # Failed to load the plug session.
+                return None
         
         ## Update the include-path to load the module correctly.
         if os.path.isdir(dirname_):
@@ -1109,7 +1118,7 @@ class Frame(mwx.Frame):
             print(f"- No such directory {dirname_!r}.")
             return False
         
-        ## Load or reload the root module, and check whether it contains a class named `Plugin`.
+        ## Load or reload the module, and check whether it contains a class named `Plugin`.
         try:
             if name in sys.modules:
                 module = reload(sys.modules[name])
@@ -1174,12 +1183,6 @@ class Frame(mwx.Frame):
                          style=wx.ICON_ERROR)
             return False
         
-        ## Add to the list after the plug is created successfully.
-        self.plugins[name] = module
-        
-        ## Set reference of a plug (one module, one plugin).
-        module.__plug__ = plug
-        
         ## Create pane or notebook pane.
         caption = plug.caption
         if not isinstance(caption, str):
@@ -1208,6 +1211,12 @@ class Frame(mwx.Frame):
                                        .Name(name).Caption(caption)
                                        .FloatingSize(size).MinSize(size).Show(0))
         
+        ## Add to the list after the plug is created successfully.
+        self.plugins[name] = module
+        
+        ## Set reference of a plug (one module, one plugin).
+        module.__plug__ = plug
+        
         ## Set winow.Name for inspection.
         plug.Name = name
         
@@ -1281,9 +1290,6 @@ class Frame(mwx.Frame):
         if not plug:
             print(f"- {name!r} is not listed in plugins.")
             return
-        if not plug.reloadable:
-            print(f"- {name!r} is not reloadable.")
-            return
         
         session = {}
         try:
@@ -1326,8 +1332,7 @@ class Frame(mwx.Frame):
     
     def Quit(self, evt=None):
         """Stop all Layer threads."""
-        for name in self.plugins:
-            plug = self.get_plug(name)
+        for plug in self.get_all_plugs():
             thread = plug.thread  # Note: thread can be None or shared.
             if thread and thread.active:
                 ## thread.active = 0

mwx/utilus.py

@@ -200,8 +200,12 @@ def typename(obj, docp=False, qualp=True):
         return pydoc.describe(obj)  # atom -> short description
     
     modname = getattr(obj, '__module__', None)
-    if modname and modname != "__main__" and not modname.startswith('mwx'):
-        name = modname + ('.' if qualp else '..') + name
+    if modname:
+        if qualp:
+            name = modname + '.' + name
+        else:
+            if not modname.startswith(("__main__", "mwx")):
+                name = modname + '..' + name
     
     if docp and callable(obj) and obj.__doc__:
         name += "<{!r}>".format(obj.__doc__.splitlines()[0])  # concat the first doc line

{mwxlib-1.5.11.dist-info → mwxlib-1.5.12.dist-info}/METADATA

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

{mwxlib-1.5.11.dist-info → mwxlib-1.5.12.dist-info}/RECORD

@@ -1,8 +1,8 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=yW17nMNPXKHM7LLXLpr9DaRhyFHz_OBAZ_DsuEK2QzA,8387
 mwx/controls.py,sha256=Mpzpp2eWyS_X7RjxTJay1-Fldchk-x-rUBpUhHSG-5w,49924
-mwx/framework.py,sha256=LRy4HZqH_JdGhVzKnfq9LxEyF24CDmzaQRzyJ5P53Us,77574
-mwx/graphman.py,sha256=hixEmn8YAbmVLYjB_XRpyddKytlw8UJH32jm-fA1EKU,69601
+mwx/framework.py,sha256=XFzMG6Jah0hROirGBGjmZHsv12986GV2-bjT4sl0D5w,77574
+mwx/graphman.py,sha256=AjXd8Hyb-lCEkPuCz1C19aEi6dnt3DW8N0b89cVYITU,69905
 mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
 mwx/matplot2.py,sha256=5Z-m9KXtSXpzBQs3swqPbfl_mfVdDoPaWKqpiepfau8,33019
 mwx/matplot2g.py,sha256=hLBYWjXPc2jgtKPTQWCdieIegQvS4jjUUaedV4qDLoE,65255
@@ -10,7 +10,7 @@ mwx/matplot2lg.py,sha256=fpxOX18vonUTpA_nAr-wBhQ_2YNsL_nfxdCDliuP1sU,27430
 mwx/mgplt.py,sha256=SVUJ0ls4gC9xulbWxK2qqmDxf0uBCflvwoPkxoF5s3M,5566
 mwx/nutshell.py,sha256=CX-NK3kOEi3JHhjKh39R2_m1po1SvMxraaDk2xt6q-Y,147617
 mwx/testsuite.py,sha256=0Q_n_XOOsZ8lsLWUkuO8QW00hts9wEQfnUKMpf0BAyU,1235
-mwx/utilus.py,sha256=YVU-2aR9_22-clA0OCFKfmW0c49uhNWdbQaNXxNKXxA,38964
+mwx/utilus.py,sha256=dsJ_wsEjqm-B75It-lwVCAiCPyPXZerngm_6TCUEmRU,39028
 mwx/wxmon.py,sha256=NIksW_CZv7Kw4dod8tWVwakO4iJuvE8hJSAcjkYfLaE,12800
 mwx/wxpdb.py,sha256=kKzEGivjoZ9zGcB3ttYsAym4putyilmXZXj-5CGaivQ,18813
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
@@ -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=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-1.5.11.dist-info/METADATA,sha256=p669CmL2U7lNRmxUD2QMu286bsTCCQeOMUN990PNpqU,7382
-mwxlib-1.5.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mwxlib-1.5.11.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.5.11.dist-info/RECORD,,
+mwxlib-1.5.12.dist-info/METADATA,sha256=h77mRadmYbztrngMyjSysNdiM9fGxuQcbIN9zCpRpcY,7382
+mwxlib-1.5.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mwxlib-1.5.12.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.5.12.dist-info/RECORD,,