From d3db65418fad8c1640f66f77e8a5d6a686be6c6a Mon Sep 17 00:00:00 2001 From: Tommy Ellqvist Date: Tue, 12 Aug 2014 15:38:20 +0200 Subject: [PATCH 1/3] Fixed 'Create Version' and 'Locate Version' spreadsheet buttons packages/spreadsheet/spreadsheet_cell.py: We should now use locator, not controller, to find the view. Ticket: 893 --- vistrails/packages/spreadsheet/spreadsheet_cell.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vistrails/packages/spreadsheet/spreadsheet_cell.py b/vistrails/packages/spreadsheet/spreadsheet_cell.py index 31f39adf3..a2b8bef39 100644 --- a/vistrails/packages/spreadsheet/spreadsheet_cell.py +++ b/vistrails/packages/spreadsheet/spreadsheet_cell.py @@ -1090,7 +1090,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']) @@ -1109,7 +1109,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() From 8adad9ad867994fb9cd263116cef8c47d0a53848 Mon Sep 17 00:00:00 2001 From: Tommy Ellqvist Date: Tue, 12 Aug 2014 16:01:47 +0200 Subject: [PATCH 2/3] Fixed invalid alias when creating version from PE Bugfix: Alias error when using spreadsheet button "Create Version" --- vistrails/core/paramexplore/paramexplore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vistrails/core/paramexplore/paramexplore.py b/vistrails/core/paramexplore/paramexplore.py index 1520af6f2..8a1de5dee 100644 --- 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 From 2d5494ed1d10df0e2f65a4eca9612a2dfc9050b3 Mon Sep 17 00:00:00 2001 From: Tommy Ellqvist Date: Fri, 22 Aug 2014 15:19:54 +0200 Subject: [PATCH 3/3] Reduced graphics view zoom range to half gui/graphics_view.py: - QInteractiveGraphicsView: Reduced scaling range to half (on a power scale) - QInteractiveGraphicsView.viewPortEvent: Improved pinch gesture scaling Fixed properties not being a Variant after change to API v2 Bugfix: Pinch gesture was broken --- vistrails/gui/graphics_view.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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