xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dont mess with which pointer is which.. just use index 0 and 1 in gestures

Browse Source
This commit is contained in:
Hannes Janetzek 2013-03-09 12:15:59 +01:00
parent 51d2a845a0
commit 722663c5f8
1 changed files with 29 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
src/org/oscim/view/TouchHandler.java
View File

@ -37,21 +37,14 @@ import android.widget.Scroller;
*/ */
final class TouchHandler implements OnGestureListener, OnDoubleTapListener { final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
//OnScaleGestureListener,
private static final String TAG = TouchHandler.class.getName(); private static final String TAG = TouchHandler.class.getName();
private static final float SCALE_DURATION = 500;
//private static final float ROTATION_DELAY = 200; // ms
private static final int INVALID_POINTER_ID = -1;
private final MapView mMapView; private final MapView mMapView;
private final MapViewPosition mMapPosition; private final MapViewPosition mMapPosition;
private final OverlayManager mOverlayManager; private final OverlayManager mOverlayManager;
private final DecelerateInterpolator mInterpolator; private final DecelerateInterpolator mInterpolator;
//private final DecelerateInterpolator mLinearInterpolator;
private boolean mBeginScale; private boolean mBeginScale;
private float mSumScale; private float mSumScale;
private float mSumRotate; private float mSumRotate;
@ -68,14 +61,9 @@ final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
private double mAngle; private double mAngle;
private int mPointerId1;
private int mPointerId2;
//private final ScaleGestureDetector mScaleGestureDetector;
private final GestureDetector mGestureDetector; private final GestureDetector mGestureDetector;
//private final float dpi; private static final float SCALE_DURATION = 500;
protected static final int JUMP_THRESHOLD = 100; protected static final int JUMP_THRESHOLD = 100;
protected static final double PINCH_ZOOM_THRESHOLD = 5; protected static final double PINCH_ZOOM_THRESHOLD = 5;
protected static final double PINCH_ROTATE_THRESHOLD = 0.02; protected static final double PINCH_ROTATE_THRESHOLD = 0.02;
@ -93,19 +81,10 @@ final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
mMapView = mapView; mMapView = mapView;
mMapPosition = mapView.getMapPosition(); mMapPosition = mapView.getMapPosition();
mOverlayManager = mapView.getOverlayManager(); mOverlayManager = mapView.getOverlayManager();
// ViewConfiguration viewConfiguration = ViewConfiguration.get(context);
// mMapMoveDelta = viewConfiguration.getScaledTouchSlop();
mPointerId1 = INVALID_POINTER_ID;
mPointerId2 = INVALID_POINTER_ID;
//mScaleGestureDetector = new ScaleGestureDetector(context, this);
mGestureDetector = new GestureDetector(context, this); mGestureDetector = new GestureDetector(context, this);
mGestureDetector.setOnDoubleTapListener(this); mGestureDetector.setOnDoubleTapListener(this);
mInterpolator = new DecelerateInterpolator(2f); mInterpolator = new DecelerateInterpolator(2f);
mScroller = new Scroller(mMapView.getContext(), mInterpolator); mScroller = new Scroller(mMapView.getContext(), mInterpolator);
//mLinearInterpolator = new DecelerateInterpolator(0.8f);//new android.view.animation.LinearInterpolator();
} }
/** /**
@ -119,7 +98,6 @@ final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
return true; return true;
mGestureDetector.onTouchEvent(e); mGestureDetector.onTouchEvent(e);
//boolean scaling = false; //mScaleGestureDetector.onTouchEvent(event);
int action = getAction(e); int action = getAction(e);
@ -150,17 +128,14 @@ final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
} }
private boolean onActionCancel() { private boolean onActionCancel() {
mPointerId1 = INVALID_POINTER_ID; //mPointerId1 = INVALID_POINTER_ID;
mLongPress = true; mLongPress = true;
return true; return true;
} }
private boolean onActionMove(MotionEvent e) { private boolean onActionMove(MotionEvent e) {
int id = e.findPointerIndex(mPointerId1); float x1 = e.getX(0);
float y1 = e.getY(0);
float x1 = e.getX(id);
float y1 = e.getY(id);
float mx = x1 - mPrevX; float mx = x1 - mPrevX;
float my = y1 - mPrevY; float my = y1 - mPrevY;
@ -182,21 +157,16 @@ final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
if (Math.abs(mx) > JUMP_THRESHOLD || Math.abs(my) > JUMP_THRESHOLD) if (Math.abs(mx) > JUMP_THRESHOLD || Math.abs(my) > JUMP_THRESHOLD)
return true; return true;
if (mMulti == 0) { if (mMulti == 0)
// reset pinch variables
//mPrevPinchWidth = -1;
return true; return true;
}
// TODO improve gesture recognition, // TODO improve gesture recognition,
// one could check change of rotation / scale within a // one could check change of rotation / scale within a
// given time to estimate if the mode should be changed: // given time to estimate if the mode should be changed:
// http://en.wikipedia.org/wiki/Viterbi_algorithm // http://en.wikipedia.org/wiki/Viterbi_algorithm
int id2 = e.findPointerIndex(mPointerId2); float x2 = e.getX(1);
float y2 = e.getY(1);
float x2 = e.getX(id2);
float y2 = e.getY(id2);
float dx = (x1 - x2); float dx = (x1 - x2);
float dy = (y1 - y2); float dy = (y1 - y2);
@ -241,7 +211,6 @@ final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
if (!mBeginRotate && Math.abs(slope) < 1) { if (!mBeginRotate && Math.abs(slope) < 1) {
float my2 = y2 - mPrevY2; float my2 = y2 - mPrevY2;
float threshold = PINCH_TILT_THRESHOLD; float threshold = PINCH_TILT_THRESHOLD;
//Log.d(TAG, r + " " + slope + " m1:" + my + " m2:" + my2); //Log.d(TAG, r + " " + slope + " m1:" + my + " m2:" + my2);
if ((my > threshold && my2 > threshold) if ((my > threshold && my2 > threshold)
@ -250,10 +219,7 @@ final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
mBeginTilt = true; mBeginTilt = true;
changed = mMapPosition.tilt(my / 5); changed = mMapPosition.tilt(my / 5);
} }
} } else if (!mBeginTilt && (mBeginRotate || Math.abs(r) > PINCH_ROTATE_THRESHOLD)) {
if (!mBeginTilt
&& (mBeginRotate || (Math.abs(slope) > 1 && Math.abs(r) > PINCH_ROTATE_THRESHOLD))) {
//Log.d(TAG, "rotate: " + mBeginRotate + " " + Math.toDegrees(rad)); //Log.d(TAG, "rotate: " + mBeginRotate + " " + Math.toDegrees(rad));
if (!mBeginRotate) { if (!mBeginRotate) {
mAngle = rad; mAngle = rad;
@ -282,15 +248,16 @@ final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
mAngle = rad; mAngle = rad;
} }
if (changed){ if (changed) {
mMapView.redrawMap(true); mMapView.redrawMap(true);
mPrevPinchWidth = pinchWidth; mPrevPinchWidth = pinchWidth;
mPrevX2 = x2;
mPrevY2 = y2;
} }
mPrevX = x1; mPrevX = x1;
mPrevY = y1; mPrevY = y1;
mPrevX2 = x2;
mPrevY2 = y2;
return true; return true;
} }
@ -298,64 +265,47 @@ final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
private int mMulti = 0; private int mMulti = 0;
private boolean mWasMulti; private boolean mWasMulti;
// private long mMultiTouchDownTime;
private boolean onActionPointerDown(MotionEvent event) { private boolean onActionPointerDown(MotionEvent event) {
// mMultiTouchDownTime = event.getEventTime();
mMulti++; mMulti++;
mWasMulti = true; mWasMulti = true;
mSumScale = 1; mSumScale = 1;
if (mMulti == 1) { if (mMulti == 1) {
mPrevX2 = event.getX(1);
int masked = (event.getAction() & MotionEvent.ACTION_POINTER_INDEX_MASK); mPrevY2 = event.getY(1);
int pointerIndex = masked >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
mPointerId2 = event.getPointerId(pointerIndex);
mPrevX2 = event.getX(pointerIndex);
mPrevY2 = event.getY(pointerIndex);
double dx = mPrevX - mPrevX2; double dx = mPrevX - mPrevX2;
double dy = mPrevY - mPrevY2; double dy = mPrevY - mPrevY2;
mAngle = Math.atan2(dy, dx); mAngle = Math.atan2(dy, dx);
mPrevPinchWidth = Math.sqrt(dx * dx + dy * dy); mPrevPinchWidth = Math.sqrt(dx * dx + dy * dy);
} }
// Log.d("...", "mMulti down " + mMulti);
return true; return true;
} }
private boolean onActionPointerUp(MotionEvent e) { private boolean onActionPointerUp(MotionEvent e) {
// extract the index of the pointer that left the touch sensor int cnt = e.getPointerCount();
int masked = (e.getAction() & MotionEvent.ACTION_POINTER_INDEX_MASK);
int pointerIndex = masked >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
if (e.getPointerId(pointerIndex) == mPointerId1) { if (cnt >= 2) {
// the active pointer has gone up, choose a new one mPrevX = e.getX(0);
if (pointerIndex == 0) { mPrevY = e.getY(0);
pointerIndex = 1;
} else {
pointerIndex = 0;
}
// save the position of the event
mPrevX = e.getX(pointerIndex);
mPrevY = e.getY(pointerIndex);
mPointerId1 = e.getPointerId(pointerIndex); mPrevX2 = e.getX(1);
mPrevY2 = e.getY(1);
double dx = mPrevX - mPrevX2;
double dy = mPrevY - mPrevY2;
mAngle = Math.atan2(dy, dx);
mPrevPinchWidth = Math.sqrt(dx * dx + dy * dy);
} }
mMulti--; mMulti--;
if (mMulti == 0){
mPointerId2 = INVALID_POINTER_ID;
}
mLongPress = false; mLongPress = false;
// Log.d("...", "mMulti up " + mMulti);
return true; return true;
} }
@ -367,18 +317,15 @@ final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
mBeginTilt = false; mBeginTilt = false;
mBeginScale = false; mBeginScale = false;
// save the ID of the pointer
mPointerId1 = e.getPointerId(0);
return true; return true;
} }
/** /**
* @param event * @param event
* unused * unused
* @return ... * @return ...
*/ */
private boolean onActionUp(MotionEvent event) { private boolean onActionUp(MotionEvent event) {
mPointerId1 = INVALID_POINTER_ID;
mLongPress = false; mLongPress = false;
mMulti = 0; mMulti = 0;
@ -445,9 +392,6 @@ final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
return true; return true;
} }
// if (mScaling)
// return true;
if (mMulti == 0) { if (mMulti == 0) {
mMapPosition.moveMap(-distanceX, -distanceY); mMapPosition.moveMap(-distanceX, -distanceY);
mMapView.redrawMap(true); mMapView.redrawMap(true);
@ -463,9 +407,6 @@ final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
if (mWasMulti) if (mWasMulti)
return true; return true;
// if (mScaling || mWasMulti)
// return true;
int w = Tile.TILE_SIZE * 6; int w = Tile.TILE_SIZE * 6;
int h = Tile.TILE_SIZE * 6; int h = Tile.TILE_SIZE * 6;
mScrollX = 0; mScrollX = 0;