mwxlib 0.84.2__py3-none-any.whl → 0.84.4__py3-none-any.whl

mwx/framework.py

@@ -4,7 +4,7 @@
 
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
-__version__ = "0.84.2"
+__version__ = "0.84.4"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -1200,7 +1200,8 @@ class ShellFrame(MiniFrame):
             with open(self.SESSION_FILE, encoding='utf-8', newline='') as i:
                 exec(i.read())
         except Exception:
-            pass
+            ## pass
+            traceback.print_exc()
     
     def save_session_as(self):
         """Save session as a new file."""
@@ -1224,7 +1225,7 @@ class ShellFrame(MiniFrame):
             for book in self.all_books:
                 for buf in book.all_buffers:
                     if buf.mtdelta is not None:
-                        o.write("self.load({!r}, {!r}, {!r})\n"
+                        o.write("self._load({!r}, {!r}, {!r})\n"
                                 .format(buf.filename, buf.markline+1, book.Name))
             o.write('\n'.join((
                 "self.SetSize({})".format(self.Size),
@@ -1436,6 +1437,14 @@ class ShellFrame(MiniFrame):
         self.indicator.Value = 1
         self.message("Quit")
     
+    def _load(self, filename, lineno, bookname):
+        """Load file in the session (internal use only)."""
+        try:
+            book = getattr(self, bookname)
+            return self.load(filename, lineno, book, show=0)
+        except Exception:
+            pass
+    
     def load(self, filename, lineno=0, book=None, show=True, focus=False):
         """Load file @where the object is defined.
         
@@ -1456,11 +1465,6 @@ class ShellFrame(MiniFrame):
             if m:
                 filename, ln = m.groups()
                 lineno = int(ln)
-        if isinstance(book, str):
-            try:
-                book = getattr(self, book)
-            except Exception:
-                pass
         if not book:
             book = next((x for x in self.all_books
                             if x.find_buffer(filename)), self.Log)
@@ -1830,9 +1834,7 @@ try:
     del core
 
 except ImportError as e:
-    print("- {!r}".format(e))
-    print("Python {}".format(sys.version))
-    print("wxPython {}".format(wx.version()))
+    print(e)
     pass
 
 ## class wxpyInspectionTools:

mwx/graphman.py

@@ -23,7 +23,7 @@ from wx import aui
 from . import framework as mwx
 from .utilus import funcall as _F
 from .controls import ControlPanel, Icon
-from .framework import CtrlInterface
+from .framework import CtrlInterface, AuiNotebook
 from .matplot2g import GraphPlot
 from .matplot2lg import Histogram
 
@@ -222,6 +222,9 @@ class LayerInterface(CtrlInterface):
     ## funcall = interactive_call
     funcall = staticmethod(_F)
     
+    ## for debug
+    pane = property(lambda self: self.parent.get_pane(self))
+    
     @property
     def Arts(self):
         """List of arts <matplotlib.artist.Artist>."""
@@ -291,9 +294,9 @@ class LayerInterface(CtrlInterface):
                    'thread_end' : [ None ], # end processing
                   'thread_quit' : [ None ], # terminated by user
                  'thread_error' : [ None ], # failed in error
-                   'page_shown' : [ None, _F(self.Draw, True)  ], # when active
-                  'page_closed' : [ None, _F(self.Draw, False) ], # when inactive
-                  'page_hidden' : [ None, _F(self.Draw, False) ], # when hidden (not closed)
+                   'page_shown' : [ None, _F(self.Draw, True)  ],
+                  'page_closed' : [ None, _F(self.Draw, False) ],
+                  'page_hidden' : [ None, _F(self.Draw, False) ],
             },
             0 : {
                   'C-c pressed' : (0, _F(copy_params)),
@@ -346,6 +349,14 @@ class LayerInterface(CtrlInterface):
             v.Skip()
         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)
+            v.Skip()
+        self.Bind(wx.EVT_SHOW, on_show)
+        
         try:
             self.Init()
             if session:
@@ -439,6 +450,9 @@ class Graph(GraphPlot):
         self.handler.append({ # DNA<Graph>
             None : {
                     'focus_set' : [ None, _F(self.loader.select_view, view=self) ],
+                   'page_shown' : [ None, ],
+                  'page_closed' : [ None, ],
+                  'page_hidden' : [ None, ],
                   'frame_shown' : [ None, _F(self.update_infobar) ],
                   'S-a pressed' : [ None, _F(self.toggle_infobar) ],
                    'f5 pressed' : [ None, _F(self.refresh) ],
@@ -446,6 +460,14 @@ class Graph(GraphPlot):
         })
         ## ドロップターゲットを許可する
         self.SetDropTarget(MyFileDropLoader(self, self.loader))
+        
+        def on_show(v):
+            if v.IsShown():
+                self.handler('page_shown', self)
+            else:
+                self.handler('page_hidden', self)
+            v.Skip()
+        self.Bind(wx.EVT_SHOW, on_show)
     
     def refresh(self):
         if self.frame:
@@ -527,55 +549,6 @@ class MyFileDropLoader(wx.FileDropTarget):
         return True
 
 
-class AuiNotebook(aui.AuiNotebook):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('style',
-            (aui.AUI_NB_DEFAULT_STYLE | aui.AUI_NB_BOTTOM)
-            ^ aui.AUI_NB_CLOSE_ON_ACTIVE_TAB
-            ^ aui.AUI_NB_MIDDLE_CLICK_CLOSE
-        )
-        aui.AuiNotebook.__init__(self, *args, **kwargs)
-        
-        self.Bind(aui.EVT_AUINOTEBOOK_TAB_RIGHT_DOWN, self.on_show_menu)
-        
-        self.Bind(aui.EVT_AUINOTEBOOK_PAGE_CHANGED, self.on_page_changed)
-        self.Bind(aui.EVT_AUINOTEBOOK_PAGE_CHANGING, self.on_page_changing)
-    
-    def on_show_menu(self, evt): #<wx._aui.AuiNotebookEvent>
-        obj = evt.EventObject
-        try:
-            win = obj.Pages[evt.Selection].window # GetPage for split notebook
-            mwx.Menu.Popup(self, win.menu)
-        except AttributeError:
-            pass
-    
-    def on_page_changed(self, evt): #<wx._aui.AuiNotebookEvent>
-        win = self.CurrentPage
-        win.handler('page_shown', win)
-        evt.Skip()
-    
-    def on_page_changing(self, evt): #<wx._aui.AuiNotebookEvent>
-        org = self.CurrentPage
-        obj = evt.EventObject
-        if obj is not self:
-            ## if wx.VERSION >= (4,1,0):
-            try:
-                win = obj.Pages[evt.Selection].window # Changing org --> win <Layer>
-                atc = self.ActiveTabCtrl # Changing atc --> obj <aui.AuiTabCtrl>
-                if obj is not atc:
-                    for page in obj.Pages: # Check if there is a page to be hidden.
-                        org = page.window
-                        if org.IsShownOnScreen() and org is not win:
-                            break
-                    else:
-                        evt.Skip() # No windows to be hidden.
-                        return
-                org.handler('page_hidden', org)
-            except AttributeError:
-                pass
-        evt.Skip()
-
-
 class Frame(mwx.Frame):
     """Graph and Plug manager frame
     
@@ -629,6 +602,7 @@ class Frame(mwx.Frame):
         ]
         self.select_view(self.graph)
         
+        ## Set winow.Name for inspection.
         self.graph.Name = "graph"
         self.output.Name = "output"
         self.histogram.Name = "histogram"
@@ -763,11 +737,14 @@ class Frame(mwx.Frame):
         ]
         self.menubar.reset()
         
+        def show_graph(frame):
+            wx.CallAfter(self.show_pane, frame.parent) # Show graph / output
+        
         self.graph.handler.append({ # DNA<Graph:Frame>
             None : {
                   'frame_shown' : [ None, self.set_title ],
-                 'frame_loaded' : [ None, lambda v: self.show_pane("graph") ],
-               'frame_modified' : [ None, lambda v: self.show_pane("graph") ],
+                 'frame_loaded' : [ None, show_graph ],
+               'frame_modified' : [ None, show_graph ],
                'frame_selected' : [ None, self.set_title ],
                   'canvas_draw' : [ None, lambda v: self.sync(self.graph, self.output) ],
             },
@@ -775,8 +752,8 @@ class Frame(mwx.Frame):
         self.output.handler.append({ # DNA<Graph:Frame>
             None : {
                   'frame_shown' : [ None, self.set_title ],
-                 'frame_loaded' : [ None, lambda v: self.show_pane("output") ],
-               'frame_modified' : [ None, lambda v: self.show_pane("output") ],
+                 'frame_loaded' : [ None, show_graph ],
+               'frame_modified' : [ None, show_graph ],
                'frame_selected' : [ None, self.set_title ],
                   'canvas_draw' : [ None, lambda v: self.sync(self.output, self.graph) ],
             },
@@ -859,7 +836,11 @@ class Frame(mwx.Frame):
     ## --------------------------------
     
     def get_pane(self, name):
-        """Get named pane or notebook pane."""
+        """Get the named pane or notebook pane.
+        
+        Args:
+            name : str or plug object.
+        """
         if name in self.plugins:
             plug = self.plugins[name].__plug__
             name = plug.category or name
@@ -907,12 +888,14 @@ class Frame(mwx.Frame):
             nb = plug.__notebook # given when load_plug
             if nb and show:
                 nb.SetSelection(nb.GetPageIndex(plug))
-            if show:
-                if not pane.IsShown():
-                    plug.handler('page_shown', plug)
-            else:
-                if pane.IsShown():
-                    plug.handler('page_closed', plug)
+        else:
+            plug = pane.window
+        if show:
+            if not pane.IsShown():
+                plug.handler('page_shown', plug)
+        else:
+            if pane.IsShown():
+                plug.handler('page_closed', plug)
         
         ## Modify the floating position of the pane when displayed.
         ## Note: This is a known bug in wxWidgets 3.17 -- 3.20,
@@ -960,12 +943,13 @@ class Frame(mwx.Frame):
         pane = evt.GetPane()
         win = pane.window
         if isinstance(win, aui.AuiNotebook):
-            for j in range(win.PageCount):
-                plug = win.GetPage(j)
+            for plug in win.all_pages:
                 plug.handler('page_closed', plug)
         else:
             win.handler('page_closed', win)
-        ## evt.Skip() # cause the same event call twice?
+        pane.Show(0)
+        self._mgr.Update()
+        evt.Veto() # Don't skip. Just hide it.
     
     ## --------------------------------
     ## Plugin (Layer) interface
@@ -987,7 +971,11 @@ class Frame(mwx.Frame):
         return plug
     
     def get_plug(self, name):
-        """Find named plug window in registered plugins."""
+        """Find the named plug window in registered plugins.
+        
+        Args:
+            name : str or plug object.
+        """
         if isinstance(name, str):
             if name.endswith(".py") or name.endswith(".pyc"):
                 name,_ = os.path.splitext(os.path.basename(name))

{mwxlib-0.84.2.dist-info → mwxlib-0.84.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.84.2
+Version: 0.84.4
 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.2.dist-info → mwxlib-0.84.4.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=jEbi33rN4VmtGvTqeXBGT6avlh3foAJf3lDl_2I0Jog,73753
-mwx/graphman.py,sha256=dJoVzwRdcXRTh-oORs0db3icxcrTgQ8zCkTGAk9PxJw,69662
+mwx/framework.py,sha256=Xm27Si5D5a-4h8nDby3fbtZt8IJNYUF6BcX3webPX-A,73816
+mwx/graphman.py,sha256=tjWMoLunwxbj53f-AppCRlisa89mFIIHozXjAysCQpA,68639
 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.2.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.84.2.dist-info/METADATA,sha256=N3-3F8X4LSbgWKM7bLD2fBwbh0BJk5k-mDalmt9rKZw,1893
-mwxlib-0.84.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-mwxlib-0.84.2.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.84.2.dist-info/RECORD,,
+mwxlib-0.84.4.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.84.4.dist-info/METADATA,sha256=wRo5HYos8tkqBTv0xfvqH1GqN-fjMkVJK3h_Wpig8vk,1893
+mwxlib-0.84.4.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+mwxlib-0.84.4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.84.4.dist-info/RECORD,,