diff --git a/vistrails/gui/graphics_view.py b/vistrails/gui/graphics_view.py index d20b9c123..39171f30b 100644 --- a/vistrails/gui/graphics_view.py +++ b/vistrails/gui/graphics_view.py @@ -234,8 +234,8 @@ def __init__(self, parent=None): self.setRenderHints (QtGui.QPainter.Antialiasing | QtGui.QPainter.TextAntialiasing | QtGui.QPainter.SmoothPixmapTransform) - self.scaleMax = 2000 - self.scaleRatio = self.scaleMax/10 + self.scaleMax = 1000 + self.scaleRatio = self.scaleMax/5 self.currentScale = self.scaleMax/2 self.startScroll = (0,0) self.lastPos = QtCore.QPoint(0,0) @@ -274,8 +274,8 @@ def viewportEvent(self, event): if changeFlags & QtGui.QPinchGesture.ScaleFactorChanged: if self.gestureStartScale is None: self.gestureStartScale = self.currentScale - newScale = self.gestureStartScale * \ - pinch.property("scaleFactor").toReal()[0] + newScale = self.gestureStartScale + self.scaleMax * \ + math.log(pinch.property("scaleFactor"))/2 # Clamp the scale if newScale<0: newScale = 0 if newScale>self.scaleMax: newScale = self.scaleMax