From 42b742781693e6fc41abac183e199a8f3b6bd7dd Mon Sep 17 00:00:00 2001 From: Shivam Dave Date: Wed, 2 Sep 2015 09:14:54 -0700 Subject: [PATCH] [Mobile] Clean up Renamed the setDR to be set Dimensions. Also removed unneeded calculateDistance function. --- .../plot-reborn/src/directives/MCTPlot.js | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/platform/features/plot-reborn/src/directives/MCTPlot.js b/platform/features/plot-reborn/src/directives/MCTPlot.js index e7aee1cdb9..17aa8e397a 100644 --- a/platform/features/plot-reborn/src/directives/MCTPlot.js +++ b/platform/features/plot-reborn/src/directives/MCTPlot.js @@ -273,18 +273,12 @@ define( updateAxesForCurrentViewport(); } - function calculateDistance(coordOne, coordTwo) { - return Math.sqrt(Math.pow(coordOne.clientX - coordTwo.clientX, 2) + - Math.pow(coordOne.clientY - coordTwo.clientY, 2)); - } - - function setDR(midpoint) { + function setDimensions(midpoint) { return { tl: { domain: Math.abs(midpoint.domain - ($scope.viewport.topLeft.domain)), range: Math.abs(midpoint.range - ($scope.viewport.topLeft.range)) }, - br: { domain: Math.abs(($scope.viewport.bottomRight.domain) - midpoint.domain), range: Math.abs(($scope.viewport.bottomRight.range) - midpoint.range) @@ -292,27 +286,27 @@ define( }; } - function calculateViewport(midpoint, touchPosition, ratio) { + function calculateViewport(midpoint, ratio) { var tl, br, - drSet = setDR(midpoint); + dimensions = setDimensions(midpoint); if (ratio < 1) { tl = { - domain: ZOOM_AMT * drSet.tl.domain, - range: ZOOM_AMT * drSet.tl.range + domain: ZOOM_AMT * dimensions.tl.domain, + range: ZOOM_AMT * dimensions.tl.range }; br = { - domain: ZOOM_AMT * drSet.br.domain, - range: ZOOM_AMT * drSet.br.range + domain: ZOOM_AMT * dimensions.br.domain, + range: ZOOM_AMT * dimensions.br.range }; } else if (ratio > 1) { tl = { - domain: - ZOOM_AMT * drSet.tl.domain, - range: - ZOOM_AMT * drSet.tl.range + domain: - ZOOM_AMT * dimensions.tl.domain, + range: - ZOOM_AMT * dimensions.tl.range }; br = { - domain: - ZOOM_AMT * drSet.br.domain, - range: - ZOOM_AMT * drSet.br.range + domain: - ZOOM_AMT * dimensions.br.domain, + range: - ZOOM_AMT * dimensions.br.range }; }