mwxlib 0.97.1__py3-none-any.whl → 0.97.3__py3-none-any.whl

mwx/bookshelf.py

@@ -31,21 +31,13 @@ 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():
-            data = self.GetItemData(self.Selection)
-            if data:
-                data.SetFocus()
-        
-        def refresh(clear=False):
-            self.build_tree(clear)
-            wx.CallAfter(self.SetFocus)
-        
-        def delete():
+        def delete_item():
             data = self.GetItemData(self.Selection)
             if data:
                 data.parent.kill_buffer(data) # -> focus moves
@@ -62,10 +54,9 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
             '*button* released' : [ None, dispatch ],
             },
             0 : {
-                'enter pressed' : (0, _F(enter)),
-               'delete pressed' : (0, _F(delete)),
-                   'f5 pressed' : (0, _F(refresh, clear=0)),
-                 '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)),
             },
         })
     
@@ -75,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:
@@ -82,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)

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):

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.97.1"
+__version__ = "0.97.3"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -1111,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

@@ -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

@@ -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
@@ -46,6 +46,12 @@ def _to_buffer(img):
     return img
 
 
+def _to_array(x):
+    if isinstance(x, (list, tuple)):
+        x = np.array(x)
+    return x
+
+
 def imconvert(src, cutoff=0, threshold=None, binning=1):
     """Convert buffer to image<uint8>
     
@@ -332,11 +338,9 @@ class AxesImagePhantom(object):
         def _cast(n):
             return np.int32(np.floor(np.round(n, 1)))
         if y is None:
-            warn("Setting xy data with single tuple.", DeprecationWarning)
+            ## warn("Setting xy data with single tuple.", DeprecationWarning)
             x, y = x
-        if isinstance(x, (list, tuple)):
-            x = np.array(x)
-            y = np.array(y)
+        x, y = _to_array(x), _to_array(y)
         l,r,b,t = self.__art.get_extent()
         ux, uy = self.xy_unit
         nx = (x - l) / ux
@@ -348,11 +352,9 @@ class AxesImagePhantom(object):
     def xyfrompixel(self, nx, ny=None):
         """Convert pixel [nx,ny] -> (x,y) xydata (float number)."""
         if ny is None:
-            warn("Setting xy data with single tuple.", DeprecationWarning)
+            ## warn("Setting xy data with single tuple.", DeprecationWarning)
             nx, ny = nx
-        if isinstance(nx, (list, tuple)):
-            nx = np.array(nx)
-            ny = np.array(ny)
+        nx, ny = _to_array(nx), _to_array(ny)
         l,r,b,t = self.__art.get_extent()
         ux, uy = self.xy_unit
         x = l + (nx + 0.5) * ux
@@ -814,8 +816,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

mwx/nutshell.py

@@ -1415,7 +1415,7 @@ class Buffer(EditWindow, EditorInterface):
                 return os.path.getmtime(fn) - self.__mtime
             if re.match(url_re, fn):
                 return -1
-        return None
+        return self.__mtime # None or specified value
     
     @property
     def caption_prefix(self):
@@ -1481,12 +1481,14 @@ class Buffer(EditWindow, EditorInterface):
         self.Bind(stc.EVT_STC_SAVEPOINTREACHED, self.OnSavePointReached)
         
         def activate(evt):
-            self.handler('buffer_activated', self)
+            if self:
+                self.handler('buffer_activated', self)
             evt.Skip()
         self.Bind(wx.EVT_SET_FOCUS, activate)
         
         def inactivate(evt):
-            self.handler('buffer_inactivated', self)
+            if self:
+                self.handler('buffer_inactivated', self)
             evt.Skip()
         self.Bind(wx.EVT_KILL_FOCUS, inactivate)
         
@@ -2006,8 +2008,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:
@@ -2020,6 +2020,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
             return
         if not self.load_file(filename):
             buf = self.create_buffer(filename)
+            buf._Buffer__mtime = 0 # => need_buffer_save
             self.swap_buffer(buf)
     
     open_buffer = find_file # for backward compatibility
@@ -2372,12 +2373,14 @@ class Nautilus(Shell, EditorInterface):
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
         
         def activate(evt):
-            self.handler('shell_activated', self)
+            if self:
+                self.handler('shell_activated', self)
             evt.Skip()
         self.Bind(wx.EVT_SET_FOCUS, activate)
         
         def inactivate(evt):
-            self.handler('shell_inactivated', self)
+            if self:
+                self.handler('shell_inactivated', self)
             evt.Skip()
         self.Bind(wx.EVT_KILL_FOCUS, inactivate)
         

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.1.dist-info → mwxlib-0.97.3.dist-info}/METADATA

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

{mwxlib-0.97.1.dist-info → mwxlib-0.97.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
-mwx/bookshelf.py,sha256=SiDYw0bMW-dHrPl2eP4ZEoQAn17f9XeEk8_0XbYw9DQ,5319
-mwx/controls.py,sha256=ebF16EOoDWndVdBh_x2TKLZ4WevkH91QkKWyEivfCjY,48373
-mwx/framework.py,sha256=ffCTDK7wMnAct-kaNXK3FoL8Bm0vECPDxXO1ordG2Og,75300
-mwx/graphman.py,sha256=NLklcxzTKklaL_FXpl5qW2apwAb3YuHH_NSr--PlqMQ,70612
+mwx/bookshelf.py,sha256=ILKB13hX4riJnYFJmUvu2b1xa4uz8KxA1ZVuf4Y1zqM,5136
+mwx/controls.py,sha256=KAnzk2EeiBZsvJkfIHKIXo8bhxc6uVpC5CW802657ow,47815
+mwx/framework.py,sha256=ro-UOz8GFUmBqiKAst5DIRcboRJ0_x2KXGjoGctBAkA,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=95J4tyA6VgKrTN7zPPGoo_f24kYAqKB5BOBordExNUg,64443
+mwx/matplot2g.py,sha256=wiZFDFuQe3ax71fmyeR_9hvAmgT-4nVfZ30UByv8Nv8,64379
 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=4mUQCvtE0SZxlHRflrgKYGlMgvj2HY9LtBhAm9Rnnd8,137518
 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.1.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.97.1.dist-info/METADATA,sha256=2iRI3XivGubsXjavm_XGa1fkwoFx5MjiWFbWnNqhrko,1880
-mwxlib-0.97.1.dist-info/WHEEL,sha256=rWxmBtp7hEUqVLOnTaDOPpR-cZpCDkzhhcBce-Zyd5k,91
-mwxlib-0.97.1.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.97.1.dist-info/RECORD,,
+mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
+mwxlib-0.97.3.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.97.3.dist-info/METADATA,sha256=Q10wJtVKCVOVctcuIDSFiyDADO0rlPKp8Ga-PLxOTKI,1880
+mwxlib-0.97.3.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+mwxlib-0.97.3.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.97.3.dist-info/RECORD,,

{mwxlib-0.97.1.dist-info → mwxlib-0.97.3.dist-info}/WHEEL

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