Skip to content
Snippets Groups Projects
Commit 4168bf23 authored by Paul McCarthy's avatar Paul McCarthy
Browse files

HistogramSeries data range is exclusive on the upper bound, to match the

behaviour of the MaskOpts.threshold property (the two are synced when a
3D histogram overlay is displayed)
parent 3e366430
No related branches found
No related tags found
No related merge requests found
...@@ -130,15 +130,16 @@ class HistogramSeries(plotpanel.DataSeries): ...@@ -130,15 +130,16 @@ class HistogramSeries(plotpanel.DataSeries):
finData = data[np.isfinite(data)] finData = data[np.isfinite(data)]
dmin = finData.min() dmin = finData.min()
dmax = finData.max() dmax = finData.max()
dist = (dmax - dmin) / 10000.0
nzData = finData[finData != 0] nzData = finData[finData != 0]
nzmin = nzData.min() nzmin = nzData.min()
nzmax = nzData.max() nzmax = nzData.max()
self.dataRange.xmin = dmin self.dataRange.xmin = dmin
self.dataRange.xmax = dmax self.dataRange.xmax = dmax + dist
self.dataRange.xlo = nzmin self.dataRange.xlo = nzmin
self.dataRange.xhi = nzmax self.dataRange.xhi = nzmax + dist
self.nbins = autoBin(nzData, self.dataRange.x) self.nbins = autoBin(nzData, self.dataRange.x)
...@@ -185,9 +186,9 @@ class HistogramSeries(plotpanel.DataSeries): ...@@ -185,9 +186,9 @@ class HistogramSeries(plotpanel.DataSeries):
nzData = self.nonZeroData nzData = self.nonZeroData
self.clippedFiniteData = finData[(finData >= self.dataRange.xlo) & self.clippedFiniteData = finData[(finData >= self.dataRange.xlo) &
(finData <= self.dataRange.xhi)] (finData < self.dataRange.xhi)]
self.clippedNonZeroData = nzData[ (nzData >= self.dataRange.xlo) & self.clippedNonZeroData = nzData[ (nzData >= self.dataRange.xlo) &
(nzData <= self.dataRange.xhi)] (nzData < self.dataRange.xhi)]
if callHistPropsChanged: if callHistPropsChanged:
self.histPropsChanged() self.histPropsChanged()
...@@ -308,6 +309,10 @@ class HistogramSeries(plotpanel.DataSeries): ...@@ -308,6 +309,10 @@ class HistogramSeries(plotpanel.DataSeries):
def getData(self): def getData(self):
if len(self.xdata) == 0 or \
len(self.ydata) == 0:
return self.xdata, self.ydata
# If smoothing is not enabled, we'll # If smoothing is not enabled, we'll
# munge the histogram data a bit so # munge the histogram data a bit so
# that plt.plot(drawstyle='steps-pre') # that plt.plot(drawstyle='steps-pre')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment