alihan/SikuliX1-gui-automation
1
0
Fork 0
mirror of https://github.com/RaiMan/SikuliX1.git synced 2023-06-02 10:04:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

revised: Finder: some refactoring

Browse Source
This commit is contained in:
RaiMan
2020-01-03 11:41:17 +01:00
parent ef8aff8ad3
commit dff352c57d
1 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
API/src/main/java/org/sikuli/script/Finder.java
View File

@@ -1529,6 +1529,7 @@ public class Finder implements Iterator<Match> {
int matchCount = -1;
int lastMatchCount = -1;
boolean currentIsMatch = false;
List<Point> matchRectangles = new ArrayList<>();
private int currentX = -1;
private int currentY = -1;
@@ -1543,10 +1544,17 @@ public class Finder implements Iterator<Match> {
return false;
}
if (matchCount < 0 || matchCount > lastMatchCount) {
resultMinMax = Core.minMaxLoc(result);
currentScore = resultMinMax.maxVal;
currentX = (int) resultMinMax.maxLoc.x;
currentY = (int) resultMinMax.maxLoc.y;
Rectangle currentRect;
while (true) {
resultMinMax = Core.minMaxLoc(result);
currentScore = resultMinMax.maxVal;
currentX = (int) resultMinMax.maxLoc.x;
currentY = (int) resultMinMax.maxLoc.y;
currentRect = new Rectangle(currentX, currentY, targetW, targetH);
if (isMatchValid()) {
break;
}
}
}
boolean isMatch = false;
if (matchCount < 0) {
@@ -1562,10 +1570,10 @@ public class Finder implements Iterator<Match> {
}
} else {
double scoreDiff = lastScore - currentScore;
scoreMeanDiff = ((scoreMeanDiff * matchCount) + scoreDiff) / (matchCount + 1);
if (findInput.isPattern && currentScore > targetScore) {
isMatch = true;
} else if (scoreDiff <= (scoreMeanDiff + 0.02)) {
scoreMeanDiff = ((scoreMeanDiff * matchCount) + scoreDiff) / (matchCount + 1);
isMatch = true;
}
}
@@ -1579,6 +1587,35 @@ public class Finder implements Iterator<Match> {
return currentIsMatch = isMatch;
}
private boolean isMatchValid() {
Rectangle currentRect = new Rectangle(currentX, currentY, targetW, targetH);
for (Point point : matchRectangles) {
Rectangle rect = new Rectangle((int) point.x, (int) point.y, targetW, targetH);
boolean isIntersecting = currentRect.intersects(rect);
matchRectangles.add(point);
if (isIntersecting) {
purgeMatchResult(false);
return false;
}
}
purgeMatchResult(true);
return true;
}
private void purgeMatchResult(boolean withMargin) {
int margin = 0;
if (withMargin) {
int targetSize = (targetW + targetH) / 2;
int range = 11 - ((int) (currentScore * 10));
margin = 20 + 10 * range;
}
Range rangeX = new Range(Math.max(currentX - margin, 0),
Math.min(currentX + targetW, result.width()));
Range rangeY = new Range(Math.max(currentY - margin, 0),
Math.min(currentY + targetH, result.height()));
result.colRange(rangeX).rowRange(rangeY).setTo(new Scalar(-1));
}
public Match next() {
Match match = null;
if (hasNext()) {
@@ -1591,23 +1628,11 @@ public class Finder implements Iterator<Match> {
lastMatchCount = matchCount;
matchCount++;
lastScore = currentScore;
int margin = getPurgeMargin();
Range rangeX = new Range(Math.max(currentX - margin, 0),
Math.min(currentX + targetW, result.width()));
Range rangeY = new Range(Math.max(currentY - margin, 0),
Math.min(currentY + targetH, result.height()));
result.colRange(rangeX).rowRange(rangeY).setTo(new Scalar(0f));
}
}
return match;
}
private int getPurgeMargin() {
int targetSize = (targetW + targetH) / 2;
int range = 11 -((int) (currentScore * 10));
return 20 + 10 * range;
}
double bestScore = 0;
double meanScore = 0;
double stdDevScore = 0;