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

mwx/framework.py

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

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>
     
@@ -325,15 +331,16 @@ 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, cast=True):
+    def xytopixel(self, x, y=None, 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 isinstance(x, (list, tuple)):
-            x = np.array(x)
-            y = np.array(y)
+        if y is None:
+            ## warn("Setting xy data with single tuple.", DeprecationWarning)
+            x, y = x
+        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
@@ -342,11 +349,12 @@ class AxesImagePhantom(object):
             return (_cast(nx), _cast(ny))
         return (nx-0.5, ny-0.5)
     
-    def xyfrompixel(self, nx, ny):
+    def xyfrompixel(self, nx, ny=None):
         """Convert pixel [nx,ny] -> (x,y) xydata (float number)."""
-        if isinstance(nx, (list, tuple)):
-            nx = np.array(nx)
-            ny = np.array(ny)
+        if ny is None:
+            ## warn("Setting xy data with single tuple.", DeprecationWarning)
+            nx, ny = nx
+        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

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)
         
@@ -2018,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
@@ -2370,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)
         

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

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

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
 mwx/bookshelf.py,sha256=ILKB13hX4riJnYFJmUvu2b1xa4uz8KxA1ZVuf4Y1zqM,5136
 mwx/controls.py,sha256=KAnzk2EeiBZsvJkfIHKIXo8bhxc6uVpC5CW802657ow,47815
-mwx/framework.py,sha256=4mawMkpnYUeESV0UTH3Qh79gki8MRbANl-f7EV75yOo,75249
+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=arUt5WMQCOg56mQLxUVQqIVHJ-HzwV-YpPcZiLTWrz0,64129
+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=Oiy9HEWrQAL4KPz0qveH8J1W8Nd4aDWMjWcO58ZMV10,137322
+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
@@ -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=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.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,,