mwxlib 1.2.3__py3-none-any.whl → 1.2.5__py3-none-any.whl

mwx/controls.py

@@ -770,6 +770,7 @@ class Clipboard:
             return text
         else:
             print("- Unable to open clipboard.")
+            return None
     
     @staticmethod
     def write(text, verbose=False):
@@ -792,7 +793,7 @@ class Clipboard:
             bmp = do.GetBitmap()
         else:
             print("- Unable to open clipboard.")
-            return
+            return None
         try:
             ## Convert bmp --> buf
             img = bmp.ConvertToImage()
@@ -802,7 +803,8 @@ class Clipboard:
             w, h = img.GetSize()
             return buf.reshape(h, w, 3)
         except Exception:
-            print("- The contents of the clipboard are not images.")
+            print("- Contents of the clipboard are not images.")
+            return None
     
     @staticmethod
     def imwrite(buf, verbose=False):
@@ -815,7 +817,7 @@ class Clipboard:
             img = wx.Image(w, h, buf.tobytes())
             bmp = img.ConvertToBitmap()
         except Exception:
-            print("- The contents of the clipboard are not images.")
+            print("- Argument 'buf' is not a 2d array.")
             return
         do = wx.BitmapDataObject(bmp)
         if wx.TheClipboard.Open():

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.2.3"
+__version__ = "1.2.5"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager

mwx/matplot2g.py

@@ -1,7 +1,6 @@
 #! python3
 """mwxlib graph plot for images.
 """
-import traceback
 import wx
 
 from matplotlib import cm
@@ -49,6 +48,11 @@ def _to_buffer(img):
         w, h = img.GetSize()
         img = np.frombuffer(img.GetDataBuffer(), dtype='uint8').reshape(h, w, 3)
     
+    if not isinstance(img, np.ndarray):
+        raise ValueError("targets must be arrays or images.")
+    
+    assert img.ndim > 1, "targets must be 2d arrays."
+    
     if img.ndim > 2:
         return cv2.cvtColor(img, cv2.COLOR_RGB2GRAY)
     return img
@@ -73,20 +77,18 @@ def _to_image(src, cutoff=0, threshold=None, binning=1):
     if src.dtype in (np.complex64, np.complex128): # maybe fft pattern
         src = np.log(1 + abs(src))
     
-    bins = binning
     if threshold:
-        ## Converted to <uint8(=1byte)> finally, binning should be reduced by itemsize.
-        n = int(np.sqrt(src.nbytes / threshold / src.itemsize)) + 1
-        if bins < n:
-            bins = n # binning or threshold; Select the larger one.
-    
-    if bins > 1:
-        ## src = src[::bins,::bins]
+        ## Reduce the binning by itemsize before finally converting to <uint8>.
+        ## Select the larger value between binning and threshold.
+        n = max(binning, int(np.sqrt(src.nbytes / threshold / src.itemsize)) + 1)
+    else:
+        n = binning
+    if n > 1:
         src = _to_cvtype(src)
-        src = cv2.resize(src, None, fx=1/bins, fy=1/bins, interpolation=cv2.INTER_AREA)
+        src = cv2.resize(src, None, fx=1/n, fy=1/n, interpolation=cv2.INTER_AREA)
     
     if src.dtype == np.uint8: # RGB or gray image <uint8>
-        return bins, (0, 255), src
+        return n, (0, 255), src
     
     if hasattr(cutoff, '__iter__'): # cutoff vlim: (vmin, vmax) is specified.
         a, b = cutoff
@@ -99,10 +101,10 @@ def _to_image(src, cutoff=0, threshold=None, binning=1):
     
     r = (255 / (b - a)) if a < b else 1
     ## img = cv2.convertScaleAbs(src, alpha=r, beta=-r*a) # 負数は絶対値になるので以下に変更
-    img = np.uint8((src - a) * r) # copy buffer
+    img = np.uint8((src - a) * r)
     img[src < a] = 0
     img[src > b] = 255
-    return bins, (a, b), img
+    return n, (a, b), img
 
 
 def _Property(name):
@@ -155,6 +157,7 @@ class AxesImagePhantom:
         return getattr(self.__art, attr)
     
     def __eq__(self, x):
+        ## Called in `on_pick` and `__contains__` to check objects in.
         return x is self.__art
     
     def update_attributes(self, attr=None, **kwargs):
@@ -221,7 +224,7 @@ class AxesImagePhantom:
     
     image = property(
         lambda self: self.__art.get_array(),
-        doc="A displayed image array<uint8>.")
+        doc="Displayed image array<uint8>.")
     
     clim = property(
         lambda self: self.__art.get_clim(),
@@ -235,7 +238,7 @@ class AxesImagePhantom:
     pathname = property(
         lambda self: self.__attributes.get('pathname'),
         lambda self,v: self.update_attributes({'pathname': v}),
-        doc="A fullpath of buffer, when bounds to file.")
+        doc="Fullpath of the buffer, if bound to a file.")
     
     annotation = property(
         lambda self: self.__attributes.get('annotation', ''),
@@ -697,22 +700,19 @@ class GraphPlot(MatplotPanel):
         return buffers[j] # j can also be slicing
     
     def __setitem__(self, j, v):
+        if v is None:
+            raise ValueError("values must be buffers, not NoneType.")
+        
         if isinstance(j, str):
-            try:
-                j = self.index(j) # overwrite buffer
-            except ValueError:
-                return self.load(v, name=j) # new buffer
+            return self.load(v, name=j) # update buffer or new buffer
         
         if isinstance(j, slice):
             raise ValueError("attempt to assign buffers via slicing")
         
-        if v is None:
-            raise ValueError("values must be buffers, not NoneType.")
-        else:
-            art = self.__Arts[j]
-            art.update_buffer(v) # update buffer
-            art.update_extent()
-            self.select(j)
+        art = self.__Arts[j]
+        art.update_buffer(v) # update buffer
+        art.update_extent()
+        self.select(j)
     
     def __delitem__(self, j):
         if isinstance(j, str):
@@ -829,8 +829,8 @@ class GraphPlot(MatplotPanel):
             self.canvas.draw_idle()
     
     def kill_buffer(self):
-        if self.buffer is not None:
-            del self.buffer
+        if self.frame:
+            del self[self.__index]
     
     def kill_buffer_all(self):
         del self[:]
@@ -959,34 +959,28 @@ class GraphPlot(MatplotPanel):
         if not frame:
             self.message("No frame")
             return
-        try:
-            name = frame.name
-            data = frame.roi
-            GraphPlot.clipboard_name = name
-            GraphPlot.clipboard_data = data
-            bins, vlim, img = _to_image(data, frame.cuts)
-            Clipboard.imwrite(img)
-            self.message("Write buffer to clipboard.")
-        except Exception as e:
-            traceback.print_exc()
-            self.message("- Failed to write to clipboard.", e)
+        
+        name = frame.name
+        data = frame.roi
+        GraphPlot.clipboard_name = name
+        GraphPlot.clipboard_data = data
+        bins, vlim, img = _to_image(data, frame.cuts)
+        Clipboard.imwrite(img)
+        self.message("Write buffer to clipboard.")
     
     def read_buffer_from_clipboard(self):
         """Read buffer data from clipboard."""
-        try:
-            name = GraphPlot.clipboard_name
-            data = GraphPlot.clipboard_data
-            if name:
-                self.message("Read buffer from clipboard.")
-                GraphPlot.clipboard_name = None
-                GraphPlot.clipboard_data = None
-            else:
-                self.message("Read image from clipboard.")
-                data = Clipboard.imread()
+        name = GraphPlot.clipboard_name
+        data = GraphPlot.clipboard_data
+        if name:
+            self.message("Read buffer from clipboard.")
+            GraphPlot.clipboard_name = None
+            GraphPlot.clipboard_data = None
+        else:
+            self.message("Read image from clipboard.")
+            data = Clipboard.imread()
+        if data is not None:
             self.load(data)
-        except Exception as e:
-            traceback.print_exc()
-            self.message("- No data in clipboard.", e)
     
     def destroy_colorbar(self):
         if self.cbar:

mwx/utilus.py

@@ -37,15 +37,16 @@ def ignore(*category):
         yield
 
 
-def warn(message, category=None):
-    frame = inspect.currentframe().f_back # previous call stack frame
-    skip = [frame.f_code.co_filename]
-    stacklevel = 1
-    while frame.f_code.co_filename in skip:
-        frame = frame.f_back
-        if not frame:
-            break
-        stacklevel += 1
+def warn(message, category=None, stacklevel=None):
+    if stacklevel is None:
+        frame = inspect.currentframe().f_back # previous call stack frame
+        skip = [frame.f_code.co_filename]
+        stacklevel = 1
+        while frame.f_code.co_filename in skip:
+            frame = frame.f_back
+            if not frame:
+                break
+            stacklevel += 1
     return warnings.warn(message, category, stacklevel+1)
 
 

mwx/wxpdb.py

@@ -53,7 +53,6 @@ class Debugger(Pdb):
     use_rawinput = False
     prompt = property(lambda self: self.indents + '(Pdb) ',
                       lambda self,v: None) # fake setter
-    parent = property(lambda self: self.__shellframe)
     handler = property(lambda self: self.__handler)
     
     @property
@@ -90,12 +89,12 @@ class Debugger(Pdb):
     def __init__(self, parent, *args, **kwargs):
         Pdb.__init__(self, *args, **kwargs)
         
-        self.__shellframe = parent
-        self.__hookpoint = None
+        self.parent = parent
         self.indents = ' ' * 2
         self.interactive_shell = parent.rootshell
         self.editor = None
         self.code = None
+        self.__hookpoint = None
         
         def _input(msg):
             ## redirects input such as cl(ear)

{mwxlib-1.2.3.dist-info → mwxlib-1.2.5.dist-info}/METADATA

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

{mwxlib-1.2.3.dist-info → mwxlib-1.2.5.dist-info}/RECORD

@@ -1,18 +1,18 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=b_TMDaNIzLHoL0xbbqb3tt0BnRvhLAqaCn_pBdrigZw,7523
-mwx/controls.py,sha256=X4zx2h6oggUsQxi2PRk4RUsJieYTmcAPIvWwaz-ysTI,48107
-mwx/framework.py,sha256=wXI4nzQcG0NV3c5ne4io9HJ1y7jd7xbjB_cOao8HKsU,76125
+mwx/controls.py,sha256=5PCy3zguDRuwYl89P9tOCUU7xAGUETs944qZBy5MS9g,48146
+mwx/framework.py,sha256=c0o6IXrdgvfpnPXHPNYU7isqzOydXwtiMY7-qRXMFyQ,76125
 mwx/graphman.py,sha256=RqD0W9I2BvJ3Q2kyMiyyg4n-T4-_x7PDuCI5bGAg5k4,70110
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
 mwx/matplot2.py,sha256=Zwte-wwzCg_OHzsBniVgKdaNLzsvJaa1gc0n7VdAqxw,33150
-mwx/matplot2g.py,sha256=tShPGy7whj51yvANja-MDmjfxiLubQ1C6rCsBZ0DAnY,64473
+mwx/matplot2g.py,sha256=ywvu5-QAIgv4jc1kalNYgVGcl4RoY9Y1Dx1qtteaqXk,64195
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=8mXbHpCmm7lz3XbAxOg7IVC7DaSGBEby1UfTlMl9kjk,5604
 mwx/nutshell.py,sha256=7nQ7UUFM9kvjDjHNUEdOkkeqZPiU6zOERwamqBdJpQs,140856
 mwx/testsuite.py,sha256=kiM3-BVhr42LRRN7xG7pYl3at8o2vnypWSxD8KRvA7c,1228
-mwx/utilus.py,sha256=HFvP682SyeSp8yNfUrdUXPhWdLuWVlsUSg6LqNBJOT8,37451
+mwx/utilus.py,sha256=bDeooo2bOcZwvkIdi0ElkT-qoblqzHNFsIveb72NFOo,37528
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
-mwx/wxpdb.py,sha256=AObuf4JLAmlQLj-yf0_mkBBd-Bhhz2Vb8hbTVcHEZOs,18875
+mwx/wxpdb.py,sha256=ge4hNfeigHGcpnioU1B_BJX_QZjNdtnokUrcZOxcEcI,18814
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
 mwx/wxwit.py,sha256=1hHtMi2YEy2T_LnUpwdmrIdtCuvxMOFyykqnbq6jLP0,7294
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
@@ -22,8 +22,8 @@ mwx/plugins/frame_listview.py,sha256=gowjQ-ARNonMkDSXkQgPKq4U9YBJ-vQ0jK2krBVOdCs
 mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-1.2.3.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.2.3.dist-info/METADATA,sha256=2sSF51qYRi78w0McPUzYn2yr9H1ISRKXMfvWSB-ATls,7258
-mwxlib-1.2.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mwxlib-1.2.3.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.2.3.dist-info/RECORD,,
+mwxlib-1.2.5.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.2.5.dist-info/METADATA,sha256=HZpDkw3rpf_1eFrLWB4UFT2sGfuJQ0nDV7cUyWuot-w,7258
+mwxlib-1.2.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mwxlib-1.2.5.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.2.5.dist-info/RECORD,,