mwxlib 0.84.7__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.7"
+__version__ = "0.84.9"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial

mwx/graphman.py

@@ -201,6 +201,7 @@ class LayerInterface(CtrlInterface):
     
     Note:
         parent <Frame> is not always equal to Parent when floating.
+        Parent type can be <Frame>, <AuiFloatingFrame>, or <AuiNotebook>.
     """
     MENU = "Plugins" # default menu for Plugins
     menukey = property(lambda self: "{}/&{}".format(self.MENU, self.__module__))
@@ -350,11 +351,10 @@ class LayerInterface(CtrlInterface):
         self.Bind(wx.EVT_WINDOW_DESTROY, destroy)
         
         def on_show(v):
-            if self and isinstance(self.Parent, aui.AuiNotebook):
-                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)
         
@@ -850,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
@@ -862,14 +862,18 @@ 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):
-                win.SetSelection(win.GetPageIndex(plug)) # => [page_shown]
-            
+                j = win.GetPageIndex(plug)
+                if j != win.Selection:
+                    win.Selection = j # the focus is moved => [page_shown]
+                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
@@ -1181,13 +1185,14 @@ class Frame(mwx.Frame):
                                        .Name(name).Caption(caption)
                                        .FloatingSize(size).MinSize(size).Show(0))
         
-        ## set reference of notebook (optional)
-        plug.__notebook = nb
-        plug.__Menu_item = None
+        ## Set winow.Name for inspection.
         plug.Name = name
+        
         self.update_pane(name, **props)
         
         ## Create a menu
+        plug.__Menu_item = None
+        
         if not hasattr(module, 'ID_'): # give a unique index to the module
             global __plug_ID__ # cache ID *not* in [ID_LOWEST(4999):ID_HIGHEST(5999)]
             try:
@@ -1232,12 +1237,13 @@ class Frame(mwx.Frame):
                 self.menubar[menu].remove(plug.__Menu_item)
                 self.menubar.update(menu)
             
-            nb = plug.__notebook
-            if nb:
+            if isinstance(plug.Parent, aui.AuiNotebook):
+                nb = plug.Parent
                 j = nb.GetPageIndex(plug)
                 nb.RemovePage(j) # just remove page
                 ## nb.DeletePage(j) # cf. destroy plug object too
             else:
+                nb = None
                 self._mgr.DetachPane(plug)
                 self._mgr.Update()
             
@@ -1264,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.7.dist-info → mwxlib-0.84.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.84.7
+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.7.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=x8a-rEsIoGwycAMhPM3G9UcTCXYUOixVrq_BhmyHg5M,73816
-mwx/graphman.py,sha256=H4501ZK0YMX52woEJHg7NlEvE-iuF7CKvgV3XzTgpLQ,68312
+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.7.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.84.7.dist-info/METADATA,sha256=S4H6IiZhEuzEV4oMaMhMBMDuEj3tM1LgEhf3QHKFimo,1893
-mwxlib-0.84.7.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-mwxlib-0.84.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.84.7.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,,