mirror-github-bspeice/libcvautomation
1
0
Fork 0
mirror of https://github.com/bspeice/libcvautomation synced 2025-04-21 00:41:29 -04:00
Code Issues Releases Wiki Activity

Make the "waitfor" command optional

Browse Source
This commit is contained in:
Bradlee Speice 2012-07-20 11:56:23 -04:00
parent 673f302f2d
commit 9685d442d9
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libcvautomation_funcs
View File

@ -159,7 +159,8 @@ click_i ()
TOLERANCE_OPTION="-t" TOLERANCE_OPTION="-t"
fi fi
eval "$CVAINPUT $TOLERANCE_OPTION $TOLERANCE --search-method $SEARCH_METHOD --timeout $TIMEOUT -s 'waitfor $x' >> $OUTFILE" if [ -n "$USE_WAIT" ]; then
waitfor "$x"
CVA_RETURN=$? CVA_RETURN=$?
if [ $CVA_RETURN -lt $RETURN_CODE ]; then if [ $CVA_RETURN -lt $RETURN_CODE ]; then
@ -169,6 +170,16 @@ click_i ()
if [ $CVA_RETURN -eq 0 ]; then if [ $CVA_RETURN -eq 0 ]; then
#We found the image, click it #We found the image, click it
eval "$CVAINPUT $TOLERANCE_OPTION $TOLERANCE --search-method $SEARCH_METHOD -s 'i${center}mouseclick $x' >> $OUTFILE" eval "$CVAINPUT $TOLERANCE_OPTION $TOLERANCE --search-method $SEARCH_METHOD -s 'i${center}mouseclick $x' >> $OUTFILE"
else
return $RETURN_CODE
fi
else
eval "$CVAINPUT $TOLERANCE_OPTION $TOLERANCE --search-method $SEARCH_METHOD -s 'i${center}mouseclick $x' >> $OUTFILE"
CVA_RETURN=$?
if [ $CVA_RETURN -lt $RETURN_CODE ]; then
RETURN_CODE=$CVA_RETURN
fi
fi fi
done done
@ -322,6 +333,7 @@ hover_i ()
TOLERANCE_OPTION="-t" TOLERANCE_OPTION="-t"
fi fi
if [ -n "$USE_WAIT" ]; then
eval "$CVAINPUT $TOLERANCE_OPTION $TOLERANCE --search-method $SEARCH_METHOD --timeout $TIMEOUT -s 'waitfor $x' >> $OUTFILE" eval "$CVAINPUT $TOLERANCE_OPTION $TOLERANCE --search-method $SEARCH_METHOD --timeout $TIMEOUT -s 'waitfor $x' >> $OUTFILE"
CVA_RETURN=$? CVA_RETURN=$?
@ -333,6 +345,14 @@ hover_i ()
#We found the image, click it #We found the image, click it
eval "$CVAINPUT $TOLERANCE_OPTION $TOLERANCE --search-method $SEARCH_METHOD -s '${center}mouseimage $x' >> $OUTFILE" eval "$CVAINPUT $TOLERANCE_OPTION $TOLERANCE --search-method $SEARCH_METHOD -s '${center}mouseimage $x' >> $OUTFILE"
fi fi
else
eval "$CVAINPUT $TOLERANCE_OPTION $TOLERANCE --search-method $SEARCH_METHOD -s '${center}mouseimage $x' >> $OUTFILE"
CVA_RETURN=$?
if [ $CVA_RETURN -lt $RETURN_CODE ]; then
RETURN_CODE=$CVA_RETURN
fi
fi
done done