[sikuli] 354/385: fixed a problem with CheckLastSeen, when a Pattern is used (targetOffset was stripped)

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to tag upstream/1.1.0_beta1
in repository sikuli.

commit d54fc0e24ee02d54a7115681484d95808f7f2b03
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Sun Apr 13 13:02:53 2014 +0200

    fixed a problem with CheckLastSeen, when a Pattern is used (targetOffset was stripped)
---
 API/src/main/java/org/sikuli/script/Region.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/API/src/main/java/org/sikuli/script/Region.java b/API/src/main/java/org/sikuli/script/Region.java
index 870e564..d9a1d00 100644
--- a/API/src/main/java/org/sikuli/script/Region.java
+++ b/API/src/main/java/org/sikuli/script/Region.java
@@ -2219,7 +2219,7 @@ public class Region {
           img = Image.create((String) ptn);
           if (img.isValid()) {
             lastSearchTime = (new Date()).getTime();
-            f = checkLastSeenAndCreateFinder(img, repeating.getFindTimeOut());
+            f = checkLastSeenAndCreateFinder(img, repeating.getFindTimeOut(), null);
             if (!f.hasNext()) {
               f.find(img);
             }
@@ -2238,7 +2238,7 @@ public class Region {
         if (((Pattern) ptn).isValid()) {
           img = ((Pattern) ptn).getImage();
           lastSearchTime = (new Date()).getTime();
-          f = checkLastSeenAndCreateFinder(img, repeating.getFindTimeOut());
+          f = checkLastSeenAndCreateFinder(img, repeating.getFindTimeOut(), (Pattern) ptn);
           if (!f.hasNext()) {
             f.find((Pattern) ptn);
           }
@@ -2249,7 +2249,7 @@ public class Region {
         if (((Image) ptn).isValid()) {
           img = ((Image) ptn);
           lastSearchTime = (new Date()).getTime();
-          f = checkLastSeenAndCreateFinder(img, repeating.getFindTimeOut());
+          f = checkLastSeenAndCreateFinder(img, repeating.getFindTimeOut(), null);
           if (!f.hasNext()) {
             f.find(img);
           }
@@ -2274,12 +2274,16 @@ public class Region {
     return m;
   }
 
-  private Finder checkLastSeenAndCreateFinder(Image img, double findTimeout) {
+  private Finder checkLastSeenAndCreateFinder(Image img, double findTimeout, Pattern ptn) {
     if (!Settings.UseImageFinder && Settings.CheckLastSeen && null != img.getLastSeen()) {
       Region r = Region.create(img.getLastSeen());
       if (this.contains(r)) {
         Finder f = new Finder(new Screen().capture(r), r);
-        f.find(new Pattern(img).similar(Settings.CheckLastSeenSimilar));
+        if (ptn == null) {
+          f.find(new Pattern(img).similar(Settings.CheckLastSeenSimilar));
+        } else {
+          f.find(new Pattern(ptn).similar(Settings.CheckLastSeenSimilar));
+        }
         if (f.hasNext()) {
           log(lvl, "Region: checkLastSeen: still there");
           return f;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git