mwxlib 1.2.4__py3-none-any.whl → 1.2.7__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.4"
+__version__ = "1.2.7"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager

mwx/graphman.py

@@ -1410,7 +1410,7 @@ class Frame(mwx.Frame):
         frames = self.load_buffer(paths, view)
         if frames:
             for frame in frames:
-                frame.update_attributes(res.get(frame.name))
+                frame.set_attributes(res.get(frame.name))
         
         n = len(frames)
         self.message(
@@ -1507,7 +1507,7 @@ class Frame(mwx.Frame):
         """Write attributes file."""
         try:
             res, mis = self.read_attributes(filename)
-            new = dict((x.name, x.attributes) for x in frames)
+            new = dict((x.name, x.get_attributes()) for x in frames)
             
             ## `res` order may differ from that of given frames,
             ## so we take a few steps to merge `new` to be exported.
@@ -1540,7 +1540,7 @@ class Frame(mwx.Frame):
                     res, mis = self.read_attributes(fn)
                     savedirs[savedir] = res
                 results = savedirs[savedir]
-                frame.update_attributes(results.get(frame.name))
+                frame.set_attributes(results.get(frame.name))
         return frames
     
     def save_frame(self, path=None, frame=None):

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
@@ -114,25 +118,22 @@ class AxesImagePhantom:
     """Phantom of frame facade
     
     Args:
-        buf         : buffer
-        name        : buffer name
-        show        : show immediately when loaded
-        aspect      : initial aspect ratio
-        localunit   : initial localunit
-        attributes  : additional info:dict
+        buf     : buffer
+        name    : buffer name
+        show    : show immediately when loaded
+        **kwargs: frame attributes
     
     Note:
         Due to the problem of performance,
         the image pixel size could be reduced by binning.
     """
-    def __init__(self, parent, buf, name, show=True,
-                 localunit=None, aspect=1.0, **attributes):
+    def __init__(self, parent, buf, name, show=True, **kwargs):
         self.parent = parent
         self.__name = name
-        self.__localunit = localunit or None # [+] value, no assertion
-        self.__aspect_ratio = aspect
-        self.__attributes = attributes
-        self.__attributes['localunit'] = self.__localunit
+        self.__attributes = kwargs
+        self.__localunit = kwargs.get('localunit')
+        self.__center = kwargs.get('center', (0, 0))
+        self.__aspect_ratio = 1
         self.__buf = _to_buffer(buf)
         bins, vlim, img = _to_image(self.__buf,
                 cutoff = self.parent.score_percentile,
@@ -147,7 +148,7 @@ class AxesImagePhantom:
                visible = show,
                 picker = True,
         )
-        self.update_extent() # this determines the aspect ratio
+        self.update_extent()
     
     def __getattr__(self, attr):
         return getattr(self.__art, attr)
@@ -156,22 +157,27 @@ class AxesImagePhantom:
         ## Called in `on_pick` and `__contains__` to check objects in.
         return x is self.__art
     
-    def update_attributes(self, attr=None, **kwargs):
-        """Update frame-specifc attributes.
-        The frame holds any attributes with dictionary
-        There are some keys which acts as the value setter when given,
-        `annotation` also shows the message with infobar
-        `localunit` also updates the frame.unit
+    def get_attributes(self):
+        """Auxiliary info about the frame."""
+        return self.__attributes
+    
+    def set_attributes(self, attr):
+        """Update frame-specifc attributes:
+        
+            annotation : aux info (also displayed as a message in the infobar)
+            center     : frame.center defaults to (0, 0)
+            localunit  : frame.unit
+            pathname   : full path of the buffer file
         """
-        attr = attr or {}
-        attr.update(kwargs)
+        if not attr:
+            return
         self.__attributes.update(attr)
         
         if 'localunit' in attr:
-            self.unit = attr['localunit']
+            self.unit = attr['localunit'] # => [frame_updated]
         
-        if 'aspect' in attr:
-            self.aspect_ratio = attr['aspect']
+        if 'center' in attr:
+            self.center = attr['center'] # => [frame_updated]
         
         if 'annotation' in attr:
             v = attr['annotation']
@@ -201,7 +207,8 @@ class AxesImagePhantom:
         ux, uy = self.xy_unit
         w *= ux/2
         h *= uy/2
-        self.__art.set_extent((-w,w,-h,h))
+        cx, cy = self.center
+        self.__art.set_extent((cx-w, cx+w, cy-h, cy+h))
     
     selector = _Property('Selector')
     markers = _Property('Markers')
@@ -227,18 +234,14 @@ class AxesImagePhantom:
         lambda self,v: self.__art.set_clim(v),
         doc="Lower/Upper color limit values of the buffer.")
     
-    attributes = property(
-        lambda self: self.__attributes,
-        doc="Miscellaneous info about the frame/buffer.")
-    
     pathname = property(
         lambda self: self.__attributes.get('pathname'),
-        lambda self,v: self.update_attributes({'pathname': v}),
+        lambda self,v: self.set_attributes({'pathname': v}),
         doc="Fullpath of the buffer, if bound to a file.")
     
     annotation = property(
         lambda self: self.__attributes.get('annotation', ''),
-        lambda self,v: self.update_attributes({'annotation': v}),
+        lambda self,v: self.set_attributes({'annotation': v}),
         doc="Annotation of the buffer.")
     
     @property
@@ -261,17 +264,16 @@ class AxesImagePhantom:
     
     @unit.setter
     def unit(self, v):
+        if v == self.__localunit: # no effect
+            return
         if v is None or np.isnan(v): # nan => undefined
-            v = self.parent.unit
-            self.__localunit = None
+            v = None
         elif np.isinf(v):
             raise ValueError("The unit value must not be inf")
         elif v <= 0:
             raise ValueError("The unit value must be greater than zero")
-        else:
-            if v == self.__localunit: # no effect when v is localunit
-                return
-            self.__localunit = v
+        
+        self.__localunit = v
         self.__attributes['localunit'] = self.__localunit
         self.update_extent()
         self.parent.handler('frame_updated', self)
@@ -286,6 +288,18 @@ class AxesImagePhantom:
         u = self.__localunit or self.parent.unit
         return (u, u * self.__aspect_ratio)
     
+    @property
+    def center(self):
+        """Center of logical unit."""
+        return self.__center
+    
+    @center.setter
+    def center(self, v):
+        self.__center = tuple(v)
+        self.__attributes['center'] = self.__center
+        self.update_extent()
+        self.parent.handler('frame_updated', self)
+    
     @property
     def aspect_ratio(self):
         """Aspect ratio of logical unit."""
@@ -293,9 +307,7 @@ class AxesImagePhantom:
     
     @aspect_ratio.setter
     def aspect_ratio(self, v):
-        if v == self.__aspect_ratio:
-            return
-        self.__aspect_ratio = v or 1.0
+        self.__aspect_ratio = v or 1
         self.update_extent()
         self.parent.handler('frame_updated', self)
     
@@ -620,20 +632,11 @@ class GraphPlot(MatplotPanel):
             name    : buffer name (default to *temp*).
             pos     : Insertion position in the frame list.
             show    : Show immediately when loaded.
-            
             **kwargs: frame attributes.
-            
-                - localunit : localunit
-                - aspect    : aspect ratio
-                - pathname  : full path of the buffer file
         """
         if isinstance(buf, str):
             buf = Image.open(buf)
         
-        if not isinstance(buf, (np.ndarray, Image.Image, wx.Bitmap, wx.Image)):
-            warn("Load targets must be either arrays or images.")
-            return None
-        
         pathname = kwargs.get('pathname')
         paths = [art.pathname for art in self.__Arts]
         names = [art.name for art in self.__Arts]
@@ -645,8 +648,8 @@ class GraphPlot(MatplotPanel):
             j = names.index(name) # existing frame
         if j != -1:
             art = self.__Arts[j]
-            art.update_buffer(buf)        # => [frame_modified]
-            art.update_attributes(kwargs) # => [frame_updated] localunit => [canvas_draw]
+            art.update_buffer(buf)      # => [frame_modified]
+            art.set_attributes(kwargs)  # => [frame_updated] localunit => [canvas_draw]
             art.update_extent()
             if show:
                 self.select(j)
@@ -697,31 +700,32 @@ class GraphPlot(MatplotPanel):
             j = self.index(j)
         
         buffers = [art.buffer for art in self.__Arts]
+        if hasattr(j, '__iter__'):
+            return [buffers[i] for i in j]
         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 isinstance(j, slice) or hasattr(j, '__iter__'):
+            raise ValueError("attempt to assign buffers via slicing or iterator")
         
-        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):
             j = self.index(j)
         
-        if isinstance(j, slice):
+        if hasattr(j, '__iter__'):
+            arts = [self.__Arts[i] for i in j]
+        elif isinstance(j, slice):
             arts = self.__Arts[j]
         else:
             arts = [self.__Arts[j]]
@@ -818,13 +822,13 @@ class GraphPlot(MatplotPanel):
     
     @unit.setter
     def unit(self, v):
+        if v == self.__unit:  # no effect unless unit changes
+            return
         if v is None or np.isnan(v) or np.isinf(v):
             raise ValueError("The unit value must not be nan or inf")
         elif v <= 0:
             raise ValueError("The unit value must be greater than zero")
         else:
-            if v == self.__unit:  # no effect unless unit changes
-                return
             self.__unit = v
             for art in self.__Arts:
                 art.update_extent()
@@ -962,34 +966,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/plugins/frame_listview.py

@@ -185,7 +185,7 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         if selected_frames:
             text = ''
             for frame in selected_frames:
-                text += pformat(frame.attributes, sort_dicts=0) # ALL attributes
+                text += pformat(frame.get_attributes(), sort_dicts=0) # ALL attributes
                 ## text += '{}\n{}\n'.format(frame.name, frame.annotation)
             Clipboard.write(text)
         else:

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)
 
 

{mwxlib-1.2.4.dist-info → mwxlib-1.2.7.dist-info}/METADATA

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

{mwxlib-1.2.4.dist-info → mwxlib-1.2.7.dist-info}/RECORD

@@ -1,16 +1,16 @@
 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=8Vh1Tkqod9sWp81ObY5Ofcqto_UJerT_VtEgA97huoA,76125
-mwx/graphman.py,sha256=RqD0W9I2BvJ3Q2kyMiyyg4n-T4-_x7PDuCI5bGAg5k4,70110
+mwx/controls.py,sha256=5PCy3zguDRuwYl89P9tOCUU7xAGUETs944qZBy5MS9g,48146
+mwx/framework.py,sha256=wurY8uvLFJW6Xig5kTTI84MkFWAK3v4-a6H2eSEwv7M,76125
+mwx/graphman.py,sha256=6ON1lckAyCbIMhIPHRbi9yvWYI2yT_CIWhNFbW31-mc,70110
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
 mwx/matplot2.py,sha256=Zwte-wwzCg_OHzsBniVgKdaNLzsvJaa1gc0n7VdAqxw,33150
-mwx/matplot2g.py,sha256=tp0KD_dqDgupTVROY4YFZyfvHS_d21w4uS3x0Sd_zSA,64643
+mwx/matplot2g.py,sha256=gs9U6VDdSX9wmzgrzDCWEZEL3DTOc5XkZOWZE5mffxc,64207
 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=ge4hNfeigHGcpnioU1B_BJX_QZjNdtnokUrcZOxcEcI,18814
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
@@ -18,12 +18,12 @@ mwx/wxwit.py,sha256=1hHtMi2YEy2T_LnUpwdmrIdtCuvxMOFyykqnbq6jLP0,7294
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
 mwx/plugins/ffmpeg_view.py,sha256=NIHFJLPeliOXH3ke0NvQzYBhY0oeEP6dgZQofB5Ry1c,11031
 mwx/plugins/fft_view.py,sha256=08A_Y73XirV7kXpwf-v0mUA0Hr0MOfdMXv3tvL1hvWA,2789
-mwx/plugins/frame_listview.py,sha256=gowjQ-ARNonMkDSXkQgPKq4U9YBJ-vQ0jK2krBVOdCs,10420
+mwx/plugins/frame_listview.py,sha256=z2mGbOTStjaICU7vkn-fs_C8uvCD1xMldSOdr-_IKH0,10426
 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.4.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.2.4.dist-info/METADATA,sha256=jgZUZOULgdBFRgLPPjGzxfiPOsz4xdibdZgiXipWvK0,7258
-mwxlib-1.2.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mwxlib-1.2.4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.2.4.dist-info/RECORD,,
+mwxlib-1.2.7.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.2.7.dist-info/METADATA,sha256=sEkzDsdCV7wSQmHtCWDZLv9-2pbqdEQ7XvuD_VSyo5o,7258
+mwxlib-1.2.7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mwxlib-1.2.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.2.7.dist-info/RECORD,,