Bladeren bron

Remove unused parameter from zoomRequest signal

Martijn Buijs 7 jaren geleden
bovenliggende
commit
fba42e8b02
2 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 1 1
      labelme/app.py
  2. 3 3
      labelme/canvas.py

+ 1 - 1
labelme/app.py

@@ -773,7 +773,7 @@ class MainWindow(QtWidgets.QMainWindow, WindowMixin):
     def addZoom(self, increment=10):
         self.setZoom(self.zoomWidget.value() + increment)
 
-    def zoomRequest(self, delta, pos, globalPos):
+    def zoomRequest(self, delta, pos):
         canvas_width_old = self.canvas.width()
 
         units = delta * 0.1

+ 3 - 3
labelme/canvas.py

@@ -29,7 +29,7 @@ CURSOR_GRAB = QtCore.Qt.OpenHandCursor
 
 
 class Canvas(QtWidgets.QWidget):
-    zoomRequest = QtCore.pyqtSignal(int, QtCore.QPoint, QtCore.QPoint)
+    zoomRequest = QtCore.pyqtSignal(int, QtCore.QPoint)
     scrollRequest = QtCore.pyqtSignal(int, int)
     newShape = QtCore.pyqtSignal()
     selectionChanged = QtCore.pyqtSignal(bool)
@@ -497,7 +497,7 @@ class Canvas(QtWidgets.QWidget):
             if QtCore.Qt.ControlModifier == int(mods):
                 # with Ctrl/Command key
                 # zoom
-                self.zoomRequest.emit(delta.y(), ev.pos(), ev.globalPos())
+                self.zoomRequest.emit(delta.y(), ev.pos())
             else:
                 # scroll
                 self.scrollRequest.emit(delta.x(), QtCore.Qt.Horizontal)
@@ -507,7 +507,7 @@ class Canvas(QtWidgets.QWidget):
                 mods = ev.modifiers()
                 if QtCore.Qt.ControlModifier == int(mods):
                     # with Ctrl/Command key
-                    self.zoomRequest.emit(ev.delta(), ev.pos(), ev.globalPos())
+                    self.zoomRequest.emit(ev.delta(), ev.pos())
                 else:
                     self.scrollRequest.emit(
                         ev.delta(),