ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not use clip_array on scalars (use clip_scalar instead)

Browse Source
This commit is contained in:
Nils Nemitz 2021-03-23 01:08:31 +09:00
parent a1eca4e2dd
commit 2c82a84f68
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyqtgraph/functions.py
View File

@ -998,6 +998,9 @@ def solveBilinearTransform(points1, points2):
return matrix return matrix
def clip_scalar(val, vmin, vmax):
""" convenience function to avoid using np.clip for scalar values """
return vmin if val < vmin else vmax if val > vmax else val
def clip_array(arr, vmin, vmax, out=None): def clip_array(arr, vmin, vmax, out=None):
# replacement for np.clip due to regression in # replacement for np.clip due to regression in

8
pyqtgraph/graphicsItems/PlotDataItem.py
View File

@ -679,8 +679,8 @@ class PlotDataItem(GraphicsObject):
# workaround for slowdown from numpy deprecation issues in 1.17 to 1.20+ # workaround for slowdown from numpy deprecation issues in 1.17 to 1.20+
# x0 = np.clip(int((range.left()-x[0])/dx) - 1*ds, 0, len(x)-1) # x0 = np.clip(int((range.left()-x[0])/dx) - 1*ds, 0, len(x)-1)
# x1 = np.clip(int((range.right()-x[0])/dx) + 2*ds, 0, len(x)-1) # x1 = np.clip(int((range.right()-x[0])/dx) + 2*ds, 0, len(x)-1)
x0 = fn.clip_array(int((range.left()-x[0])/dx) - 1*ds, 0, len(x)-1) x0 = fn.clip_scalar(int((range.left()-x[0])/dx) - 1*ds, 0, len(x)-1)
x1 = fn.clip_array(int((range.right()-x[0])/dx) + 2*ds, 0, len(x)-1) x1 = fn.clip_scalar(int((range.right()-x[0])/dx) + 2*ds, 0, len(x)-1)
# if data has been clipped too strongly (in case of non-uniform # if data has been clipped too strongly (in case of non-uniform
# spacing of x-values), refine the clipping region as required # spacing of x-values), refine the clipping region as required
@ -688,11 +688,11 @@ class PlotDataItem(GraphicsObject):
# best case performance: O(1) # best case performance: O(1)
if x[x0] > range.left(): if x[x0] > range.left():
x0 = np.searchsorted(x, range.left()) - 1*ds x0 = np.searchsorted(x, range.left()) - 1*ds
x0 = fn.clip_array(x0, 0, len(x)) # workaround x0 = fn.clip_scalar(x0, 0, len(x)) # workaround
# x0 = np.clip(x0, 0, len(x)) # x0 = np.clip(x0, 0, len(x))
if x[x1] < range.right(): if x[x1] < range.right():
x1 = np.searchsorted(x, range.right()) + 2*ds x1 = np.searchsorted(x, range.right()) + 2*ds
x1 = fn.clip_array(x1, 0, len(x)) x1 = fn.clip_scalar(x1, 0, len(x))
# x1 = np.clip(x1, 0, len(x)) # x1 = np.clip(x1, 0, len(x))
x = x[x0:x1] x = x[x0:x1]
y = y[x0:x1] y = y[x0:x1]