mwxlib 0.98.6__py3-none-any.whl → 0.99.0__py3-none-any.whl

mwx/bookshelf.py

@@ -2,7 +2,6 @@
 import re
 import wx
 
-from .utilus import funcall as _F
 from .framework import CtrlInterface, postcall
 
 
@@ -18,31 +17,11 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         self.Font = wx.Font(9, wx.DEFAULT, wx.NORMAL, wx.NORMAL)
         
         self.parent = parent
-        self.target = None
-        
-        self.context = { # DNA<EditorBook>
-            None : {
-                   'buffer_new' : [ None, self.on_buffer_new ],
-                 'buffer_saved' : [ None, ],
-                'buffer_loaded' : [ None, ],
-               'buffer_deleted' : [ None, self.on_buffer_deleted ],
-             'buffer_activated' : [ None, self.on_buffer_selected ],
-           'buffer_inactivated' : [ None, ],
-       'buffer_caption_updated' : [ None, self.on_buffer_filename ],
-            },
-        }
-        wx.CallAfter(self.attach, target=parent)
         
         ## self.Bind(wx.EVT_TREE_ITEM_GETTOOLTIP, self.OnItemTooltip)
         self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnSelChanged)
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
         
-        def delete_item():
-            data = self.GetItemData(self.Selection)
-            if data:
-                data.parent.kill_buffer(data) # the focus moves
-                wx.CallAfter(self.SetFocus)
-        
         def dispatch(evt):
             """Fork events to the parent."""
             self.parent.handler(self.handler.current_event, evt)
@@ -54,33 +33,57 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
             '*button* released' : [ None, dispatch ],
             },
             0 : {
-               'delete pressed' : (0, _F(delete_item)),
-                   'f5 pressed' : (0, _F(self.build_tree, clear=0)),
-                 'S-f5 pressed' : (0, _F(self.build_tree, clear=1)),
+               'delete pressed' : (0, self._delete),
+                   'f5 pressed' : (0, self._refresh),
             },
         })
+        self.context = { # DNA<EditorBook>
+            None : {
+                   'buffer_new' : [ None, self.on_buffer_new ],
+                 'buffer_saved' : [ None, ],
+                'buffer_loaded' : [ None, ],
+               'buffer_deleted' : [ None, self.on_buffer_deleted ],
+             'buffer_activated' : [ None, self.on_buffer_selected ],
+           'buffer_inactivated' : [ None, ],
+       'buffer_caption_updated' : [ None, self.on_buffer_filename ],
+            },
+        }
+        def _attach():
+            if self and self.parent:
+                for editor in self.parent.all_editors:
+                    editor.handler.append(self.context)
+                self.build_tree()
+        wx.CallAfter(_attach)
     
     def OnDestroy(self, evt):
-        if evt.EventObject is self:
-            self.detach()
+        if self and self.parent:
+            for editor in self.parent.all_editors:
+                editor.handler.remove(self.context)
         evt.Skip()
     
-    def attach(self, target):
-        if not self:
-            return
-        self.detach()
-        self.target = target
-        for editor in self.target.all_editors:
-            editor.handler.append(self.context)
+    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 detach(self):
-        if not self or not self.target:
-            return
-        for editor in self.target.all_editors:
-            editor.handler.remove(self.context)
-        self.target = None
-        self.build_tree()
+    def _delete(self, evt):
+        if self.Selection.IsOk():
+            data = self.GetItemData(self.Selection)
+            if data:
+                data.parent.kill_buffer(data) # the focus moves
+                wx.CallAfter(self.SetFocus)
     
     ## --------------------------------
     ## TreeList/Ctrl wrapper interface 
@@ -93,33 +96,39 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         if clear:
             self.DeleteAllItems()
             self.AddRoot(self.Name)
-        if self.target:
-            for editor in self.target.all_editors:
-                self._set_item(self.RootItem, editor.Name, editor.all_buffers)
+        for editor in self.parent.all_editors:
+            self._set_item(self.RootItem, editor.Name, editor.all_buffers)
         self.Refresh()
     
-    def _get_item(self, root, key):
-        """Returns the first item [root/key] found.
-        Note: Items with the same name are not supported.
-        """
+    def _gen_item(self, root, key):
+        """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):
-                return item
+                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)
+    
     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)
-        if isinstance(data, list):
+        """Set the [root/key] item with data recursively."""
+        for item in self._gen_item(root, key):
+            buf = self.GetItemData(item)
+            if not buf or buf is data:
+                break
+        else:
+            item = self.AppendItem(root, key)
+        try:
             for buf in data:
                 self._set_item(item, buf.name, buf)
-        else:
+        except Exception:
             data.__itemId = item
             self.SetItemData(item, data)
             self.SetItemText(item, data.caption_prefix + data.name)
+        return item
     
     ## --------------------------------
     ## Actions for bookshelf interfaces
@@ -135,10 +144,12 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
     ##       buf.__itemId がない場合がある (delete_buffer 直後など)
     @postcall
     def on_buffer_selected(self, buf):
-        self.SelectItem(buf.__itemId)
+        if self and buf:
+            self.SelectItem(buf.__itemId)
     
     def on_buffer_filename(self, buf):
-        self.SetItemText(buf.__itemId, buf.caption_prefix + buf.name)
+        if self and buf:
+            self.SetItemText(buf.__itemId, buf.caption_prefix + buf.name)
     
     def OnSelChanged(self, evt):
         if self and self.HasFocus():

mwx/controls.py

@@ -7,9 +7,9 @@ import wx.lib.platebtn as pb
 import wx.lib.scrolledpanel as scrolled
 
 from . import images
-from .utilus import SSM
+from .utilus import SSM, warn
 from .utilus import funcall as _F
-from .framework import pack, Menu, postcall
+from .framework import pack, Menu, CtrlInterface
 
 import numpy as np
 from numpy import nan, inf  # noqa: necessary to eval
@@ -26,7 +26,7 @@ class Param:
     Args:
         name    : label
         range   : range
-        value   : std_value (default is None)
+        value   : std_value (default is nan)
         fmt     : text formatter or format:str (default is '%g')
                   `hex` specifies hexadecimal format
         handler : called when control changed
@@ -84,11 +84,19 @@ class Param:
     def __len__(self):
         return len(self.range)
     
+    def bind(self, action=None, target='control'):
+        warn("Use `Param.callback.bind('control')` instead.", DeprecationWarning)
+        return self.callback.bind(target, action)
+    
+    def unbind(self, action=None, target='control'):
+        warn("Use `Param.callback.unbind('control')` instead.", DeprecationWarning)
+        return self.callback.unbind(target, action)
+    
     def reset(self, v=None, internal_callback=True):
         """Reset value when indexed (by knobs) with callback."""
         if v is None:
-            v = self.std_value
-            if np.isnan(v):
+            v = self.std_value  # reset to std_value
+            if np.isnan(v):     # do nothing if std_value is nan
                 return
         elif isinstance(v, str):
             try:
@@ -96,7 +104,27 @@ class Param:
             except Exception:
                 v = self.value
                 internal_callback = False
-        self.value = v
+        
+        if v is None:
+            v = nan
+        if np.isnan(v) or np.isinf(v):
+            self.__value = v
+            for knob in self.knobs:
+                knob.update_ctrl(None, notify=False)
+            return
+        if v != self.__value:
+            ## If the value is out of range, it will be modified.
+            valid = (self.min <= v <= self.max)
+            if valid:
+                self.__value = v
+            elif v < self.min:
+                self.__value = self.min
+                self.callback('underflow', self)
+            else:
+                self.__value = self.max
+                self.callback('overflow', self)
+            for knob in self.knobs:
+                knob.update_ctrl(valid, notify=True)
         if internal_callback:
             self.callback('control', self)
     
@@ -129,30 +157,7 @@ class Param:
     
     @value.setter
     def value(self, v):
-        if v is None:
-            v = nan
-        if np.isnan(v) or np.isinf(v):
-            self.__value = v
-            for knob in self.knobs:
-                knob.update_ctrl(None, notify=False)
-            return
-        elif v == self.__value:
-            for knob in self.knobs:
-                knob.update_ctrl(True, notify=False)
-            return
-        
-        ## If the value is out of range, it will be modified.
-        valid = (self.min <= v <= self.max)
-        if valid:
-            self.__value = v
-        elif v < self.min:
-            self.__value = self.min
-            self.callback('underflow', self)
-        else:
-            self.__value = self.max
-            self.callback('overflow', self)
-        for knob in self.knobs:
-            knob.update_ctrl(valid, notify=True)
+        self.reset(v)
     
     @property
     def std_value(self):
@@ -438,13 +443,11 @@ class Knob(wx.Panel):
         self.label.SetLabel(v.name + t)
         self.label.Refresh()
     
-    ## Note: wxAssertionError in text.SetValue
-    @postcall
     def update_ctrl(self, valid=True, notify=False):
         """Called when value is being changed (internal use only)."""
         v = self.__par
         self.ctrl.SetValue(v.index)
-        self.text.SetValue(str(v))
+        wx.CallAfter(self.text.SetValue, str(v)) # for wxAssertionError
         if valid:
             if notify:
                 if self.text.BackgroundColour != '#ffff80':
@@ -475,14 +478,12 @@ class Knob(wx.Panel):
         j = self.ctrl.GetValue() + bit
         if j != v.index:
             v.index = j
-            v.reset(v.value)
     
     def OnScroll(self, evt): #<wx._core.ScrollEvent><wx._controls.SpinEvent><wx._core.CommandEvent>
         v = self.__par
         j = self.ctrl.GetValue()
         if j != v.index:
             v.index = j
-            v.reset(v.value)
         evt.Skip()
     
     def OnMouseWheel(self, evt): #<wx._core.MouseEvent>
@@ -540,7 +541,7 @@ class Knob(wx.Panel):
         self.text.Enable(p)
 
 
-class ControlPanel(scrolled.ScrolledPanel):
+class KnobCtrlPanel(scrolled.ScrolledPanel):
     """Scrollable Control Panel
     """
     def __init__(self, *args, **kwargs):
@@ -728,7 +729,7 @@ class ControlPanel(scrolled.ScrolledPanel):
                 except Exception as e: # failed to eval
                     print(f"- Failed to reset {p!r}.", e)
     
-    reset_params = set_params #: for backward compatibility
+    reset_params = set_params
     
     def copy_to_clipboard(self, checked_only=False):
         params = self.get_params(checked_only)
@@ -742,6 +743,14 @@ class ControlPanel(scrolled.ScrolledPanel):
             self.set_params(text.split('\t'), checked_only)
 
 
+class ControlPanel(CtrlInterface, KnobCtrlPanel):
+    """Gnuplot control panel.
+    """
+    def __init__(self, *args, **kwargs):
+        KnobCtrlPanel.__init__(self, *args, **kwargs)
+        CtrlInterface.__init__(self)
+
+
 class Clipboard:
     """Clipboard interface of text and image
     

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.98.6"
+__version__ = "0.99.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -178,6 +178,15 @@ def getKeyState(key):
         pass
 
 
+def setKeyState(key, state):
+    """Makes you feel like having pressed/released speckey."""
+    vk = wx.UIActionSimulator()
+    if state:
+        vk.KeyDown(_speckeys_wxkmap[key])
+    else:
+        vk.KeyUp(_speckeys_wxkmap[key])
+
+
 def hotkey(evt):
     """Interpret evt.KeyCode as hotkey:str and overwrite evt.key.
     The modifiers are arranged in the same order as matplotlib as
@@ -695,7 +704,8 @@ class StatusBar(wx.StatusBar):
     
     def __call__(self, *args, **kwargs):
         text = ' '.join(str(v) for v in args)
-        return self.write(text, **kwargs)
+        if self:
+            return self.write(text, **kwargs)
     
     def resize(self, field):
         self.SetFieldsCount(len(field))
@@ -1135,8 +1145,8 @@ class ShellFrame(MiniFrame):
                                  skip=[Debugger.__module__, # Don't enter debugger
                                        EventMonitor.__module__, # Don't enter event-hook
                                        FSM.__module__,
-                                       'fnmatch', 'warnings', 'bdb', 'pdb',
                                        'wx.core', 'wx.lib.eventwatcher',
+                                       'fnmatch', 'warnings', 'bdb', 'pdb', #'contextlib',
                                        ],
                                  )
         self.inspector = Inspector(self, name="Inspector")
@@ -1268,7 +1278,7 @@ class ShellFrame(MiniFrame):
         
         self.Scratch.set_attributes(Style=Nautilus.STYLE)
         self.Log.set_attributes(ReadOnly=True)
-        self.Help.set_attributes(ReadOnly=True)
+        self.Help.set_attributes(ReadOnly=False)
         
         self.set_hookable(self.Scratch)
         self.set_hookable(self.Log)
@@ -1335,20 +1345,19 @@ class ShellFrame(MiniFrame):
         _fsave(self.Scratch, self.SCRATCH_FILE) # save scratch
         _fsave(self.Log,     self.LOGGING_FILE) # save log
         
-        with open(self.SESSION_FILE, 'w', encoding='utf-8', newline='') as o:
+        with open(self.SESSION_FILE, 'w') as o:
             o.write("#! Session file (This file is generated automatically)\n")
+            o.write("self.SetSize({})\n".format(self.Size))
+            o.write("self.SetPosition({})\n".format(self.Position))
             
-            for book in (self.Scratch, self.Log):
+            for book in self.all_editors:
                 for buf in book.all_buffers:
                     if buf.mtdelta is not None:
                         o.write("self.{}.load_file({!r}, {})\n"
                                 .format(book.Name, buf.filename, buf.markline+1))
+                o.write("self.{}.loadPerspective({!r})\n"
+                        .format(book.Name, book.savePerspective()))
             o.write('\n'.join((
-                "self.SetSize({})".format(self.Size),
-                "self.SetPosition({})".format(self.Position),
-                "self.Scratch.loadPerspective({!r})".format(self.Scratch.savePerspective()),
-                "self.Log.loadPerspective({!r})".format(self.Log.savePerspective()),
-                ## Note: Perspectives should be called after all pages have been added.
                 "self.ghost.loadPerspective({!r})".format(self.ghost.savePerspective()),
                 "self.watcher.loadPerspective({!r})".format(self.watcher.savePerspective()),
                 "self._mgr.LoadPerspective({!r})".format(self._mgr.SavePerspective()),
@@ -1699,8 +1708,7 @@ class ShellFrame(MiniFrame):
             elif isinstance(obj, str):
                 filename = "<string>"
                 editor = self.Scratch
-                buf = editor.find_buffer(filename)\
-                   or editor.create_buffer(filename)
+                buf = editor.find_buffer(filename) or editor.create_buffer(filename)
                 with buf.off_readonly():
                     buf.Text = obj
                 self.debugger.run(obj, filename)
@@ -1855,6 +1863,7 @@ class ShellFrame(MiniFrame):
         shell = self.rootshell.__class__(self, target, name="clone",
                     style=wx.CLIP_CHILDREN|wx.BORDER_NONE)
         self.handler('shell_new', shell)
+        self.Show()
         self.console.AddPage(shell, typename(shell.target))
         self.popup_window(shell)
         shell.SetFocus()

mwx/graphman.py

@@ -27,7 +27,7 @@ from PIL.TiffImagePlugin import TiffImageFile
 from . import framework as mwx
 from .utilus import ignore, warn
 from .utilus import funcall as _F
-from .controls import ControlPanel, Icon
+from .controls import KnobCtrlPanel, Icon
 from .framework import CtrlInterface, AuiNotebook, Menu, FSM
 
 from .matplot2 import MatplotPanel # noqa
@@ -260,12 +260,6 @@ class LayerInterface(CtrlInterface):
     ## thread_type = Thread
     thread = None
     
-    ## layout helper function (deprecated: internal use only)
-    pack = mwx.pack
-    
-    ## funcall = interactive_call (deprecated: internal use only)
-    funcall = staticmethod(_F)
-    
     ## for debug (internal use only)
     pane = property(lambda self: self.parent.get_pane(self))
     
@@ -474,11 +468,11 @@ class LayerInterface(CtrlInterface):
             del self.Arts
 
 
-class Layer(LayerInterface, ControlPanel):
+class Layer(LayerInterface, KnobCtrlPanel):
     """Graphman.Layer
     """
     def __init__(self, parent, session=None, **kwargs):
-        ControlPanel.__init__(self, parent, **kwargs)
+        KnobCtrlPanel.__init__(self, parent, **kwargs)
         LayerInterface.__init__(self, parent, session)
 
 

mwx/matplot2g.py

@@ -124,7 +124,6 @@ class AxesImagePhantom:
     Note:
         Due to the problem of performance,
         the image pixel size could be reduced by binning.
-        ( ･ω･)? Current verision of wxagg limits < 24M bytes?
     """
     def __init__(self, parent, buf, name, show=True,
                  localunit=None, aspect=1.0, **attributes):
@@ -766,7 +765,7 @@ class GraphPlot(MatplotPanel):
     ## Property of frame / drawer
     ## --------------------------------
     
-    #: image bytes max for loading matplotlib wxagg backend
+    #: image bytes max for loading matplotlib (with wxAgg backend)
     nbytes_threshold = 24e6
     
     #: image cutoff score percentiles

mwx/mgplt.py

@@ -13,7 +13,7 @@ from .controls import ControlPanel
 
 
 class Gnuplot:
-    """Gnuplot - gnuplot:pipe wrapper
+    """Gnuplot backend - gnuplot pipe wrapper.
     """
     debug = 0
     
@@ -123,15 +123,13 @@ class Gnuplot:
 
 
 class GnuplotFrame(mwx.Frame):
-    """Gnuplot Frame
+    """Gnuplot frontend frame.
     """
-    gnuplot = property(lambda self: self.__gplot) #: single class object
-    
     def __init__(self, *args, **kwargs):
         mwx.Frame.__init__(self, *args, **kwargs)
         
-        self.__gplot = Gnuplot()
-        self.panel = ControlPanel(self)
+        self.gnuplot = Gnuplot()
+        self.panel = GnuplotPanel(self)
         
         self.menubar["Edit"] = [
             (wx.ID_COPY, "&Copy params\tCtrl-c", "Copy params to clipboard",
@@ -157,6 +155,6 @@ class GnuplotFrame(mwx.Frame):
     
     def Destroy(self):
         try:
-            del self.__gplot
+            del self.gnuplot
         finally:
             return mwx.Frame.Destroy(self)

mwx/nutshell.py

@@ -545,22 +545,19 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_VLINE, *v)
         self.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_VLINE, *v)
         
-        ## Custom indicator (0,1) for filter_text
-        ## if wx.VERSION >= (4,1,0):
-        try:
-            self.IndicatorSetStyle(0, stc.STC_INDIC_TEXTFORE)
-            self.IndicatorSetStyle(1, stc.STC_INDIC_ROUNDBOX)
-        except AttributeError:
-            self.IndicatorSetStyle(0, stc.STC_INDIC_PLAIN)
-            self.IndicatorSetStyle(1, stc.STC_INDIC_ROUNDBOX)
-        
-        self.IndicatorSetUnder(1, True)
-        self.IndicatorSetAlpha(1, 60)
-        self.IndicatorSetOutlineAlpha(1, 120)
-        self.IndicatorSetForeground(0, "red")
-        self.IndicatorSetForeground(1, "yellow")
+        ## Custom indicators ([BUG] indicator=1 is reset when the buffer is udpated.)
+        ## [10-11] filter_text
+        ## [2] URL for load_file
+        ## [3] match_paren
+        self.IndicatorSetStyle(10, stc.STC_INDIC_TEXTFORE)
+        self.IndicatorSetForeground(10, "red")
+        
+        self.IndicatorSetStyle(11, stc.STC_INDIC_STRAIGHTBOX)
+        self.IndicatorSetUnder(11, True)
+        self.IndicatorSetAlpha(11, 255)
+        self.IndicatorSetOutlineAlpha(11, 255)
+        self.IndicatorSetForeground(11, "yellow")
         
-        ## Custom indicator (2) for URL (buffer_modified)
         self.IndicatorSetStyle(2, stc.STC_INDIC_DOTS)
         self.IndicatorSetForeground(2, "light gray")
         try:
@@ -569,7 +566,6 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         except AttributeError:
             pass
         
-        ## Custom indicator (3) for match_paren
         self.IndicatorSetStyle(3, stc.STC_INDIC_DOTS)
         self.IndicatorSetForeground(3, "light gray")
         
@@ -590,34 +586,36 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.__stylus = {}
     
     ## Custom constants embedded in wx.stc
-    stc.STC_P_WORD3 = 20
+    stc.STC_P_WORD3 = 20 # deprecated
     stc.STC_STYLE_CARETLINE = 40
     stc.STC_STYLE_ANNOTATION = 41
     
-    ## Common DnD target and flags
-    dnd = None
-    dnd_flag = 0 # 1:copy 2:ctrl-pressed
-    
     def OnDrag(self, evt): #<wx._core.StyledTextEvent>
-        EditorInterface.dnd = evt.EventObject
+        EditorInterface.__dnd_from = evt.EventObject
+        try:
+            EditorInterface.__dnd_flag = (evt.Position < self.bolc) # force copy
+        except AttributeError:
+            EditorInterface.__dnd_flag = 0
         evt.Skip()
     
     def OnDragging(self, evt): #<wx._core.StyledTextEvent>
-        if isinstance(self.dnd, Shell):
-            if EditorInterface.dnd is not evt.EventObject\
-              and EditorInterface.dnd_flag == 1:
-                vk = wx.UIActionSimulator()
-                vk.KeyDown(wx.WXK_CONTROL) # force [C-Ldrag]
-                EditorInterface.dnd_flag += 1
-                def _release():
-                    vk.KeyUp(wx.WXK_CONTROL)
-                    EditorInterface.dnd_flag -= 1
-                wx.CallLater(1000, _release)
+        _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)
+            elif EditorInterface.__dnd_flag:
+                evt.DragResult = wx.DragCopy # Don't move
+        except AttributeError:
+            pass
         evt.Skip()
     
     def OnDragged(self, evt): #<wx._core.StyledTextEvent>
-        EditorInterface.dnd = None
-        EditorInterface.dnd_flag = 0
+        EditorInterface.__dnd_from = None
+        EditorInterface.__dnd_flag = 0
+        wx.UIActionSimulator().KeyUp(wx.WXK_CONTROL)
         evt.Skip()
     
     ## --------------------------------
@@ -1129,12 +1127,6 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
             if 'bold' in item:
                 self.SetCaretStyle(stc.STC_CARETSTYLE_BLOCK)
         
-        ## Custom indicator (0,1) for filter_text
-        item = _map(spec.pop(stc.STC_P_WORD3, ''))
-        if item:
-            self.IndicatorSetForeground(0, item.get('fore') or "red")
-            self.IndicatorSetForeground(1, item.get('back') or "yellow")
-        
         ## Apply the rest of the style
         for key, value in spec.items():
             self.StyleSetSpec(key, value)
@@ -1187,7 +1179,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.ScrollToLine(vl - m)
     
     def _calc_vline(self, line):
-        """Virtual line numberin the buffer window."""
+        """Virtual line number in the buffer window."""
         pos = self.PositionFromLine(line)
         w, h = self.PointFromPosition(pos)
         return self.FirstVisibleLine + h//self.TextHeight(0)
@@ -1318,7 +1310,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     def filter_text(self, text=None):
         """Show indicators for the selected text."""
         self.__itextlines = []
-        for i in range(2):
+        for i in (10, 11,):
             self.SetIndicatorCurrent(i)
             self.IndicatorClearRange(0, self.TextLength)
         if text is None:
@@ -1331,7 +1323,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         lines = []
         for p in self.search_text(text):
             lines.append(self.LineFromPosition(p))
-            for i in range(2):
+            for i in (10, 11,):
                 self.SetIndicatorCurrent(i)
                 self.IndicatorFillRange(p, lw)
         self.__itextlines = sorted(set(lines)) # keep order, no duplication
@@ -1661,7 +1653,6 @@ class Buffer(EditorInterface, EditWindow):
         stc.STC_P_DEFNAME         : "fore:#0000ff,bold",
         stc.STC_P_WORD            : "fore:#0000ff",
         stc.STC_P_WORD2           : "fore:#b8007f",
-        stc.STC_P_WORD3           : "fore:#ff0000,back:#ffff00", # optional for search word
         stc.STC_P_DECORATOR       : "fore:#e08040",
     }
     
@@ -1693,18 +1684,17 @@ class Buffer(EditorInterface, EditWindow):
         """Timestamp delta (for checking external mod).
         
         Returns:
-            None : No file
+            None : no file
             = 0  : a file
             > 0  : a file edited externally
             < 0  : a url file
         """
         fn = self.filename
-        if fn:
-            if os.path.isfile(fn):
-                return os.path.getmtime(fn) - self.__mtime
-            if re.match(url_re, fn):
-                return -1
-        return self.__mtime # None or specified value
+        if os.path.isfile(fn):
+            return os.path.getmtime(fn) - self.__mtime
+        if re.match(url_re, fn):
+            return -1
+        return None
     
     @property
     def caption_prefix(self):
@@ -1753,7 +1743,7 @@ class Buffer(EditorInterface, EditWindow):
         return EditorInterface.post_command_hook(self, evt)
     post_command_hook.__name__ = str('post_command_dispatch') # alias
     
-    def __init__(self, parent, filename=None, **kwargs):
+    def __init__(self, parent, filename, **kwargs):
         EditWindow.__init__(self, parent, **kwargs)
         EditorInterface.__init__(self)
         
@@ -1908,7 +1898,7 @@ class Buffer(EditorInterface, EditWindow):
                 self.handler('buffer_modified', self)
         evt.Skip()
     
-    def OnCallTipClick(self, evt):
+    def OnCallTipClick(self, evt): #<wx._stc.StyledTextEvent>
         if self.CallTipActive():
             self.CallTipCancel()
         pos, tip, more = self._calltips
@@ -1916,23 +1906,24 @@ class Buffer(EditorInterface, EditWindow):
             self.CallTipShow(pos, tip, N=None)
         evt.Skip()
     
-    def OnIndicatorClick(self, evt):
+    def OnIndicatorClick(self, evt): #<wx._stc.StyledTextEvent>
         if self.SelectedText or not wx.GetKeyState(wx.WXK_CONTROL):
             ## Processing text selection, dragging, or dragging+
             evt.Skip()
             return
         pos = evt.Position
-        if self.IndicatorValueAt(2, pos):
-            p = self.IndicatorStart(2, pos)
-            q = self.IndicatorEnd(2, pos)
+        i = 2
+        if self.IndicatorValueAt(i, pos): # [C-indic click]
+            p = self.IndicatorStart(i, pos)
+            q = self.IndicatorEnd(i, pos)
             url = self.GetTextRange(p, q).strip()
             self.message("URL {!r}".format(url))
-            if wx.GetKeyState(wx.WXK_SHIFT):
-                ## Note: post-call for the confirmation dialog.
-                wx.CallAfter(self.parent.load_file, url)
-            else:
+            if wx.GetKeyState(wx.WXK_SHIFT): # [C-S-indic click]
                 import webbrowser
                 return webbrowser.open(url)
+            else:
+                ## Note: post-call for the confirmation dialog.
+                wx.CallAfter(self.parent.load_file, url)
         self.anchor = pos # Clear selection
     
     def on_modified(self, buf):
@@ -2423,8 +2414,6 @@ class EditorBook(AuiNotebook, CtrlInterface):
             buf._Buffer__mtime = 0 # => need_buffer_save
             self.swap_buffer(buf)
     
-    open_buffer = find_file # for backward compatibility
-    
     def save_file(self, filename, buf=None, verbose=True):
         """Save the current buffer to a file.
         """
@@ -2679,7 +2668,6 @@ class Nautilus(EditorInterface, Shell):
         stc.STC_P_DEFNAME         : "fore:#3a96ff,bold",
         stc.STC_P_WORD            : "fore:#80c0ff",
         stc.STC_P_WORD2           : "fore:#ff80ff",
-        stc.STC_P_WORD3           : "fore:#ff0000,back:#ffff00", # optional for search word
         stc.STC_P_DECORATOR       : "fore:#ff8040",
     }
     
@@ -2762,9 +2750,6 @@ class Nautilus(EditorInterface, Shell):
         
         self.Bind(stc.EVT_STC_UPDATEUI, self.OnUpdate) # skip to brace matching
         self.Bind(stc.EVT_STC_CALLTIP_CLICK, self.OnCallTipClick)
-        self.Bind(stc.EVT_STC_START_DRAG, self.OnDrag)
-        self.Bind(stc.EVT_STC_DRAG_OVER, self.OnDragging)
-        self.Bind(stc.EVT_STC_DO_DROP, self.OnDragging)
         
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
         
@@ -3043,17 +3028,6 @@ class Nautilus(EditorInterface, Shell):
         self.parent.handler('add_help', self._calltips[1])
         evt.Skip()
     
-    def OnDrag(self, evt): #<wx._core.StyledTextEvent>
-        EditorInterface.dnd_flag = (evt.Position < self.bolc) # copy
-        evt.Skip()
-    
-    def OnDragging(self, evt): #<wx._core.StyledTextEvent>
-        if evt.Position < self.bolc:
-            evt.DragResult = wx.DragNone # Don't drop (as readonly)
-        elif EditorInterface.dnd_flag:
-            evt.DragResult = wx.DragCopy # Don't move
-        evt.Skip()
-    
     def OnSpace(self, evt):
         """Called when space pressed."""
         if not self.CanEdit():

mwx/plugins/ffmpeg_view.py

@@ -150,11 +150,12 @@ class Plugin(Layer):
         ## self.mc.Bind(wx.EVT_KEY_UP, self.on_hotkey_up)
         self.mc.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
         self.mc.Bind(wx.EVT_KEY_UP, self.OnKeyUp)
+        
+        self.Bind(wx.EVT_SHOW, self.OnShow)
     
     def Destroy(self):
         try:
             self.parent.handler.unbind("unknown_format", self.load_media)
-            self.mc.Stop()
         finally:
             return Layer.Destroy(self)
     
@@ -166,6 +167,12 @@ class Plugin(Layer):
         if self.handler('{} released'.format(hotkey(evt)), evt) is None:
             evt.Skip()
     
+    def OnShow(self, evt):
+        if not evt.IsShown():
+            if self.mc:
+                self.mc.Stop()
+        evt.Skip()
+    
     def OnMediaLoaded(self, evt):
         self.ss.range = (0, self.video_dur, 0.01)
         self.to.range = (0, self.video_dur, 0.01)
@@ -187,8 +194,11 @@ class Plugin(Layer):
             self.video_fps = eval(v['avg_frame_rate'])  # averaged frame rate
             self.video_dur = eval(v['duration'])        # duration [s]
             w, h = v['width'], v['height']
-            if v['tags'].get('rotate') in ('90', '270'):
-                w, h = h, w  # transpose
+            try:
+                if v['tags']['rotate'] in ('90', '270'):
+                    w, h = h, w  # transpose
+            except KeyError:
+                pass
             self.video_size = w, h
             self._path = path
             self.message(f"Loaded {path!r} successfully.")
@@ -272,6 +282,7 @@ class Plugin(Layer):
             return
         fout = "{}_clip".format(os.path.splitext(self._path)[0])
         with wx.FileDialog(self, "Save as",
+                defaultDir=os.path.dirname(fout),
                 defaultFile=os.path.basename(fout),
                 wildcard="Media file (*.mp4)|*.mp4|"
                          "Animiation (*.gif)|*.gif",

mwx/plugins/frame_listview.py

@@ -241,7 +241,7 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
 
 
 class Plugin(Layer):
-    """Property list of Grpah buffers.
+    """Property list of Graph buffers.
     """
     menukey = "Plugins/Extensions/&Buffer listbox\tCtrl+b"
     caption = "Property list"

mwx/wxmon.py

@@ -7,7 +7,7 @@ import wx
 import wx.lib.eventwatcher as ew
 from wx.lib.mixins.listctrl import ListCtrlAutoWidthMixin
 
-from .utilus import where, ignore
+from .utilus import where
 from .controls import Icon, Clipboard
 from .framework import CtrlInterface, Menu
 
@@ -174,10 +174,7 @@ class EventMonitor(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         name = self.get_name(event)
         source = ew._makeSourceString(obj) + " id=0x{:X}".format(id(evt))
         stamp = 1
-        
-        with ignore(DeprecationWarning):
-            attribs = ew._makeAttribString(evt)
-        
+        attribs = ew._makeAttribString(evt)
         data = self.__items
         for i, item in enumerate(data):
             if item[0] == event:

{mwxlib-0.98.6.dist-info → mwxlib-0.99.0.dist-info}/METADATA

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

mwxlib-0.99.0.dist-info/RECORD

@@ -0,0 +1,28 @@
+mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
+mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
+mwx/controls.py,sha256=WYd0nbpXL7eiE5E7l7jG49pm_u4mfgHI4c1dop4lsMM,48103
+mwx/framework.py,sha256=28_DX0eYwintdgBaO-06ds0NGevwXu_UdYmXjqTy4os,75587
+mwx/graphman.py,sha256=N34F5GXpN3ZEMfUIOswlM-OCIB1KObC6X1NTq_Qc2dk,69973
+mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
+mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
+mwx/matplot2g.py,sha256=gCXa8X1MEMP7n_mG73h3SkWKuNZOfjVKUTWNRXXK11c,64310
+mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
+mwx/mgplt.py,sha256=0WJ1RN_Y0a4Y3rz1C_Lx-WhumtOMdb1N49guX9aZZ_o,5602
+mwx/nutshell.py,sha256=xoHTyWZ46geGy3u4aU8k8_-mr520EdGcvuQRO4TBU_A,140715
+mwx/utilus.py,sha256=B76pDg6_kW8FMNdQ6xO0Bwy4KJ0laY98Gg6N3iqV7c8,37325
+mwx/wxmon.py,sha256=Pq8XXigM_isJd80yiqG18iRVdArJpsePpxfnZOkk-Uw,12573
+mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
+mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
+mwx/wxwit.py,sha256=ifxMwdIz-QhDEr8vyAztToF8VVSxKNXlq4Ap1awBZvo,7362
+mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
+mwx/plugins/ffmpeg_view.py,sha256=Mmen75o6LyA5QEHB8sCFSPCIPvEaALKzrgomym3fGAU,10721
+mwx/plugins/fft_view.py,sha256=xxTDD-_z4l18u4t2ybPB3xAMIslJmJ0gQlTxEqJUhNI,2782
+mwx/plugins/frame_listview.py,sha256=yEYPCdLHLSMTJwTv6iYAh3Lo4lJvYfp5BxTLP3FhW9Y,10421
+mwx/plugins/line_profile.py,sha256=--9NIc3x5EfRB3L59JvD7rzENQHyiYfu7wWJo6AuMkA,820
+mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
+mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
+mwxlib-0.99.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.99.0.dist-info/METADATA,sha256=Ix7YJKkft0nZZfhvPm-XOgN65HwIZF3T6asdSvhsCP0,7411
+mwxlib-0.99.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mwxlib-0.99.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.99.0.dist-info/RECORD,,

{mwxlib-0.98.6.dist-info → mwxlib-0.99.0.dist-info}/WHEEL

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

mwxlib-0.98.6.dist-info/RECORD

@@ -1,28 +0,0 @@
-mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
-mwx/bookshelf.py,sha256=Y4xI2SrEO22DrI1hyyfFx7DfFZA8znOzX9RWMPsA2BE,5137
-mwx/controls.py,sha256=jhru4HiIijb3QJz2elGt0in9soaR3xilgHsfItYY0JI,47595
-mwx/framework.py,sha256=rp93Nh7eqeAWGpkjxp-NY84RYBfmI1Ahn_tauavWSbg,75475
-mwx/graphman.py,sha256=A53ufapRAysL0wTCr1anrg_T_PqpumonnYn-swaC598,70165
-mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
-mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
-mwx/matplot2g.py,sha256=3hS0ilXCif0mZkSufE_Rf-taRs3m1hIxiIFMuioYYuc,64371
-mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
-mwx/mgplt.py,sha256=r56SFryorIgO12mvHJY-z6uwWsaPEqk6pHYwKWqbTY4,5663
-mwx/nutshell.py,sha256=9SjAwZB0NkSe7K-REBXEaqYwgML7JVKbp2HkI6cLM54,141807
-mwx/utilus.py,sha256=B76pDg6_kW8FMNdQ6xO0Bwy4KJ0laY98Gg6N3iqV7c8,37325
-mwx/wxmon.py,sha256=f3V24EF7kdMlYF7usLYK9QE5KU6fSu0jVqsvwAiA-Ag,12647
-mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
-mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
-mwx/wxwit.py,sha256=ifxMwdIz-QhDEr8vyAztToF8VVSxKNXlq4Ap1awBZvo,7362
-mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
-mwx/plugins/ffmpeg_view.py,sha256=epO_26sPmdDyr_lApa2Jtgxp-yCEdW0OEz0_QbrFEuM,10427
-mwx/plugins/fft_view.py,sha256=xxTDD-_z4l18u4t2ybPB3xAMIslJmJ0gQlTxEqJUhNI,2782
-mwx/plugins/frame_listview.py,sha256=hbApzZWa9-BmQthu7uZBlBbGbtf4iJ_prO8IhxoGMs8,10421
-mwx/plugins/line_profile.py,sha256=--9NIc3x5EfRB3L59JvD7rzENQHyiYfu7wWJo6AuMkA,820
-mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
-mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-0.98.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.98.6.dist-info/METADATA,sha256=RDfB4NPf48FHJKeGXjSM72yYzMlOlrs5nqqPqO45ToU,7411
-mwxlib-0.98.6.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-mwxlib-0.98.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.98.6.dist-info/RECORD,,