From ab3d347fc586c682c154924ec9959cac3fb89754 Mon Sep 17 00:00:00 2001
From: Gokiburi <Gokiburi@DESKTOP-9ITC11L>
Date: 星期六, 21 六月 2025 15:13:10 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M200
---
src/Bro.M141.Process/M141Process_ImageCheck.cs | 57 ++++++++++++++++-----------------------------------------
1 files changed, 16 insertions(+), 41 deletions(-)
diff --git a/src/Bro.M141.Process/M141Process_ImageCheck.cs b/src/Bro.M141.Process/M141Process_ImageCheck.cs
index fc4dc13..b61d5c4 100644
--- a/src/Bro.M141.Process/M141Process_ImageCheck.cs
+++ b/src/Bro.M141.Process/M141Process_ImageCheck.cs
@@ -520,14 +520,14 @@
else
{
_isDemoStarted = true;
- OfflineDemoAsync(opConfig.ImageFolder);
+ OfflineDemoAsync(opConfig.ImageFolder, opConfig.IsOK, opConfig.SaveImageTime);
}
}
return new ResponseMessage();
}
- private async void OfflineDemoAsync(string imageFolder)
+ private async void OfflineDemoAsync(string imageFolder,bool isok,int saveimagetime)
{
await Task.Run(() =>
{
@@ -539,13 +539,19 @@
{
return;
}
-
var imageFile = Path.GetFileNameWithoutExtension(imageFileNames[i]);
if (imageFile.EndsWith("Fit"))
{
continue;
}
-
+ if (imageFile.EndsWith("OK")& isok == false)
+ {
+ continue;
+ }
+ if (imageFile.EndsWith("NG") & isok == true)
+ {
+ continue;
+ }
var nameDatas = imageFile.Split(new char[] { '_'}, StringSplitOptions.RemoveEmptyEntries).ToList();
if (nameDatas.Count != 5)
{
@@ -554,10 +560,10 @@
}
var sn = nameDatas[0];
- var imageSeq = nameDatas[1];
-
+ var imageSeq = nameDatas[2][^1].ToString();
var measureBind = M141Config.MeasureBindCollection.FirstOrDefault(u => u.ImageSaveSeq == imageSeq);
- if (measureBind == null || !measureBind.IsFixed)
+
+ if (measureBind == null || !measureBind.IsFixed)
{
LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"绂荤嚎娴嬭瘯锛屽伐浣峽(measureBind == null ? "鏈尮閰�" : $"{measureBind.WorkPosition}鏈紑鍚�")}");
continue;
@@ -565,46 +571,15 @@
LogAsync(DateTime.Now, EnumHelper.LogLevel.Action, $"绂荤嚎娴嬭瘯锛屼骇鍝亄sn}寮�濮嬪伐浣峽measureBind.WorkPosition}绂荤嚎妫�娴�");
MLImageSet imgSet = new MLImageSet();
+
imgSet.HImage = new HalconDotNet.HImage(imageFileNames[i]);
imgSet.PID = sn;
var detectResults = ML.RunMLDetectionSync(imgSet, null, measureBind.DetectionId);
-
+ Thread.Sleep(saveimagetime);
imgSet.HImage?.Dispose();
imgSet.HImage = null;
-
-
-
- //var defectFields = M141Config.DefectLocationSettings.FirstOrDefault(u => u.PositionCode == measureBind.WorkPosition);
-
-
- //var list = detectResults.SelectMany(u => u.NetResults.SelectMany(m => m.DetectDetails)).ToList();
- ////if (list.Count > 0)
- ////{
- //// //list.ForEach(d =>
- //// //{
- //// // //if (defectFields == null)
- //// // //{
- //// // // d.Tag = "";
- //// // //}
- //// // //else
- //// // //{
- //// // // RectangleF rect = new RectangleF(d.Rect.Point_LU.X, d.Rect.Point_LU.Y, d.Rect.Width, d.Rect.Height);
- //// // // //var rectList = defectFields.Display.RectDict.Where(u => rect.IntersectsWith(u.Value)).ToList();
- //// // // //if (rectList.Count > 0)
- //// // // //{
- //// // // // d.Tag = string.Join(" ", rectList.Select(u => u.Key).OrderBy(u => u));
- //// // // //}
- //// // // //else
- //// // // //{
- //// // // // d.Tag = "";
- //// // // //}
- //// // //}
- //// //});
- ////}
-
- //Bitmap originImage = new Bitmap(imageFileNames[i]);
- //DetectResultSaveExcelAsync(detectResults, sn, originImage, DateTime.Now);
+
}
});
}
--
Gitblit v1.8.0