Skip to content

Commit

Permalink
scanwidget: fix div by zero rubberband width (closes #335) (4b8fe1e)
Browse files Browse the repository at this point in the history
jordens committed Mar 18, 2016
1 parent 223657f commit d60eaa7
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions artiq/gui/scanwidget.py
Original file line number Diff line number Diff line change
@@ -159,10 +159,13 @@ def mouseReleaseEvent(self, ev):
if self._drag == "zoom":
self._rubber.hide()
left, scale = self._axisView
scale *= self.width()/self._rubber.geometry().width()
center = self._pixelToAxis(self._rubber.geometry().center().x())
if center:
scale = min(scale, self.dynamicRange/abs(center))
if self._rubber.geometry().width():
scale *= self.width()/self._rubber.geometry().width()
if center:
scale = min(scale, self.dynamicRange/abs(center))
elif center:
scale = self.dynamicRange/abs(center)
left = self.width()/2 - center*scale
self._setView(left, scale)
self._drag = None

0 comments on commit d60eaa7

Please sign in to comment.