gnh1201/welsonjs
1
0
Fork 0
mirror of https://github.com/gnh1201/welsonjs.git synced 2024-11-26 15:31:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update ScreenMatch.cs

Browse Source
This commit is contained in:
Namhyeon Go 2024-11-04 03:55:11 +09:00
parent b2975e053c
commit a8a13b539c
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
WelsonJS.Toolkit/WelsonJS.Service/ScreenMatch.cs
View File

@ -461,14 +461,14 @@ public class ScreenMatch
Screen screen = Screen.AllScreens[i]; Screen screen = Screen.AllScreens[i];
Bitmap mainImage = CaptureScreen(screen); Bitmap mainImage = CaptureScreen(screen);
Bitmap image = templateImages[templateCurrentIndex]; Bitmap templateImage = templateImages[templateCurrentIndex];
string templateName = image.Tag as string; string templateName = templateImage.Tag as string;
TemplateInfo nextTemplateInfo = parent.GetNextTemplateInfo(); TemplateInfo nextTemplateInfo = parent.GetNextTemplateInfo();
Size templateSize = new Size Size templateSize = new Size
{ {
Width = image.Width, Width = templateImage.Width,
Height = image.Height Height = templateImage.Height
}; };
logger.LogInformation($"Trying match the template {templateName} on the screen {i}..."); logger.LogInformation($"Trying match the template {templateName} on the screen {i}...");
@ -505,22 +505,20 @@ public class ScreenMatch
// If the index value is negative, retrieve and use an outdated image from the queue // If the index value is negative, retrieve and use an outdated image from the queue
if (nextTemplateInfo.Index < 0) if (nextTemplateInfo.Index < 0)
{ {
Bitmap outdatedImage = null;
logger.LogInformation($"Finding a previous screen of {nextTemplateInfo.FileName}..."); logger.LogInformation($"Finding a previous screen of {nextTemplateInfo.FileName}...");
Bitmap outdatedImage = null;
try try
{ {
while (outdatedSamples.Count > 0) // Since outdatedSamples is also used to detect duplicate work, we do not delete tasks with Dequeue.
foreach (var image in outdatedSamples)
{ {
outdatedImage = outdatedSamples.Dequeue(); if (image.Tag != null &&
if (outdatedImage.Tag != null) ((SampleInfo)image.Tag).FileName == nextTemplateInfo.FileName)
{ {
if (((SampleInfo)outdatedImage.Tag).FileName == nextTemplateInfo.FileName) outdatedImage = image;
{ logger.LogInformation($"Found the previous screen of {nextTemplateInfo.FileName}");
logger.LogInformation($"Found the previous screen of {nextTemplateInfo.FileName}"); break;
break;
}
} }
} }
} }
@ -550,7 +548,7 @@ public class ScreenMatch
else else
{ {
// If the index is not negative, use the current image for template matching // If the index is not negative, use the current image for template matching
matchPositions = FindTemplate(out_mainImage, (Bitmap)image.Clone()); matchPositions = FindTemplate(out_mainImage, (Bitmap)templateImage.Clone());
} }
foreach (Point matchPosition in matchPositions) foreach (Point matchPosition in matchPositions)