nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Debug flag" into jb-mr1-dev

main
Satoshi Kataoka 2012-09-11 01:08:35 -07:00 committed by Android (Google) Code Review
parent 41c2765b44 952ec4977d
commit 040f1c50bf
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
native/jni/src/defines.h
View File

@ -220,7 +220,11 @@ static inline void prof_out(void) {
#define DEBUG_CORRECTION_FREQ false #define DEBUG_CORRECTION_FREQ false
#define DEBUG_WORDS_PRIORITY_QUEUE false #define DEBUG_WORDS_PRIORITY_QUEUE false
#ifdef FLAG_FULL_DBG
#define DEBUG_GEO_FULL true
#else
#define DEBUG_GEO_FULL false #define DEBUG_GEO_FULL false
#endif
#else // FLAG_DBG #else // FLAG_DBG

12
native/jni/src/proximity_info_state.cpp
View File

@ -124,8 +124,8 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
const int x = proximityOnly ? NOT_A_COORDINATE : xCoordinates[i]; const int x = proximityOnly ? NOT_A_COORDINATE : xCoordinates[i];
const int y = proximityOnly ? NOT_A_COORDINATE : yCoordinates[i]; const int y = proximityOnly ? NOT_A_COORDINATE : yCoordinates[i];
const int time = times ? times[i] : -1; const int time = times ? times[i] : -1;
if (pushTouchPoint(i, c, x, y, time, isGeometric, i == lastInputIndex, if (pushTouchPoint(i, c, x, y, time, isGeometric /* do sampling */,
currentNearKeysDistances, prevNearKeysDistances, i == lastInputIndex, currentNearKeysDistances, prevNearKeysDistances,
prevPrevNearKeysDistances)) { prevPrevNearKeysDistances)) {
// Previous point information was popped. // Previous point information was popped.
NearKeysDistanceMap *tmp = prevNearKeysDistances; NearKeysDistanceMap *tmp = prevNearKeysDistances;
@ -218,6 +218,10 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
} }
} }
} }
if (DEBUG_GEO_FULL) {
AKLOGI("ProximityState init finished: %d points out of %d", mInputSize, inputSize);
}
} }
bool ProximityInfoState::checkAndReturnIsContinuationPossible(const int inputSize, bool ProximityInfoState::checkAndReturnIsContinuationPossible(const int inputSize,
@ -402,6 +406,10 @@ bool ProximityInfoState::pushTouchPoint(const int inputIndex, const int nodeChar
mInputYs.push_back(y); mInputYs.push_back(y);
mTimes.push_back(time); mTimes.push_back(time);
mInputIndice.push_back(inputIndex); mInputIndice.push_back(inputIndex);
if (DEBUG_GEO_FULL) {
AKLOGI("pushTouchPoint: x = %03d, y = %03d, time = %d, index = %d, popped ? %01d",
x, y, time, inputIndex, popped);
}
return popped; return popped;
} }