gnh1201/welsonjs
1
0
Fork 0
mirror of https://github.com/gnh1201/welsonjs.git synced 2025-02-11 09:24:58 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update ScreenMatch.cs

Browse Source
This commit is contained in:
Namhyeon Go 2024-10-21 04:16:46 +09:00
parent 06731f4d4b
commit c03a8011c2
1 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,7 @@ public class ScreenMatch
private string templateDirectoryPath; private string templateDirectoryPath;
private string outputDirectoryPath; private string outputDirectoryPath;
private int templateCurrentIndex = 0; private int templateCurrentIndex = 0;
private double threshold = 0.4; private double threshold = 0.3;
private string mode; private string mode;
private bool busy; private bool busy;
private List<string> _params = new List<string>(); private List<string> _params = new List<string>();
@ -181,8 +181,8 @@ public class ScreenMatch
sampleNodup = new List<string>(); sampleNodup = new List<string>();
sampleNodupSize = new Size sampleNodupSize = new Size
{ {
Width = 256, Width = 180,
Height = 32 Height = 60
}; };
outdatedSamples = new Queue<Bitmap>(); outdatedSamples = new Queue<Bitmap>();
@ -249,6 +249,13 @@ public class ScreenMatch
break; break;
} }
case "threshold":
{
double.TryParse(config_value, out double t);
threshold = t;
break;
}
case "sample_clipboard": case "sample_clipboard":
{ {
sampleClipboard = new List<string>(config_value.Split(':')); sampleClipboard = new List<string>(config_value.Split(':'));
@ -277,6 +284,20 @@ public class ScreenMatch
break; break;
} }
case "sample_nodup_width":
{
int.TryParse(config_value, out int w);
sampleNodupSize.Width = w;
break;
}
case "sample_nodup_height":
{
int.TryParse(config_value, out int h);
sampleNodupSize.Height = h;
break;
}
case "sample_adjust_x": case "sample_adjust_x":
{ {
int.TryParse(config_value, out sampleAdjustX); int.TryParse(config_value, out sampleAdjustX);
@ -465,24 +486,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)
{ {
parent.Log($"Review and find the last data of {nextTemplateInfo.FileName}...");
Bitmap outdatedImage = null; Bitmap outdatedImage = null;
// Dequeue the oldest image from the sampleOutdated queue parent.Log($"Finding a previous screen of {nextTemplateInfo.FileName}...");
try try
{ {
while (outdatedSamples.Count > 0) while (outdatedSamples.Count > 0)
{ {
outdatedImage = outdatedSamples.Dequeue(); outdatedImage = outdatedSamples.Dequeue();
if (outdatedImage.Tag != null) if (outdatedImage.Tag != null)
{ {
parent.Log($"Reviewing... {((SampleInfo)outdatedImage.Tag).FileName}");
if (((SampleInfo)outdatedImage.Tag).FileName == nextTemplateInfo.FileName) if (((SampleInfo)outdatedImage.Tag).FileName == nextTemplateInfo.FileName)
{ {
parent.Log($"Found the last data of {nextTemplateInfo.FileName}"); parent.Log($"Found the previous screen of {nextTemplateInfo.FileName}");
break; break;
} }
} }
@ -490,15 +507,26 @@ public class ScreenMatch
} }
catch (Exception ex) catch (Exception ex)
{ {
parent.Log($"Error while reviewing the data: {ex.Message}"); parent.Log($"Error finding a previous screen: {ex.Message}");
} }
outdatedImage.Save("outdated.png");
// Find the matching positions of the outdated image in the main image // Find the matching positions of the outdated image in the main image
if (outdatedImage != null) { if (outdatedImage != null) {
matchPositions = FindTemplate(out_mainImage, (Bitmap)outdatedImage.Clone()); matchPositions = FindTemplate(out_mainImage, outdatedImage);
if (matchPositions.Count > 0)
{
parent.Log("Match found with the outdated image");
}
else
{
parent.Log("No match found with the outdated image");
}
} }
else else
{ {
parent.Log("Not found a outdated image");
matchPositions = new List<Point>(); matchPositions = new List<Point>();
} }
} }