From fc60f3504c74a942e29e824de6b01bb23b9461ca Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Mon, 14 Mar 2016 18:06:18 +0100
Subject: [PATCH] scanwidget: wheel event handling cleanup (380634e)

---
 artiq/gui/scanwidget.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/artiq/gui/scanwidget.py b/artiq/gui/scanwidget.py
index b04a2008e..6edb57fdd 100644
--- a/artiq/gui/scanwidget.py
+++ b/artiq/gui/scanwidget.py
@@ -364,7 +364,7 @@ class ScanWidget(QtWidgets.QWidget):
             return
         self.setView(newLeft, newScale)
 
-    def _wheelEvent(self, ev):
+    def wheelEvent(self, ev):
         y = ev.angleDelta().y()
         if ev.modifiers() & QtCore.Qt.ShiftModifier:
             # If shift+scroll, modify number of points.
@@ -405,7 +405,7 @@ class ScanWidget(QtWidgets.QWidget):
 
     def eventFilter(self, obj, ev):
         if ev.type() == QtCore.QEvent.Wheel:
-            self._wheelEvent(ev)
+            ev.ignore()
             return True
         if ev.type() == QtCore.QEvent.Resize:
             ev.ignore()