mwxlib 1.1.7__py3-none-any.whl → 1.2.3__py3-none-any.whl

mwx/__init__.py

@@ -8,7 +8,7 @@ from .framework import Frame, MiniFrame, ShellFrame, deb
 
 ## Controls
 from .controls import Param, LParam, Knob, ControlPanel, Clipboard, Icon
-from .controls import Button, ToggleButton, ClassicButton, TextCtrl, Choice, Gauge, Indicator
+from .controls import Button, ToggleButton, ClassicButton, TextBox, Choice, Gauge, Indicator
 
 ## Plugman
 ## from .graphman import Frame as GraphmanFrame, Layer, Thread, Graph

mwx/controls.py

@@ -712,24 +712,25 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
             return params
         return filter(lambda c: getattr(c, 'check', None), params)
     
-    def set_params(self, argv=None, checked_only=False):
+    def set_params(self, argv, checked_only=False):
         params = self.get_params(checked_only)
-        if argv is None:
-            for p in params:
-                try:
-                    p.reset()
-                except (AttributeError, TypeError):
-                    pass
-        else:
-            for p, v in zip(params, argv):
-                try:
-                    p.reset(v) # eval v:str -> value
-                except AttributeError:
-                    p.value = v
-                except Exception as e: # failed to eval
-                    print(f"- Failed to reset {p!r}.", e)
+        for p, v in zip(params, argv):
+            try:
+                p.reset(v) # eval v:str -> value
+            except AttributeError:
+                p.value = v
+            except Exception as e:
+                print(f"- Failed to eval {v}:", e)
     
-    reset_params = set_params
+    def reset_params(self, checked_only=False):
+        params = self.get_params(checked_only)
+        for p in params:
+            try:
+                p.reset()
+            except (AttributeError, TypeError):
+                ## TypeError might occur if p.reset(v) is called with
+                ## missing 1 required positional argument.
+                pass
     
     def copy_to_clipboard(self, checked_only=False):
         params = self.get_params(checked_only)
@@ -1041,7 +1042,7 @@ class ToggleButton(wx.ToggleButton):
                 self.SetBitmap(Icon(icon))
 
 
-class TextCtrl(wx.Control):
+class TextBox(wx.Control):
     """Text control
     
     Args:
@@ -1095,6 +1096,9 @@ class TextCtrl(wx.Control):
             pass
 
 
+TextCtrl = TextBox #: for backward compatibility
+
+
 class Choice(wx.Control):
     """Editable Choice (ComboBox) control
     

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.1.7"
+__version__ = "1.2.3"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager

mwx/graphman.py

@@ -16,6 +16,7 @@ import platform
 import re
 import wx
 from wx import aui
+from wx import stc
 
 from matplotlib import cm
 from matplotlib import colors
@@ -322,18 +323,22 @@ class LayerInterface(CtrlInterface):
         except AttributeError:
             self.parameters = None
         
-        def copy_params(**kwargs):
-            if self.parameters:
-                return self.copy_to_clipboard(**kwargs)
+        def copy_params(evt, checked_only=False):
+            if isinstance(evt.EventObject, (wx.TextEntry, stc.StyledTextCtrl)):
+                evt.Skip()
+            elif self.parameters:
+                self.copy_to_clipboard(checked_only)
         
-        def paste_params(**kwargs):
-            if self.parameters:
-                return self.paste_from_clipboard(**kwargs)
+        def paste_params(evt, checked_only=False):
+            if isinstance(evt.EventObject, (wx.TextEntry, stc.StyledTextCtrl)):
+                evt.Skip()
+            elif self.parameters:
+                self.paste_from_clipboard(checked_only)
         
-        def reset_params(**kwargs):
+        def reset_params(evt, checked_only=False):
             self.Draw(None)
             if self.parameters:
-                return self.set_params(**kwargs)
+                self.reset_params(checked_only)
         
         self.handler.append({ # DNA<Layer>
             None : {
@@ -356,15 +361,15 @@ class LayerInterface(CtrlInterface):
         })
         self.menu = [
             (wx.ID_COPY, "&Copy params\t(C-c)", "Copy params",
-                lambda v: copy_params(checked_only=wx.GetKeyState(wx.WXK_SHIFT)),
+                lambda v: copy_params(v, checked_only=wx.GetKeyState(wx.WXK_SHIFT)),
                 lambda v: v.Enable(bool(self.parameters))),
                 
             (wx.ID_PASTE, "&Paste params\t(C-v)", "Read params",
-                lambda v: paste_params(checked_only=wx.GetKeyState(wx.WXK_SHIFT)),
+                lambda v: paste_params(v, checked_only=wx.GetKeyState(wx.WXK_SHIFT)),
                 lambda v: v.Enable(bool(self.parameters))),
             (),
             (wx.ID_RESET, "&Reset params\t(C-n)", "Reset params", Icon('-'),
-                lambda v: reset_params(checked_only=wx.GetKeyState(wx.WXK_SHIFT)),
+                lambda v: reset_params(v, checked_only=wx.GetKeyState(wx.WXK_SHIFT)),
                 lambda v: v.Enable(bool(self.parameters))),
             (),
             (wx.ID_EDIT, "&Edit module", "Edit module", Icon('pen'),

mwx/matplot2.py

@@ -348,22 +348,22 @@ class MatplotPanel(wx.Panel):
     xbound = property(
         lambda self: np.array(self.axes.get_xbound()),
         lambda self,v: self.axes.set_xbound(v),
-        doc="x-axis numerical bounds where lowerBound < upperBound)")
+        doc="X-axis numerical bounds where lowerBound < upperBound)")
     
     ybound = property(
         lambda self: np.array(self.axes.get_ybound()),
         lambda self,v: self.axes.set_ybound(v),
-        doc="y-axis numerical bounds where lowerBound < upperBound)")
+        doc="Y-axis numerical bounds where lowerBound < upperBound)")
     
     xlim = property(
         lambda self: np.array(self.axes.get_xlim()),
         lambda self,v: self.axes.set_xlim(v),
-        doc="x-axis range [left, right]")
+        doc="X-axis range [left, right]")
     
     ylim = property(
         lambda self: np.array(self.axes.get_ylim()),
         lambda self,v: self.axes.set_ylim(v),
-        doc="y-axis range [bottom, top]")
+        doc="Y-axis range [bottom, top]")
     
     @property
     def ddpu(self):

mwx/matplot2g.py

@@ -14,7 +14,7 @@ from scipy import ndimage as ndi
 
 from . import framework as mwx
 from .framework import Menu
-## from .utilus import warn
+from .utilus import warn
 from .utilus import funcall as _F
 from .controls import Clipboard
 from .matplot2 import MatplotPanel
@@ -88,7 +88,7 @@ def _to_image(src, cutoff=0, threshold=None, binning=1):
     if src.dtype == np.uint8: # RGB or gray image <uint8>
         return bins, (0, 255), src
     
-    if hasattr(cutoff, '__iter__'): # cutoff vlim:list is specified.
+    if hasattr(cutoff, '__iter__'): # cutoff vlim: (vmin, vmax) is specified.
         a, b = cutoff
     elif cutoff > 0:
         a = np.percentile(src, cutoff)
@@ -129,7 +129,7 @@ class AxesImagePhantom:
     """
     def __init__(self, parent, buf, name, show=True,
                  localunit=None, aspect=1.0, **attributes):
-        self.__owner = parent
+        self.parent = parent
         self.__name = name
         self.__localunit = localunit or None # [+] value, no assertion
         self.__aspect_ratio = aspect
@@ -141,7 +141,7 @@ class AxesImagePhantom:
              threshold = self.parent.nbytes_threshold,
         )
         self.__bins = bins
-        self.__vlim = vlim
+        self.__cuts = vlim
         self.__art = parent.axes.imshow(img,
                   cmap = cm.gray,
                 aspect = 'equal',
@@ -157,39 +157,6 @@ class AxesImagePhantom:
     def __eq__(self, x):
         return x is self.__art
     
-    parent = property(lambda self: self.__owner)
-    artist = property(lambda self: self.__art)
-    name = property(lambda self: self.__name)
-    buffer = property(lambda self: self.__buf)  # buffer.setter is defined below.
-    binning = property(lambda self: self.__bins)
-    
-    image = property(
-        lambda self: self.__art.get_array(),
-        doc="A displayed image array<uint8>.")
-    
-    vlim = property(
-        lambda self: self.__vlim,
-        doc="Image lower/upper values.")
-    
-    clim = property(
-        lambda self: self.__art.get_clim(),
-        lambda self,v: self.__art.set_clim(v),
-        doc="Buffer lower/upper values.")
-    
-    attributes = property(
-        lambda self: self.__attributes,
-        doc="Miscellaneous info about the frame/buffer.")
-    
-    pathname = property(
-        lambda self: self.__attributes.get('pathname'),
-        lambda self,v: self.update_attributes({'pathname': v}),
-        doc="A fullpath of buffer, when bounds to file.")
-    
-    annotation = property(
-        lambda self: self.__attributes.get('annotation', ''),
-        lambda self,v: self.update_attributes({'annotation': v}),
-        doc="Annotation of the buffer.")
-    
     def update_attributes(self, attr=None, **kwargs):
         """Update frame-specifc attributes.
         The frame holds any attributes with dictionary
@@ -215,10 +182,70 @@ class AxesImagePhantom:
         if {'pathname', 'annotation'} & attr.keys():
             self.parent.handler('frame_updated', self)
     
+    def update_buffer(self, buf=None):
+        """Update buffer and the image (internal use only)."""
+        if buf is not None:
+            self.__buf = _to_buffer(buf)
+        
+        bins, vlim, img = _to_image(self.__buf,
+                cutoff = self.parent.score_percentile,
+             threshold = self.parent.nbytes_threshold,
+        )
+        self.__bins = bins
+        self.__cuts = vlim
+        self.__art.set_array(img)
+        self.parent.handler('frame_modified', self)
+    
+    def update_extent(self):
+        """Update logical extent of the image (internal use only)."""
+        h, w = self.__buf.shape[:2]
+        ux, uy = self.xy_unit
+        w *= ux/2
+        h *= uy/2
+        self.__art.set_extent((-w,w,-h,h))
+    
     selector = _Property('Selector')
     markers = _Property('Markers')
     region = _Property('Region')
     
+    artist = property(
+        lambda self: self.__art)
+    
+    binning = property(
+        lambda self: self.__bins,
+        doc="Binning value resulting from the score_percentile.")
+    
+    cuts = property(
+        lambda self: self.__cuts,
+        doc="Lower/Upper cutoff values of the buffer.")
+    
+    image = property(
+        lambda self: self.__art.get_array(),
+        doc="A displayed image array<uint8>.")
+    
+    clim = property(
+        lambda self: self.__art.get_clim(),
+        lambda self,v: self.__art.set_clim(v),
+        doc="Lower/Upper color limit values of the buffer.")
+    
+    attributes = property(
+        lambda self: self.__attributes,
+        doc="Miscellaneous info about the frame/buffer.")
+    
+    pathname = property(
+        lambda self: self.__attributes.get('pathname'),
+        lambda self,v: self.update_attributes({'pathname': v}),
+        doc="A fullpath of buffer, when bounds to file.")
+    
+    annotation = property(
+        lambda self: self.__attributes.get('annotation', ''),
+        lambda self,v: self.update_attributes({'annotation': v}),
+        doc="Annotation of the buffer.")
+    
+    @property
+    def name(self):
+        return self.__name
+    
     @name.setter
     def name(self, v):
         self.__name = v
@@ -278,28 +305,6 @@ class AxesImagePhantom:
         """Page number in the parent book."""
         return self.parent.index(self)
     
-    def update_buffer(self, buf=None):
-        """Update buffer and the image (internal use only)."""
-        if buf is not None:
-            self.__buf = _to_buffer(buf)
-        
-        bins, vlim, img = _to_image(self.__buf,
-                cutoff = self.parent.score_percentile,
-             threshold = self.parent.nbytes_threshold,
-        )
-        self.__bins = bins
-        self.__vlim = vlim
-        self.__art.set_array(img)
-        self.parent.handler('frame_modified', self)
-    
-    def update_extent(self):
-        """Update logical extent of the image (internal use only)."""
-        h, w = self.__buf.shape[:2]
-        ux, uy = self.xy_unit
-        w *= ux/2
-        h *= uy/2
-        self.__art.set_extent((-w,w,-h,h))
-    
     @property
     def roi(self):
         """Current buffer ROI (region of interest)."""
@@ -315,9 +320,14 @@ class AxesImagePhantom:
         self.roi[:] = v # cannot broadcast input array into different shape
         self.update_buffer()
     
+    @property
+    def buffer(self):
+        return self.__buf
+    
     @buffer.setter
     def buffer(self, v):
         self.update_buffer(v)
+        self.update_extent()
     
     def xytoc(self, x, y=None, nearest=True):
         """Convert xydata (x,y) -> data[(x,y)] value of neaerst pixel.
@@ -618,9 +628,6 @@ class GraphPlot(MatplotPanel):
                 - aspect    : aspect ratio
                 - pathname  : full path of the buffer file
         """
-        if buf is None:
-            return
-        
         if isinstance(buf, str):
             buf = Image.open(buf)
         
@@ -687,9 +694,6 @@ class GraphPlot(MatplotPanel):
             j = self.index(j)
         
         buffers = [art.buffer for art in self.__Arts]
-        if hasattr(j, '__iter__'):
-            return [buffers[i] for i in j]
-        
         return buffers[j] # j can also be slicing
     
     def __setitem__(self, j, v):
@@ -699,14 +703,14 @@ class GraphPlot(MatplotPanel):
             except ValueError:
                 return self.load(v, name=j) # new buffer
         
-        if hasattr(j, '__iter__') or isinstance(j, slice):
-            raise ValueError("attempt to assign buffers into slice")
+        if isinstance(j, slice):
+            raise ValueError("attempt to assign buffers via slicing")
         
         if v is None:
-            self.__delitem__(j)
+            raise ValueError("values must be buffers, not NoneType.")
         else:
             art = self.__Arts[j]
-            art.update_buffer(v)
+            art.update_buffer(v) # update buffer
             art.update_extent()
             self.select(j)
     
@@ -714,9 +718,7 @@ class GraphPlot(MatplotPanel):
         if isinstance(j, str):
             j = self.index(j)
         
-        if hasattr(j, '__iter__'):
-            arts = [self.__Arts[i] for i in j]
-        elif isinstance(j, slice):
+        if isinstance(j, slice):
             arts = self.__Arts[j]
         else:
             arts = [self.__Arts[j]]
@@ -784,16 +786,27 @@ class GraphPlot(MatplotPanel):
         if self.__Arts and self.__index is not None:
             return self.__Arts[self.__index]
     
-    buffer = property(
-        lambda self: self.frame and self.frame.buffer,
-        lambda self,v: self.__setitem__(self.__index, v),
-        lambda self: self.__delitem__(self.__index),
-        doc="current buffer array")
+    @property
+    def buffer(self):
+        """Current buffer array."""
+        if self.frame:
+            return self.frame.buffer
+    
+    @buffer.setter
+    def buffer(self, v):
+        if self.frame:
+            self.__setitem__(self.__index, v)
+        else:
+            self.load(v)
+    
+    @property
+    def newbuffer(self):
+        """New buffer loader."""
+        return None
     
-    newbuffer = property(
-        lambda self: None,
-        lambda self,v: self.load(v),
-        doc="new buffer loader")
+    @newbuffer.setter
+    def newbuffer(self, v):
+        self.load(v)
     
     @property
     def unit(self):
@@ -951,7 +964,7 @@ class GraphPlot(MatplotPanel):
             data = frame.roi
             GraphPlot.clipboard_name = name
             GraphPlot.clipboard_data = data
-            bins, vlim, img = _to_image(data, frame.vlim)
+            bins, vlim, img = _to_image(data, frame.cuts)
             Clipboard.imwrite(img)
             self.message("Write buffer to clipboard.")
         except Exception as e:

mwx/mgplt.py

@@ -139,7 +139,7 @@ class GnuplotFrame(mwx.Frame):
                 lambda v: self.panel.paste_from_clipboard()),
             (),
             (wx.ID_RESET, "&Reset params\tCtrl-n", "Reset params to ini-value",
-                lambda v: self.panel.set_params()),
+                lambda v: self.panel.reset_params()),
         ]
         self.menubar["Gnuplot"] = [
             (mwx.ID_(80), "&Gnuplot setting\tCtrl-g", "Edit settings",

mwx/nutshell.py

@@ -4,6 +4,7 @@
 from functools import wraps
 from importlib import import_module
 from contextlib import contextmanager
+from pathlib import Path
 from pprint import pformat
 from bdb import BdbQuit
 import traceback
@@ -32,7 +33,8 @@ from .framework import CtrlInterface, AuiNotebook, Menu
 
 
 ## URL pattern (flag = re.M | re.A)
-url_re = r"https?://[\w/:%#$&?()~.=+-]+"
+## url_re = r"https?://[\w/:%#$&?()~.=+-]+"
+url_re = r"https?://[\w/:%#$&?~.=+-]+"  # excluding ()
 
 ## no-file pattern
 nofile_re = r'[\/:*?"<>|]'
@@ -220,21 +222,21 @@ class AutoCompInterfaceMixin:
         if self.CallTipActive():
             self.CallTipCancel()
         
-        text = next(self.gen_text_at_caret(), None)
+        text = self.SelectedText or self.expr_at_caret or self.line_at_caret
         if text:
             text = introspect.getRoot(text, terminator='(')
             try:
                 obj = self.eval(text)
                 self.help(obj)
             except Exception as e:
-                self.message("- {} : {!r}".format(e, text))
+                self.message(e)
     
     def call_helpTip(self, evt):
         """Show a calltip for the selected function."""
         if self.CallTipActive():
             self.CallTipCancel()
         
-        text = next(self.gen_text_at_caret(), None)
+        text = self.SelectedText or self.expr_at_caret or self.line_at_caret
         if text:
             p = self.cpos
             self.autoCallTipShow(text,
@@ -629,7 +631,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         
         ## Custom indicators ([BUG] indicator=1 is reset when the buffer is udpated.)
         ## [10-11] filter_text
-        ## [2] URL for load_file
+        ## [2] URL
         ## [3] match_paren
         self.IndicatorSetStyle(10, stc.STC_INDIC_TEXTFORE)
         self.IndicatorSetForeground(10, "red")
@@ -1721,10 +1723,18 @@ class Buffer(EditorInterface, EditWindow):
         return self.__filename
     
     def update_filestamp(self, fn):
-        if fn and os.path.isfile(fn):
-            self.__mtime = os.path.getmtime(fn) # update timestamp (modified time)
+        self.__path = Path(fn)
+        if self.__path.is_file():
+            self.__mtime = self.__path.stat().st_mtime # update timestamp (modified time)
+        elif re.match(url_re, fn):
+            self.__mtime = -1
         else:
-            self.__mtime = None
+            try:
+                self.__path.resolve(True) # Check if the path format is valid.
+            except FileNotFoundError:
+                self.__mtime = False # valid path (but not found)
+            except OSError:
+                self.__mtime = None # *invalid path*
         if self.__filename != fn:
             self.__filename = fn
             self.update_caption()
@@ -1735,16 +1745,31 @@ class Buffer(EditorInterface, EditWindow):
         
         Returns:
             None : no file
-            = 0  : a file
+            = 0  : a file (even if not found)
             > 0  : a file edited externally
             < 0  : a url file
         """
-        fn = self.filename
-        if os.path.isfile(fn):
-            return os.path.getmtime(fn) - self.__mtime
-        if re.match(url_re, fn):
-            return -1
-        return None
+        try:
+            return self.__path.stat().st_mtime - self.__mtime
+        except FileNotFoundError:
+            self.__mtime = False  # valid path (but not found)
+        except OSError:
+            pass
+        return self.__mtime
+    
+    @property
+    def need_buffer_save(self):
+        """Returns whether the buffer should be saved.
+        The file has been modified internally.
+        """
+        return self.mtdelta is not None and self.IsModified()
+    
+    @property
+    def need_buffer_load(self):
+        """Returns whether the buffer should be loaded.
+        The file has been modified externally.
+        """
+        return self.mtdelta is not None and self.mtdelta > 0
     
     @property
     def caption_prefix(self):
@@ -1769,20 +1794,6 @@ class Buffer(EditorInterface, EditWindow):
         except AttributeError:
             pass
     
-    @property
-    def need_buffer_save(self):
-        """Returns whether the buffer should be saved.
-        The file has been modified internally.
-        """
-        return self.mtdelta is not None and self.IsModified()
-    
-    @property
-    def need_buffer_load(self):
-        """Returns whether the buffer should be loaded.
-        The file has been modified externally.
-        """
-        return self.mtdelta is not None and self.mtdelta > 0
-    
     def __init__(self, parent, filename, **kwargs):
         EditWindow.__init__(self, parent, **kwargs)
         EditorInterface.__init__(self)
@@ -1952,20 +1963,20 @@ class Buffer(EditorInterface, EditWindow):
             ## Processing text selection, dragging, or dragging+
             evt.Skip()
             return
+        
         pos = evt.Position
+        self.goto_char(pos) # Clear selection
         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): # [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):
         """Called when the buffer is modified."""
@@ -2083,34 +2094,21 @@ class Buffer(EditorInterface, EditWindow):
         dispatcher.send(signal='Interpreter.push',
                         sender=self, command=None, more=False)
     
-    def gen_text_at_caret(self):
-        """Generates the selected text,
-        otherwise the line or expression at the caret.
-        """
-        def _gen_text():
-            text = self.SelectedText
-            if text:
-                yield text
-            else:
-                yield self.line_at_caret
-                yield self.expr_at_caret
-        return filter(None, _gen_text())
-    
     def eval_line(self):
         if self.CallTipActive():
             self.CallTipCancel()
         
-        status = "No words"
-        for text in self.gen_text_at_caret():
+        text = self.SelectedText or self.expr_at_caret
+        if text:
             try:
                 obj = eval(text, self.globals, self.locals)
             except Exception as e:
-                status = "- {} : {!r}".format(e, text)
+                self.message(e)
             else:
                 self.CallTipShow(self.cpos, pformat(obj))
                 self.message(text)
-                return
-        self.message(status)
+        else:
+            self.message("No words")
     
     def exec_region(self):
         try:
@@ -2419,14 +2417,14 @@ 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", filename)
+                ## raise Exception("URL not found:", filename)
+                res.raise_for_status()  # raise HTTP error
             if buf._load_file(filename):
                 self.swap_buffer(buf, lineno)
                 return True
             return False
-        except OSError as e:
-            self.post_message(e)
+        except (OSError, UnicodeDecodeError) as e:
+            self.post_message("Failed to load:", e)
             self.delete_buffer(buf)
             return False
     
@@ -2441,11 +2439,10 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     for fn in dlg.Paths:
                         self.find_file(fn)
             return
-        if self.load_file(filename) == False: # not None
+        if self.load_file(filename) == False: # noqa: 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}.")
+            self.post_message("New file.")
     
     def save_file(self, filename, buf=None, verbose=True):
         """Save the current buffer to a file.
@@ -2467,8 +2464,8 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     self.default_buffer = None
                 return True
             return False
-        except Exception as e:
-            self.post_message(f"Failed to save {filename!r}.", e)
+        except (OSError, UnicodeDecodeError) as e:
+            self.post_message("Failed to save:", e)
             return False
     
     def load_buffer(self, buf=None):
@@ -3592,39 +3589,25 @@ class Nautilus(EditorInterface, Shell):
         self.cpos, self.anchor = self.anchor, self.cpos
         self.EnsureCaretVisible()
     
-    def gen_text_at_caret(self):
-        """Generates the selected text,
-        otherwise the line or expression at the caret.
-        (override) Generates command line (that starts with a prompt).
-        """
-        def _gen_text():
-            text = self.SelectedText
-            if text:
-                yield text
-            else:
-                yield self.getCommand() # self.line_at_caret
-                yield self.expr_at_caret
-        return filter(None, _gen_text())
-    
     def eval_line(self, evt):
         """Evaluate the selected word or line."""
         if self.CallTipActive():
             self.CallTipCancel()
         
-        status = "No words"
-        for text in self.gen_text_at_caret():
+        text = self.SelectedText or self.expr_at_caret
+        if text:
             tokens = split_words(text)
             try:
                 cmd = self.magic_interpret(tokens)
                 cmd = self.regulate_cmd(cmd)
                 obj = self.eval(cmd)
             except Exception as e:
-                status = "- {} : {!r}".format(e, text)
+                self.message(e)
             else:
                 self.CallTipShow(self.cpos, pformat(obj))
                 self.message(cmd)
-                return
-        self.message(status)
+        else:
+            self.message("No words")
     
     def exec_region(self, evt):
         """Execute the the selected region."""

mwx/plugins/ffmpeg_view.py

@@ -10,7 +10,7 @@ import wx.media
 
 from mwx.framework import _F, hotkey
 from mwx.graphman import Layer
-from mwx.controls import LParam, Icon, Button, TextCtrl
+from mwx.controls import LParam, Icon, Button, TextBox
 
 
 def read_info(path):
@@ -101,7 +101,7 @@ class Plugin(Layer):
                         handler=self.set_offset,
                         updater=self.get_offset,
                         )
-        self.crop = TextCtrl(self, icon="cut", size=(130,-1),
+        self.crop = TextBox(self, icon="cut", size=(130,-1),
                         handler=self.set_crop,
                         updater=self.get_crop,
                         )
@@ -210,20 +210,18 @@ class Plugin(Layer):
     
     def set_offset(self, tc):
         """Set offset value by referring to ss/to value."""
-        try:
+        if self._path:
             self.mc.Seek(self.DELTA + int(tc.value * 1000))
-        except Exception:
-            pass
     
     def get_offset(self, tc):
         """Get offset value and assigns it to ss/to value."""
-        try:
+        if self._path:
             tc.value = round(self.mc.Tell()) / 1000
-        except Exception:
-            pass
     
     def set_crop(self):
         """Set crop area (W:H:Left:Top) to roi."""
+        if not self._path:
+            return
         frame = self.graph.frame
         if frame:
             try:
@@ -238,6 +236,8 @@ class Plugin(Layer):
     
     def get_crop(self):
         """Get crop area (W:H:Left:Top) from roi."""
+        if not self._path:
+            return
         crop = ''
         frame = self.graph.frame
         if frame:
@@ -246,28 +246,24 @@ class Plugin(Layer):
                 xo, yo = nx[0], ny[1]
                 xp, yp = nx[1], ny[0]
                 crop = "{}:{}:{}:{}".format(xp-xo, yp-yo, xo, yo)
-        if self._path and not crop:
+        if not crop:
             crop = "{}:{}:0:0".format(*self.video_size)
         self.crop.Value = crop
     
     def seekto(self, offset):
         """Seek position with offset [ms] from the `to` position."""
-        try:
+        if self._path:
             t = self.to.value + offset/1000
             if 0 <= t < self.video_dur:
                 self.to.value = round(t, 3)
             self.set_offset(self.to)
-        except AttributeError:
-            pass
     
     def seekd(self, offset):
         """Seek position with offset [ms] from the current position."""
-        try:
+        if self._path:
             t = self.mc.Tell() + offset
             if 0 <= t < self.video_dur * 1000:
                 self.mc.Seek(self.DELTA + t)
-        except AttributeError:
-            pass
     
     def snapshot(self):
         """Create a snapshot of the current frame.

{mwxlib-1.1.7.dist-info → mwxlib-1.2.3.dist-info}/METADATA

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

{mwxlib-1.1.7.dist-info → mwxlib-1.2.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
-mwx/__init__.py,sha256=psabnAMei5VzB2TsB2qBNLrIZMX0LiqjlXCpNGmDejk,668
+mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=b_TMDaNIzLHoL0xbbqb3tt0BnRvhLAqaCn_pBdrigZw,7523
-mwx/controls.py,sha256=trJKRFgum3u-8f8hd6N3qk6jHt4dVqiLgE6CKK5EE4U,47971
-mwx/framework.py,sha256=bgO-mgMMYZtb3cQtPzOyErEVtpSvd9RJEdqFMpcpz6c,76125
-mwx/graphman.py,sha256=LjN1R8UZxHycrgAfnl_SoTT_vHuKcSISr5VVf0cMflM,69821
+mwx/controls.py,sha256=X4zx2h6oggUsQxi2PRk4RUsJieYTmcAPIvWwaz-ysTI,48107
+mwx/framework.py,sha256=wXI4nzQcG0NV3c5ne4io9HJ1y7jd7xbjB_cOao8HKsU,76125
+mwx/graphman.py,sha256=RqD0W9I2BvJ3Q2kyMiyyg4n-T4-_x7PDuCI5bGAg5k4,70110
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
-mwx/matplot2.py,sha256=RuVWXC2A_qgZRNmBBptbHDn5MyxaWBqp3ru4bP_lDE0,33150
-mwx/matplot2g.py,sha256=dBAODQvSM_yf2uQUCrRO03ZOK3MycR8lEXTJfRXDlbY,64432
+mwx/matplot2.py,sha256=Zwte-wwzCg_OHzsBniVgKdaNLzsvJaa1gc0n7VdAqxw,33150
+mwx/matplot2g.py,sha256=tShPGy7whj51yvANja-MDmjfxiLubQ1C6rCsBZ0DAnY,64473
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
-mwx/mgplt.py,sha256=M5rt-H7Uq1OHnlFvMA4a3945UBvppbR9L_mw8NL_YZ0,5602
-mwx/nutshell.py,sha256=wzcZSxTM9G2bYtIBri51-AA6JhiKrtfsh-DMgwJZ5io,141340
+mwx/mgplt.py,sha256=8mXbHpCmm7lz3XbAxOg7IVC7DaSGBEby1UfTlMl9kjk,5604
+mwx/nutshell.py,sha256=7nQ7UUFM9kvjDjHNUEdOkkeqZPiU6zOERwamqBdJpQs,140856
 mwx/testsuite.py,sha256=kiM3-BVhr42LRRN7xG7pYl3at8o2vnypWSxD8KRvA7c,1228
 mwx/utilus.py,sha256=HFvP682SyeSp8yNfUrdUXPhWdLuWVlsUSg6LqNBJOT8,37451
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
@@ -16,14 +16,14 @@ 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
-mwx/plugins/ffmpeg_view.py,sha256=Yp1BMeNfkTTPwykvWW1_h4wrvhBSeBUdAvKhnMQIa6g,11102
+mwx/plugins/ffmpeg_view.py,sha256=NIHFJLPeliOXH3ke0NvQzYBhY0oeEP6dgZQofB5Ry1c,11031
 mwx/plugins/fft_view.py,sha256=08A_Y73XirV7kXpwf-v0mUA0Hr0MOfdMXv3tvL1hvWA,2789
 mwx/plugins/frame_listview.py,sha256=gowjQ-ARNonMkDSXkQgPKq4U9YBJ-vQ0jK2krBVOdCs,10420
 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.7.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.1.7.dist-info/METADATA,sha256=G8xDeGhF9BCMfozwYrtRmZgMltFt3QcKGv_ka5UjSEg,7258
-mwxlib-1.1.7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mwxlib-1.1.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.1.7.dist-info/RECORD,,
+mwxlib-1.2.3.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.2.3.dist-info/METADATA,sha256=2sSF51qYRi78w0McPUzYn2yr9H1ISRKXMfvWSB-ATls,7258
+mwxlib-1.2.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mwxlib-1.2.3.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.2.3.dist-info/RECORD,,