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

mwx/framework.py

@@ -4,7 +4,7 @@
 
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
-__version__ = "0.84.6"
+__version__ = "0.84.8"
 __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__))
@@ -222,7 +223,7 @@ class LayerInterface(CtrlInterface):
     ## funcall = interactive_call
     funcall = staticmethod(_F)
     
-    ## for debug
+    ## for debug (internal use only)
     pane = property(lambda self: self.parent.get_pane(self))
     
     @property
@@ -350,10 +351,11 @@ class LayerInterface(CtrlInterface):
         self.Bind(wx.EVT_WINDOW_DESTROY, destroy)
         
         def on_show(v):
-            if v.IsShown():
-                self.handler('page_shown', self)
-            else:
-                self.handler('page_hidden', self)
+            if self.category: # -> notebook
+                if v.IsShown():
+                    self.handler('page_shown', self)
+                else:
+                    self.handler('page_hidden', self)
             v.Skip()
         self.Bind(wx.EVT_SHOW, on_show)
         
@@ -831,17 +833,14 @@ class Frame(mwx.Frame):
         if name in self.plugins:
             plug = self.plugins[name].__plug__
             name = plug.category or name
-        elif _isLayer(name):
-            if name: # Check if wrapped C/C++ object of Layer has been deleted.
-                name = name.category or name
-            else:
-                name = '' # to return a dummy pane
+        elif name and _isLayer(name):
+            ## Also check if wrapped C/C++ object of Layer has been deleted.
+            name = name.category or name
         return self._mgr.GetPane(name)
     
-    def show_pane(self, name, show=True):
+    def show_pane(self, name, show=True, interactive=False):
         """Show named pane or notebook pane."""
         pane = self.get_pane(name)
-        plug = self.get_plug(name)
         if not pane.IsOk():
             return
         
@@ -851,7 +850,7 @@ class Frame(mwx.Frame):
             pane.best_size = (w//2, h) # ドッキング時に再計算される
         
         ## Force Layer windows to show.
-        if _isLayer(plug):
+        if interactive:
             ## [M-menu] Reload plugin (ret: None if succeeded).
             if wx.GetKeyState(wx.WXK_ALT):
                 self.reload_plug(name)
@@ -864,24 +863,22 @@ class Frame(mwx.Frame):
                 pane.Float()
                 show = True
         
-        self._show_pane(name, show)
-        self._mgr.Update()
-    
-    def _show_pane(self, name, show=True):
-        """Show named pane window (internal use only)."""
-        pane = self.get_pane(name)
-        plug = self.get_plug(name)
-        if plug:
-            nb = plug.__notebook # given when load_plug
-            if nb and show:
-                nb.SetSelection(nb.GetPageIndex(plug))
-        
-        win = plug or pane.window
+        plug = self.get_plug(name) # -> None if pane.window is Graph
+        win = pane.window # -> Window (plug / notebook / Graph)
         if show:
-            if not pane.IsShown():
+            if isinstance(win, aui.AuiNotebook):
+                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)
         else:
-            if pane.IsShown():
+            if isinstance(win, aui.AuiNotebook):
+                for plug in win.all_pages: # => [page_closed] to all pages
+                    plug.handler('page_closed', plug)
+            elif pane.IsShown():
                 win.handler('page_closed', win)
         
         ## Modify the floating position of the pane when displayed.
@@ -890,6 +887,7 @@ class Frame(mwx.Frame):
         if wx.Display.GetFromWindow(pane.window) == -1:
             pane.floating_pos = wx.GetMousePosition()
         pane.Show(show)
+        self._mgr.Update()
     
     def update_pane(self, name, show=False, **kwargs):
         """Update the layout of the pane.
@@ -923,7 +921,7 @@ class Frame(mwx.Frame):
             pane.Dock()
         else:
             pane.Float()
-        self._show_pane(name, show)
+        self.show_pane(name, show)
         self._mgr.Update()
     
     def OnPaneClose(self, evt): #<wx.aui.AuiManagerEvent>
@@ -968,9 +966,9 @@ class Frame(mwx.Frame):
                 name,_ = os.path.splitext(os.path.basename(name))
             if name in self.plugins:
                 return self.plugins[name].__plug__
-        elif _isLayer(name):
-            if name: # Check if wrapped C/C++ object of Layer has been deleted.
-                return name
+        elif name and _isLayer(name):
+            ## Also check if wrapped C/C++ object of Layer has been deleted.
+            return name
     
     @staticmethod
     def register(cls, module=None):
@@ -1099,7 +1097,7 @@ class Frame(mwx.Frame):
         
         module = self.load_module(root, force, session, **props)
         if not module:
-            return module # None or False
+            return module # None (if not force) or False (failed to import)
         
         try:
             name = module.Plugin.__module__
@@ -1187,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:
@@ -1210,7 +1209,7 @@ class Frame(mwx.Frame):
             hint = (plug.__doc__ or name).strip().splitlines()[0]
             plug.__Menu_item = (
                 module.ID_, text, hint, wx.ITEM_CHECK,
-                lambda v: self.show_pane(name, v.IsChecked()),
+                lambda v: self.show_pane(name, v.IsChecked(), interactive=1),
                 lambda v: v.Check(self.get_pane(name).IsShown()),
             )
             if menu not in self.menubar:
@@ -1238,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()
             

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.84.6
+Version: 0.84.8
 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.6.dist-info → mwxlib-0.84.8.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=_xEyhQCLiybNR5mjO11x8RzzxXwcrM2ZQw5GmA3I0nY,73816
-mwx/graphman.py,sha256=g5pRrWysU-9yK3RY72hlu2nUM93ZK4NZQB-3E_nMH6U,68211
+mwx/framework.py,sha256=FREzT3tMg6wXLvVmJhRMEuc8KHLH655JT0Zoxtc5a3E,73816
+mwx/graphman.py,sha256=rDOYa3IZVp48hD0bio7fCwIG0-dNWjdZHm1cvfINszY,68561
 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.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.84.6.dist-info/METADATA,sha256=wizHJAqVB8N_Bgam9rtlHXf65O1k2QKV4DbbUYNOIOM,1893
-mwxlib-0.84.6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-mwxlib-0.84.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.84.6.dist-info/RECORD,,
+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,,