上传备份

master
王兵 2 weeks ago
parent eed73bfe88
commit 6ac3a4f00a

@ -451,7 +451,7 @@ public abstract class JMacro {
* @param minSimilar * @param minSimilar
* @return * @return
*/ */
public Region[] matchLegends(String[] legends, double minSimilar) { public Region[] findLegends(String[] legends, double minSimilar) {
Region[] viewRects = new Region[legends.length]; Region[] viewRects = new Region[legends.length];
for (int i = 0; i < legends.length; i++) { for (int i = 0; i < legends.length; i++) {
String legend = legends[i]; String legend = legends[i];
@ -471,14 +471,14 @@ public abstract class JMacro {
* @param seconds * @param seconds
* @return * @return
*/ */
public Region[] waitAndMatchLegends(String[] legends, double minSimilar, long seconds) { public Region[] waitAndFindLegends(String[] legends, double minSimilar, long seconds) {
if (legends.length == 0) { if (legends.length == 0) {
return new Region[0]; return new Region[0];
} }
Logger.info("等待并匹配图例组合:{}", String.join(",", legends)); Logger.info("等待并匹配图例组合:{}", String.join(",", legends));
Region[] result = TaskUtil.timeTask(() -> { Region[] result = TaskUtil.timeTask(() -> {
while (JMainService.getInstance().run) { while (JMainService.getInstance().run) {
Region[] viewRects = matchLegends(legends, minSimilar); Region[] viewRects = findLegends(legends, minSimilar);
for (Region viewRect : viewRects) { for (Region viewRect : viewRects) {
if (viewRect != null) { if (viewRect != null) {
return viewRects; return viewRects;

Loading…
Cancel
Save

Powered by TurnKey Linux.