mwxlib 1.5.0__py3-none-any.whl → 1.5.10__py3-none-any.whl

mwx/matplot2g.py

@@ -109,9 +109,9 @@ def _to_image(src, cutoff=0, threshold=None, binning=1):
 
 def _Property(name):
     return property(
-        lambda self:   getattr(self.parent, name),
-        lambda self,v: setattr(self.parent, name, v),
-        lambda self:   delattr(self.parent, name))
+        lambda self:    getattr(self.parent, name),
+        lambda self, v: setattr(self.parent, name, v),
+        lambda self:    delattr(self.parent, name))
 
 
 class AxesImagePhantom:
@@ -227,7 +227,7 @@ class AxesImagePhantom:
     
     clim = property(
         lambda self: self.__art.get_clim(),
-        lambda self,v: self.__art.set_clim(v),
+        lambda self, v: self.__art.set_clim(v),
         doc="Lower/Upper color limit values of the buffer.")
     
     attributes = property(
@@ -236,12 +236,12 @@ class AxesImagePhantom:
     
     pathname = property(
         lambda self: self.__attributes.get('pathname'),
-        lambda self,v: self.update_attr({'pathname': v}),
+        lambda self, v: self.update_attr({'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_attr({'annotation': v}),
+        lambda self, v: self.update_attr({'annotation': v}),
         doc="Annotation of the buffer.")
     
     @property
@@ -321,9 +321,9 @@ class AxesImagePhantom:
         """Current buffer ROI (region of interest)."""
         if self.parent.region.size:
             nx, ny = self.xytopixel(*self.parent.region)
-            sx = slice(max(0,nx[0]), nx[1]) # nx slice
-            sy = slice(max(0,ny[1]), ny[0]) # ny slice 反転 (降順)
-            return self.__buf[sy,sx]
+            sx = slice(max(0, nx[0]), nx[1])  # nx slice
+            sy = slice(max(0, ny[1]), ny[0])  # ny slice 反転 (降順)
+            return self.__buf[sy, sx]
         return self.__buf
     
     @roi.setter
@@ -342,7 +342,7 @@ class AxesImagePhantom:
     
     def xytoc(self, x, y=None, nearest=True):
         """Convert xydata (x,y) -> data[(x,y)] value of neaerst pixel.
-        if nearest is False, retval is interpolated with spline
+        If `nearest` is False, the return value is interpolated with spline.
         """
         h, w = self.__buf.shape[:2]
         nx, ny = self.xytopixel(x, y, cast=nearest)
@@ -355,7 +355,7 @@ class AxesImagePhantom:
     
     def xytopixel(self, x, y=None, cast=True):
         """Convert xydata (x,y) -> [nx,ny] pixel.
-        If cast, convert pixel-based lengths to pixel numbers.
+        If `cast` is True, the return value will be integer pixel values.
         """
         def _cast(n):
             return np.int32(np.floor(np.round(n, 1)))
@@ -372,7 +372,8 @@ class AxesImagePhantom:
         return (nx-0.5, ny-0.5)
     
     def xyfrompixel(self, nx, ny=None):
-        """Convert pixel [nx,ny] -> (x,y) xydata (float number)."""
+        """Convert pixel [nx,ny] -> (x,y) xydata (float number).
+        """
         if ny is None:
             ## warn("Setting xy data with single tuple.", DeprecationWarning)
             nx, ny = nx
@@ -831,15 +832,6 @@ class GraphPlot(MatplotPanel):
         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):
         """Logical length per pixel arb.unit [u/pixel]."""
@@ -1217,9 +1209,9 @@ class GraphPlot(MatplotPanel):
         If centred, correct the point to the center of the nearest pixel.
         """
         dx, dy = x-xo, y-yo
-        L = np.hypot(dy,dx)
-        a = np.arctan2(dy,dx)
-        aa = np.linspace(-pi,pi,9) + pi/8 # 角度の検索範囲
+        L = np.hypot(dy, dx)
+        a = np.arctan2(dy, dx)
+        aa = np.linspace(-pi, pi, 9) + pi/8 # 角度の検索範囲
         k = np.searchsorted(aa, a)
         x = xo + L * np.cos(aa[k] - pi/8)
         y = yo + L * np.sin(aa[k] - pi/8)
@@ -1413,7 +1405,7 @@ class GraphPlot(MatplotPanel):
             if x.size:
                 self.__rectarts.append(
                   self.axes.add_patch(
-                    patches.Polygon(list(zip(x,y)),
+                    patches.Polygon(list(zip(x, y)),
                       color='red', ls='solid', lw=1/2, ec='white', alpha=0.2)
                   )
                 )
@@ -1458,7 +1450,7 @@ class GraphPlot(MatplotPanel):
         self.__lastpoint = self.calc_point(org.xdata, org.ydata, centred=False)
         if not self.__rectsel:
             x, y = self.__lastpoint
-            self.set_current_rect((x,x), (y,y)) # start new region
+            self.set_current_rect((x, x), (y, y))  # start new region
         self.__orgpoints = self.get_current_rect()
     
     def OnRegionDragMove(self, evt, shift=False, meta=False):
@@ -1477,7 +1469,7 @@ class GraphPlot(MatplotPanel):
                 i = np.searchsorted(nn, n)
                 x = xo + nn[i] * np.sign(x-xo) * ux
                 y = yo + nn[i] * np.sign(y-yo) * uy
-            self.set_current_rect((xo,x), (yo,y))
+            self.set_current_rect((xo, x), (yo, y))
         else:
             xc, yc = self.__lastpoint
             xo, yo = self.__orgpoints
@@ -1612,7 +1604,7 @@ class GraphPlot(MatplotPanel):
         j = self.__marksel
         if j:
             xm, ym = self.marked.get_data(orig=0)
-            xm, ym = np.delete(xm,j), np.delete(ym,j)
+            xm, ym = np.delete(xm, j), np.delete(ym, j)
             self.__marksel = []
             self.marked.set_data(xm, ym)
             n = len(xm)
@@ -1621,7 +1613,7 @@ class GraphPlot(MatplotPanel):
     
     def update_art_of_mark(self, *args):
         if args:
-            for k,x,y in zip(*args):
+            for k, x, y in zip(*args):
                 art = self.__markarts[k] # art の再描画処理をして終了
                 art.xy = x, y
             self.draw(self.marked)
@@ -1632,7 +1624,7 @@ class GraphPlot(MatplotPanel):
         if self.marked.get_visible() and self.handler.current_state in (MARK, MARK+DRAGGING):
             N = self.maxnum_markers
             xm, ym = self.marked.get_data(orig=0)
-            for k, (x,y) in enumerate(zip(xm[:N],ym[:N])):
+            for k, (x, y) in enumerate(zip(xm[:N], ym[:N])):
                 self.__markarts.append(
                   self.axes.annotate(k, #<matplotlib.text.Annotation>
                     xy=(x,y), xycoords='data',

mwx/matplot2lg.py

@@ -217,8 +217,8 @@ class Histogram(LinePlot):
     常に整数ビット画像となるので，高速なビンづめ法で計算する
     
     Attributes:
-       __graphs : list of attached graph <matplot2g.GraphPlot>
-        __frame : reference to the current frame
+        __graphs : list of attached graph <matplot2g.GraphPlot>
+        __frame  : reference to the current frame
     """
     def __init__(self, *args, **kwargs):
         LinePlot.__init__(self, *args, **kwargs)
@@ -356,7 +356,7 @@ class Histogram(LinePlot):
                     i, j = x.searchsorted(self.region)
                 else:
                     i, j = (0, -1)
-                self.__fil.set_xy(list(chain([(x[i],0)], zip(x[i:j],y[i:j]), [(x[j-1],0)])))
+                self.__fil.set_xy(list(chain([(x[i], 0)], zip(x[i:j], y[i:j]), [(x[j-1], 0)])))
             else:
                 self.__fil.set_xy([(0,0)])
         else:
@@ -387,10 +387,10 @@ class LineProfile(LinePlot):
     """LinePlot panel for line profile (Multi-graph : Single-frame)
     
     Attributes:
-       __graphs : list of attached graph <matplot2g.GraphPlot>
-        __frame : reference to the current frame
-       __logicp : line axis in logical unit
-    __linewidth : line width to integrate [pixel]
+        __graphs    : list of attached graph <matplot2g.GraphPlot>
+        __frame     : reference to the current frame
+        __logicp    : line axis in logical unit
+        __linewidth : line width to integrate [pixel]
     """
     def __init__(self, *args, **kwargs):
         LinePlot.__init__(self, *args, **kwargs)
@@ -635,7 +635,7 @@ class LineProfile(LinePlot):
         
         x, y = self.plotdata
         if x.size:
-            self.__fil.set_xy(list(chain([(x[0],0)], zip(x,y), [(x[-1],0)])))
+            self.__fil.set_xy(list(chain([(x[0], 0)], zip(x, y), [(x[-1], 0)])))
         self.writeln()
     
     ## --------------------------------
@@ -723,10 +723,10 @@ class LineProfile(LinePlot):
             ys = np.convolve(window/window.sum(), y, mode='same')
             
             ## maxima = signal.find_peaks_cwt(ys, np.arange(lw,lw*2))
-            maxima,_ = signal.find_peaks(ys, width=lw, prominence=20)
+            maxima, _ = signal.find_peaks(ys, width=lw, prominence=20)
             
             ## minima = signal.find_peaks_cwt(-ys, np.arange(lw,lw*2))
-            minima,_ = signal.find_peaks(-ys, width=lw, prominence=20)
+            minima, _ = signal.find_peaks(-ys, width=lw, prominence=20)
             
             peaks = np.sort(np.append(maxima, minima))
             if peaks.size:

mwx/mgplt.py

@@ -84,7 +84,7 @@ class Gnuplot:
             while len(data) > len(opts): # opts 指定の数が足りない場合 (maybe+1)
                 opts.append("w l")
             
-            pcmd = ["tempfile using 1:{} {}".format(j+2,opt) for j,opt in enumerate(opts)]
+            pcmd = ["tempfile using 1:{} {}".format(j+2, opt) for j, opt in enumerate(opts)]
             data = np.vstack((axis, data))
             with open(self.tempfile, 'w') as o:
                 for v in data.T: