mwxlib 0.84.8__py3-none-any.whl → 0.84.9__py3-none-any.whl

mwx/framework.py

@@ -4,7 +4,7 @@
 
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
-__version__ = "0.84.8"
+__version__ = "0.84.9"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial

mwx/graphman.py

@@ -351,11 +351,10 @@ class LayerInterface(CtrlInterface):
         self.Bind(wx.EVT_WINDOW_DESTROY, destroy)
         
         def on_show(v):
-            if self.category: # -> notebook
-                if v.IsShown():
-                    self.handler('page_shown', self)
-                else:
-                    self.handler('page_hidden', self)
+            if v.IsShown():
+                self.handler('page_shown', self)
+            elif self and isinstance(self.Parent, aui.AuiNotebook):
+                self.handler('page_hidden', self) # -> notebook
             v.Skip()
         self.Bind(wx.EVT_SHOW, on_show)
         
@@ -851,8 +850,8 @@ class Frame(mwx.Frame):
         
         ## Force Layer windows to show.
         if interactive:
-            ## [M-menu] Reload plugin (ret: None if succeeded).
-            if wx.GetKeyState(wx.WXK_ALT):
+            ## [M-S-menu] Reload plugin
+            if wx.GetKeyState(wx.WXK_ALT) and wx.GetKeyState(wx.WXK_SHIFT):
                 self.reload_plug(name)
                 pane = self.get_pane(name)
                 show = True
@@ -863,7 +862,7 @@ class Frame(mwx.Frame):
                 pane.Float()
                 show = True
         
-        plug = self.get_plug(name) # -> None if pane.window is Graph
+        plug = self.get_plug(name) # -> None if pane.window is a Graph
         win = pane.window # -> Window (plug / notebook / Graph)
         if show:
             if isinstance(win, aui.AuiNotebook):
@@ -873,7 +872,8 @@ class Frame(mwx.Frame):
                 else:
                     plug.handler('page_shown', plug)
             elif not pane.IsShown():
-                win.handler('page_shown', win)
+                if not plug or win.Parent is not self: # otherwise Layer.on_show
+                    win.handler('page_shown', win)
         else:
             if isinstance(win, aui.AuiNotebook):
                 for plug in win.all_pages: # => [page_closed] to all pages
@@ -1270,6 +1270,7 @@ class Frame(mwx.Frame):
         if plug.reloadable:
             session = {}
             try:
+                print("Reloading {}...".format(plug))
                 plug.save_session(session)
             except Exception:
                 traceback.print_exc()

{mwxlib-0.84.8.dist-info → mwxlib-0.84.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.84.8
+Version: 0.84.9
 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.84.8.dist-info → mwxlib-0.84.9.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mwx/__init__.py,sha256=bSRdncjfSCKycMFQVnagOi9R2vUCC5snGkjea7jqPgU,2520
 mwx/controls.py,sha256=pD1IjgkwdvD-ebntnAH-6Jo7KY5hDq30Ne6rTE_i9fE,43499
-mwx/framework.py,sha256=FREzT3tMg6wXLvVmJhRMEuc8KHLH655JT0Zoxtc5a3E,73816
-mwx/graphman.py,sha256=rDOYa3IZVp48hD0bio7fCwIG0-dNWjdZHm1cvfINszY,68561
+mwx/framework.py,sha256=axKlqwJG6pi5x6q0-dUtegNtDzBDWqow9QGasGt3vXM,73816
+mwx/graphman.py,sha256=iF1cSVYdQHiu1Wylt1cBGIzbQtZQLSetRN3qw_g6-jA,68716
 mwx/images.py,sha256=9e8X7OpJ6Z3fF3ez17P_qk2D1NMO10-lN8TCtulAqT0,46248
 mwx/matplot2.py,sha256=W_FpY0S33crCAh7N9YTXo-jgYzj8uL9gqXkekfQo7Pk,36017
 mwx/matplot2g.py,sha256=cBuLMnQt3XSKQL9io0XJb_v8Lv0pO9hm0IMjVIERtu4,68253
@@ -15,8 +15,8 @@ mwx/wxwil.py,sha256=DPXXx4OdEzvHr-_jxz9J29Ozufmb6Vr7rXVkG_LKQd0,5254
 mwx/wxwit.py,sha256=UG361QTUheO_hlSIRgkprrGUYh0IzHB8ZqOoJeeMzUs,7424
 mwx/py/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mwx/py/filling.py,sha256=f6KMBcBv7gwrl6qmJYLTL-O0Z47bWNAdTCZtUZIo8vM,16794
-mwxlib-0.84.8.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.84.8.dist-info/METADATA,sha256=xZ7328VNHvIs8oA83rx-zd5jDLlh6jTIQfGO6kg3NkI,1893
-mwxlib-0.84.8.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-mwxlib-0.84.8.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.84.8.dist-info/RECORD,,
+mwxlib-0.84.9.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.84.9.dist-info/METADATA,sha256=Nt7X4C4jS8_safBBRGm2ZcZzk3WEo5B9-czJj-3UIfU,1893
+mwxlib-0.84.9.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+mwxlib-0.84.9.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.84.9.dist-info/RECORD,,