mwxlib 0.98.7__py3-none-any.whl → 0.99.1__py3-none-any.whl

mwx/controls.py

@@ -9,7 +9,7 @@ import wx.lib.scrolledpanel as scrolled
 from . import images
 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
@@ -117,8 +117,6 @@ class Param:
     def check(self, v):
         self.__check = bool(v)
         self.callback('check', self)
-        for knob in self.knobs:
-            knob.update_label()
     
     @property
     def name(self):
@@ -329,7 +327,7 @@ class Knob(wx.Panel):
         self.__par = param
         self.__par.knobs.append(self) # パラメータの関連付けを行う
         
-        if type is None:
+        if not type:
             type = 'slider'
             if cw < 0:
                 cw = 0
@@ -445,14 +443,13 @@ class Knob(wx.Panel):
         t = '  ' if np.isnan(v.std_value) or v.value == v.std_value else '*'
         self.label.SetLabel(v.name + t)
         self.label.Refresh()
+        self.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':
@@ -548,7 +545,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):
@@ -597,7 +594,6 @@ class ControlPanel(scrolled.ScrolledPanel):
                         for cc in obj.Children: # child of child <wx._core.SizerItem>
                             cc.Show(not cc.IsShown())
                         self.Layout()
-                        self.SendSizeEvent()
                         break
         evt.Skip()
     
@@ -625,9 +621,7 @@ class ControlPanel(scrolled.ScrolledPanel):
         ## child = self.Sizer.Children[groupid]
         ## child.Show(p)
         self.Sizer.Show(groupid % len(self.__groups), p)
-        ## self.Sizer.Fit(self) # do Fit(self.Parent) if needed
         self.Layout()
-        self.Parent.SendSizeEvent() # let parent redraw the child panel
     
     def is_folded(self, groupid):
         child = self.Sizer.Children[groupid]
@@ -639,9 +633,7 @@ class ControlPanel(scrolled.ScrolledPanel):
         if isinstance(child.Sizer, wx.StaticBoxSizer) and child.IsShown():
             for cc in child.Sizer.Children: # child of child <wx._core.SizerItem>
                 cc.Show(not p)
-            ## self.Sizer.Fit(self) # do Fit(self.Parent) if needed
             self.Layout()
-            self.Parent.SendSizeEvent() # let parent redraw the child panel
     
     def layout(self, items, title=None,
                row=0, expand=0, border=2, hspacing=1, vspacing=1,
@@ -736,7 +728,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)
@@ -750,6 +742,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.7"
+__version__ = "0.99.1"
 __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))
@@ -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.7.dist-info → mwxlib-0.99.1.dist-info}/METADATA

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

{mwxlib-0.98.7.dist-info → mwxlib-0.99.1.dist-info}/RECORD

@@ -1,28 +1,28 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
 mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
-mwx/controls.py,sha256=TRlwxUNhY5myJYiCWIogisM-khVIVvKbjrCU19e_1Ms,47991
-mwx/framework.py,sha256=RKYDybDicu1JQQmnWZETQjJCqMmSP2O6DqpZF1waMfs,75490
-mwx/graphman.py,sha256=A53ufapRAysL0wTCr1anrg_T_PqpumonnYn-swaC598,70165
+mwx/controls.py,sha256=IPd2MhiWncKcsNu9m0Pi3WJU61FXUdaup8v9XmgM4Zg,47795
+mwx/framework.py,sha256=UIFTHvaE3gjLg8LMep5_2XWIK-_XGbc6wsJ0jFkfq1Y,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=3hS0ilXCif0mZkSufE_Rf-taRs3m1hIxiIFMuioYYuc,64371
+mwx/matplot2g.py,sha256=gCXa8X1MEMP7n_mG73h3SkWKuNZOfjVKUTWNRXXK11c,64310
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
-mwx/mgplt.py,sha256=r56SFryorIgO12mvHJY-z6uwWsaPEqk6pHYwKWqbTY4,5663
-mwx/nutshell.py,sha256=9SjAwZB0NkSe7K-REBXEaqYwgML7JVKbp2HkI6cLM54,141807
+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=f3V24EF7kdMlYF7usLYK9QE5KU6fSu0jVqsvwAiA-Ag,12647
+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=epO_26sPmdDyr_lApa2Jtgxp-yCEdW0OEz0_QbrFEuM,10427
+mwx/plugins/ffmpeg_view.py,sha256=Mmen75o6LyA5QEHB8sCFSPCIPvEaALKzrgomym3fGAU,10721
 mwx/plugins/fft_view.py,sha256=xxTDD-_z4l18u4t2ybPB3xAMIslJmJ0gQlTxEqJUhNI,2782
-mwx/plugins/frame_listview.py,sha256=hbApzZWa9-BmQthu7uZBlBbGbtf4iJ_prO8IhxoGMs8,10421
+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.98.7.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.98.7.dist-info/METADATA,sha256=AB3gj2NFJuTGe34FMOVYzjkQCZAFWZHNQ_bTb_dWMio,7411
-mwxlib-0.98.7.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-mwxlib-0.98.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.98.7.dist-info/RECORD,,
+mwxlib-0.99.1.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.99.1.dist-info/METADATA,sha256=Hen3Gyc04u6p8FXYzfrB3fwK1h-OFhYVqzlqdMkCsbs,7411
+mwxlib-0.99.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mwxlib-0.99.1.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.99.1.dist-info/RECORD,,

{mwxlib-0.98.7.dist-info → mwxlib-0.99.1.dist-info}/WHEEL

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