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

[Mobile, Gestures] Pan

Browse Source 
Added pan file which is based on
PinchGesture. Also made PinchGesture more
DRY. PanGesture, like PinchGesture only
logs the pan coordinates on touch moving.
Added check to pinch and pan to disallow those
gestures in folder representations.
This commit is contained in:
Shivam Dave 2015-08-07 14:16:32 -07:00
parent 113d1c909f
commit 7b371327e6
4 changed files with 95 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/browse/bundle.json
View File

@ -56,7 +56,7 @@
"key": "browse-object",
"templateUrl": "templates/browse-object.html",
"uses": [ "view" ],
"gestures": [ "pinch" ]
"gestures": [ "pinch", "pan" ]
},
{
"key": "create-button",

5
platform/representation/bundle.json
View File

@ -32,6 +32,11 @@
"key": "pinch",
"implementation": "gestures/PinchGesture.js",
"depends": ["$log", "agentService"]
},
{
"key": "pan",
"implementation": "gestures/PanGesture.js",
"depends": ["$log", "agentService"]
}
],
"components": [

73
platform/representation/src/gestures/PanGesture.js Normal file
View File

@ -0,0 +1,73 @@
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
* Open MCT Web is licensed under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* Open MCT Web includes source code licensed under additional open source
* licenses. See the Open Source Licenses file (LICENSES.md) included with
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define,Promise*/
/**
* Module defining DragGesture. Created by vwoeltje on 11/17/14.
*/
define(
['./GestureConstants'],
function (GestureConstants) {
"use strict";
/**
* Add event handlers to a representation such that it may be
* dragged as the source for drag-drop composition.
*
* @constructor
* @param $log Angular's logging service
* @param element the jqLite-wrapped element which should become
* draggable
* @param {DomainObject} domainObject the domain object which
* is represented; this will be passed on drop.
*/
function PanGesture($log, agentService, element, domainObject) {
// Gets name of current domainobject
var currentObjectName = domainObject.getCapability('type').getName();
function trackPosition(event) {
return [event.clientX, event.clientY];
}
function panAction(event) {
if (event.changedTouches.length === 1) {
var touchPos = trackPosition(event.changedTouches[0]);
$log.warn("PAN POS: " + touchPos);
// event.preventDefault();
}
}
if (agentService.isMobile(navigator.userAgent) && currentObjectName !== "Folder") {
element.on('touchstart', panAction);
element.on('touchmove', panAction);
element.on('touchend', panAction);
}
return {
};
}
return PanGesture;
}
);

76
platform/representation/src/gestures/PinchGesture.js
View File

@ -41,79 +41,35 @@ define(
* is represented; this will be passed on drop.
*/
function PinchGesture($log, agentService, element, domainObject) {
var touchOneX,
touchOneY,
touchTwoX,
touchTwoY,
distance;
// Gets name of current domainobject
var currentObjectName = domainObject.getCapability('type').getName();
function trackTouchOne(event) {
if (event) {
touchOneX = event.clientX;
touchOneY = event.clientY;
}
function trackPosition(event) {
return [event.clientX, event.clientY];
}
function trackTouchTwo(event) {
if (event) {
touchTwoX = event.clientX;
touchTwoY = event.clientY;
}
}
function findDistance() {
var squareX = Math.pow(touchOneX - touchTwoX, 2),
squareY = Math.pow(touchOneY - touchTwoY, 2);
// $log.warn(" MATHSQRT(" + squareX + " + " + squareY + ")");
function calculateDistance(coordOne, coordTwo) {
var squareX = Math.pow(coordOne[0] - coordTwo[0], 2),
squareY = Math.pow(coordOne[1] - coordTwo[1], 2);
return Math.sqrt(squareX + squareY);
}
function pinchStartAction(event) {
function pinchAction(event) {
if (event.changedTouches.length === 2) {
trackTouchOne(event.changedTouches[0]);
trackTouchTwo(event.changedTouches[1]);
var touchPosOne = trackPosition(event.changedTouches[0]),
touchPosTwo = trackPosition(event.changedTouches[1]),
distance = calculateDistance(touchPosOne, touchPosTwo);
var distance = findDistance();
$log.warn("START DIST: " + distance);
$log.warn("DIST: " + distance);
event.preventDefault();
}
}
function pinchMoveAction(event) {
if (event.changedTouches.length === 2) {
trackTouchOne(event.changedTouches[0]);
trackTouchTwo(event.changedTouches[1]);
var distance = findDistance();
$log.warn("MOVE DIST: " + distance);
event.preventDefault();
}
}
function pinchEndAction(event) {
if (event.changedTouches.length === 2) {
trackTouchOne(event.changedTouches[0]);
trackTouchTwo(event.changedTouches[1]);
var distance = findDistance();
$log.warn("END DIST: " + distance);
event.preventDefault();
}
}
// Need to start the touch, transition to a touch move,
// Then capture the coordinates during every single touch
// move, updating as movement is done. Keep in mind it is
// two different touches, and therefore 2 sets of coordinates
// Having these two sets allows manipulation and we can also take
// the distance between them and find the difference to then scale and
// accomplish pinch to zoom properly.
if (agentService.isMobile(navigator.userAgent)) {
element.on('touchstart', pinchStartAction);
element.on('touchmove', pinchMoveAction);
element.on('touchend', pinchEndAction);
if (agentService.isMobile(navigator.userAgent) && currentObjectName !== "Folder") {
element.on('touchstart', pinchAction);
element.on('touchmove', pinchAction);
element.on('touchend', pinchAction);
}
return {