From 11219b1b266c7b98dde39eb710faaa83b4a37924 Mon Sep 17 00:00:00 2001
From: kingno <30263@KINGNO>
Date: 星期二, 17 六月 2025 13:04:52 +0800
Subject: [PATCH] 双击圆点出图
---
libs/PFW/Bro.Common.Model.dll | 0
libs/PFW/Bro.UI.Device.Winform.dll | 0
libs/PFW/Bro.UI.Main.dll | 0
libs/PFW/Bro.Common.Device.dll | 0
libs/PFW.7z | 0
src/Bro.M141.Process/M141Process.cs | 12 +++---
src/Bro.M141.Process/M141Process_ImageCheck.cs | 2
libs/PFW/Bro.UI.Main.deps.json | 49 +++++++++++++++++-------
libs/PFW/Bro.UI.Main.exe | 0
libs/PFW/Bro.UI.Model.Winform.dll | 0
libs/PFW/Bro.Process.DataBase.dll | 0
src/Bro.M141_AOI1.Process/AOI1Process.cs | 7 ++-
src/Bro.M135.Common/ProductModel.cs | 2 +
libs/PFW/Bro.Process.dll | 0
libs/PFW/Bro.DataBase.Model.dll | 0
15 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/libs/PFW.7z b/libs/PFW.7z
new file mode 100644
index 0000000..54f3052
--- /dev/null
+++ b/libs/PFW.7z
Binary files differ
diff --git a/libs/PFW/Bro.Common.Device.dll b/libs/PFW/Bro.Common.Device.dll
index d6f82b1..9811712 100644
--- a/libs/PFW/Bro.Common.Device.dll
+++ b/libs/PFW/Bro.Common.Device.dll
Binary files differ
diff --git a/libs/PFW/Bro.Common.Model.dll b/libs/PFW/Bro.Common.Model.dll
index a8242f0..97be8b4 100644
--- a/libs/PFW/Bro.Common.Model.dll
+++ b/libs/PFW/Bro.Common.Model.dll
Binary files differ
diff --git a/libs/PFW/Bro.DataBase.Model.dll b/libs/PFW/Bro.DataBase.Model.dll
index dafd718..cb6be8d 100644
--- a/libs/PFW/Bro.DataBase.Model.dll
+++ b/libs/PFW/Bro.DataBase.Model.dll
Binary files differ
diff --git a/libs/PFW/Bro.Process.DataBase.dll b/libs/PFW/Bro.Process.DataBase.dll
index fc0fb27..661e76c 100644
--- a/libs/PFW/Bro.Process.DataBase.dll
+++ b/libs/PFW/Bro.Process.DataBase.dll
Binary files differ
diff --git a/libs/PFW/Bro.Process.dll b/libs/PFW/Bro.Process.dll
index 263bb6d..083175f 100644
--- a/libs/PFW/Bro.Process.dll
+++ b/libs/PFW/Bro.Process.dll
Binary files differ
diff --git a/libs/PFW/Bro.UI.Device.Winform.dll b/libs/PFW/Bro.UI.Device.Winform.dll
index b1af54b..6a2e2eb 100644
--- a/libs/PFW/Bro.UI.Device.Winform.dll
+++ b/libs/PFW/Bro.UI.Device.Winform.dll
Binary files differ
diff --git a/libs/PFW/Bro.UI.Main.deps.json b/libs/PFW/Bro.UI.Main.deps.json
index 6b2cfbd..da7cce0 100644
--- a/libs/PFW/Bro.UI.Main.deps.json
+++ b/libs/PFW/Bro.UI.Main.deps.json
@@ -16,21 +16,21 @@
"Krypton.Docking": "6.2111.312",
"ScottPlot.WinForms": "4.1.58",
"SunnyUI": "3.0.9",
- "runtimepack.Microsoft.Windows.SDK.NET.Ref": "10.0.19041.28"
+ "runtimepack.Microsoft.Windows.SDK.NET.Ref": "10.0.19041.52"
},
"runtime": {
"Bro.UI.Main.dll": {}
}
},
- "runtimepack.Microsoft.Windows.SDK.NET.Ref/10.0.19041.28": {
+ "runtimepack.Microsoft.Windows.SDK.NET.Ref/10.0.19041.52": {
"runtime": {
"Microsoft.Windows.SDK.NET.dll": {
- "assemblyVersion": "10.0.19041.24",
- "fileVersion": "10.0.19041.28"
+ "assemblyVersion": "10.0.19041.38",
+ "fileVersion": "10.0.19041.52"
},
"WinRT.Runtime.dll": {
- "assemblyVersion": "2.0.0.0",
- "fileVersion": "2.0.1.40881"
+ "assemblyVersion": "2.1.0.0",
+ "fileVersion": "2.1.6.47881"
}
}
},
@@ -1009,7 +1009,10 @@
"Bro.UI.Model.Winform": "1.0.0"
},
"runtime": {
- "Bro.Common.Device.dll": {}
+ "Bro.Common.Device.dll": {
+ "assemblyVersion": "1.0.0",
+ "fileVersion": "1.0.40124.0"
+ }
}
},
"Bro.Common.Model/1.0.0": {
@@ -1021,7 +1024,10 @@
"System.Resources.ResourceManager": "4.3.0"
},
"runtime": {
- "Bro.Common.Model.dll": {}
+ "Bro.Common.Model.dll": {
+ "assemblyVersion": "1.0.0",
+ "fileVersion": "1.0.40127.0"
+ }
},
"resources": {
"en-US/Bro.Common.Model.resources.dll": {
@@ -1035,7 +1041,10 @@
"Microsoft.EntityFrameworkCore": "7.0.0"
},
"runtime": {
- "Bro.DataBase.Model.dll": {}
+ "Bro.DataBase.Model.dll": {
+ "assemblyVersion": "1.0.0",
+ "fileVersion": "1.0.0.0"
+ }
}
},
"Bro.Process/1.0.0": {
@@ -1047,7 +1056,10 @@
"Bro.UI.Model.Winform": "1.0.0"
},
"runtime": {
- "Bro.Process.dll": {}
+ "Bro.Process.dll": {
+ "assemblyVersion": "1.0.0",
+ "fileVersion": "1.0.40125.0"
+ }
}
},
"Bro.Process.DataBase/1.0.0": {
@@ -1061,7 +1073,10 @@
"System.Configuration.ConfigurationManager": "6.0.0"
},
"runtime": {
- "Bro.Process.DataBase.dll": {}
+ "Bro.Process.DataBase.dll": {
+ "assemblyVersion": "1.0.0",
+ "fileVersion": "1.0.21116.0"
+ }
}
},
"Bro.UI.Device.Winform/1.0.0": {
@@ -1071,7 +1086,10 @@
"Bro.UI.Model.Winform": "1.0.0"
},
"runtime": {
- "Bro.UI.Device.Winform.dll": {}
+ "Bro.UI.Device.Winform.dll": {
+ "assemblyVersion": "1.0.0",
+ "fileVersion": "1.0.30415.0"
+ }
}
},
"Bro.UI.Model.Winform/1.0.0": {
@@ -1081,7 +1099,10 @@
"SunnyUI": "3.0.9"
},
"runtime": {
- "Bro.UI.Model.Winform.dll": {}
+ "Bro.UI.Model.Winform.dll": {
+ "assemblyVersion": "1.0.0",
+ "fileVersion": "1.0.21118.0"
+ }
}
},
"halcondotnet/12.0.0.0": {
@@ -1116,7 +1137,7 @@
"serviceable": false,
"sha512": ""
},
- "runtimepack.Microsoft.Windows.SDK.NET.Ref/10.0.19041.28": {
+ "runtimepack.Microsoft.Windows.SDK.NET.Ref/10.0.19041.52": {
"type": "runtimepack",
"serviceable": false,
"sha512": ""
diff --git a/libs/PFW/Bro.UI.Main.dll b/libs/PFW/Bro.UI.Main.dll
index 70c10bb..8f63e91 100644
--- a/libs/PFW/Bro.UI.Main.dll
+++ b/libs/PFW/Bro.UI.Main.dll
Binary files differ
diff --git a/libs/PFW/Bro.UI.Main.exe b/libs/PFW/Bro.UI.Main.exe
index 38bff4e..b0509d0 100644
--- a/libs/PFW/Bro.UI.Main.exe
+++ b/libs/PFW/Bro.UI.Main.exe
Binary files differ
diff --git a/libs/PFW/Bro.UI.Model.Winform.dll b/libs/PFW/Bro.UI.Model.Winform.dll
index 8fde443..5180ead 100644
--- a/libs/PFW/Bro.UI.Model.Winform.dll
+++ b/libs/PFW/Bro.UI.Model.Winform.dll
Binary files differ
diff --git a/src/Bro.M135.Common/ProductModel.cs b/src/Bro.M135.Common/ProductModel.cs
index 5bebb83..5017521 100644
--- a/src/Bro.M135.Common/ProductModel.cs
+++ b/src/Bro.M135.Common/ProductModel.cs
@@ -76,6 +76,8 @@
public bool IsPreStationOK { get; set; } = false;
+ public List<string> ImagePaths { get; set; } = new List<string>();
+
public DateTime? EndTime { get; set; } = null;
object _checkResultLock = new object();
diff --git a/src/Bro.M141.Process/M141Process.cs b/src/Bro.M141.Process/M141Process.cs
index dc29ff2..a68780c 100644
--- a/src/Bro.M141.Process/M141Process.cs
+++ b/src/Bro.M141.Process/M141Process.cs
@@ -38,8 +38,11 @@
public M141Process(string productCode) : base(productCode) { }
#endregion
+
TaskFactory _taskFactory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.LongRunning);
+
public event Action<string, P_PRODUCT_DETAIL, string> OnSinglePostionDetectResultUpdate;
+
protected M141Config M141Config => Config as M141Config;
public static object _productListLock = new object();
@@ -55,7 +58,6 @@
public override void InitialProcessMethods()
{
base.InitialProcessMethods();
-
if (ThHeartPlc == null)
{
@@ -82,7 +84,6 @@
bool devicestate = false;
PLCBase Plc2;
public Thread ThHeartPlc;
-
public override void Open()
@@ -120,6 +121,7 @@
base.Close();
}
+
public void Heartplc()
{
@@ -417,8 +419,6 @@
Dictionary<string, List<string>> _positionSpecHeads = new Dictionary<string, List<string>>();
-
-
volatile int uploadId = 0;
@@ -512,8 +512,8 @@
// dicpid[tem] = pidList[i];
//}
-
- List<DetectResult> detectResults = ML?.RunMLDetectionSync(imgSet, pidList, measureBind.DetectionId);
+ //var c=products[0].ImagePaths;
+ List<DetectResult> detectResults = ML?.RunMLDetectionSync(imgSet, pidList, measureBind.DetectionId,false,null,null,"", products[0].ImagePaths);
List<DetectResult> ngResults = new List<DetectResult>();
diff --git a/src/Bro.M141.Process/M141Process_ImageCheck.cs b/src/Bro.M141.Process/M141Process_ImageCheck.cs
index 3836a93..3b69ea8 100644
--- a/src/Bro.M141.Process/M141Process_ImageCheck.cs
+++ b/src/Bro.M141.Process/M141Process_ImageCheck.cs
@@ -637,7 +637,7 @@
UpdateDefectAsync(defects);
var defectClass = GetDefectClassFromDefectList(defects);
- UpdateResult(DateTime.Now, p.SN, defectClass.ClassName, "");
+ UpdateResult(DateTime.Now, p.SN, defectClass.ClassName, "",p.ImagePaths);
//浜у搧搴忓彿+1
//Interlocked.Increment(ref _productIndex);
diff --git a/src/Bro.M141_AOI1.Process/AOI1Process.cs b/src/Bro.M141_AOI1.Process/AOI1Process.cs
index 823c420..1fca474 100644
--- a/src/Bro.M141_AOI1.Process/AOI1Process.cs
+++ b/src/Bro.M141_AOI1.Process/AOI1Process.cs
@@ -48,6 +48,7 @@
base.Open();
}
+
[ProcessMethod("", "PositionCheck_P1", "宸ヤ綅1妫�娴�", InvokeType.TestInvoke)]
public ResponseMessage PositionCheck_P1(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
{
@@ -64,6 +65,7 @@
return msg;
}
+
[ProcessMethod("", "PositionCheck_P2", "宸ヤ綅2妫�娴�", InvokeType.TestInvoke)]
public ResponseMessage PositionCheck_P2(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
@@ -82,6 +84,7 @@
return msg;
}
+
[ProcessMethod("", "PositionCheck_P3", "宸ヤ綅3妫�娴�", InvokeType.TestInvoke)]
public ResponseMessage PositionCheck_P3(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
{
@@ -98,7 +101,6 @@
return msg;
}
-
[ProcessMethod("ImageCheck", "ReadBarcode", "璇荤爜", InvokeType.TestInvoke)]
@@ -233,6 +235,7 @@
return "NOREAD";
}
+
private bool CheckBarcodeValid(string barcode)
{
@@ -386,8 +389,6 @@
return msg;
}
-
-
}
}
--
Gitblit v1.8.0