ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-31 06:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Mobile] Clean up

Browse Source 
Renamed the setDR to be set
Dimensions. Also removed unneeded
calculateDistance function.
This commit is contained in:
Shivam Dave 2015-09-02 09:14:54 -07:00
parent a1b37b1269
commit 42b7427816
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
platform/features/plot-reborn/src/directives/MCTPlot.js
View File

@ -273,18 +273,12 @@ define(
updateAxesForCurrentViewport(); updateAxesForCurrentViewport();
} }
function calculateDistance(coordOne, coordTwo) { function setDimensions(midpoint) {
return Math.sqrt(Math.pow(coordOne.clientX - coordTwo.clientX, 2) +
Math.pow(coordOne.clientY - coordTwo.clientY, 2));
}
function setDR(midpoint) {
return { return {
tl: { tl: {
domain: Math.abs(midpoint.domain - ($scope.viewport.topLeft.domain)), domain: Math.abs(midpoint.domain - ($scope.viewport.topLeft.domain)),
range: Math.abs(midpoint.range - ($scope.viewport.topLeft.range)) range: Math.abs(midpoint.range - ($scope.viewport.topLeft.range))
}, },
br: { br: {
domain: Math.abs(($scope.viewport.bottomRight.domain) - midpoint.domain), domain: Math.abs(($scope.viewport.bottomRight.domain) - midpoint.domain),
range: Math.abs(($scope.viewport.bottomRight.range) - midpoint.range) 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, var tl,
br, br,
drSet = setDR(midpoint); dimensions = setDimensions(midpoint);
if (ratio < 1) { if (ratio < 1) {
tl = { tl = {
domain: ZOOM_AMT * drSet.tl.domain, domain: ZOOM_AMT * dimensions.tl.domain,
range: ZOOM_AMT * drSet.tl.range range: ZOOM_AMT * dimensions.tl.range
}; };
br = { br = {
domain: ZOOM_AMT * drSet.br.domain, domain: ZOOM_AMT * dimensions.br.domain,
range: ZOOM_AMT * drSet.br.range range: ZOOM_AMT * dimensions.br.range
}; };
} else if (ratio > 1) { } else if (ratio > 1) {
tl = { tl = {
domain: - ZOOM_AMT * drSet.tl.domain, domain: - ZOOM_AMT * dimensions.tl.domain,
range: - ZOOM_AMT * drSet.tl.range range: - ZOOM_AMT * dimensions.tl.range
}; };
br = { br = {
domain: - ZOOM_AMT * drSet.br.domain, domain: - ZOOM_AMT * dimensions.br.domain,
range: - ZOOM_AMT * drSet.br.range range: - ZOOM_AMT * dimensions.br.range
}; };
} }