mwxlib 0.99.5__py3-none-any.whl → 0.99.8__py3-none-any.whl

mwx/controls.py

@@ -581,8 +581,8 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
         x, y = evt.Position
         for child in self.Sizer.Children: # child <wx._core.SizerItem>
             if child.IsShown():
-                obj = child.Sizer or child.Window
-                if isinstance(obj, (wx.StaticBoxSizer, wx.StaticBox)):
+                obj = child.Sizer
+                if isinstance(obj, wx.StaticBoxSizer):
                     cx, cy = obj.Position
                     if cx < x < cx + obj.Size[0] and cy < y < cy+22:
                         for cc in obj.Children: # child of child <wx._core.SizerItem>
@@ -737,7 +737,7 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
 
 
 class ControlPanel(CtrlInterface, KnobCtrlPanel):
-    """Gnuplot control panel.
+    """Control panel with mouse/key event interface.
     """
     def __init__(self, *args, **kwargs):
         KnobCtrlPanel.__init__(self, *args, **kwargs)

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.99.5"
+__version__ = "0.99.8"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -32,8 +32,8 @@ def deb(target=None, loop=True, locals=None, debrc=None, **kwargs):
                   If None, the target is set to `__main__`.
         loop    : If True, the app and the mainloop will be created.
         locals  : Additional context of the shell
-        debrc   : file name of the session.
-                  If None, the session will not be saved.
+        debrc   : file name of the session; defaults to None.
+                  If None, no session will be created or saved.
         
         **kwargs: Nautilus ShellFrame arguments
         
@@ -1023,7 +1023,7 @@ class FileDropLoader(wx.DropTarget):
     def __init__(self, target):
         wx.DropTarget.__init__(self)
         
-        self.editor = target
+        self.target = target
         self.textdo = wx.TextDataObject()
         self.filedo = wx.FileDataObject()
         self.DataObject = wx.DataObjectComposite()
@@ -1031,7 +1031,7 @@ class FileDropLoader(wx.DropTarget):
         self.DataObject.Add(self.filedo, True)
     
     def OnData(self, x, y, result):
-        editor = self.editor
+        editor = self.target.current_editor
         self.GetData()
         if self.textdo.TextLength > 1:
             f = self.textdo.Text.strip()
@@ -1061,9 +1061,11 @@ class ShellFrame(MiniFrame):
     Args:
         target  : target object of the rootshell.
                   If None, it will be __main__.
+        session : file name of the session; defaults to None.
+                  If None, no session will be created or saved.
         ensureClose : flag for the shell standalone.
                       If True, EVT_CLOSE will close the window.
-                      Otherwise it will be only hidden.
+                      Otherwise the window will be only hidden.
         **kwargs    : Nautilus arguments
     
     Attributes:
@@ -1135,7 +1137,7 @@ class ShellFrame(MiniFrame):
                                        EventMonitor.__module__, # Don't enter event-hook
                                        FSM.__module__,
                                        'wx.core', 'wx.lib.eventwatcher',
-                                       'fnmatch', 'warnings', 'bdb', 'pdb', #'contextlib',
+                                       'fnmatch', 'warnings', 'bdb', 'pdb', 'contextlib',
                                        ],
                                  )
         self.inspector = Inspector(self, name="Inspector")
@@ -1159,7 +1161,7 @@ class ShellFrame(MiniFrame):
         
         self.ghost.AddPage(self.Bookshelf, "Bookshelf", bitmap=Icon('book'))
         
-        self.ghost.SetDropTarget(FileDropLoader(self.Scratch))
+        self.ghost.SetDropTarget(FileDropLoader(self))
         
         self.watcher = AuiNotebook(self, size=(600,400), name="watcher")
         self.watcher.AddPage(self.ginfo, "globals")
@@ -1253,7 +1255,7 @@ class ShellFrame(MiniFrame):
             0 : {
                     '* pressed' : (0, fork_debugger),
                    '* released' : (0, fork_debugger),
-                  'C-g pressed' : (0, self.quit, fork_debugger),
+                  'C-g pressed' : (0, self.Quit, fork_debugger),
                    'f1 pressed' : (0, self.About),
                   'C-f pressed' : (0, self.OnFindText),
                    'f3 pressed' : (0, self.OnFindNext),
@@ -1356,7 +1358,7 @@ class ShellFrame(MiniFrame):
                                 Style=Stylus.py_log_mode)
         
         self.Help.set_attributes(ReadOnly=False,
-                                 Style=Stylus.py_text_mode)
+                                 Style=Stylus.py_log_mode)
         
         self.set_hookable(self.Scratch)
         self.set_hookable(self.Log)
@@ -1431,7 +1433,7 @@ class ShellFrame(MiniFrame):
                 evt.Veto()
                 return
             #? RuntimeError('wrapped C/C++ object ... has been deleted')
-            self.quit()
+            self.Quit()
         
         if self.debugger.tracing:
             wx.MessageBox("The debugger ends tracing.\n\n"
@@ -1600,12 +1602,8 @@ class ShellFrame(MiniFrame):
     ## Actions for handler
     ## --------------------------------
     
-    def quit(self, evt=None):
+    def Quit(self, evt=None):
         """Stop debugger and monitor."""
-        ## self.inspector.unwatch()
-        self.monitor.unwatch()
-        self.ginfo.unwatch()
-        self.linfo.unwatch()
         self.debugger.unwatch()
         self.debugger.send_input('\n') # terminates the reader of threading pdb
         shell = self.debugger.interactive_shell # reset interp locals

mwx/graphman.py

@@ -162,12 +162,13 @@ class Thread:
         """
         if not self.running:
             return None
+        if '\n\n' not in msg:
+            msg += '\n\n'
         try:
             self.event.clear() # suspend
-            if wx.MessageBox(msg + "\n\n"
-                    "Press [OK] to continue.\n"
-                    "Press [CANCEL] to terminate the process.",
-                    style=wx.OK|wx.CANCEL|wx.ICON_WARNING) != wx.OK:
+            if wx.MessageBox(msg +
+                    "Do you want to terminate the process?",
+                    style=wx.OK|wx.CANCEL|wx.ICON_WARNING) == wx.OK:
                 self.Stop()
                 return False
             return True

mwx/mgplt.py

@@ -129,7 +129,7 @@ class GnuplotFrame(mwx.Frame):
         mwx.Frame.__init__(self, *args, **kwargs)
         
         self.gnuplot = Gnuplot()
-        self.panel = GnuplotPanel(self)
+        self.panel = ControlPanel(self)
         
         self.menubar["Edit"] = [
             (wx.ID_COPY, "&Copy params\tCtrl-c", "Copy params to clipboard",

mwx/nutshell.py

@@ -2107,16 +2107,13 @@ class Buffer(EditorInterface, EditWindow):
         return filter(None, _gen_text())
     
     def eval_line(self):
-        self.py_eval_line(self.globals, self.locals)
-    
-    def py_eval_line(self, globals=None, locals=None):
         if self.CallTipActive():
             self.CallTipCancel()
         
         status = "No words"
         for text in self.gen_text_at_caret():
             try:
-                obj = eval(text, globals, locals)
+                obj = eval(text, self.globals, self.locals)
             except Exception as e:
                 status = "- {} : {!r}".format(e, text)
             else:
@@ -2126,14 +2123,9 @@ class Buffer(EditorInterface, EditWindow):
         self.message(status)
     
     def exec_region(self):
-        self.py_exec_region(self.globals, self.locals)
-    
-    def py_exec_region(self, globals=None, locals=None, filename=None):
-        if not filename:
-            filename = self.filename
         try:
-            code = compile(self.Text, filename, "exec")
-            exec(code, globals, locals)
+            code = compile(self.Text, self.filename, "exec")
+            exec(code, self.globals, self.locals)
             dispatcher.send(signal='Interpreter.push',
                             sender=self, command=None, more=False)
         except BdbQuit:
@@ -2142,7 +2134,7 @@ class Buffer(EditorInterface, EditWindow):
         except Exception as e:
             msg = traceback.format_exc()
             err = re.findall(py_error_re, msg, re.M)
-            lines = [int(ln) for fn, ln in err if fn == filename]
+            lines = [int(ln) for fn, ln in err if fn == self.filename]
             if lines:
                 lx = lines[-1] - 1
                 self.red_arrow = lx
@@ -2158,7 +2150,7 @@ class Buffer(EditorInterface, EditWindow):
             del self.pointer # Reset pointer (debugger hook point).
             del self.red_arrow
             self.handler('buffer_region_executed', self)
-            self.message("Evaluated {!r} successfully.".format(filename))
+            self.message("Evaluated {!r} successfully.".format(self.filename))
             self.AnnotationClearAll()
 
 

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
+from .utilus import where, ignore
 from .controls import Icon, Clipboard
 from .framework import CtrlInterface, Menu
 
@@ -99,8 +99,8 @@ class EventMonitor(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
     
     def watch(self, widget=None):
         """Begin watching the widget."""
-        self.clear()
         self.unwatch()
+        self.clear()
         if widget is None:
             widget = self._target # Resume watching the previous target.
         if not widget:
@@ -174,7 +174,11 @@ class EventMonitor(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         name = self.get_name(event)
         source = ew._makeSourceString(obj) + " id=0x{:X}".format(id(evt))
         stamp = 1
-        attribs = ew._makeAttribString(evt)
+        try:
+            with ignore(DeprecationWarning):
+                attribs = ew._makeAttribString(evt)
+        except Exception:
+            attribs = '' # Failed to get event attributes; possibly <BdbQuit>.
         data = self.__items
         for i, item in enumerate(data):
             if item[0] == event:

mwx/wxwit.py

@@ -49,13 +49,17 @@ class Inspector(it.InspectionTree, CtrlInterface):
             self.parent.handler(self.handler.current_event, evt)
             evt.Skip()
         
-        @self.handler.bind('f4 pressed')
-        def highlight(evt):
+        @self.handler.bind('f3 pressed')
+        def _watchit(evt):
             if self.target:
-                self.highlighter.HighlightCurrentItem(self)
+                watchit(self.target)
+        
+        @self.handler.bind('f4 pressed')
+        def _highlight(evt):
+            self.highlighter.HighlightCurrentItem(self)
         
         @self.handler.bind('f5 pressed')
-        def refresh(evt):
+        def _refresh(evt):
             self.BuildTree(self.target)
     
     def OnDestroy(self, evt):
@@ -73,7 +77,10 @@ class Inspector(it.InspectionTree, CtrlInterface):
     ## --------------------------------
     
     def SetObj(self, obj):
-        """Called from tree.toolFrame -> SetObj."""
+        """Called from tree.toolFrame -> SetObj.
+        
+        (override) Set target object.
+        """
         if self.target is obj:
             return
         self.target = obj
@@ -86,7 +93,8 @@ class Inspector(it.InspectionTree, CtrlInterface):
     
     def GetTextForWidget(self, obj):
         """Returns the string to be used in the tree for a widget.
-        (override) make better object name and Id
+        
+        (override) Make better object name and Id.
         """
         clsname = obj.__class__.__name__
         if hasattr(obj, 'Name'):
@@ -103,7 +111,6 @@ class Inspector(it.InspectionTree, CtrlInterface):
             self.highlighter.HighlightSizer(obj.Sizer)
     
     def set_colour(self, obj, col):
-        self.SetObj(obj)
         item = self.FindWidgetItem(obj)
         if item:
             self.SetItemTextColour(item, col)
@@ -158,11 +165,15 @@ class Inspector(it.InspectionTree, CtrlInterface):
             self.SetFocus()
         obj = self.target
         Menu.Popup(self, [
-            (8, "&Filling View", miniIcon('ShowFilling'),
-                lambda v: filling(obj),
+            (1, "&Dive into {!r}".format(typename(obj)), Icon('core'),
+                lambda v: dive(obj),
+                lambda v: v.Enable(obj is not None)),
+                
+            (2, "&Watch event", Icon('tv'),
+                lambda v: watch(obj),
                 lambda v: v.Enable(obj is not None)),
-            
-            (10, "&Inspection Tool", Icon('inspect'),
+            (),
+            (10, "&Inspection Tool\tf3", Icon('inspect'),
                 lambda v: watchit(obj),
                 lambda v: v.Enable(obj is not None)),
             (),
@@ -172,14 +183,6 @@ class Inspector(it.InspectionTree, CtrlInterface):
                 
             (12, "Refresh\tf5", miniIcon('Refresh'),
                 lambda v: self.BuildTree(obj)),
-            (),
-            (2, "&Watch event", Icon('tv'),
-                lambda v: watch(obj),
-                lambda v: v.Enable(obj is not None)),
-                
-            (1, "&Dive into {!r}".format(typename(obj)), Icon('core'),
-                lambda v: dive(obj),
-                lambda v: v.Enable(obj is not None)),
         ])
 
 

{mwxlib-0.99.5.dist-info → mwxlib-0.99.8.dist-info}/METADATA

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

{mwxlib-0.99.5.dist-info → mwxlib-0.99.8.dist-info}/RECORD

@@ -1,19 +1,19 @@
 mwx/__init__.py,sha256=U7n9X8JAWdzOavKvVqecHdE4ooiXcCB5DSPCKWxfTnY,653
 mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
-mwx/controls.py,sha256=0UkLeyIsQU0uj--v1NYctx-GzqO36Z5rdeNpCsfIN10,47657
-mwx/framework.py,sha256=ROCF9XJ5nQMmwaDJFoOs3r2qsV7hM7bfBkR1MaGQSMg,75465
-mwx/graphman.py,sha256=EZiRUKhPb6V-S1BcgFhsOQoaZvp4yw6F4SF45uUjla4,70266
+mwx/controls.py,sha256=5RDA9YgxrxCmjrHOU6XgA_5tcOU1UEwqU4tFEuBNcrk,47648
+mwx/framework.py,sha256=lxqSl_IrGp7ZAUPKJWP5JaUUm3vhaOCjAujFVPocPXg,75501
+mwx/graphman.py,sha256=qX5aHEw4u9iGR8lNpZkXDnGPVMhyAH6NnBapiaUbKZw,70265
 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=etvpwPctuf9KhvIB1WZwTAaljYQ2ciMRfUWzmXW6NUo,142090
+mwx/mgplt.py,sha256=M5rt-H7Uq1OHnlFvMA4a3945UBvppbR9L_mw8NL_YZ0,5602
+mwx/nutshell.py,sha256=zJULq1K8WiOBUncMpXE8HbunqUULa9MUt0hBET5jmgs,141810
 mwx/utilus.py,sha256=iizdVrbwL1lX7eTfsMmltFz4IfHqTXVM37wwlPQ3A3Y,37346
-mwx/wxmon.py,sha256=Pq8XXigM_isJd80yiqG18iRVdArJpsePpxfnZOkk-Uw,12573
+mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
 mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
-mwx/wxwit.py,sha256=ifxMwdIz-QhDEr8vyAztToF8VVSxKNXlq4Ap1awBZvo,7362
+mwx/wxwit.py,sha256=l7uq6NgGBhay-uAE1pQgWziSAGO9QZPJ4EpEBw1P9xU,7357
 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
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=yEYPCdLHLSMTJwTv6iYAh3Lo4lJvYfp5BxTLP3FhW9Y
 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.5.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.99.5.dist-info/METADATA,sha256=96mrQkWQoHslFbVsH5M7bEfVkEdsoQ7ke3Dn7kBJPe0,7411
-mwxlib-0.99.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-mwxlib-0.99.5.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.99.5.dist-info/RECORD,,
+mwxlib-0.99.8.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.99.8.dist-info/METADATA,sha256=C8n66k4LeYcPBb91oVSh7D68pfZI2d1JteEJn3F4UQU,7411
+mwxlib-0.99.8.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+mwxlib-0.99.8.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.99.8.dist-info/RECORD,,