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

[Mobile] Clean Up

Browse Source 
Removed unneeded variables passed into
MCTPlot functions.
This commit is contained in:
Shivam Dave 2015-09-02 09:16:01 -07:00
parent 42b7427816
commit 5a9619ce26
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -322,14 +322,12 @@ define(
};
}
function updateZoom(midpoint, bounds, touches, distance) {
function updateZoom(midpoint, bounds, distance) {
// calculate offset between points. Apply that offset to viewport.
var midpointPosition = trackTouchPosition(midpoint, bounds),
newMidpointPosition = midpointPosition.positionAsPlotPoint,
newTouchPosition = [trackTouchPosition(touches[0], bounds).positionAsPlotPoint,
trackTouchPosition(touches[1], bounds).positionAsPlotPoint],
distanceRatio = lastTouchDistance / distance || firstTouchDistance / distance,
newViewport = calculateViewport(newMidpointPosition, newTouchPosition, distanceRatio);
distanceRatio = (lastTouchDistance / distance) || (firstTouchDistance / distance),
newViewport = calculateViewport(newMidpointPosition, distanceRatio);
$scope.viewport = newViewport;
}
@ -382,15 +380,14 @@ define(
}
function onPinchChange(event, touch) {
console.log(Math.round(touch.distance));
if(comparePinchDrag(Math.round(touch.distance), Math.round(firstTouchDistance),
if(comparePinchDrag(Math.round(touch.distance),
Math.round(firstTouchDistance),
Math.round(lastTouchDistance))) {
//console.log("# PINCH PAN");
updatePan(touch.midpoint, touch.bounds);
} else {
//console.log("# PINCH ZOOM");
updateZoom(touch.midpoint, touch.bounds, touch.touches, touch.distance);
updateZoom(touch.midpoint, touch.bounds, touch.distance);
}
lastTouchDistance = touch.distance;
}
@ -403,7 +400,7 @@ define(
updatePan(touch.touch, touch.bounds);
}
function onTouchEnd(event) {
function onTouchEnd() {
endTouch();
}