Skip to content

Commit

Permalink
Merge pull request #387 from hhslepicka/auto_range_fix
Browse files Browse the repository at this point in the history 
FIX: Waveform and Scatter plots were not respecting user defined limits.
  • Loading branch information
@hhslepicka
hhslepicka authored Aug 22, 2018
2 parents 4f4097d + d0a740c commit e26aad5
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 68 deletions.
42 changes: 28 additions & 14 deletions pydm/widgets/baseplot.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,10 @@ def __init__(self, parent=None, background='default', axisItems=None):
self.setAutoRangeX(True)
self._auto_range_y = None
self.setAutoRangeY(True)
self._min_x = 0.0
self._max_x = 1.0
self._min_y = 0.0
self._max_y = 1.0
self._show_x_grid = None
self.setShowXGrid(False)
self._show_y_grid = None
Expand Down Expand Up @@ -402,7 +406,8 @@ def getAutoRangeX(self):

def setAutoRangeX(self, value):
self._auto_range_x = value
self.plotItem.enableAutoRange(ViewBox.XAxis, enable=self._auto_range_x)
if self._auto_range_x:
self.plotItem.enableAutoRange(ViewBox.XAxis, enable=self._auto_range_x)

def resetAutoRangeX(self):
self.setAutoRangeX(True)
Expand All @@ -412,7 +417,8 @@ def getAutoRangeY(self):

def setAutoRangeY(self, value):
self._auto_range_y = value
self.plotItem.enableAutoRange(ViewBox.YAxis, enable=self._auto_range_y)
if self._auto_range_y:
self.plotItem.enableAutoRange(ViewBox.YAxis, enable=self._auto_range_y)

def resetAutoRangeY(self):
self.setAutoRangeY(True)
Expand All @@ -435,9 +441,10 @@ def setMinXRange(self, new_min_x_range):
-------
new_min_x_range : float
"""
viewRange = self.plotItem.viewRange()
viewRange[0][0] = new_min_x_range
self.plotItem.setXRange(viewRange[0][0], viewRange[0][1], padding=0)
if self._auto_range_x:
return
self._min_x = new_min_x_range
self.plotItem.setXRange(self._min_x, self._max_x, padding=0)

def getMaxXRange(self):
"""
Expand All @@ -457,9 +464,11 @@ def setMaxXRange(self, new_max_x_range):
-------
new_max_x_range : float
"""
viewRange = self.plotItem.viewRange()
viewRange[0][1] = new_max_x_range
self.plotItem.setXRange(viewRange[0][0], viewRange[0][1], padding=0)
if self._auto_range_x:
return

self._max_x = new_max_x_range
self.plotItem.setXRange(self._min_x, self._max_x, padding=0)

def getMinYRange(self):
"""
Expand All @@ -479,9 +488,12 @@ def setMinYRange(self, new_min_y_range):
-------
new_min_y_range : float
"""
viewRange = self.plotItem.viewRange()
viewRange[1][0] = new_min_y_range
self.plotItem.setYRange(viewRange[1][0], viewRange[1][1], padding=0)
if self._auto_range_y:
return

self._min_y = new_min_y_range
self.plotItem.setYRange(self._min_y, self._max_y, padding=0)


def getMaxYRange(self):
"""
Expand All @@ -501,9 +513,11 @@ def setMaxYRange(self, new_max_y_range):
-------
new_max_y_range : float
"""
viewRange = self.plotItem.viewRange()
viewRange[1][1] = new_max_y_range
self.plotItem.setYRange(viewRange[1][0], viewRange[1][1], padding=0)
if self._auto_range_y:
return

self._max_y = new_max_y_range
self.plotItem.setYRange(self._min_y, self._max_y, padding=0)

@pyqtProperty(bool)
def mouseEnabledX(self):
Expand Down
27 changes: 0 additions & 27 deletions pydm/widgets/scatterplot.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,39 +372,12 @@ def removeChannelAtIndex(self, index):
curve = self._curves[index]
self.removeChannel(curve)

def updateAxes(self):
"""
Update the X and Y axes for the plot to fit all data in
all curves for the plot.
"""
plot_xmin = None
plot_xmax = None
plot_ymin = None
plot_ymax = None
for curve in self._curves:
try:
((curve_xmin, curve_xmax),
(curve_ymin, curve_ymax)) = curve.limits()
except NoDataError:
continue
if plot_xmin is None or curve_xmin < plot_xmin:
plot_xmin = curve_xmin
if plot_xmax is None or curve_xmax > plot_xmax:
plot_xmax = curve_xmax
if plot_ymin is None or curve_ymin < plot_ymin:
plot_ymin = curve_ymin
if plot_ymax is None or curve_ymax > plot_ymax:
plot_ymax = curve_ymax
self.plotItem.setLimits(xMin=plot_xmin, xMax=plot_xmax,
yMin=plot_ymin, yMax=plot_ymax)

@pyqtSlot()
def redrawPlot(self):
"""
Request a redraw from each curve in the plot.
Called by curves when they get new data.
"""
self.updateAxes()
for curve in self._curves:
curve.redrawCurve()

Expand Down
27 changes: 0 additions & 27 deletions pydm/widgets/waveformplot.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,32 +397,6 @@ def removeChannelAtIndex(self, index):
def set_needs_redraw(self):
self._needs_redraw = True

def updateAxes(self):
"""
Update the X and Y axes for the plot to fit all data in
all curves for the plot.
"""
plot_xmin = None
plot_xmax = None
plot_ymin = None
plot_ymax = None
for curve in self._curves:
try:
((curve_xmin, curve_xmax),
(curve_ymin, curve_ymax)) = curve.limits()
except NoDataError:
continue
if plot_xmin is None or curve_xmin < plot_xmin:
plot_xmin = curve_xmin
if plot_xmax is None or curve_xmax > plot_xmax:
plot_xmax = curve_xmax
if plot_ymin is None or curve_ymin < plot_ymin:
plot_ymin = curve_ymin
if plot_ymax is None or curve_ymax > plot_ymax:
plot_ymax = curve_ymax
self.plotItem.setLimits(xMin=plot_xmin, xMax=plot_xmax,
yMin=plot_ymin, yMax=plot_ymax)

@pyqtSlot()
def redrawPlot(self):
"""
Expand All @@ -431,7 +405,6 @@ def redrawPlot(self):
"""
if not self._needs_redraw:
return
self.updateAxes()
for curve in self._curves:
curve.redrawCurve()
self._needs_redraw = False
Expand Down

0 comments on commit e26aad5

Please sign in to comment.