mwxlib 1.3.3__py3-none-any.whl → 1.4.0__py3-none-any.whl

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.3.3"
+__version__ = "1.4.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -32,8 +32,9 @@ def deb(target=None, loop=True, locals=None, debrc=None, **kwargs):
                   If None, the target is set to `__main__`.
         loop    : If True, the app and the mainloop will be created.
         locals  : Additional context of the shell
-        debrc   : file name of the session; defaults to None.
+        debrc   : file name of the session. Defaults to None.
                   If None, no session will be created or saved.
+                  If `''`, the default session (.debrc) will be loaded.
         
         **kwargs: Nautilus ShellFrame arguments
         
@@ -872,23 +873,19 @@ class AuiNotebook(aui.AuiNotebook):
         self.Bind(aui.EVT_AUINOTEBOOK_TAB_RIGHT_DOWN, tab_menu)
     
     @property
-    def all_pages(self): # (deprecated) internal use only
-        """Returns all window pages (internal use only)."""
-        return [self.GetPage(i) for i in range(self.PageCount)]
-    
-    @property
-    def all_tabs(self): # (deprecated) internal use only
+    def _all_tabs(self): # (deprecated) internal use only
         """Returns all AuiTabCtrl objects (internal use only)."""
         return [x for x in self.Children if isinstance(x, aui.AuiTabCtrl)]
     
     @property
-    def all_panes(self): # (deprecated) internal use only
+    def _all_panes(self): # (deprecated) internal use only
         """Returns all AuiPaneInfo excluding `dummy` one (internal use only)."""
         return list(self._mgr.AllPanes)[1:]
     
     def get_pages(self, type=None):
         """Yields pages of the specified window type."""
-        for win in self.all_pages:
+        for i in range(self.PageCount):
+            win = self.GetPage(i)
             if type is None or isinstance(win, type):
                 yield win
     
@@ -926,7 +923,7 @@ class AuiNotebook(aui.AuiNotebook):
         Note:
             Argument `win` can also be page.window.Name (not page.caption).
         """
-        for tabs in self.all_tabs: #<aui.AuiTabCtrl>
+        for tabs in self._all_tabs: #<aui.AuiTabCtrl>
             for page in tabs.Pages: #<aui.AuiNotebookPage>
                 ## if page.window is win or page.caption == win:
                 if page.window is win or page.window.Name == win:
@@ -944,8 +941,8 @@ class AuiNotebook(aui.AuiNotebook):
         tabs.AddPage(win, page) # Add a page with the copied info.
         if tc1.PageCount == 0:
             ## Delete an empty tab and the corresponding pane.
-            j = self.all_tabs.index(tc1)
-            pane = self.all_panes[j]
+            j = self._all_tabs.index(tc1)
+            pane = self._all_panes[j]
             tc1.Destroy()
             self._mgr.DetachPane(pane.window)
         self._mgr.Update()
@@ -961,10 +958,10 @@ class AuiNotebook(aui.AuiNotebook):
             Perspectives are saved according to page.window.Name.
             User should give it (not page.caption) a unique name.
         """
-        for j, pane in enumerate(self.all_panes):
+        for j, pane in enumerate(self._all_panes):
             pane.name = f"pane{j+1}"
         spec = ""
-        for j, tabs in enumerate(self.all_tabs):
+        for j, tabs in enumerate(self._all_tabs):
             k = next(k for k, page in enumerate(tabs.Pages)
                                    if page.window.Shown) # get active window
             ## names = [page.caption for page in tabs.Pages]
@@ -984,19 +981,19 @@ class AuiNotebook(aui.AuiNotebook):
         try:
             self.Parent.Freeze()
             ## Collapse all tabs to main tabctrl
-            maintab = self.all_tabs[0]
-            for win in self.all_pages:
+            maintab = self._all_tabs[0]
+            for win in self.get_pages():
                 self.move_tab(win, maintab)
             
             ## Create a new tab using Split method.
             ## Note: The normal way of creating panes with `_mgr` crashes.
             
-            all_names = [win.Name for win in self.all_pages]
+            all_names = [win.Name for win in self.get_pages()]
             for names, k in tabinfo[1:]:
                 names, k = eval(names), int(k)
                 i = all_names.index(names[0]) # Assuming 0:tab is included.
                 self.Split(i, wx.LEFT)
-                newtab = self.all_tabs[-1]
+                newtab = self._all_tabs[-1]
                 for name in names[1:]:
                     self.move_tab(name, newtab)
                 self.Selection = all_names.index(names[k]) # new tabs active window
@@ -1005,7 +1002,7 @@ class AuiNotebook(aui.AuiNotebook):
                 names, k = eval(names), int(k)
                 self.Selection = all_names.index(names[k]) # main tabs active window
             
-            for j, pane in enumerate(self.all_panes):
+            for j, pane in enumerate(self._all_panes):
                 pane.name = f"pane{j+1}"
             self._mgr.LoadPerspective(frames)
             self._mgr.Update()
@@ -1061,8 +1058,9 @@ class ShellFrame(MiniFrame):
     Args:
         target  : target object of the rootshell.
                   If None, it will be __main__.
-        session : file name of the session; defaults to None.
+        session : file name of the session. Defaults to None.
                   If None, no session will be created or saved.
+                  If `''`, the default session (.debrc) will be loaded.
         ensureClose : flag for the shell standalone.
                       If True, EVT_CLOSE will close the window.
                       Otherwise the window will be only hidden.
@@ -1182,7 +1180,7 @@ class ShellFrame(MiniFrame):
         self._mgr.AddPane(self.ghost,
                           aui.AuiPaneInfo().Name("ghost")
                              .Caption("Ghost in the Shell").Right()
-                             .MaximizeButton().Show(0))
+                             .MaximizeButton().Show(1))
         
         self._mgr.AddPane(self.watcher,
                           aui.AuiPaneInfo().Name("watcher")
@@ -1245,12 +1243,10 @@ class ShellFrame(MiniFrame):
                     'trace_end' : [ None, self.on_trace_end ],
                 'monitor_begin' : [ None, self.on_monitor_begin ],
                   'monitor_end' : [ None, self.on_monitor_end ],
-                   'buffer_new' : [ None, ],
                     'shell_new' : [ None, ],
                       'add_log' : [ None, self.add_log ],
                      'add_help' : [ None, self.add_help ],
                  'title_window' : [ None, self.on_title_window ],
-       'buffer_caption_updated' : [ None, self.on_buffer_caption ], # => self.OnActivate
             },
             0 : {
                     '* pressed' : (0, fork_debugger),
@@ -1424,7 +1420,7 @@ class ShellFrame(MiniFrame):
     
     def OnClose(self, evt):
         if self.debugger.busy:
-            if wx.MessageBox( # Confirm debugger close.
+            if wx.MessageBox( # Confirm closing the debugger.
                     "The debugger is running.\n\n"
                     "Enter [q]uit to exit before closing.\n"
                     "Continue closing?",
@@ -1445,7 +1441,7 @@ class ShellFrame(MiniFrame):
                 if buf.need_buffer_save:
                     self.popup_window(book)
                     buf.SetFocus()
-                    if wx.MessageBox( # Confirm close.
+                    if wx.MessageBox( # Confirm closing the buffer.
                             "You are closing unsaved content.\n\n"
                             "Changes to the content will be discarded.\n"
                             "Continue closing?",
@@ -1464,21 +1460,30 @@ class ShellFrame(MiniFrame):
         if not evt.Active:
             ## Reset autoload when active focus going outside.
             self.__autoload = True
-        elif evt.GetActivationReason() == evt.Reason_Mouse\
-          and self.__autoload:
+        elif evt.GetActivationReason() == evt.Reason_Mouse and self.__autoload:
             ## Check all buffers that need to be loaded.
+            verbose = 1
             for book in self.get_all_editors():
                 for buf in book.get_all_buffers():
                     if buf.need_buffer_load:
-                        if wx.MessageBox( # Confirm load.
-                                "The file has been modified externally.\n\n"
-                                "The contents of the buffer will be overwritten.\n"
-                                "Continue loading {}/{}?".format(book.Name, buf.name),
-                                "Load {!r}".format(buf.name),
-                                style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
-                            self.__autoload = False # Don't ask any more.
-                            return
+                        buf.update_caption()
+                        if verbose:
+                            with wx.MessageDialog(self, # Confirm load.
+                                    "The file has been modified externally.\n\n"
+                                    "The contents of the buffer will be overwritten.\n"
+                                    "Continue loading {}/{}?".format(book.Name, buf.name),
+                                    "Load {!r}".format(buf.name),
+                                    style=wx.YES_NO|wx.CANCEL|wx.HELP|wx.ICON_INFORMATION) as dlg:
+                                dlg.SetHelpLabel("Yes to All")
+                                ret = dlg.ShowModal()
+                                if ret == wx.ID_NO:
+                                    continue
+                                if ret == wx.ID_CANCEL:
+                                    break # all
+                                if ret == wx.ID_HELP: # ID_YESTOALL
+                                    verbose = 0
                         book.load_file(buf.filename, buf.markline+1)
+            self.__autoload = False
         ## Reinitialize self-specific builtins if other instances are destroyed.
         if evt.Active:
             self.Init()
@@ -1629,7 +1634,7 @@ class ShellFrame(MiniFrame):
             if m:
                 filename, ln = m.groups()
                 lineno = int(ln)
-        editor = self.find_editor(filename) or self.Log
+        editor = next(self.get_all_editors(filename), self.Log)
         ret = editor.load_file(filename, lineno)
         if ret:
             self.popup_window(editor, show)
@@ -1829,23 +1834,16 @@ class ShellFrame(MiniFrame):
         title = obj if isinstance(obj, str) else repr(obj)
         self.SetTitle("Nautilus - {}".format(title))
     
-    def on_buffer_caption(self, buf):
-        """Called when the buffer caption is updated."""
-        if buf.caption_prefix.startswith('!'):
-            v = wx.ActivateEvent(wx.wxEVT_ACTIVATE, True,
-                                 buf.Id, ActivationReason=0)
-            self.EventHandler.ProcessEvent(v) # => self.OnActivate
-    
     def add_log(self, text, noerr=None):
         """Add text to the logging buffer.
-        If noerr:bool is specified, add a line-marker.
+        If noerr:bool is specified, add a line-mark.
         """
         buf = self.Log.default_buffer or self.Log.new_buffer()
         with buf.off_readonly():
-            buf.goto_char(buf.TextLength) # line to set an arrow marker
+            buf.goto_char(buf.TextLength) # line to set an arrow mark
             buf.write(text)
         if noerr is not None:
-            ## Set a marker on the current line.
+            ## Set a mark on the current line.
             buf.add_marker(buf.cline, 1 if noerr else 2) # 1:white 2:red-arrow
             return
         
@@ -1873,8 +1871,9 @@ class ShellFrame(MiniFrame):
         if not hasattr(target, '__dict__'):
             raise TypeError("primitive objects cannot be targeted")
         
-        shell = self.find_shell(target)
-        if not shell:
+        try:
+            shell = next(self.get_all_shells(target))
+        except StopIteration:
             shell = self.rootshell.__class__(self, target, name="clone",
                         style=wx.CLIP_CHILDREN|wx.BORDER_NONE)
             self.console.AddPage(shell, typename(shell.target))
@@ -1906,38 +1905,40 @@ class ShellFrame(MiniFrame):
         yield from self.console.get_pages(type)
         yield from self.ghost.get_pages(type)
     
-    def get_all_shells(self):
-        """Yields all shells in the notebooks."""
-        yield from self.console.get_pages(type(self.rootshell))
-    
-    def get_all_editors(self):
-        """Yields all editors in the notebooks."""
-        yield from self.ghost.get_pages(type(self.Log))
+    def get_all_shells(self, target=None):
+        """Yields all shells with specified target.
+        
+        If the shell is found, it switches to the corresponding page.
+        If `target` is not provided, it yields all shells in the notebooks.
+        """
+        if target is None:
+            yield from self.console.get_pages(type(self.rootshell))
+        else:
+            for shell in self.console.get_pages(type(self.rootshell)):
+                if shell.target is target:
+                    self.console.swap_page(shell)
+                    yield shell
     
-    @property
-    def all_shells(self): # (deprecated) for backward compatibility
-        """Yields all books in the notebooks."""
-        return self.console.get_pages(type(self.rootshell))
+    def get_all_editors(self, fn=None):
+        """Yields all editors with specified fn:filename or code.
+        
+        If the editor is found, it switches to the corresponding page.
+        If `fn` is not provided, it yields all editors in the notebooks.
+        """
+        if fn is None:
+            yield from self.ghost.get_pages(type(self.Log))
+        else:
+            for book in self.ghost.get_pages(type(self.Log)):
+                buf = book.find_buffer(fn)
+                if buf:
+                    book.swap_page(buf)
+                    yield book
     
     @property
     def current_shell(self):
         """Currently selected shell or rootshell."""
         return self.console.CurrentPage
     
-    def find_shell(self, target):
-        """Find a shell targeting the specified object.
-        If found, switch to the corresponding page.
-        """
-        for shell in self.get_all_shells():
-            if shell.target is target:
-                self.console.swap_page(shell)
-                return shell
-    
-    @property
-    def all_editors(self): # (deprecated) for backward compatibility
-        """Yields all editors in the notebooks."""
-        return self.ghost.get_pages(type(self.Log))
-    
     @property
     def current_editor(self):
         """Currently selected editor or scratch."""
@@ -1946,16 +1947,6 @@ class ShellFrame(MiniFrame):
             return editor
         return next((x for x in self.get_all_editors() if x.IsShown()), self.Scratch)
     
-    def find_editor(self, fn):
-        """Find an editor containing the specified fn:filename or code.
-        If found, switch to the corresponding page.
-        """
-        for book in self.get_all_editors():
-            buf = book.find_buffer(fn)
-            if buf:
-                book.swap_page(buf)
-                return book
-    
     ## --------------------------------
     ## Find text dialog
     ## --------------------------------

mwx/graphman.py

@@ -152,32 +152,38 @@ class Thread:
             raise KeyboardInterrupt("terminated by user")
         return True
     
-    def pause(self, msg="Pausing..."):
+    def pause(self, msg=None, caption=wx.MessageBoxCaptionStr):
         """Pause the thread.
+        Confirm whether to terminate the thread.
         
-        Use ``check`` method where you want to pause.
+        Returns:
+            True  : [OK] if terminating.
+            False : [CANCEL] otherwise.
         
         Note:
+            Use ``check`` method where you want to pause.
             Even after the message dialog is displayed, the thread
             does not suspend until check (or event.wait) is called.
         """
         if not self.running:
             return None
-        if '\n\n' not in msg:
-            msg += '\n\n'
+        if not msg:
+            msg = ("The thread is running.\n\n"
+                   "Do you want to terminate the thread?")
         try:
             self.event.clear() # suspend
-            if wx.MessageBox(  # Confirm terminatation.
-                    msg + "Do you want to terminate the process?",
+            if wx.MessageBox(  # Confirm closing the thread.
+                    msg, caption,
                     style=wx.OK|wx.CANCEL|wx.ICON_WARNING) == wx.OK:
                 self.Stop()
-                return False
-            return True
+                return True
+            return False
         finally:
             self.event.set() # resume
     
     def Start(self, f, *args, **kwargs):
-        """Start the thread to run the specified function."""
+        """Start the thread to run the specified function.
+        """
         @wraps(f)
         def _f(*v, **kw):
             try:
@@ -213,7 +219,10 @@ class Thread:
     def Stop(self):
         """Stop the thread.
         
-        Use ``check`` method where you want to quit.
+        Note:
+            Use ``check`` method where you want to stop.
+            Even after the message dialog is displayed, the thread
+            does not suspend until check (or event.wait) is called.
         """
         def _stop():
             with wx.BusyInfo("One moment please, "
@@ -553,9 +562,9 @@ class Graph(GraphPlot):
         self.update_art_of_mark()
     
     def remove_markups(self):
-        del self.Selector
-        del self.Markers
-        del self.Region
+        del self.selector
+        del self.markers
+        del self.region
     
     def hide_layers(self):
         for name in self.parent.plugins:
@@ -730,21 +739,21 @@ class Frame(mwx.Frame):
             (wx.ID_PASTE, "&Paste\t(C-v)", "Paste buffer from clipboard", Icon('paste'),
                 lambda v: self.__view.read_buffer_from_clipboard()),
             (),
-            (mwx.ID_(21), "Toggle &Markers", "Show/Hide markups", wx.ITEM_CHECK, Icon('+'),
+            (mwx.ID_(21), "Toggle &markers", "Show/Hide markups", wx.ITEM_CHECK, Icon('+'),
                 lambda v: self.__view.set_markups_visible(v.IsChecked()),
                 lambda v: v.Check(self.__view.get_markups_visible())),
                 
-            (mwx.ID_(22), "&Remove Markers", "Remove markups", Icon('-'),
+            (mwx.ID_(22), "&Remove markers", "Remove markups", Icon('-'),
                 lambda v: self.__view.remove_markups()),
             (),
-            (mwx.ID_(23), "Hide all &Layers", "Hide all layers", Icon('xr'),
+            (mwx.ID_(23), "Hide all &layers", "Hide all layers", Icon('xr'),
                 lambda v: self.__view.hide_layers()),
             (),
-            (mwx.ID_(24), "&Histogram\tCtrl-h", "Show Histogram window", wx.ITEM_CHECK,
+            (mwx.ID_(24), "&Histogram\tCtrl-h", "Show histogram window", wx.ITEM_CHECK,
                 lambda v: self.show_pane(self.histogram, v.IsChecked()),
                 lambda v: v.Check(self.histogram.IsShownOnScreen())),
                 
-            (mwx.ID_(25), "&Invert Color\t(C-i)", "Invert colormap", wx.ITEM_CHECK,
+            (mwx.ID_(25), "&Invert color\t(C-i)", "Invert colormap", wx.ITEM_CHECK,
                 lambda v: self.__view.invert_cmap(),
                 lambda v: v.Check(self.__view.get_cmap()[-2:] == "_r")),
         ]
@@ -764,10 +773,10 @@ class Frame(mwx.Frame):
             ##     lambda v: self.__view.set_cmap('gray'),
             ##     lambda v: v.Check(self.__view.get_cmap()[:4] == "gray")),
             ##     
-            ("Standard Colors",
+            ("Standard colors",
                 [_cmenu(i, c) for i, c in enumerate(colours) if c.islower()]),
                 
-            ("Other Colors",
+            ("Other colors",
                 [_cmenu(i, c) for i, c in enumerate(colours) if not c.islower()]),
         ]
         
@@ -876,20 +885,17 @@ class Frame(mwx.Frame):
         for name in self.plugins:
             plug = self.get_plug(name)
             if plug.thread and plug.thread.active:
-                if wx.MessageBox( # Confirm thread close.
+                if not plug.thread.pause( # Confirm closing the thread.
                         "The thread is running.\n\n"
-                        "Enter [q]uit to exit before closing.\n"
                         "Continue closing?",
-                        "Close {!r}".format(plug.Name),
-                        style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
+                        "Close {!r}".format(plug.Name)):
                     self.message("The close has been canceled.")
                     evt.Veto()
                     return
-                self.Quit()
-                break
+        ## self.Quit()
         for frame in self.graph.get_all_frames():
             if frame.pathname is None:
-                if wx.MessageBox( # Confirm close.
+                if wx.MessageBox( # Confirm closing the frame.
                         "You are closing unsaved frame.\n\n"
                         "Continue closing?",
                         "Close {!r}".format(frame.name),

mwx/matplot2.py

@@ -457,12 +457,12 @@ class MatplotPanel(wx.Panel):
         self.canvas.draw()
     
     @property
-    def Selector(self):
+    def selector(self):
         """Selected points array [[x],[y]]."""
         return np.array(self.selected.get_data(orig=0))
     
-    @Selector.setter
-    def Selector(self, v):
+    @selector.setter
+    def selector(self, v):
         x, y = v
         if not hasattr(x, '__iter__'):
             x, y = [x], [y]
@@ -472,8 +472,8 @@ class MatplotPanel(wx.Panel):
         self.draw(self.selected)
         self.trace_point(*v)
     
-    @Selector.deleter
-    def Selector(self):
+    @selector.deleter
+    def selector(self):
         self.selected.set_visible(0)
         self.selected.set_data([], [])
         self.handler('selector_removed', self.frame)
@@ -502,7 +502,7 @@ class MatplotPanel(wx.Panel):
         self.__isMenu = 0
     
     def on_pick(self, evt): #<matplotlib.backend_bases.PickEvent>
-        """Find index near (x,y) and set the Selector.
+        """Find index near (x,y) and set the selector.
         Called (maybe) after mouse button pressed.
         """
         if evt.mouseevent.button != 1 or not evt.artist.get_visible():
@@ -527,7 +527,7 @@ class MatplotPanel(wx.Panel):
             evt.index = k = indices[distances.argmin()] # index of the nearest point
             evt.xdata = x = xs[k]
             evt.ydata = y = ys[k]
-            self.Selector = ([x], [y])
+            self.selector = ([x], [y])
             self.canvas.draw_idle()
             self.handler('art_picked', evt)
             self.message("({:g}, {:g}) index {}".format(x, y, evt.index))
@@ -634,7 +634,7 @@ class MatplotPanel(wx.Panel):
     
     def OnMotion(self, evt):
         """Called when mouse moves in axes."""
-        if not self.Selector.size:
+        if not self.selector.size:
             self.trace_point(evt.xdata, evt.ydata)
     
     def OnForwardPosition(self, evt):
@@ -656,7 +656,7 @@ class MatplotPanel(wx.Panel):
     
     def OnEscapeSelection(self, evt):
         """Escape from selection."""
-        del self.Selector
+        del self.selector
         self.canvas.draw_idle()
     
     def zoomlim(self, lim, M, c=None):