Merge branch 'v2.1'

VisTrails · Aug 22, 2014 · e19cc7d · e19cc7d
2 parents 0db0675 + 2d5494e
commit e19cc7d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/vistrails/core/paramexplore/paramexplore.py b/vistrails/core/paramexplore/paramexplore.py
@@ -236,7 +236,7 @@ def collectParameterActions(self, pipeline):
                     new_param = ModuleParam(id=tmp_p_id,
                                             pos=old_param.pos,
                                             name=old_param.name,
-                                            alias=pe_function.is_alias,
+                                            alias=old_param.alias,
                                             val=str_value,
                                             type=old_param.type)
                     tmp_p_id -= 1

diff --git 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

diff --git a/vistrails/packages/spreadsheet/spreadsheet_cell.py b/vistrails/packages/spreadsheet/spreadsheet_cell.py
@@ -1187,7 +1187,7 @@ def updateVersion(self):
                                                         self.cellInfo[2])
             if info:
                 info = info[0]
-                view = builderWindow.ensureController(info['controller'])
+                view = builderWindow.ensureVistrail(info['locator'])
                 if view:
                     controller = view.controller
                     controller.change_selected_version(info['version'])
@@ -1206,7 +1206,7 @@ def locateVersion(self):
                                                         self.cellInfo[2])
             if info:
                 info = info[0]
-                view = builderWindow.ensureController(info['controller'])
+                view = builderWindow.ensureVistrail(info['locator'])
                 if view:
                     view.version_selected(info['version'], True)
                     view.version_view.select_current_version()