commit 5065bcbb8ad027e51c87880924873afe6e1c8e41
author Charlie Mooney <charliemooney@chromium.org> Mon May 04 13:18:09 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Wed May 06 20:20:38 2015 +0000
tree 7968776e1bc80e19a5b87e5c38bc56454678e4f8
parent e9fd656e9c4c9e7bd27d096554f326b61c6565be

Add robot support for the pinch/zoom tests

This CL adds in the robot control scripts and the gesture
interpreter code to enable the touch robot to perform the
pinch & zoom tests.

BUG=chromium:474709
TEST=manual testing

Change-Id: I6f42cbb2450eecbdb3a221499b949cc458da1de8
Signed-off-by: Charlie Mooney <charliemooney@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/269148
Reviewed-by: Shyh-In Hwang <josephsih@chromium.org>

gesture_interpreter.py

diff --git a/gesture_interpreter.py b/gesture_interpreter.py
index d63a4a2..d585469 100644
--- a/gesture_interpreter.py
+++ b/gesture_interpreter.py
@@ -67,6 +67,13 @@
     tests.GV.SLOW: Touchbot.SPEED_SLOW,
 }
 
+PINCH_ANGLES = {
+    tests.GV.HORIZONTAL: 0,
+    tests.GV.VERTICAL: 90,
+    tests.GV.DIAGONAL: 45,
+}
+
+
 SINGLE_FINGER_LINE_TESTS = [
     tests.ONE_FINGER_TO_EDGE,
     tests.ONE_FINGER_TRACKING,
@@ -88,6 +95,8 @@
     fn = lambda: _PerformTwoFingerLineTest(variation, robot, device_spec)
   elif test.name == tests.RESTING_FINGER_PLUS_2ND_FINGER_MOVE:
     fn = lambda: _PerformRestingFingerTest(variation, robot, device_spec)
+  elif test.name == tests.PINCH_TO_ZOOM:
+    fn = lambda: _PerformPinchTest(variation, robot, device_spec)
 
   if fn is None:
     print color.Fore.RED + 'Error: Robot unable to perform gesture!'
@@ -153,3 +162,19 @@
                                  moving_fingertip, start, end,
                                  stationary_location)
   robot.PopSpeed()
+
+def _PerformPinchTest(variation, robot, device_spec):
+  direction, angle = variation
+
+  min_spread = 15
+  max_spread = min(device_spec.Height(), device_spec.Width(),
+                   robot.MAX_FINGER_DISTANCE)
+  if direction == tests.GV.ZOOM_OUT:
+    start_distance, end_distance = max_spread, min_spread
+  else:
+    start_distance, end_distance = min_spread, max_spread
+
+  robot.PushSpeed(SPEEDS[tests.GV.NORMAL])
+  robot.Pinch(device_spec, (CENTER, CENTER), PINCH_ANGLES[angle],
+              start_distance, end_distance)
+  robot.PopSpeed()