mwxlib 1.0rc4__py3-none-any.whl → 1.0.1__py3-none-any.whl

mwx/framework.py

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

mwx/images.py

@@ -135,6 +135,19 @@ clock = PyEmbeddedImage(
     b'vqHBv3R3pmbxzgwz4Z+EaTXtwqIogrzjxIJ4QVVV1UyihxgjFv3/K09Bu/lEkBgg5rLZH+fT'
     b'5dvfn7iFAAAAAElFTkSuQmCC')
 
+#----------------------------------------------------------------------
+cog = PyEmbeddedImage(
+    b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAAK/INwWK6QAAABl0'
+    b'RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGSSURBVCjPVVFNSwJhEF78Ad79'
+    b'Cf6PvXQRsotUlzKICosuRYmR2RJR0KE6lBFFZVEbpFBSqKu2rum6llFS9HHI4iUhT153n6Zt'
+    b'IWMOM+/MM88z7wwH7s9Ub16SJcnbmrNcxVm2q7Z8/QPvEOtntpj92NkCqITLepEpjix7xQti'
+    b'LOoQ2b6+E7YAN/5nfOEJ2WbKqOIOJ4bYVMEQx4LfBBQDsvFMhUcCVU1/CxVXmDBGA5ZETrhD'
+    b'CQVcYAPbyEJBhvrnBVPiSpNr6cYDNCQwo4zzU/ySckkgDYuNuVpI42T9k4gLKGMPs/xPzzov'
+    b'QiY2hQYe0jlJfyNNhTqiWDYBq/wBMcSRpnyPzu1oS7WtxjVBSthU1vgVksiQ3Dn6Gp5ah2YO'
+    b'KQo5GiuHPA6xT1EKpxQNCNYejgIR457KKio0S56YckjSa9jo//3mrj+BV0QQagqGTOo+Y7gZ'
+    b'If1puP3WHoLhEb2PjTlCTCWGXtbp8DCX3hZuOdaIc9A+aQvWk4ihq95p67a7nP+u+Ws+r0dq'
+    b'l9z/zv0NCYhdCPKZ7oYAAAAASUVORK5CYII=')
+
 #----------------------------------------------------------------------
 colour = PyEmbeddedImage(
     b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'

mwx/matplot2g.py

@@ -21,7 +21,13 @@ from .matplot2 import MatplotPanel
 from .matplot2 import NORMAL, DRAGGING, PAN, ZOOM, MARK, LINE, REGION
 
 
-def _imcv(src):
+def _to_array(x):
+    if isinstance(x, (list, tuple)):
+        x = np.array(x)
+    return x
+
+
+def _to_cvtype(src):
     """Convert the image to a type that can be applied to the cv2 function.
     Note:
         CV2 normally accepts uint8/16 and float32/64.
@@ -31,36 +37,27 @@ def _imcv(src):
     return src
 
 
-def _to_buffer(img, grayscale=True):
+def _to_buffer(img):
     if isinstance(img, Image.Image):
         ## return np.asarray(img) # ref
         return np.array(img) # copy
     
-    if isinstance(img, wx.Bitmap):
+    if isinstance(img, wx.Bitmap): # bitmap to image
         img = img.ConvertToImage()
     
-    if isinstance(img, wx.Image):
+    if isinstance(img, wx.Image): # image to RGB array; RGB to grayscale
         w, h = img.GetSize()
-        buf = np.frombuffer(img.GetDataBuffer(), dtype='uint8')
-        return buf.reshape(h, w, 3)
-    
-    if img.ndim > 2 and grayscale:
+        img = np.frombuffer(img.GetDataBuffer(), dtype='uint8').reshape(h, w, 3)
         return cv2.cvtColor(img, cv2.COLOR_RGB2GRAY)
     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>
+def _to_image(src, cutoff=0, threshold=None, binning=1):
+    """Convert buffer to image <uint8>
     
     >>> dst = (src-a) * 255 / (b-a)
     
-    cf. convertScaleAbs(src[, dst[, alpha[, beta]]]) -> dst<uint8>
+    cf. convertScaleAbs(src[, dst[, alpha[, beta]]]) -> dst <uint8>
     
         >>> dst = |src * alpha + beta|
             alpha = 255 / (b-a)
@@ -83,13 +80,13 @@ def imconvert(src, cutoff=0, threshold=None, binning=1):
     
     if bins > 1:
         ## src = src[::bins,::bins]
-        src = _imcv(src)
+        src = _to_cvtype(src)
         src = cv2.resize(src, None, fx=1/bins, fy=1/bins, interpolation=cv2.INTER_AREA)
     
-    if src.dtype == np.uint8:
-        return bins, (0,255), src
+    if src.dtype == np.uint8: # RGB or gray image <uint8>
+        return bins, (0, 255), src
     
-    if hasattr(cutoff, '__iter__'):
+    if hasattr(cutoff, '__iter__'): # cutoff vlim:list is specified.
         a, b = cutoff
     elif cutoff > 0:
         a = np.percentile(src, cutoff)
@@ -137,7 +134,7 @@ class AxesImagePhantom:
         self.__attributes = attributes
         self.__attributes['localunit'] = self.__localunit
         self.__buf = _to_buffer(buf)
-        bins, vlim, img = imconvert(self.__buf,
+        bins, vlim, img = _to_image(self.__buf,
                 cutoff = self.parent.score_percentile,
              threshold = self.parent.nbytes_threshold,
         )
@@ -284,7 +281,7 @@ class AxesImagePhantom:
         if buf is not None:
             self.__buf = _to_buffer(buf)
         
-        bins, vlim, img = imconvert(self.__buf,
+        bins, vlim, img = _to_image(self.__buf,
                 cutoff = self.parent.score_percentile,
              threshold = self.parent.nbytes_threshold,
         )
@@ -954,7 +951,7 @@ class GraphPlot(MatplotPanel):
             data = frame.roi
             GraphPlot.clipboard_name = name
             GraphPlot.clipboard_data = data
-            bins, vlim, img = imconvert(data, frame.vlim)
+            bins, vlim, img = _to_image(data, frame.vlim)
             Clipboard.imwrite(img)
             self.message("Write buffer to clipboard.")
         except Exception as e:

mwx/nutshell.py

@@ -2711,7 +2711,6 @@ class Nautilus(EditorInterface, Shell):
             obj.this = inspect.getmodule(obj)
             obj.shell = self # overwrite the facade <wx.py.shell.ShellFacade>
         except AttributeError:
-            ## print("- cannot overwrite target vars:", e)
             pass
         self.parent.handler('title_window', obj)
     
@@ -3276,9 +3275,10 @@ class Nautilus(EditorInterface, Shell):
         Delete target shell to prevent referencing the dead shell.
         """
         def _del():
+            obj = self.target
             try:
-                if not self.target.shell:
-                    del self.target.shell # delete the facade <wx.py.shell.ShellFacade>
+                if not obj.shell:
+                    del obj.shell # delete the facade <wx.py.shell.ShellFacade>
             except AttributeError:
                 pass
         wx.CallAfter(_del)
@@ -3288,11 +3288,14 @@ class Nautilus(EditorInterface, Shell):
         Reset localvars assigned for the shell target.
         """
         self.trace_position()
-        self.parent.handler('title_window', self.target)
+        obj = self.target
         try:
-            self.target.shell = self # overwrite the facade <wx.py.shell.ShellFacade>
+            obj.self = obj
+            obj.this = inspect.getmodule(obj)
+            obj.shell = self # overwrite the facade <wx.py.shell.ShellFacade>
         except AttributeError:
             pass
+        self.parent.handler('title_window', obj)
     
     def on_inactivated(self, shell):
         """Called when shell:self is inactivated.

{mwxlib-1.0rc4.dist-info → mwxlib-1.0.1.dist-info}/METADATA

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

{mwxlib-1.0rc4.dist-info → mwxlib-1.0.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=psabnAMei5VzB2TsB2qBNLrIZMX0LiqjlXCpNGmDejk,668
 mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
 mwx/controls.py,sha256=LZqee9K8uPxs-Iqcp1zMMNBjFpGPrHbcMaIBuBOL7oo,47647
-mwx/framework.py,sha256=AlmzB7g3rkgBOKvgxZs1UZpnIovfiI2FNsVfN-F9O5A,75810
+mwx/framework.py,sha256=arqDZTKqvvqydF1aNWER1QzJMs5VqHa4B5Bb8x-QPwk,75809
 mwx/graphman.py,sha256=1GGBk4kJYRQ7zkvO2rvHxHoINrIfHSB7cabQKWhTyaI,69669
-mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
+mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
 mwx/matplot2.py,sha256=zA56jIdRUdzu-wrmPai1PSOjzqV2Erqw2yFKW-jwdA8,32901
-mwx/matplot2g.py,sha256=-vONEcU1UzAvsl5tgEluiDhebyA1_SU3HNnUN25ZQzU,64414
+mwx/matplot2g.py,sha256=diwWNxzyy-c8KBDaolHaMqWdFXSYhEumgwXIZ9wAEYk,64467
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=M5rt-H7Uq1OHnlFvMA4a3945UBvppbR9L_mw8NL_YZ0,5602
-mwx/nutshell.py,sha256=Kp4REs2TsiVhoBZn8SapcrkfcnKp_IQiOaLZJDggpuA,141809
+mwx/nutshell.py,sha256=pNGLBlVYz6D4LNjosCjXaopcITkQ2-qGVQ6zGmVJJYQ,141850
 mwx/utilus.py,sha256=Yyw8L1f-ikhyd7wtFXYtsOswofWxmB4GAmLOZnhUXeU,37388
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
 mwx/wxpdb.py,sha256=--TQr-_zs9dWPYV2V4s3Zr4abvN14o5wD8anT9frHUg,18875
@@ -21,8 +21,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.0rc4.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.0rc4.dist-info/METADATA,sha256=-ZzR93Ze3uYiaIWArAhSj9NFfTUDcJLxt0xhD-MhaGs,7260
-mwxlib-1.0rc4.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-mwxlib-1.0rc4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.0rc4.dist-info/RECORD,,
+mwxlib-1.0.1.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.0.1.dist-info/METADATA,sha256=wAEdiChVsOWS6L8ggO5JeupCCFlHu-AkEfpd1dPq4PU,7259
+mwxlib-1.0.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+mwxlib-1.0.1.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.0.1.dist-info/RECORD,,