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

[Mobile] Gestures

Browse Source 
Set the range of difference allowed between
the last distance and current distance to
differenciate panning and zooming. If
lastDistance - 2 <= currentDistance <= lastDistance + 2
than panning occurs, otherwise user is zooming.
BUG: The auto snap to right side of chart causes the
chart to resize narrower overtime and as user BOTH
zooms and pans more.
This commit is contained in:
Shivam Dave 2015-09-01 10:17:53 -07:00
parent 0ac6caa823
commit 2295be5e35
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,9 +328,8 @@ define(
};
}
function updateZoom(midpoint, bounds, touches, distance) {
//console.log("ZOOM");
// calculate offset between points. Apply that offset to viewport.
var midpointPosition = trackTouchPosition(midpoint, bounds),
newMidpointPosition = midpointPosition.positionAsPlotPoint,
@ -339,9 +338,6 @@ define(
distanceRatio = firstTouchDistance / distance,
newViewport = calculateViewport(newMidpointPosition, newTouchPosition, distanceRatio);
//console.log(newViewport);
//$scope.$emit('user:viewport:change:end', newViewport);
$scope.viewport = newViewport;
}
@ -353,6 +349,7 @@ define(
}
function updatePan(touch, bounds) {
//console.log("PAN");
// calculate offset between points. Apply that offset to viewport.
var panPosition = trackTouchPosition(touch, bounds),
newPanPosition = panPosition.positionAsPlotPoint,
@ -386,12 +383,21 @@ define(
}
function comparePinchDrag(distance, firstDistance, lastDistance) {
var amt = 2;
return (((firstDistance += amt) >= distance) && ((firstDistance -= amt) <= distance))
|| (((lastDistance += amt) >= distance) && ((lastDistance -= amt) <= distance));
}
function onPinchChange(event, touch) {
console.log(Math.round(touch.distance));
if(Math.round(firstTouchDistance) === Math.round(touch.distance) ||
Math.round(lastTouchDistance) === Math.round(touch.distance)) {
//console.log(Math.round(touch.distance));
if(comparePinchDrag(Math.round(touch.distance), Math.round(firstTouchDistance),
Math.round(lastTouchDistance))) {
console.log("PAN");
updatePan(touch.midpoint, touch.bounds);
} else {
console.log("ZOOM");
updateZoom(touch.midpoint, touch.bounds, touch.touches, touch.distance);
}
lastTouchDistance = touch.distance;