mwxlib 1.2.0__py3-none-any.whl → 1.2.4__py3-none-any.whl

mwx/framework.py

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

mwx/matplot2.py

@@ -348,22 +348,22 @@ class MatplotPanel(wx.Panel):
     xbound = property(
         lambda self: np.array(self.axes.get_xbound()),
         lambda self,v: self.axes.set_xbound(v),
-        doc="x-axis numerical bounds where lowerBound < upperBound)")
+        doc="X-axis numerical bounds where lowerBound < upperBound)")
     
     ybound = property(
         lambda self: np.array(self.axes.get_ybound()),
         lambda self,v: self.axes.set_ybound(v),
-        doc="y-axis numerical bounds where lowerBound < upperBound)")
+        doc="Y-axis numerical bounds where lowerBound < upperBound)")
     
     xlim = property(
         lambda self: np.array(self.axes.get_xlim()),
         lambda self,v: self.axes.set_xlim(v),
-        doc="x-axis range [left, right]")
+        doc="X-axis range [left, right]")
     
     ylim = property(
         lambda self: np.array(self.axes.get_ylim()),
         lambda self,v: self.axes.set_ylim(v),
-        doc="y-axis range [bottom, top]")
+        doc="Y-axis range [bottom, top]")
     
     @property
     def ddpu(self):

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
@@ -73,22 +73,20 @@ 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:list is specified.
+    if hasattr(cutoff, '__iter__'): # cutoff vlim: (vmin, vmax) is specified.
         a, b = cutoff
     elif cutoff > 0:
         a = np.percentile(src, cutoff)
@@ -99,10 +97,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):
@@ -129,7 +127,7 @@ class AxesImagePhantom:
     """
     def __init__(self, parent, buf, name, show=True,
                  localunit=None, aspect=1.0, **attributes):
-        self.__owner = parent
+        self.parent = parent
         self.__name = name
         self.__localunit = localunit or None # [+] value, no assertion
         self.__aspect_ratio = aspect
@@ -141,7 +139,7 @@ class AxesImagePhantom:
              threshold = self.parent.nbytes_threshold,
         )
         self.__bins = bins
-        self.__vlim = vlim
+        self.__cuts = vlim
         self.__art = parent.axes.imshow(img,
                   cmap = cm.gray,
                 aspect = 'equal',
@@ -155,41 +153,9 @@ 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
     
-    parent = property(lambda self: self.__owner)
-    artist = property(lambda self: self.__art)
-    name = property(lambda self: self.__name)
-    buffer = property(lambda self: self.__buf)  # buffer.setter is defined below.
-    binning = property(lambda self: self.__bins)
-    
-    image = property(
-        lambda self: self.__art.get_array(),
-        doc="A displayed image array<uint8>.")
-    
-    vlim = property(
-        lambda self: self.__vlim,
-        doc="Image lower/upper values.")
-    
-    clim = property(
-        lambda self: self.__art.get_clim(),
-        lambda self,v: self.__art.set_clim(v),
-        doc="Buffer lower/upper values.")
-    
-    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}),
-        doc="A fullpath of buffer, when bounds to file.")
-    
-    annotation = property(
-        lambda self: self.__attributes.get('annotation', ''),
-        lambda self,v: self.update_attributes({'annotation': v}),
-        doc="Annotation of the buffer.")
-    
     def update_attributes(self, attr=None, **kwargs):
         """Update frame-specifc attributes.
         The frame holds any attributes with dictionary
@@ -215,10 +181,70 @@ class AxesImagePhantom:
         if {'pathname', 'annotation'} & attr.keys():
             self.parent.handler('frame_updated', self)
     
+    def update_buffer(self, buf=None):
+        """Update buffer and the image (internal use only)."""
+        if buf is not None:
+            self.__buf = _to_buffer(buf)
+        
+        bins, vlim, img = _to_image(self.__buf,
+                cutoff = self.parent.score_percentile,
+             threshold = self.parent.nbytes_threshold,
+        )
+        self.__bins = bins
+        self.__cuts = vlim
+        self.__art.set_array(img)
+        self.parent.handler('frame_modified', self)
+    
+    def update_extent(self):
+        """Update logical extent of the image (internal use only)."""
+        h, w = self.__buf.shape[:2]
+        ux, uy = self.xy_unit
+        w *= ux/2
+        h *= uy/2
+        self.__art.set_extent((-w,w,-h,h))
+    
     selector = _Property('Selector')
     markers = _Property('Markers')
     region = _Property('Region')
     
+    artist = property(
+        lambda self: self.__art)
+    
+    binning = property(
+        lambda self: self.__bins,
+        doc="Binning value resulting from the score_percentile.")
+    
+    cuts = property(
+        lambda self: self.__cuts,
+        doc="Lower/Upper cutoff values of the buffer.")
+    
+    image = property(
+        lambda self: self.__art.get_array(),
+        doc="Displayed image array<uint8>.")
+    
+    clim = property(
+        lambda self: self.__art.get_clim(),
+        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}),
+        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}),
+        doc="Annotation of the buffer.")
+    
+    @property
+    def name(self):
+        return self.__name
+    
     @name.setter
     def name(self, v):
         self.__name = v
@@ -278,28 +304,6 @@ class AxesImagePhantom:
         """Page number in the parent book."""
         return self.parent.index(self)
     
-    def update_buffer(self, buf=None):
-        """Update buffer and the image (internal use only)."""
-        if buf is not None:
-            self.__buf = _to_buffer(buf)
-        
-        bins, vlim, img = _to_image(self.__buf,
-                cutoff = self.parent.score_percentile,
-             threshold = self.parent.nbytes_threshold,
-        )
-        self.__bins = bins
-        self.__vlim = vlim
-        self.__art.set_array(img)
-        self.parent.handler('frame_modified', self)
-    
-    def update_extent(self):
-        """Update logical extent of the image (internal use only)."""
-        h, w = self.__buf.shape[:2]
-        ux, uy = self.xy_unit
-        w *= ux/2
-        h *= uy/2
-        self.__art.set_extent((-w,w,-h,h))
-    
     @property
     def roi(self):
         """Current buffer ROI (region of interest)."""
@@ -315,9 +319,14 @@ class AxesImagePhantom:
         self.roi[:] = v # cannot broadcast input array into different shape
         self.update_buffer()
     
+    @property
+    def buffer(self):
+        return self.__buf
+    
     @buffer.setter
     def buffer(self, v):
         self.update_buffer(v)
+        self.update_extent()
     
     def xytoc(self, x, y=None, nearest=True):
         """Convert xydata (x,y) -> data[(x,y)] value of neaerst pixel.
@@ -618,12 +627,13 @@ class GraphPlot(MatplotPanel):
                 - aspect    : aspect ratio
                 - pathname  : full path of the buffer file
         """
-        if buf is None:
-            return
-        
         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]
@@ -687,9 +697,6 @@ 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):
@@ -699,14 +706,14 @@ class GraphPlot(MatplotPanel):
             except ValueError:
                 return self.load(v, name=j) # new buffer
         
-        if hasattr(j, '__iter__') or isinstance(j, slice):
-            raise ValueError("attempt to assign buffers into slice")
+        if isinstance(j, slice):
+            raise ValueError("attempt to assign buffers via slicing")
         
         if v is None:
-            self.__delitem__(j)
+            raise ValueError("values must be buffers, not NoneType.")
         else:
             art = self.__Arts[j]
-            art.update_buffer(v)
+            art.update_buffer(v) # update buffer
             art.update_extent()
             self.select(j)
     
@@ -714,9 +721,7 @@ class GraphPlot(MatplotPanel):
         if isinstance(j, str):
             j = self.index(j)
         
-        if hasattr(j, '__iter__'):
-            arts = [self.__Arts[i] for i in j]
-        elif isinstance(j, slice):
+        if isinstance(j, slice):
             arts = self.__Arts[j]
         else:
             arts = [self.__Arts[j]]
@@ -784,16 +789,27 @@ class GraphPlot(MatplotPanel):
         if self.__Arts and self.__index is not None:
             return self.__Arts[self.__index]
     
-    buffer = property(
-        lambda self: self.frame and self.frame.buffer,
-        lambda self,v: self.__setitem__(self.__index, v),
-        lambda self: self.__delitem__(self.__index),
-        doc="current buffer array")
+    @property
+    def buffer(self):
+        """Current buffer array."""
+        if self.frame:
+            return self.frame.buffer
     
-    newbuffer = property(
-        lambda self: None,
-        lambda self,v: self.load(v),
-        doc="new buffer loader")
+    @buffer.setter
+    def buffer(self, v):
+        if self.frame:
+            self.__setitem__(self.__index, v)
+        else:
+            self.load(v)
+    
+    @property
+    def newbuffer(self):
+        """New buffer loader."""
+        return None
+    
+    @newbuffer.setter
+    def newbuffer(self, v):
+        self.load(v)
     
     @property
     def unit(self):
@@ -816,8 +832,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[:]
@@ -951,7 +967,7 @@ class GraphPlot(MatplotPanel):
             data = frame.roi
             GraphPlot.clipboard_name = name
             GraphPlot.clipboard_data = data
-            bins, vlim, img = _to_image(data, frame.vlim)
+            bins, vlim, img = _to_image(data, frame.cuts)
             Clipboard.imwrite(img)
             self.message("Write buffer to clipboard.")
         except Exception as e:

mwx/nutshell.py

@@ -33,7 +33,8 @@ from .framework import CtrlInterface, AuiNotebook, Menu
 
 
 ## URL pattern (flag = re.M | re.A)
-url_re = r"https?://[\w/:%#$&?()~.=+-]+"
+## url_re = r"https?://[\w/:%#$&?()~.=+-]+"
+url_re = r"https?://[\w/:%#$&?~.=+-]+"  # excluding ()
 
 ## no-file pattern
 nofile_re = r'[\/:*?"<>|]'
@@ -630,7 +631,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         
         ## Custom indicators ([BUG] indicator=1 is reset when the buffer is udpated.)
         ## [10-11] filter_text
-        ## [2] URL for load_file
+        ## [2] URL
         ## [3] match_paren
         self.IndicatorSetStyle(10, stc.STC_INDIC_TEXTFORE)
         self.IndicatorSetForeground(10, "red")
@@ -1725,16 +1726,15 @@ class Buffer(EditorInterface, EditWindow):
         self.__path = Path(fn)
         if self.__path.is_file():
             self.__mtime = self.__path.stat().st_mtime # update timestamp (modified time)
+        elif re.match(url_re, fn):
+            self.__mtime = -1
         else:
-            if re.match(url_re, fn):
-                self.__mtime = -1
-            else:
-                try:
-                    self.__path.resolve(True) # Check if the path format is valid.
-                except FileNotFoundError:
-                    self.__mtime = False
-                except Exception:
-                    self.__mtime = None
+            try:
+                self.__path.resolve(True) # Check if the path format is valid.
+            except FileNotFoundError:
+                self.__mtime = False # valid path (but not found)
+            except OSError:
+                self.__mtime = None # *invalid path*
         if self.__filename != fn:
             self.__filename = fn
             self.update_caption()
@@ -1751,10 +1751,11 @@ class Buffer(EditorInterface, EditWindow):
         """
         try:
             return self.__path.stat().st_mtime - self.__mtime
-        except Exception:
-            if isinstance(self.__mtime, float): # path not resolved.
-                self.__mtime = False
-            return self.__mtime
+        except FileNotFoundError:
+            self.__mtime = False  # valid path (but not found)
+        except OSError:
+            pass
+        return self.__mtime
     
     @property
     def need_buffer_save(self):
@@ -1962,20 +1963,20 @@ class Buffer(EditorInterface, EditWindow):
             ## Processing text selection, dragging, or dragging+
             evt.Skip()
             return
+        
         pos = evt.Position
+        self.goto_char(pos) # Clear selection
         i = 2
         if self.IndicatorValueAt(i, pos): # [C-indic click]
             p = self.IndicatorStart(i, pos)
             q = self.IndicatorEnd(i, pos)
             url = self.GetTextRange(p, q).strip()
-            self.message("URL {!r}".format(url))
             if wx.GetKeyState(wx.WXK_SHIFT): # [C-S-indic click]
                 import webbrowser
                 return webbrowser.open(url)
             else:
                 ## Note: post-call for the confirmation dialog.
                 wx.CallAfter(self.parent.load_file, url)
-        self.anchor = pos # Clear selection
     
     def on_modified(self, buf):
         """Called when the buffer is modified."""
@@ -2416,8 +2417,8 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     buf._load_textfile(res.text, filename)
                     self.swap_buffer(buf, lineno)
                     return True
-                return False
-                ## raise Exception("The requested URL was not found", filename)
+                ## raise Exception("URL not found:", filename)
+                res.raise_for_status()  # raise HTTP error
             if buf._load_file(filename):
                 self.swap_buffer(buf, lineno)
                 return True

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.0.dist-info → mwxlib-1.2.4.dist-info}/METADATA

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

{mwxlib-1.2.0.dist-info → mwxlib-1.2.4.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=8QHKtncqf_ip6BkcVA9CFttFFsjw4EgxEkT9efltECg,76125
+mwx/framework.py,sha256=8Vh1Tkqod9sWp81ObY5Ofcqto_UJerT_VtEgA97huoA,76125
 mwx/graphman.py,sha256=RqD0W9I2BvJ3Q2kyMiyyg4n-T4-_x7PDuCI5bGAg5k4,70110
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
-mwx/matplot2.py,sha256=RuVWXC2A_qgZRNmBBptbHDn5MyxaWBqp3ru4bP_lDE0,33150
-mwx/matplot2g.py,sha256=dBAODQvSM_yf2uQUCrRO03ZOK3MycR8lEXTJfRXDlbY,64432
+mwx/matplot2.py,sha256=Zwte-wwzCg_OHzsBniVgKdaNLzsvJaa1gc0n7VdAqxw,33150
+mwx/matplot2g.py,sha256=tp0KD_dqDgupTVROY4YFZyfvHS_d21w4uS3x0Sd_zSA,64643
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=8mXbHpCmm7lz3XbAxOg7IVC7DaSGBEby1UfTlMl9kjk,5604
-mwx/nutshell.py,sha256=qPMOa4froZAhslacI2Oz_Xhe99zU6ucgh42zwe3sKxQ,140838
+mwx/nutshell.py,sha256=7nQ7UUFM9kvjDjHNUEdOkkeqZPiU6zOERwamqBdJpQs,140856
 mwx/testsuite.py,sha256=kiM3-BVhr42LRRN7xG7pYl3at8o2vnypWSxD8KRvA7c,1228
 mwx/utilus.py,sha256=HFvP682SyeSp8yNfUrdUXPhWdLuWVlsUSg6LqNBJOT8,37451
 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.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.2.0.dist-info/METADATA,sha256=0hdCtq1FWS8gy0i8hVk3Yslu0L7fmOp9ZBoxc0QVIlQ,7258
-mwxlib-1.2.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mwxlib-1.2.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.2.0.dist-info/RECORD,,
+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,,