mwxlib 0.97.0__py3-none-any.whl → 0.97.2__py3-none-any.whl

mwx/bookshelf.py

@@ -31,27 +31,16 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
        '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 enter(evt):
+        def delete_item():
             data = self.GetItemData(self.Selection)
             if data:
-                data.SetFocus()
-        
-        def refresh(evt, clear=False):
-            self.build_tree(clear)
-            if self.target:
-                self.target.current_editor.SetFocus()
-                wx.CallAfter(self.SetFocus)
-        
-        def delete(evt):
-            data = self.GetItemData(self.Selection)
-            if data:
-                if data.mtdelta or data.Text:
-                    data.parent.kill_buffer(data) # -> focus moves
+                data.parent.kill_buffer(data) # -> focus moves
                 wx.CallAfter(self.SetFocus)
         
         def dispatch(evt):
@@ -65,10 +54,9 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
             '*button* released' : [ None, dispatch ],
             },
             0 : {
-                'enter pressed' : (0, enter),
-               'delete pressed' : (0, delete),
-                   'f5 pressed' : (0, refresh),
-                 'S-f5 pressed' : (0, _F(refresh, clear=1)),
+               '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)),
             },
         })
     
@@ -78,6 +66,8 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         evt.Skip()
     
     def attach(self, target):
+        if not self:
+            return
         self.detach()
         self.target = target
         for editor in self.target.all_editors:
@@ -85,7 +75,7 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         self.build_tree()
     
     def detach(self):
-        if not self.target:
+        if not self or not self.target:
             return
         for editor in self.target.all_editors:
             editor.handler.remove(self.context)
@@ -135,19 +125,18 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
     ## Actions for bookshelf interfaces
     ## --------------------------------
     
-    ## @postcall
     def on_buffer_new(self, buf):
         self.build_tree(clear=0)
     
-    ## @postcall
     def on_buffer_deleted(self, buf):
         self.Delete(buf.__itemId)
     
+    ## Note: [buffer_activated][EVT_SET_FOCUS] > [buffer_new] の順で呼ばれる
+    ##       buf.__itemId がない場合がある (delete_buffer 直後など)
     @postcall
     def on_buffer_selected(self, buf):
         self.SelectItem(buf.__itemId)
     
-    @postcall
     def on_buffer_filename(self, buf):
         self.SetItemText(buf.__itemId, buf.caption_prefix + buf.name)
     

mwx/controls.py

@@ -84,14 +84,6 @@ class Param(object):
     def __len__(self):
         return len(self.range)
     
-    def bind(self, action=None, target='control'):
-        warn("Use `Param.callback.bind` instead.", DeprecationWarning)
-        return self.callback.bind(target, action)
-    
-    def unbind(self, action=None, target='control'):
-        warn("Use `Param.callback.unbind` instead.", DeprecationWarning)
-        return self.callback.unbind(target, action)
-    
     def reset(self, v=None, backcall=True):
         """Reset value when indexed (by knobs) with callback."""
         if v is None or v == '':
@@ -315,8 +307,7 @@ class Knob(wx.Panel):
         self.update_ctrl()
     
     def __init__(self, parent, param, type=None,
-                 style=None, editable=1, cw=-1, lw=-1, tw=-1, h=22,
-                 **kwargs):
+                 style=None, cw=-1, lw=-1, tw=-1, h=22, **kwargs):
         wx.Panel.__init__(self, parent, **kwargs)
         
         assert isinstance(param, Param),\
@@ -359,9 +350,6 @@ class Knob(wx.Panel):
         self.label.SetToolTip(self.__par._tooltip)
         self.label.Enable(lw) # skip focus
         
-        if not editable:
-            warn("Knob option `editable` is deprecated.", DeprecationWarning)
-        
         self.text = wx.TextCtrl(self, size=(tw,h), style=wx.TE_PROCESS_ENTER)
         self.text.Bind(wx.EVT_TEXT_ENTER, self.OnTextEnter)
         self.text.Bind(wx.EVT_KILL_FOCUS, self.OnTextExit)
@@ -926,8 +914,6 @@ class Icon(wx.Bitmap):
             bmp = wx.NullBitmap
         return bmp
 
-Icon2 = Icon # for backward compatibility
-
 
 def _getBitmap1(key, size=(16,16)):
     if isinstance(key, wx.Bitmap):
@@ -1225,7 +1211,7 @@ class Indicator(wx.Control):
         self.__value = int(v)
         self.Refresh()
     
-    def update_design(self, **kwargs):
+    def redesign(self, **kwargs):
         """Update multiple design properties at once.
         
         This method is useful for changing colors, spacing, radius, etc.

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.97.0"
+__version__ = "0.97.2"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -54,16 +54,15 @@ def deb(target=None, loop=True, locals=None, **kwargs):
     kwargs.setdefault("ensureClose", True)
     
     app = wx.GetApp() or wx.App()
-    try:
-        frame = ShellFrame(None, target, **kwargs)
-        frame.Show()
-        frame.rootshell.SetFocus()
-        if locals:
-            frame.rootshell.locals.update(locals)
+    frame = ShellFrame(None, target, **kwargs)
+    frame.Show()
+    frame.rootshell.SetFocus()
+    if locals:
+        frame.rootshell.locals.update(locals)
+    if not loop:
         return frame
-    finally:
-        if loop and not app.GetMainLoop():
-            app.MainLoop()
+    if not app.GetMainLoop():
+        return app.MainLoop()
 
 
 def postcall(f):
@@ -159,7 +158,7 @@ _speckeys = {
 
 _speckeys_wxkmap = dict((v, k) for k, v in _speckeys.items())
 
-def keyspec(key):
+def getKeyState(key):
     """Returns state of speckey (cf. wx.GetKeyState)."""
     try:
         return wx.GetKeyState(_speckeys_wxkmap[key])
@@ -1112,7 +1111,6 @@ class ShellFrame(MiniFrame):
         
         self.Bookshelf = EditorTreeCtrl(self, name="Bookshelf",
                                         style=wx.TR_DEFAULT_STYLE|wx.TR_HIDE_ROOT)
-        wx.CallAfter(self.Bookshelf.attach, self)
         
         from .wxpdb import Debugger
         from .wxwit import Inspector

mwx/graphman.py

@@ -895,8 +895,8 @@ class Frame(mwx.Frame):
         evt.Skip()
     
     def Destroy(self):
-        for name in list(self.plugins):
-            self.unload_plug(name) # => plug.Destroy
+        ## for name in list(self.plugins):
+        ##     self.unload_plug(name) # => plug.Destroy
         self._mgr.UnInit()
         return mwx.Frame.Destroy(self)
     
@@ -1477,9 +1477,6 @@ class Frame(mwx.Frame):
         print(self.message.read())
         return frames
     
-    import_index = load_index # for backward compatibility
-    export_index = save_index # for backward compatibility
-    
     ## --------------------------------
     ## load/save frames and attributes 
     ## --------------------------------

mwx/matplot2g.py

@@ -272,7 +272,7 @@ class AxesImagePhantom(object):
         return self.parent.index(self)
     
     def update_buffer(self, buf=None):
-        """Update buffer and the image."""
+        """Update buffer and the image (internal use only)."""
         if buf is not None:
             self.__buf = _to_buffer(buf)
         
@@ -286,7 +286,7 @@ class AxesImagePhantom(object):
         self.parent.handler('frame_modified', self)
     
     def update_extent(self):
-        """Update logical extent of the image."""
+        """Update logical extent of the image (internal use only)."""
         h, w = self.__buf.shape[:2]
         ux, uy = self.xy_unit
         w *= ux/2
@@ -325,15 +325,12 @@ class AxesImagePhantom(object):
             return self.__buf[ny, nx] # nearest value
         return ndi.map_coordinates(self.__buf, np.vstack((ny, nx))) # spline value
     
-    def xytopixel(self, x, y=None, cast=True):
+    def xytopixel(self, x, y, cast=True):
         """Convert xydata (x,y) -> [nx,ny] pixel.
         If cast, convert pixel-based lengths to pixel numbers.
         """
         def _cast(n):
             return np.int32(np.floor(np.round(n, 1)))
-        if y is None:
-            warn("Setting xy data with single tuple.", DeprecationWarning)
-            x, y = x
         if isinstance(x, (list, tuple)):
             x = np.array(x)
             y = np.array(y)
@@ -345,11 +342,8 @@ class AxesImagePhantom(object):
             return (_cast(nx), _cast(ny))
         return (nx-0.5, ny-0.5)
     
-    def xyfrompixel(self, nx, ny=None):
+    def xyfrompixel(self, nx, ny):
         """Convert pixel [nx,ny] -> (x,y) xydata (float number)."""
-        if ny is None:
-            warn("Setting xy data with single tuple.", DeprecationWarning)
-            nx, ny = nx
         if isinstance(nx, (list, tuple)):
             nx = np.array(nx)
             ny = np.array(ny)
@@ -396,7 +390,7 @@ class GraphPlot(MatplotPanel):
                'pageup pressed' : [ None, self.OnPageUp ],
              'pagedown pressed' : [ None, self.OnPageDown ],
                   'M-a pressed' : [ None, _F(self.fit_to_canvas) ],
-                  'C-a pressed' : [ None, _F(self.update_axis) ],
+                  'C-a pressed' : [ None, _F(self.fit_to_axes) ],
                   'C-i pressed' : [ None, _F(self.invert_cmap) ],
                   'C-k pressed' : [ None, _F(self.kill_buffer) ],
                 'C-S-k pressed' : [ None, _F(self.kill_buffer_all) ],
@@ -814,8 +808,6 @@ class GraphPlot(MatplotPanel):
                 self.handler('frame_updated', art)
             self.canvas.draw_idle()
     
-    globalunit = unit # for backward compatibility
-    
     def kill_buffer(self):
         if self.buffer is not None:
             del self.buffer
@@ -823,8 +815,8 @@ class GraphPlot(MatplotPanel):
     def kill_buffer_all(self):
         del self[:]
     
-    def update_axis(self):
-        """Reset display range (xylim's), update home position."""
+    def fit_to_axes(self):
+        """Reset the view limits to the current frame extent."""
         if self.frame:
             self.axes.axis(self.frame.get_extent()) # reset xlim and ylim
             self.toolbar.update()
@@ -832,7 +824,7 @@ class GraphPlot(MatplotPanel):
             self.draw()
     
     def fit_to_canvas(self):
-        """fit display range (xylim's) to canvas."""
+        """Reset the view limits to the canvas range."""
         x, y = self.xlim, self.ylim
         w, h = self.canvas.GetSize()
         r = h/w
@@ -1114,7 +1106,7 @@ class GraphPlot(MatplotPanel):
             self.select(i - 1)
     
     def OnHomePosition(self, evt):
-        self.update_axis()
+        self.fit_to_axes()
     
     def OnEscapeSelection(self, evt):
         xs, ys = self.Selector

mwx/nutshell.py

@@ -2006,8 +2006,6 @@ class EditorBook(AuiNotebook, CtrlInterface):
             self.delete_buffer(buf)
             return False
     
-    load_url = load_file # for backward compatibility
-    
     def find_file(self, filename=None):
         """Open the specified file."""
         if not filename:

mwx/py/filling.py

@@ -1,8 +1,9 @@
 #! python3
 """Filling is the gui tree control through which a user can navigate
-the local namespace or any object."""
-
+the local namespace or any object.
+"""
 __author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+__author__ += "Kazuya O'moto <komoto@jeol.co.jp>"
 # Tags: py3-port
 
 import wx

{mwxlib-0.97.0.dist-info → mwxlib-0.97.2.dist-info}/METADATA

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

{mwxlib-0.97.0.dist-info → mwxlib-0.97.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
-mwx/bookshelf.py,sha256=UgyVYHiYUL2wEvVw110vWnvkJBtXgYAE5hvz9MMLRsU,5333
-mwx/controls.py,sha256=s6yJzQyYnjCzcjXa6nbTJncxzpMI0E5zYWPn3-cFy5Q,48378
-mwx/framework.py,sha256=cXyfw0-PdkONYMHM-h9OsVIsOnDO3C1f4aDC5aYBP4o,75332
-mwx/graphman.py,sha256=VktL6fnYt2BBo-r7UVgVcqVd7IIOY9vpGBDNLNie088,70606
+mwx/bookshelf.py,sha256=ILKB13hX4riJnYFJmUvu2b1xa4uz8KxA1ZVuf4Y1zqM,5136
+mwx/controls.py,sha256=KAnzk2EeiBZsvJkfIHKIXo8bhxc6uVpC5CW802657ow,47815
+mwx/framework.py,sha256=4mawMkpnYUeESV0UTH3Qh79gki8MRbANl-f7EV75yOo,75249
+mwx/graphman.py,sha256=Y6PD9L-ee5hc7nwBkmTDDKXf6cGHkc5L-f6OW3QtD6M,70486
 mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
 mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
-mwx/matplot2g.py,sha256=jSyRTW9oUqAKA9L9Rcujxy1QLoFOVg411HjVNElexzQ,64401
+mwx/matplot2g.py,sha256=arUt5WMQCOg56mQLxUVQqIVHJ-HzwV-YpPcZiLTWrz0,64129
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=zrye6tLuGgyCC-Od323o71bauGDKFnO8Zsabs0JMqjs,137383
+mwx/nutshell.py,sha256=Oiy9HEWrQAL4KPz0qveH8J1W8Nd4aDWMjWcO58ZMV10,137322
 mwx/utilus.py,sha256=8GK_2mGY08DVN5_SGWynLKQEJsCKqvqWTDToar1XozM,37333
 mwx/wxmon.py,sha256=f3V24EF7kdMlYF7usLYK9QE5KU6fSu0jVqsvwAiA-Ag,12647
 mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
@@ -20,9 +20,9 @@ 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=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwxlib-0.97.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.97.0.dist-info/METADATA,sha256=3nBiqPuPWhRv2W2keE3GqrTbXBNP9N0iWDOPDKPh6DA,1880
-mwxlib-0.97.0.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-mwxlib-0.97.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.97.0.dist-info/RECORD,,
+mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
+mwxlib-0.97.2.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.97.2.dist-info/METADATA,sha256=dBXbEkroA5_XxikmiXvAEQix_YjHJoQiKN-sKABSyCs,1880
+mwxlib-0.97.2.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+mwxlib-0.97.2.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.97.2.dist-info/RECORD,,

{mwxlib-0.97.0.dist-info → mwxlib-0.97.2.dist-info}/WHEEL

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