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

Fix set empty (#1446)

Browse Source 
* changes to setData and dataRect to handle setting empty data

* simplified named argument check

* tests for clearing PlotDataItem by setData() and setData([],[]), commented out vestigal xClean/yClean

* removed last remains of xClean/yClean
This commit is contained in:
Nils Nemitz 2020-11-19 02:31:28 +09:00 committed by GitHub
parent 020b7077cb
commit 6c14204682
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pyqtgraph/graphicsItems/PlotDataItem.py
View File

@ -226,7 +226,6 @@ class PlotDataItem(GraphicsObject):
return
self.opts['fftMode'] = mode
self.xDisp = self.yDisp = None
self.xClean = self.yClean = None
self.updateItems()
self.informViewBoundsChanged()
@ -235,7 +234,6 @@ class PlotDataItem(GraphicsObject):
return
self.opts['logMode'] = [xMode, yMode]
self.xDisp = self.yDisp = None
self.xClean = self.yClean = None
self.updateItems()
self.informViewBoundsChanged()
@ -245,7 +243,6 @@ class PlotDataItem(GraphicsObject):
return
self.opts['derivativeMode'] = mode
self.xDisp = self.yDisp = None
self.xClean = self.yClean = None
self.updateItems()
self.informViewBoundsChanged()
@ -254,7 +251,6 @@ class PlotDataItem(GraphicsObject):
return
self.opts['phasemapMode'] = mode
self.xDisp = self.yDisp = None
self.xClean = self.yClean = None
self.updateItems()
self.informViewBoundsChanged()
@ -470,8 +466,12 @@ class PlotDataItem(GraphicsObject):
if 'x' in kargs:
x = kargs['x']
if dataType(x) == 'MetaArray':
x = x.asarray()
if 'y' in kargs:
y = kargs['y']
if dataType(y) == 'MetaArray':
y = y.asarray()
profiler('interpret data')
## pull in all style arguments.
@ -506,23 +506,22 @@ class PlotDataItem(GraphicsObject):
#self.opts[k] = kargs[k]
#scatterArgs[v] = self.opts[k]
if y is None:
self.updateItems()
profiler('update items')
return
if y is not None and x is None:
x = np.arange(len(y))
if not isinstance(x, np.ndarray):
x = np.array(x)
if not isinstance(y, np.ndarray):
y = np.array(y)
self.xData = x.view(np.ndarray) ## one last check to make sure there are no MetaArrays getting by
self.yData = y.view(np.ndarray)
if y is None or len(y) == 0: # empty data is represented as None
self.yData = None
else: # actual data is represented by ndarray
if not isinstance(y, np.ndarray):
y = np.array(y)
self.yData = y.view(np.ndarray)
if x is None:
x = np.arange(len(y))
if x is None or len(x)==0: # empty data is represented as None
self.xData = None
else: # actual data is represented by ndarray
if not isinstance(x, np.ndarray):
x = np.array(x)
self.xData = x.view(np.ndarray) # one last check to make sure there are no MetaArrays getting by
self._dataRect = None
self.xClean = self.yClean = None
self.xDisp = None
self.yDisp = None
profiler('set data')
@ -683,6 +682,8 @@ class PlotDataItem(GraphicsObject):
return self._dataRect
if self.xData is None or self.yData is None:
return None
if len(self.xData) == 0: # avoid crash if empty data is represented by [] instead of None
return None
with warnings.catch_warnings():
# All-NaN data is handled by returning None; Explicit numpy warning is not needed.
warnings.simplefilter("ignore")
@ -751,8 +752,6 @@ class PlotDataItem(GraphicsObject):
#self.scatters = []
self.xData = None
self.yData = None
#self.xClean = None
#self.yClean = None
self.xDisp = None
self.yDisp = None
self._dataRect = None

14
pyqtgraph/graphicsItems/tests/test_PlotDataItem.py
View File

@ -42,6 +42,11 @@ def test_setData():
pdi.setData(x, y)
assert len(pdi.xData) == 150
assert len(pdi.yData) == 150
#test clear by empty call
pdi.setData()
assert pdi.xData is None
assert pdi.yData is None
#test dict of x, y list
y += list(np.random.normal(size=50))
@ -50,14 +55,19 @@ def test_setData():
assert len(pdi.xData) == 200
assert len(pdi.yData) == 200
#test clear by zero length arrays call
pdi.setData([],[])
assert pdi.xData is None
assert pdi.yData is None
def test_clear():
y = list(np.random.normal(size=100))
x = np.linspace(5, 10, 100)
pdi = pg.PlotDataItem(x, y)
pdi.clear()
assert pdi.xData == None
assert pdi.yData == None
assert pdi.xData is None
assert pdi.yData is None
def test_clear_in_step_mode():
w = pg.PlotWidget()