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

mwx/bookshelf.py

@@ -13,9 +13,11 @@ class MyDropTarget(wx.DropTarget):
         
         self.tree = tree
         self.datado = wx.CustomDataObject("TreeItem")
+        self.textdo = wx.TextDataObject()
         self.filedo = wx.FileDataObject()
         self.do = wx.DataObjectComposite()
         self.do.Add(self.datado)
+        self.do.Add(self.textdo)
         self.do.Add(self.filedo)
         self.SetDataObject(self.do)
     
@@ -31,20 +33,22 @@ class MyDropTarget(wx.DropTarget):
     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.")
+        editor = self.tree.Parent.FindWindow(name) # window.Name
         self.GetData()
-        data = self.datado.Data
-        if data:
-            f = data.tobytes().decode()
-            _load(f)
+        if self.datado.Data:
+            fn = self.datado.Data.tobytes().decode()
+            editor.load_file(fn)
             self.datado.SetData(b"")
+        elif self.textdo.Text:
+            fn = self.textdo.Text.strip()
+            res = editor.parent.handler("text_dropped", fn)
+            if res is None or not any(res):
+                editor.load_file(fn)
+            result = wx.DragCopy
+            self.textdo.SetText("")
         else:
-            for f in self.filedo.Filenames:
-                _load(f)
+            for fn in self.filedo.Filenames:
+                editor.load_file(fn)
             self.filedo.SetData(wx.DF_FILENAME, None)
         return result
 

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.3.0"
+__version__ = "1.3.3"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -872,18 +872,18 @@ class AuiNotebook(aui.AuiNotebook):
         self.Bind(aui.EVT_AUINOTEBOOK_TAB_RIGHT_DOWN, tab_menu)
     
     @property
-    def all_pages(self):
-        """Returns all window pages."""
+    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):
-        """Returns all AuiTabCtrl objects."""
+    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):
-        """Returns all AuiPaneInfo excluding `dummy` one."""
+    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):
@@ -1033,30 +1033,24 @@ class FileDropLoader(wx.DropTarget):
         index, flags = self.target.HitTest((x, y))
         if index != -1:
             self.target.Selection = index
+            result = wx.DragCopy
+        else:
+            result = wx.DragNone
         return result
     
     def OnData(self, x, y, result):
         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.message(f"Loading {f!r} canceled.")
-                result = wx.DragCancel
-            else:
-                editor.message(f"Loading {f!r} failed.")
-                result = wx.DragNone
-            self.textdo.SetText('')
+        if self.textdo.Text:
+            fn = self.textdo.Text.strip()
+            res = editor.parent.handler("text_dropped", fn)
+            if res is None or not any(res):
+                editor.load_file(fn)
+            result = wx.DragCopy
+            self.textdo.SetText("")
         else:
-            for f in self.filedo.Filenames:
-                if editor.load_file(f):
-                    editor.buffer.SetFocus()
-                    editor.message(f"Loaded {f!r} successfully.")
+            for fn in self.filedo.Filenames:
+                editor.load_file(fn)
             self.filedo.SetData(wx.DF_FILENAME, None)
         return result
 
@@ -1535,7 +1529,7 @@ class ShellFrame(MiniFrame):
     
     def OnConsolePageClose(self, evt): #<wx._aui.AuiNotebookEvent>
         nb = evt.EventObject
-        win = nb.all_pages[evt.Selection]
+        win = list(nb.get_pages())[evt.Selection]
         if win is self.rootshell:
             ## self.message("Don't close the root shell.")
             nb.WindowStyle &= ~aui.AUI_NB_CLOSE_ON_ACTIVE_TAB
@@ -1550,22 +1544,20 @@ class ShellFrame(MiniFrame):
     def About(self, evt=None):
         self.add_help(
             '\n\n'.join((
-                "#<module 'mwx' from {!r}>".format(__file__),
-                "Author: {!r}".format(__author__),
-                "Version: {!s}".format(__version__),
+                f"#<module 'mwx' from {__file__!r}>",
+                f"Author: {__author__!r}",
+                f"Version: {__version__!s}",
                 self.__class__.__doc__,
                 self.rootshell.__class__.__doc__,
-                
-                ## Thanks to wx.py.shell.
-                "#{!r}".format(wx.py),
-                "Author: {!r}".format(wx.py.version.__author__),
-                "Version: {!s}".format(wx.py.version.VERSION),
+                ## --- Thanks to <wx.py.shell> ---
+                f"#{wx.py!r}",
+                f"Author: {wx.py.version.__author__!r}",
+                f"Version: {wx.py.version.VERSION!s}",
                 wx.py.shell.Shell.__doc__,
                 textwrap.indent("*original" + wx.py.shell.HELP_TEXT, ' '*4),
-                
-                ## Thanks are also due to wx.
-                "#{!r}".format(wx),
-                "To show the credit, press C-M-Mbutton.\n",
+                ## --- Thanks are also due to <wx> ---
+                ## f"#{wx!r}".format(wx),
+                ## f"To show the credit, press [C-M-Mbutton].", # cf. wx.InfoMessageBox(None)
                 ))
             )
     
@@ -1846,7 +1838,7 @@ class ShellFrame(MiniFrame):
     
     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-marker.
         """
         buf = self.Log.default_buffer or self.Log.new_buffer()
         with buf.off_readonly():
@@ -1861,11 +1853,18 @@ class ShellFrame(MiniFrame):
         ## with open(self.LOGGING_FILE, 'a', encoding='utf-8', newline='') as o:
         ##     o.write(text)
     
-    def add_help(self, text):
-        """Add text to the help buffer."""
+    def add_help(self, text, title=None):
+        """Add text to the help buffer.
+        If title:str is specified, create a new buffer with that title.
+        """
         buf = self.Help.default_buffer or self.Help.new_buffer()
+        if title is not None:
+            self.Help.find_file(f"*{title}*")
+            buf = self.Help.buffer
         with buf.off_readonly():
-            buf.SetText(text)
+            buf.Text = text
+            buf.EmptyUndoBuffer()
+            buf.SetSavePoint()
         ## Overwrite text and popup the window.
         self.popup_window(self.Help)
         self.Help.swap_page(buf)

mwx/graphman.py

@@ -887,7 +887,7 @@ class Frame(mwx.Frame):
                     return
                 self.Quit()
                 break
-        for frame in self.graph.all_frames:
+        for frame in self.graph.get_all_frames():
             if frame.pathname is None:
                 if wx.MessageBox( # Confirm close.
                         "You are closing unsaved frame.\n\n"
@@ -970,7 +970,7 @@ class Frame(mwx.Frame):
                 win.handler('page_shown', win)
         elif not show and shown:
             if isinstance(win, aui.AuiNotebook):
-                for plug in win.all_pages:
+                for plug in win.get_pages():
                     plug.handler('page_closed', plug)
             else:
                 win.handler('page_closed', win)
@@ -1016,7 +1016,7 @@ class Frame(mwx.Frame):
         pane = evt.GetPane()
         win = pane.window
         if isinstance(win, aui.AuiNotebook):
-            for plug in win.all_pages:
+            for plug in win.get_pages():
                 plug.handler('page_closed', plug)
         else:
             win.handler('page_closed', win)
@@ -1103,6 +1103,7 @@ class Frame(mwx.Frame):
             else:
                 module = import_module(name)
         except Exception as e:
+            traceback.print_exc()
             print(f"- Unable to load {root!r}.", e)
             return False
         
@@ -1425,7 +1426,7 @@ class Frame(mwx.Frame):
         """
         view = self.selected_view
         if not frames:
-            frames = view.all_frames
+            frames = view.get_all_frames()
             if not frames:
                 return None
         
@@ -1691,7 +1692,7 @@ class Frame(mwx.Frame):
     def save_buffers_as_tiffs(self, path=None, frames=None):
         """Save buffers to a file as a multi-page tiff."""
         if not frames:
-            frames = self.selected_view.all_frames
+            frames = self.selected_view.get_all_frames()
             if not frames:
                 return None
         
@@ -1810,7 +1811,7 @@ class Frame(mwx.Frame):
             
             def _save(view):
                 name = view.Name
-                paths = [x.pathname for x in view.all_frames if x.pathname]
+                paths = [x.pathname for x in view.get_all_frames() if x.pathname]
                 o.write(f"self.{name}.unit = {view.unit:g}\n")
                 o.write(f"self.load_frame({paths!r}, self.{name})\n")
                 try:

mwx/matplot2g.py

@@ -772,6 +772,10 @@ class GraphPlot(MatplotPanel):
             return next((art for art in self.__Arts if art.name == j), None)
         return self.__Arts[j]
     
+    def get_all_frames(self):
+        """List of arts <matplotlib.image.AxesImage>."""
+        return self.__Arts
+    
     ## --------------------------------
     ## Property of frame / drawer
     ## --------------------------------
@@ -780,10 +784,10 @@ class GraphPlot(MatplotPanel):
     nbytes_threshold = 24e6
     
     #: image cutoff score percentiles
-    score_percentile = 0.01
+    score_percentile = 0.005
     
     @property
-    def all_frames(self):
+    def all_frames(self): # (deprecated) for backward compatibility
         """List of arts <matplotlib.image.AxesImage>."""
         return self.__Arts
     

mwx/nutshell.py

@@ -27,14 +27,14 @@ from wx.py.shell import Shell
 from wx.py.editwindow import EditWindow
 
 from .utilus import funcall as _F
-from .utilus import ignore
+from .utilus import ignore, typename
 from .utilus import split_words, split_paren, split_tokens, find_modules
 from .framework import CtrlInterface, AuiNotebook, Menu
 
 
 ## URL pattern (flag = re.M | re.A)
 ## url_re = r"https?://[\w/:%#$&?()~.=+-]+"
-url_re = r"https?://[\w/:%#$&?~.=+-]+"  # excluding ()
+url_re = r"https?://[\w/:%#$&?!@~.,;=+-]+"  # excluding ()
 
 ## no-file pattern
 nofile_re = r'[\/:*?"<>|]'
@@ -2022,12 +2022,11 @@ class Buffer(EditorInterface, EditWindow):
     ## File I/O
     ## --------------------------------
     
-    def _load_textfile(self, text, filename):
+    def _load_textfile(self, text):
         with self.off_readonly():
             self.Text = text
             self.EmptyUndoBuffer()
             self.SetSavePoint()
-        self.update_filestamp(filename)
         self.handler('buffer_loaded', self)
     
     def _load_file(self, filename):
@@ -2214,7 +2213,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
     
     def OnPageClose(self, evt): #<wx._aui.AuiNotebookEvent>
         nb = evt.EventObject
-        buf = nb.all_pages[evt.Selection]
+        buf = list(nb.get_pages())[evt.Selection]
         if buf.need_buffer_save:
             if wx.MessageBox( # Confirm close.
                     "You are closing unsaved content.\n\n"
@@ -2276,9 +2275,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
     
     @property
     def all_buffers(self): # (deprecated) for backward compatibility
-        """Returns all buffer pages.
-        cf. equiv. AuiNotebook.all_pages or get_pages()
-        """
+        """Returns all buffers."""
         return [self.GetPage(j) for j in range(self.PageCount)]
     
     def get_all_buffers(self, fn=None):
@@ -2391,7 +2388,8 @@ class EditorBook(AuiNotebook, CtrlInterface):
             elif not buf.need_buffer_load:
                 self.swap_buffer(buf, lineno)
                 return True
-            buf._load_textfile(''.join(lines), filename)
+            buf._load_textfile(''.join(lines))
+            buf.update_filestamp(filename)
             self.swap_buffer(buf, lineno)
             return True
         return False
@@ -2421,7 +2419,8 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 kwargs.setdefault('timeout', 3.0)
                 res = requests.get(filename, **kwargs)
                 if res.status_code == requests.codes.OK:
-                    buf._load_textfile(res.text, filename)
+                    buf._load_textfile(res.text)
+                    buf.update_filestamp(filename)
                     self.swap_buffer(buf, lineno)
                     return True
                 res.raise_for_status()  # raise HTTP error; don't catch here.
@@ -2653,7 +2652,7 @@ class Nautilus(EditorInterface, Shell):
     
         C-up        : [0] retrieve previous history
         C-down      : [0] retrieve next history
-        C-j, M-j    : [0] tooltip of eval (for the selected or focused word)
+        C-j         : [0] tooltip of eval (for the selected or focused word)
         C-h, M-h    : [0] calltip of help (for the selected or focused func)
         TAB         : [1] history-comp
         M-p         : [1] retrieve previous history in history-comp mode
@@ -3520,13 +3519,13 @@ class Nautilus(EditorInterface, Shell):
         """Short information."""
         doc = inspect.getdoc(obj)\
                 or "No information about {}".format(obj)
-        self.parent.handler('add_help', doc) or print(doc)
+        self.parent.handler('add_help', doc, typename(obj)) or print(doc)
     
     def help(self, obj):
         """Full description."""
         doc = pydoc.plain(pydoc.render_doc(obj))\
                 or "No description about {}".format(obj)
-        self.parent.handler('add_help', doc) or print(doc)
+        self.parent.handler('add_help', doc, typename(obj)) or print(doc)
     
     def eval(self, text):
         return eval(text, self.globals, self.locals)

mwx/wxpdb.py

@@ -103,7 +103,7 @@ class Debugger(Pdb):
         pdb.input = _input
         
         def _help():
-            self.parent.handler('add_help', pdb.__doc__)
+            self.parent.handler('add_help', pdb.__doc__, "pdb")
         pdb.help = _help
         
         def dispatch(evt):

{mwxlib-1.3.0.dist-info → mwxlib-1.3.3.dist-info}/METADATA

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

{mwxlib-1.3.0.dist-info → mwxlib-1.3.3.dist-info}/RECORD

@@ -1,18 +1,18 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
-mwx/bookshelf.py,sha256=REBMiiC2IE4MUtoDu5T8klFizBr4G0tdFrZinR2yVUg,7547
+mwx/bookshelf.py,sha256=SFT_08Us0d0tjwlKX9HWaRdbZpcBBK4sCkP2DSetRbE,7747
 mwx/controls.py,sha256=ojMUTl-1YRVVEH32WBIK_NUED6UWAil6EGAYigqh5ak,48090
-mwx/framework.py,sha256=TOKFx4epSTgHClbKtL--K_8gRSc7OwAHjl6tZpSDtlo,76805
-mwx/graphman.py,sha256=knoleskaSdwu65jHNfzrnaCEaN1wHtr3ouQg4tM2doE,70335
+mwx/framework.py,sha256=6TtB58J5aYE5R3zNLC7xlhT77FkxKV4cq48jwH8AnrY,76906
+mwx/graphman.py,sha256=jZvSH5SPV_L_cTbYCG2JHN1phuvTpe-UjXmcyJz0QX0,70398
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
 mwx/matplot2.py,sha256=Zwte-wwzCg_OHzsBniVgKdaNLzsvJaa1gc0n7VdAqxw,33150
-mwx/matplot2g.py,sha256=ceeAjFkrDz49aSLo_9dIWZZd4HhnSjxe8u9G_ipBHek,64195
+mwx/matplot2g.py,sha256=yloFQCVjR2r4pDBJeKh3uqbdOxoeKO5Z5lhmjVwdRac,64361
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=8mXbHpCmm7lz3XbAxOg7IVC7DaSGBEby1UfTlMl9kjk,5604
-mwx/nutshell.py,sha256=PUVlIac1HMIoaHj2m8ZUmiOIE_xcsWlTJifm9GRPAjM,141572
+mwx/nutshell.py,sha256=8U40niudjo2EjAoSzaZ2g9W-uSlrfcNqfo4A0s2GiaU,141577
 mwx/testsuite.py,sha256=Zk75onPSEn2tf0swS3l-vIn6yTXGB7allIyvJsPHj20,1229
 mwx/utilus.py,sha256=bDeooo2bOcZwvkIdi0ElkT-qoblqzHNFsIveb72NFOo,37528
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
-mwx/wxpdb.py,sha256=ge4hNfeigHGcpnioU1B_BJX_QZjNdtnokUrcZOxcEcI,18814
+mwx/wxpdb.py,sha256=KkTQKwsr7g0uJeN8qdgMz7P2a-I859G1XJyPibAOUDI,18821
 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.3.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.3.0.dist-info/METADATA,sha256=0Q6nnQK4gPzt6Kgg98OVyzhNbMDIN9xwfy9tL3xYlY0,7456
-mwxlib-1.3.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-mwxlib-1.3.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.3.0.dist-info/RECORD,,
+mwxlib-1.3.3.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.3.3.dist-info/METADATA,sha256=wyWGjSDomWzGvIQGyxsVLhdBd1xLwoaX54A0aDFdNUU,7456
+mwxlib-1.3.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+mwxlib-1.3.3.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.3.3.dist-info/RECORD,,