mwxlib 0.94.2__py3-none-any.whl → 0.94.4__py3-none-any.whl

mwx/bookshelf.py

@@ -2,29 +2,17 @@
 import re
 import wx
 
-from .utilus import TreeList
-from .nutshell import EditorBook
-from .framework import CtrlInterface
+from .framework import CtrlInterface, postcall
 
 
-class ItemData:
-    """Item data for TreeListCtrl
-    """
-    def __init__(self, tree, buffer):
-        self.tree = tree
-        self.buffer = buffer
-        self._itemId = None #: reference <TreeItemId>
-
-
-class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface, TreeList):
-    """TreeList control
+class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
+    """TreeList/Ctrl
     
     Construct treectrl in the order of tree:list.
     """
     def __init__(self, parent, *args, **kwargs):
         wx.TreeCtrl.__init__(self, parent, *args, **kwargs)
         CtrlInterface.__init__(self)
-        TreeList.__init__(self)
         
         self.Font = wx.Font(9, wx.DEFAULT, wx.NORMAL, wx.NORMAL)
         
@@ -52,18 +40,20 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface, TreeList):
         def enter(v):
             data = self.GetItemData(self.Selection)
             if data:
-                data.buffer.SetFocus()
+                data.SetFocus()
         
         @self.handler.bind('f5 pressed')
         def refresh(v):
-            self.reset(clear=0)
+            self.update(clear=0)
+            if self.target:
+                self.target.current_editor.SetFocus()
+                wx.CallAfter(self.SetFocus)
         
         @self.handler.bind('delete pressed')
         def delete(v):
             data = self.GetItemData(self.Selection)
             if data:
-                buf = data.buffer
-                buf.parent.kill_buffer(buf) # -> focus moves
+                data.parent.kill_buffer(data) # -> focus moves
                 wx.CallAfter(self.SetFocus)
         
         @self.handler.bind('*button* pressed')
@@ -75,28 +65,41 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface, TreeList):
     
     def OnDestroy(self, evt):
         if evt.EventObject is self:
-            self.unwatch()
+            self.detach()
         evt.Skip()
     
+    def attach(self, target):
+        self.detach()
+        self.target = target
+        for editor in self.target.all_editors:
+            editor.handler.append(self.context)
+        self.update()
+    
+    def detach(self):
+        if not self.target:
+            return
+        for editor in self.target.all_editors:
+            editor.handler.remove(self.context)
+        self.target = None
+        self.update()
+    
     ## --------------------------------
     ## TreeList/Ctrl wrapper interface 
     ## --------------------------------
     
-    def reset(self, clear=True):
+    def update(self, clear=True):
         """Build tree control.
-        All items will be reset after clear if specified.
+        All items will be cleared if specified.
         """
         try:
             self.Freeze()
-            wnd = wx.Window.FindFocus() # original focus
             if clear:
                 self.DeleteAllItems()
                 self.AddRoot(self.Name)
-            for branch in self:
-                self._set_item(self.RootItem, *branch)
+            if self.target:
+                for editor in self.target.all_editors:
+                    self._set_item(self.RootItem, editor.Name, editor.all_buffers)
         finally:
-            if wnd:
-                wnd.SetFocus() # restore focus
             self.Thaw()
     
     def _get_item(self, root, key):
@@ -110,83 +113,46 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface, TreeList):
                 return item
             item, cookie = self.GetNextChild(root, cookie)
     
-    def _set_item(self, root, key, *values):
-        """Set the item [root/key] with values recursively.
+    def _set_item(self, root, key, data):
+        """Set the item [root/key] with data recursively.
         """
         item = self._get_item(root, key) or self.AppendItem(root, key)
-        branches = next((x for x in values if isinstance(x, (tuple, list))), [])
-        rest = [x for x in values if x not in branches]
-        if rest:
-            ## Take the first element assuming it's client data.
-            ## Set the item client data. (override as needed)
-            try:
-                data = rest[0]
-                data._itemId = item
-                self.SetItemData(item, data)
-                buf = data.buffer
-                self.SetItemText(item, buf.caption_prefix + buf.name)
-            except AttributeError:
-                pass
-        for branch in branches:
-            self._set_item(item, *branch)
+        if isinstance(data, list):
+            for buf in data:
+                self._set_item(item, buf.name, buf)
+        else:
+            data.__itemId = item
+            self.SetItemData(item, data)
+            self.SetItemText(item, data.caption_prefix + data.name)
     
     ## --------------------------------
     ## Actions for bookshelf interfaces
     ## --------------------------------
     
-    def reset_tree(self, editor):
-        """Reset a branch for EditorBook/Buffer."""
-        self[editor.Name] = [
-            [buf.name, ItemData(self, buf)] for buf in editor.all_buffers
-        ]
-    
-    def watch(self, target):
-        self.unwatch()
-        self.target = target
-        if self.target:
-            for editor in self.target.get_pages(EditorBook):
-                editor.handler.append(self.context)
-                self.reset_tree(editor)
-            self.reset()
-    
-    def unwatch(self):
-        if self.target:
-            for editor in self.target.get_pages(EditorBook):
-                editor.handler.remove(self.context)
-            self[:] = [] # clear tree
-            self.reset()
-        self.target = None
-    
+    @postcall
     def on_buffer_new(self, buf):
-        self[f"{buf.parent.Name}/{buf.name}"] = ItemData(self, buf)
-        self.reset(clear=0)
+        self.update(clear=0)
     
+    @postcall
     def on_buffer_deleted(self, buf):
-        del self[f"{buf.parent.Name}/{buf.name}"]
-        self.reset()
+        self.Delete(buf.__itemId)
     
+    @postcall
     def on_buffer_selected(self, buf):
-        data = self[f"{buf.parent.Name}/{buf.name}"]
-        self.SelectItem(data._itemId)
+        self.SelectItem(buf.__itemId)
     
+    @postcall
     def on_buffer_caption(self, buf):
-        data = self[f"{buf.parent.Name}/{buf.name}"]
-        self.SetItemText(data._itemId, buf.caption_prefix + buf.name)
+        self.SetItemText(buf.__itemId, buf.caption_prefix + buf.name)
     
+    @postcall
     def on_buffer_filename(self, buf):
-        self.reset_tree(buf.parent)
-        self.reset()
+        self.SetItemText(buf.__itemId, buf.caption_prefix + buf.name)
     
     def OnSelChanged(self, evt):
         if self and self.HasFocus():
             data = self.GetItemData(evt.Item)
-            if data and data.buffer:
-                data.buffer.SetFocus()
+            if data:
+                data.SetFocus()
             self.SetFocus()
         evt.Skip()
-    
-    ## def OnItemTooltip(self, evt):
-    ##     data = self.GetItemData(evt.Item)
-    ##     if data and data.buffer:
-    ##         evt.SetToolTip(data.buffer.filename)
-    ##     evt.Skip()

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.94.2"
+__version__ = "0.94.4"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -1016,7 +1016,7 @@ class FileDropLoader(wx.DropTarget):
     def __init__(self, target):
         wx.DropTarget.__init__(self)
         
-        self.book = target
+        self.editor = target
         self.textdo = wx.TextDataObject()
         self.filedo = wx.FileDataObject()
         self.DataObject = wx.DataObjectComposite()
@@ -1024,7 +1024,7 @@ class FileDropLoader(wx.DropTarget):
         self.DataObject.Add(self.filedo, True)
     
     def OnData(self, x, y, result):
-        editor = self.book
+        editor = self.editor
         self.GetData()
         if self.textdo.TextLength > 1:
             f = self.textdo.Text.strip()
@@ -1156,12 +1156,9 @@ class ShellFrame(MiniFrame):
         
         self.Bookshelf = EditorTreeCtrl(self, name="Bookshelf",
                                         style=wx.TR_DEFAULT_STYLE|wx.TR_HIDE_ROOT)
-        self.Bookshelf.watch(self.ghost)
+        self.Bookshelf.attach(self)
         
         self.ghost.AddPage(self.Bookshelf, "Bookshelf", bitmap=Icon('book'))
-        ## self._mgr.AddPane(self.Bookshelf,
-        ##                   aui.AuiPaneInfo().Name("bookshelf")
-        ##                      .Caption("Bookshelf").Right().Show(1))
         
         self.ghost.SetDropTarget(FileDropLoader(self.Scratch))
         
@@ -1250,7 +1247,7 @@ class ShellFrame(MiniFrame):
                       'add_log' : [ None, self.add_log ],
                      'add_help' : [ None, self.add_help ],
                  'title_window' : [ None, self.on_title_window ],
-         'buffer_caption_reset' : [ None, self.on_buffer_caption ],
+         'buffer_caption_reset' : [ None, self.on_buffer_caption ], # => self.OnActivate
             },
             0 : {
                     '* pressed' : (0, fork_debugger),
@@ -1638,7 +1635,7 @@ class ShellFrame(MiniFrame):
                 filename, ln = m.groups()
                 lineno = int(ln)
         editor = self.find_editor(filename) or self.Log
-        ret = self._load(filename, lineno, editor, verbose=1)
+        ret = editor.load_file(filename, lineno, verbose=1)
         if ret:
             self.popup_window(editor, show, focus)
         return ret
@@ -1912,13 +1909,21 @@ class ShellFrame(MiniFrame):
         """Yields all editors in the notebooks."""
         yield from self.ghost.get_pages(type(self.Log))
     
+    @property
+    def current_editor(self):
+        """Currently selected editor or scratch."""
+        editor = self.ghost.CurrentPage
+        if isinstance(editor, type(self.Log)):
+            return editor
+        return next((x for x in self.all_editors if x.IsShown()), self.Scratch)
+    
     def find_editor(self, fn):
         """Find an editor which has the specified fn:filename or code."""
-        for editor in self.all_editors:
-            buf = editor.find_buffer(fn)
+        for book in self.all_editors:
+            buf = book.find_buffer(fn)
             if buf:
-                editor.swap_page(buf)
-                return editor
+                book.swap_page(buf)
+                return book
     
     ## --------------------------------
     ## Find text dialog

mwx/matplot2g.py

@@ -946,8 +946,6 @@ class GraphPlot(MatplotPanel):
                 xr, yr = max(nx), max(ny) # bottom-right
                 self.message("[Region] "
                     "crop={}:{}:{}:{}".format(xr-xo, yr-yo, xo, yo)) # (W:H:left:top)
-            else:
-                return self.trace_point(x[[0,-1]], y[[0,-1]], type)
     
     def writeln(self):
         """Puts (override) attributes of current frame to the modeline."""

mwx/nutshell.py

@@ -290,7 +290,7 @@ class EditorInterface(CtrlInterface):
         self.__mark = -1
         self.__stylus = {}
     
-    ## Custom constants embedded in stc
+    ## Custom constants embedded in wx.stc
     stc.STC_P_WORD3 = 20
     stc.STC_STYLE_CARETLINE = 40
     stc.STC_STYLE_ANNOTATION = 41
@@ -986,7 +986,7 @@ class EditorInterface(CtrlInterface):
             self.EnsureVisible(self.cline)
             yield err
     
-    def grep_barckward(self, pattern, flags=re.M):
+    def grep_backward(self, pattern, flags=re.M):
         text = self.GetTextRange(0, self.cpos)
         errs = re.finditer(pattern, text, flags)
         for err in reversed(list(errs)):
@@ -1965,7 +1965,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         """
         buf = self.find_buffer(filename)
         if not buf:
-            buf = self.create_buffer(filename)
+            buf = self.create_buffer("*temp file*")
         elif buf.need_buffer_save and verbose:
             if wx.MessageBox( # Confirm load.
                     "You are leaving unsaved content.\n\n"
@@ -3141,10 +3141,6 @@ class Nautilus(Shell, EditorInterface):
     
     def help(self, obj):
         """Full description."""
-        ## if obj is None:
-        ##     self.message("Currently redirected to stdin/stdout.")
-        ##     wx.CallAfter(pydoc.help)
-        ##     return
         doc = pydoc.plain(pydoc.render_doc(obj))\
                 or "No description about {}".format(obj)
         self.parent.handler('add_help', doc) or print(doc)

{mwxlib-0.94.2.dist-info → mwxlib-0.94.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.94.2
+Version: 0.94.4
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto

{mwxlib-0.94.2.dist-info → mwxlib-0.94.4.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=zLsXDgqyC5NsPCjRxjS2huvZ3uDyeOJ1vapotqe2ULM,834
-mwx/bookshelf.py,sha256=FrissUYdGXLABOzJmMaQU6GXvu6n_9DVW3d5wGwQzjM,6613
+mwx/bookshelf.py,sha256=OWeEXMqdSF1IqAKV15TnZ_R5578AV5VDyaB7CWd2sjs,5258
 mwx/controls.py,sha256=1eguX5eofsA6hmS2y7R4hvlFjFikVoZ8v2S1ES7rjEU,47196
-mwx/framework.py,sha256=1QVxdGh9q2auq4hQV-DaJsAZellHuUd9jpYfPBUj0fA,75394
+mwx/framework.py,sha256=3Yn4lK7_qnafFitJGTtdRHetZmdxFms-PVDpOdX4kWY,75522
 mwx/graphman.py,sha256=UsNBo5Z1eiuXj3VkxCZds_Uy8R0cQV7mXoCwLtejbCE,70001
 mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
 mwx/matplot2.py,sha256=qaF_gvLoLn-TimLbRR59KUavNr1ZpZQdSMqjzJk47rk,32682
-mwx/matplot2g.py,sha256=Ca-3RJZmSiZcvNrXmeK_lFf2fdG-0gkp7dYkCtrKi2I,65530
+mwx/matplot2g.py,sha256=mDaD367wjq6xsyIDX9ot8jLwYYGayoavWMhqsQVBHac,65442
 mwx/matplot2lg.py,sha256=tg8u7w4DxiJdPN-E197NOmbQpc_1gZkgDHYv_xUhbFA,27224
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=iJEFzcu5qfp-HxXORB8ci-Q1z7a8zTPwbfFxik5h6pY,135802
+mwx/nutshell.py,sha256=tlpYJEpe9sRSnILZBHqu85kQ0VGzTGeLT4PpRDcJPno,135647
 mwx/utilus.py,sha256=5GVSNKyvNWxsDftIrTJUhBlnQAh3zvrW5BuQSGasJv8,37395
 mwx/wxmon.py,sha256=Qk86VbuuW2rR46pqEYLur13G_aloWz5SVv6sib30YY0,12717
 mwx/wxpdb.py,sha256=2z3ZD9Oo1H-ONBHlaprkB9hrTmAI7o03sqO46ppEFE4,19129
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=T-2xSv_D2bk9fJ64aiSEe1rJRTeqaIpLVAYEUXW5vz8
 mwx/plugins/line_profile.py,sha256=WJB5z7F53yg4dII2R36IFZvtkSOGWT669b1HmAAXSnQ,816
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwxlib-0.94.2.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.94.2.dist-info/METADATA,sha256=nG8tQUyP23iDpjnaedgv9mFikcFoIBpFhFhfgI0wlWY,1925
-mwxlib-0.94.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.94.2.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.94.2.dist-info/RECORD,,
+mwxlib-0.94.4.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.94.4.dist-info/METADATA,sha256=kgPD9dBMgo_dMK-YF1Fye0nl2LqFpduWFVt9EgdXn7c,1925
+mwxlib-0.94.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mwxlib-0.94.4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.94.4.dist-info/RECORD,,