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

mwx/bookshelf.py

@@ -36,22 +36,19 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnSelChanged)
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
         
-        def enter(evt):
+        def enter():
             data = self.GetItemData(self.Selection)
             if data:
                 data.SetFocus()
         
-        def refresh(evt, clear=False):
+        def refresh(clear=False):
             self.build_tree(clear)
-            if self.target:
-                self.target.current_editor.SetFocus()
-                wx.CallAfter(self.SetFocus)
+            wx.CallAfter(self.SetFocus)
         
-        def delete(evt):
+        def delete():
             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,9 +62,9 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
             '*button* released' : [ None, dispatch ],
             },
             0 : {
-                'enter pressed' : (0, enter),
-               'delete pressed' : (0, delete),
-                   'f5 pressed' : (0, refresh),
+                '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)),
             },
         })
@@ -135,19 +132,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

@@ -1225,7 +1225,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.1"
 __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])

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)
     

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
@@ -396,7 +396,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) ],
@@ -823,8 +823,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 +832,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 +1114,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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.97.0
+Version: 0.97.1
 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.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 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=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/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
 mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
-mwx/matplot2g.py,sha256=jSyRTW9oUqAKA9L9Rcujxy1QLoFOVg411HjVNElexzQ,64401
+mwx/matplot2g.py,sha256=95J4tyA6VgKrTN7zPPGoo_f24kYAqKB5BOBordExNUg,64443
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
 mwx/nutshell.py,sha256=zrye6tLuGgyCC-Od323o71bauGDKFnO8Zsabs0JMqjs,137383
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=hbApzZWa9-BmQthu7uZBlBbGbtf4iJ_prO8IhxoGMs8
 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,,
+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,,

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

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