mwxlib 1.1.2__py3-none-any.whl → 1.1.6__py3-none-any.whl

mwx/bookshelf.py

@@ -2,13 +2,59 @@
 import re
 import wx
 
-from .framework import CtrlInterface, postcall
+from .framework import CtrlInterface
+
+
+class MyDropTarget(wx.DropTarget):
+    """DnD loader for files and URL text.
+    """
+    def __init__(self, tree):
+        wx.DropTarget.__init__(self)
+        
+        self.tree = tree
+        self.datado = wx.CustomDataObject("TreeItem")
+        self.filedo = wx.FileDataObject()
+        self.do = wx.DataObjectComposite()
+        self.do.Add(self.datado)
+        self.do.Add(self.filedo)
+        self.SetDataObject(self.do)
+    
+    def OnDragOver(self, x, y, result):
+        item, flags = self.tree.HitTest((x, y))
+        items = list(self.tree._gen_items(self.tree.RootItem)) # first level items
+        if not item:
+            item = items[0]
+        if item in items and item != self.tree.Selection:
+            self.tree.SelectItem(item)
+        return result
+    
+    def OnData(self, x, y, result):
+        item = self.tree.Selection
+        name = self.tree.GetItemText(item)
+        editor = self.tree.Parent.FindWindow(name) # window.Name (not page.caption)
+        def _load(f):
+            if editor.load_file(f):
+                editor.buffer.SetFocus()
+                editor.message(f"Loaded {f!r} successfully.")
+        self.GetData()
+        data = self.datado.Data
+        if data:
+            f = data.tobytes().decode()
+            _load(f)
+            self.datado.SetData(b"")
+        else:
+            for f in self.filedo.Filenames:
+                _load(f)
+            self.filedo.SetData(wx.DF_FILENAME, None)
+        return result
 
 
 class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
     """TreeList/Ctrl
     
     Construct treectrl in the order of tree:list.
+    Note:
+        This only works with single selection mode.
     """
     def __init__(self, parent, *args, **kwargs):
         wx.TreeCtrl.__init__(self, parent, *args, **kwargs)
@@ -22,6 +68,10 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnSelChanged)
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
         
+        self.SetDropTarget(MyDropTarget(self))
+        
+        self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.OnBeginDrag)
+        
         def dispatch(evt):
             """Fork events to the parent."""
             self.parent.handler(self.handler.current_event, evt)
@@ -34,7 +84,6 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
             },
             0 : {
                'delete pressed' : (0, self._delete),
-                   'f5 pressed' : (0, self._refresh),
             },
         })
         self.context = { # DNA<EditorBook>
@@ -61,26 +110,10 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
                 editor.handler.remove(self.context)
         evt.Skip()
     
-    def _refresh(self, evt):
-        def _item(editor):
-            return self._get_item(self.RootItem, editor.Name)
-        ls = []
-        for editor in self.parent.all_editors:
-            if self.IsExpanded(_item(editor)):
-                ls.append(editor)
-        data = None
-        if self.Selection.IsOk():
-            data = self.GetItemData(self.Selection)
-            if data:
-                wx.CallAfter(data.SetFocus)
-                wx.CallAfter(self.SetFocus)
-        self.build_tree()
-        for editor in ls:
-            self.Expand(_item(editor))
-    
     def _delete(self, evt):
-        if self.Selection.IsOk():
-            data = self.GetItemData(self.Selection)
+        item = self.Selection
+        if item:
+            data = self.GetItemData(item)
             if data:
                 data.parent.kill_buffer(data) # the focus moves
                 wx.CallAfter(self.SetFocus)
@@ -100,22 +133,26 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
             self._set_item(self.RootItem, editor.Name, editor.all_buffers)
         self.Refresh()
     
-    def _gen_item(self, root, key):
+    def _gen_items(self, root, key=None):
         """Generates the [root/key] items."""
         item, cookie = self.GetFirstChild(root)
         while item:
-            caption = self.GetItemText(item)
-            if key == re.sub(r"^\W+\s+(.*)", r"\1", caption):
+            if not key:
                 yield item
+            else:
+                ## キャプション先頭の識別子 %* を除外して比較する
+                caption = self.GetItemText(item)
+                if key == re.sub(r"^\W+\s+(.*)", r"\1", caption):
+                    yield item
             item, cookie = self.GetNextChild(root, cookie)
     
     def _get_item(self, root, key):
         """Get the first [root/key] item found."""
-        return next(self._gen_item(root, key), None)
+        return next(self._gen_items(root, key), None)
     
     def _set_item(self, root, key, data):
         """Set the [root/key] item with data recursively."""
-        for item in self._gen_item(root, key):
+        for item in self._gen_items(root, key):
             buf = self.GetItemData(item)
             if not buf or buf is data:
                 break
@@ -142,10 +179,9 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
     
     ## Note: [buffer_activated][EVT_SET_FOCUS] > [buffer_new] の順で呼ばれる
     ##       buf.__itemId がない場合がある (delete_buffer 直後など)
-    @postcall
     def on_buffer_selected(self, buf):
         if self and buf:
-            self.SelectItem(buf.__itemId)
+            wx.CallAfter(lambda: self.SelectItem(buf.__itemId))
     
     def on_buffer_filename(self, buf):
         if self and buf:
@@ -156,5 +192,20 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
             data = self.GetItemData(evt.Item)
             if data:
                 data.SetFocus()
-            self.SetFocus()
+            else:
+                name = self.GetItemText(evt.Item)
+                editor = self.Parent.FindWindow(name) # window.Name (not page.caption)
+                if not editor.IsShown():
+                    ## editor.SetFocus()
+                    self.Parent.Selection = self.Parent.FindPage(editor)
+            wx.CallAfter(self.SetFocus)
         evt.Skip()
+    
+    def OnBeginDrag(self, evt):
+        data = self.GetItemData(evt.Item)
+        if data:
+            dd = wx.CustomDataObject("TreeItem")
+            dd.SetData(data.filename.encode())
+            dropSource = wx.DropSource()
+            dropSource.SetData(dd)
+            dropSource.DoDragDrop(wx.Drag_AllowMove) # -> wx.DragResult

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.1.2"
+__version__ = "1.1.6"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -1024,31 +1024,39 @@ class FileDropLoader(wx.DropTarget):
         self.target = target
         self.textdo = wx.TextDataObject()
         self.filedo = wx.FileDataObject()
-        self.DataObject = wx.DataObjectComposite()
-        self.DataObject.Add(self.textdo)
-        self.DataObject.Add(self.filedo, True)
+        self.do = wx.DataObjectComposite()
+        self.do.Add(self.textdo)
+        self.do.Add(self.filedo)
+        self.SetDataObject(self.do)
+    
+    def OnDragOver(self, x, y, result):
+        index, flags = self.target.HitTest((x, y))
+        if index != -1:
+            self.target.Selection = index
+        return result
     
     def OnData(self, x, y, result):
-        editor = self.target.current_editor
+        editor = self.target.Parent.current_editor
         self.GetData()
         if self.textdo.TextLength > 1:
             f = self.textdo.Text.strip()
             res = editor.load_file(f)
             if res:
                 editor.buffer.SetFocus()
+                editor.message(f"Loaded {f!r} successfully.")
                 result = wx.DragCopy
             elif res is None:
-                editor.post_message("Load canceled.")
+                editor.message(f"Loading {f!r} canceled.")
                 result = wx.DragCancel
             else:
-                editor.post_message(f"Loading {f!r} failed.")
+                editor.message(f"Loading {f!r} failed.")
                 result = wx.DragNone
-            self.textdo.Text = ''
+            self.textdo.SetText('')
         else:
             for f in self.filedo.Filenames:
                 if editor.load_file(f):
                     editor.buffer.SetFocus()
-                    editor.post_message(f"Loaded {f!r} successfully.")
+                    editor.message(f"Loaded {f!r} successfully.")
             self.filedo.SetData(wx.DF_FILENAME, None)
         return result
 
@@ -1159,7 +1167,7 @@ class ShellFrame(MiniFrame):
         
         self.ghost.AddPage(self.Bookshelf, "Bookshelf", bitmap=Icon('book'))
         
-        self.ghost.SetDropTarget(FileDropLoader(self))
+        self.ghost.SetDropTarget(FileDropLoader(self.ghost))
         
         self.watcher = AuiNotebook(self, size=(600,400), name="watcher")
         self.watcher.AddPage(self.ginfo, "globals")
@@ -1649,6 +1657,8 @@ class ShellFrame(MiniFrame):
             self.linfo.watch(obj.__dict__)
             self.ginfo.watch(None)
             self.popup_window(self.linfo)
+        else:
+            raise TypeError("primitive objects cannot be set as watch targets")
     
     def highlight(self, obj, *args, **kwargs):
         self.inspector.highlight(obj, *args, **kwargs)
@@ -1969,7 +1979,7 @@ class ShellFrame(MiniFrame):
         if self.findDlg:
             self.OnFindClose(None)
         wnd.EnsureVisible(wnd.cline)
-        wnd.EnsureLineMoreOnScreen(wnd.cline)
+        wnd.ensureLineMoreOnScreen(wnd.cline)
     
     def OnFindPrev(self, evt):
         self.OnFindNext(evt, backward=True)

mwx/graphman.py

@@ -1451,7 +1451,7 @@ class Frame(mwx.Frame):
                     frame.name = os.path.basename(fn) # new name and pathname
                 output_frames.append(frame)
                 print(' ', self.message("\b done."))
-            except (PermissionError, OSError) as e:
+            except OSError as e:
                 print('-', self.message("\b failed.", e))
         
         frames = output_frames

mwx/nutshell.py

@@ -667,35 +667,30 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.__mark = -1
         self.__stylus = {}
     
-    __dnd_from = None
     __dnd_flag = 0
     
     def OnDrag(self, evt): #<wx._core.StyledTextEvent>
-        EditorInterface.__dnd_from = evt.EventObject
-        try:
-            EditorInterface.__dnd_flag = (evt.Position < self.bolc) # force copy
-        except AttributeError:
+        if isinstance(self, Shell):
+            EditorInterface.__dnd_flag = (evt.Position < self.bolc) # readonly
+        else:
             EditorInterface.__dnd_flag = 0
         evt.Skip()
     
     def OnDragging(self, evt): #<wx._core.StyledTextEvent>
-        _from = EditorInterface.__dnd_from
-        _to = evt.EventObject
-        if isinstance(_from, Shell) and _from is not _to:  # from shell to buffer
-            wx.UIActionSimulator().KeyDown(wx.WXK_CONTROL) # force copy
-        try:
-            if evt.Position < self.bolc:
-                evt.DragResult = wx.DragNone # Don't drop (as readonly)
+        if isinstance(self, Shell):
+            if evt.Position < self.bolc: # target is readonly
+                evt.DragResult = wx.DragNone
             elif EditorInterface.__dnd_flag:
-                evt.DragResult = wx.DragCopy # Don't move
-        except AttributeError:
-            pass
+                ## from shell to shell
+                evt.DragResult = wx.DragCopy if wx.GetKeyState(wx.WXK_CONTROL) else wx.DragNone
+        else:
+            if EditorInterface.__dnd_flag:
+                ## from shell to buffer
+                evt.DragResult = wx.DragCopy if wx.GetKeyState(wx.WXK_CONTROL) else wx.DragNone
         evt.Skip()
     
     def OnDragged(self, evt): #<wx._core.StyledTextEvent>
-        EditorInterface.__dnd_from = None
         EditorInterface.__dnd_flag = 0
-        wx.UIActionSimulator().KeyUp(wx.WXK_CONTROL)
         evt.Skip()
     
     ## --------------------------------
@@ -1108,7 +1103,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
                 break
             lc = la
         self.ToggleFold(lc)
-        self.EnsureLineOnScreen(lc)
+        self.ensureLineOnScreen(lc)
         return lc
     
     def get_region(self, line):
@@ -1265,7 +1260,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         w, h = self.PointFromPosition(pos)
         return self.FirstVisibleLine + h//self.TextHeight(0)
     
-    def EnsureLineOnScreen(self, line):
+    def ensureLineOnScreen(self, line):
         """Ensure a particular line is visible by scrolling the buffer
         without expanding any header line hiding it.
         """
@@ -1277,7 +1272,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         elif vl > hl + n - 1:
             self.ScrollToLine(vl - n + 1)
     
-    def EnsureLineMoreOnScreen(self, line, offset=0):
+    def ensureLineMoreOnScreen(self, line, offset=0):
         """Ensure a particular line is visible by scrolling the buffer
         without expanding any header line hiding it.
         If the line is at the screen edge, recenter it.
@@ -2330,7 +2325,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
             self.set_attributes(buf, **self.defaultBufferStyle)
             if index is None:
                 index = self.PageCount
-            self.InsertPage(index, buf, buf.name)
+            self.InsertPage(index, buf, buf.name) # => [buffer_activated]
             self.handler('buffer_new', buf)
             return buf
         finally:
@@ -2424,20 +2419,16 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     buf._load_textfile(res.text, filename)
                     self.swap_buffer(buf, lineno)
                     return True
-                ## return False
-                raise Exception("The requested URL was not found")
+                return False
+                ## raise Exception("The requested URL was not found", filename)
             if buf._load_file(filename):
                 self.swap_buffer(buf, lineno)
                 return True
             return False
-        except FileNotFoundError:
-            self.post_message(f"New file: {filename!r}.")
+        except OSError as e:
+            self.post_message(e)
             self.delete_buffer(buf)
             return False
-        except Exception as e:
-            self.post_message(f"Failed to load {filename!r}.", e)
-            self.delete_buffer(buf)
-            raise
     
     def find_file(self, filename=None):
         """Open the specified file."""
@@ -2450,10 +2441,11 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     for fn in dlg.Paths:
                         self.find_file(fn)
             return
-        if self.load_file(filename) == False:
+        if self.load_file(filename) == False: # not None
             buf = self.create_buffer(filename)
             buf._Buffer__mtime = 0 # => need_buffer_save
             self.swap_buffer(buf)
+            self.post_message(f"New file: {filename!r}.")
     
     def save_file(self, filename, buf=None, verbose=True):
         """Save the current buffer to a file.
@@ -2700,7 +2692,7 @@ class Nautilus(EditorInterface, Shell):
         """Reset the shell target object; Rename the parent title.
         """
         if not hasattr(obj, '__dict__'):
-            raise TypeError("primitive objects cannot be targeted")
+            raise TypeError("primitive objects cannot be targets")
         
         self.__target = obj
         self.locals = obj.__dict__

mwx/utilus.py

@@ -359,6 +359,8 @@ def _extract_words_from_tokens(tokens, reverse=False):
     stack = []
     words = []
     for j, c in enumerate(tokens):
+        if not c:
+            continue
         if c in p:
             stack.append(c)
         elif c in q:
@@ -390,6 +392,8 @@ def _extract_paren_from_tokens(tokens, reverse=False):
     stack = []
     words = []
     for j, c in enumerate(tokens):
+        if not c:
+            continue
         if c in p:
             stack.append(c)
         elif c in q:

mwx/wxpdb.py

@@ -330,7 +330,7 @@ class Debugger(Pdb):
                     buffer.recenter(3)
                 buffer.goto_line(lineno - 1)
                 buffer.pointer = lineno - 1 # (->) pointer:marker
-                buffer.EnsureLineMoreOnScreen(lineno - 1)
+                buffer.ensureLineMoreOnScreen(lineno - 1)
             self.code = code
         wx.CallAfter(_mark)
     

{mwxlib-1.1.2.dist-info → mwxlib-1.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 1.1.2
+Version: 1.1.6
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto
@@ -17,7 +17,7 @@ Classifier: Topic :: Scientific/Engineering :: Image Processing
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: wxpython >=4.2.0
+Requires-Dist: wxpython>=4.2.0
 Requires-Dist: matplotlib
 Requires-Dist: opencv-python
 Requires-Dist: scipy

{mwxlib-1.1.2.dist-info → mwxlib-1.1.6.dist-info}/RECORD

@@ -1,18 +1,18 @@
 mwx/__init__.py,sha256=psabnAMei5VzB2TsB2qBNLrIZMX0LiqjlXCpNGmDejk,668
-mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
+mwx/bookshelf.py,sha256=b_TMDaNIzLHoL0xbbqb3tt0BnRvhLAqaCn_pBdrigZw,7523
 mwx/controls.py,sha256=cNZkgwSv90lPIz61FvMtYxHIt8hJD_RQYXxsgTQIdLc,47949
-mwx/framework.py,sha256=RDpWhsQt4JjHF1MSscYclm0ZoOQspgQCqCMzkCy8PqU,75759
-mwx/graphman.py,sha256=04bEw7TEIs6X1QrgqBSLJoIhJnW5TwHTW_wZOvJYSwo,69840
+mwx/framework.py,sha256=kqreWhh0wfhBz70vx9b5b8XHJR6BD-TxFbopzl__Ryc,76125
+mwx/graphman.py,sha256=LjN1R8UZxHycrgAfnl_SoTT_vHuKcSISr5VVf0cMflM,69821
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
 mwx/matplot2.py,sha256=RuVWXC2A_qgZRNmBBptbHDn5MyxaWBqp3ru4bP_lDE0,33150
 mwx/matplot2g.py,sha256=4G5uZJZzATEC3QEVZ4pGHetEDfu5NJNUFyeAaQScK5s,64495
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=M5rt-H7Uq1OHnlFvMA4a3945UBvppbR9L_mw8NL_YZ0,5602
-mwx/nutshell.py,sha256=IN9sC7vfeBn9hqr79eNPpnfwYMXFDWahFDyil1lHtCc,141581
+mwx/nutshell.py,sha256=wzcZSxTM9G2bYtIBri51-AA6JhiKrtfsh-DMgwJZ5io,141340
 mwx/testsuite.py,sha256=kiM3-BVhr42LRRN7xG7pYl3at8o2vnypWSxD8KRvA7c,1228
-mwx/utilus.py,sha256=2Mw6mVMXpkls-K1z1Tab5CAOGNyZZ1XnYePcxQe7pC4,37369
+mwx/utilus.py,sha256=HFvP682SyeSp8yNfUrdUXPhWdLuWVlsUSg6LqNBJOT8,37451
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
-mwx/wxpdb.py,sha256=--TQr-_zs9dWPYV2V4s3Zr4abvN14o5wD8anT9frHUg,18875
+mwx/wxpdb.py,sha256=AObuf4JLAmlQLj-yf0_mkBBd-Bhhz2Vb8hbTVcHEZOs,18875
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
 mwx/wxwit.py,sha256=1hHtMi2YEy2T_LnUpwdmrIdtCuvxMOFyykqnbq6jLP0,7294
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
@@ -22,8 +22,8 @@ mwx/plugins/frame_listview.py,sha256=gowjQ-ARNonMkDSXkQgPKq4U9YBJ-vQ0jK2krBVOdCs
 mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-1.1.2.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.1.2.dist-info/METADATA,sha256=oZlFJYkY1z0cvMR5NOGJqG7szi7z1Jffz76TrfcTnJw,7259
-mwxlib-1.1.2.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-mwxlib-1.1.2.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.1.2.dist-info/RECORD,,
+mwxlib-1.1.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.1.6.dist-info/METADATA,sha256=XXM7dJHiEuRk1rwo-UIfx9wfYFH6A5Vg_POkY0SPSpI,7258
+mwxlib-1.1.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mwxlib-1.1.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.1.6.dist-info/RECORD,,

{mwxlib-1.1.2.dist-info → mwxlib-1.1.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.4.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any