Skip to content

Added option click location to refresh window before searching for waitForText and waitForImage #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wzydhek wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added option click location to refresh window before searching for waitForText and waitForImage #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bff975
added click location to refresh window before searching
wzydhek Feb 10, 2016
d5021c4
comment modification
wzydhek Feb 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions scripts/common_wait.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ function iterateImage(args)
local file = args[1];
local range = args[2];
local tol = args[3];
local refresh = args[4];
if refresh ~= nil then
safeclick(refresh[0], refresh[1]);
end
if not tol then
tol = 5000;
end
Expand All @@ -187,6 +191,10 @@ function iterateText(args)
local range = args[2];
local flags = args[3];
local sizemod = args[4];
local refresh = args[5];
if refresh ~= nil then
safeclick(refresh[0], refresh[1]);
end
srReadScreen();
return findText(text, range, flags, sizemod);
end
Expand Down Expand Up @@ -226,7 +234,7 @@ function waitForFunction(f, args, timeout, message, inverted)
end

-------------------------------------------------------------------------------
-- waitForImage(file, timeout, message, range, tol)
-- waitForImage(file, timeout, message, range, tol, refresh)
--
-- Wait for a particular image to appear subject to a timeout in ms.
--
Expand All @@ -235,23 +243,24 @@ end
-- message (optional) -- Status message to show while waiting
-- range (optional) -- box to restrict search
-- tol (optional) -- tolerance for comparison
-- refresh (optional) -- location to click to refresh window before searching
--
-- returns image on success or none on failure
-------------------------------------------------------------------------------

function waitForImage(file, timeout, message, range, tol)
function waitForImage(file, timeout, message, range, tol, refresh)
if not file then
error("Incorrect number of arguments for waitForImage()");
end
if not range then
local size = srGetWindowSize();
range = makeBox(0, 0, size[0], size[1]);
end
return waitForFunction(iterateImage, {file, range, tol}, timeout, message);
return waitForFunction(iterateImage, {file, range, tol, refresh}, timeout, message);
end

-------------------------------------------------------------------------------
-- waitForText(text, timeout, message, range, flags, sizemod)
-- waitForText(text, timeout, message, range, flags, sizemod, refresh)
--
-- Wait for a particular image to appear subject to a timeout in ms.
--
Expand All @@ -261,19 +270,20 @@ end
-- range (optional) -- box to restrict search
-- flags (optional) -- same flags as findText()
-- sizemod (optional) -- same constants as findText()
-- refresh (optional) -- location to click to refresh window before searching
--
-- returns parse object on success or none on failure
-------------------------------------------------------------------------------

function waitForText(text, timeout, message, range, flags, sizemod)
function waitForText(text, timeout, message, range, flags, sizemod, refresh)
if not text then
error("Incorrect number of arguments for waitForText()");
end
return waitForFunction(iterateText, {text, range, flags, sizemod}, timeout, message);
return waitForFunction(iterateText, {text, range, flags, sizemod, refresh}, timeout, message);
end

-------------------------------------------------------------------------------
-- waitForNoText(text, timeout, message, range, flags, sizemod)
-- waitForNoText(text, timeout, message, range, flags, sizemod, refresh)
--
-- Wait for a particular text to disappear subject to a timeout in ms.
--
Expand All @@ -283,15 +293,16 @@ end
-- range (optional) -- box to restrict search
-- flags (optional) -- same flags as findText()
-- sizemod (optional) -- same constants as findText()
-- refresh (optional) -- location to click to refresh window before searching
--
-- returns parse object on success or none on failure
-------------------------------------------------------------------------------

function waitForNoText(text, timeout, message, range, flags, sizemod)
function waitForNoText(text, timeout, message, range, flags, sizemod, refresh)
if not text then
error("Incorrect number of arguments for waitForText()");
end
return waitForFunction(iterateText, {text, range, flags, sizemod}, timeout, message, true);
return waitForFunction(iterateText, {text, range, flags, sizemod, refresh}, timeout, message, true);
end

-------------------------------------------------------------------------------
Expand Down