commit cfb4a648f81f91350d8d40ed835f4ab8babdc7eb
author Charlie Mooney <charliemooney@chromium.org> Thu May 07 15:33:37 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri May 08 18:26:21 2015 +0000
tree f1b41a16c6a14188136d1b40c0b929525e5a9a69
parent c56c8607556354709ee5776b288953b1c4184bb6

Add robot support for "two close fingers" tests

This generalizes the two-finger line tests a bit to allow
the "close" fingers test to work.  This is two 9mm fingertips
just barely separated.

BUG=chromium:474709
TEST=manual

Change-Id: I83c9cf0e68adc7be8a941a1e40d7ee6feeb93feb
Signed-off-by: Charlie Mooney <charliemooney@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/270016

gesture_interpreter.py

diff --git a/gesture_interpreter.py b/gesture_interpreter.py
index 96e851a..8e3a192 100644
--- a/gesture_interpreter.py
+++ b/gesture_interpreter.py
@@ -81,6 +81,11 @@
     tests.ONE_FINGER_TRACKING_FROM_CENTER,
 ]
 
+TWO_FINGER_LINE_TESTS = [
+    tests.TWO_FINGER_TRACKING,
+    tests.TWO_CLOSE_FINGERS_TRACKING,
+]
+
 
 def _ComputePerpendicularAngle(start, end):
   """ Compute the fingertip angle to be perpendicular to the
@@ -119,8 +124,10 @@
   elif test.name in SINGLE_FINGER_LINE_TESTS:
     pause = 1 if test.name == tests.ONE_FINGER_TRACKING_FROM_CENTER else 0
     fn = lambda: _PerformOneFingerLineTest(variation, robot, device_spec, pause)
-  elif test.name == tests.TWO_FINGER_TRACKING:
-    fn = lambda: _PerformTwoFingerLineTest(variation, robot, device_spec)
+  elif test.name in TWO_FINGER_LINE_TESTS:
+    spacing = 0 if test.name == tests.TWO_CLOSE_FINGERS_TRACKING else 5
+    fn = lambda: _PerformTwoFingerLineTest(variation, robot, device_spec,
+                                           spacing_mm=spacing)
   elif test.name == tests.RESTING_FINGER_PLUS_2ND_FINGER_MOVE:
     fn = lambda: _PerformRestingFingerTest(variation, robot, device_spec)
   elif test.name == tests.PINCH_TO_ZOOM:
@@ -169,16 +176,17 @@
   robot.PopSpeed()
 
 
-def _PerformTwoFingerLineTest(variation, robot, device_spec):
+def _PerformTwoFingerLineTest(variation, robot, device_spec, spacing_mm):
   direction, speed = variation
   start, end = LINE_DIRECTION_COORDINATES[direction]
   angle = _ComputePerpendicularAngle(start, end)
 
   fingertips = [robot.fingertips[STANDARD_FINGERTIP],
                 robot.fingertips[STANDARD_SECONDARY_FINGERTIP]]
+
   robot.PushSpeed(SPEEDS[speed])
   robot.Line(device_spec, fingertips, start, end,
-             fingertip_spacing=5, fingertip_angle=angle)
+             fingertip_spacing=spacing_mm, fingertip_angle=angle)
   robot.PopSpeed()