From dbf412713ba8aaaf197a7b8652b9a4b3a95b5ebb Mon Sep 17 00:00:00 2001
From: TD <Administrator@PC-20240810NGQJ>
Date: Wed, 2 Apr 2025 20:14:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DH.Devices.Vision/SimboVisionDriver.cs        | 29 ++++++++++++-------
 .../DH.UI.Model.Winform.csproj                |  8 +++++
 DH.UI.Model.Winform/Element/ElementBase.cs    |  2 +-
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/DH.Devices.Vision/SimboVisionDriver.cs b/DH.Devices.Vision/SimboVisionDriver.cs
index 6f7a745..2a1fb88 100644
--- a/DH.Devices.Vision/SimboVisionDriver.cs
+++ b/DH.Devices.Vision/SimboVisionDriver.cs
@@ -84,6 +84,8 @@ namespace DH.Devices.Vision
             detectResult.SaveNGOriginal=detectConfig.SaveNGOriginal;
             detectResult.SaveOKDetect=detectConfig.SaveOKDetect;
             detectResult.SaveOKOriginal=detectConfig.SaveOKOriginal;
+            Mat OriginImage = originImgSet.Clone();
+            detectResult.DetectionOriginImage = CopyBitmapWithLockBits(OriginImage.ToBitmap());
             //detectResult.DetectionOriginImage = originImgSet.Clone().ToBitmap();
             Stopwatch sw = new Stopwatch();
             #region 1.预处理
@@ -1003,7 +1005,7 @@ namespace DH.Devices.Vision
                     List<IShapeElement> detectionResultShapesClone = new List<IShapeElement>(detectionResultShapes);
 
                     DetectionDone(DetectionId, resultMask, detectionResultShapes);
-                    detectResult.DetectionOriginImage = CopyBitmapWithLockBits(resultMask);
+                    //detectResult.DetectionOriginImage = CopyBitmapWithLockBits(resultMask);
                     SaveDetectResultImageAsync(detectResult);
                    // SaveDetectResultCSVAsync(detectResult);
                 }
@@ -1108,15 +1110,15 @@ namespace DH.Devices.Vision
 
                         Bitmap preTreatedBitmap = detectResult.DetectionOriginImage.CopyBitmap();
 
-                        List<IShapeElement> detectionResultShapes = new List<IShapeElement>(detectResult.DetectionResultShapes);
-                        DetectResultDisplay resultDisplay = new DetectResultDisplay(detectResult, resultMask, displayTxt);
-                        detectionResultShapes.Add(resultDisplay);
+                        //List<IShapeElement> detectionResultShapes = new List<IShapeElement>(detectResult.DetectionResultShapes);
+                        //DetectResultDisplay resultDisplay = new DetectResultDisplay(detectResult, resultMask, displayTxt);
+                        //detectionResultShapes.Add(resultDisplay);
 
-                        Bitmap resultMap = GetResultImage(resultMask, detectionResultShapes);
+                        Bitmap resultMap = GetResultImage(resultMask, detectResult.DetectionResultShapes);
 
 
-                        resultDisplay.Dispose();
-                        detectionResultShapes.Clear();
+                       // resultDisplay.Dispose();
+                        //detectionResultShapes.Clear();
 
 
                         Bitmap detectionFitImage = StaticHelper.HConnectBitmap(preTreatedBitmap, resultMap);
@@ -1228,6 +1230,9 @@ namespace DH.Devices.Vision
                 {
                     g.DrawImage(baseImage, 0, 0);
 
+                    // 创建临时拷贝避免共享状态
+                    // var tempElements = eleList.Select(e => e.Clone()).Cast<IShapeElement>().ToList();
+
                     eleList.ForEach(e =>
                     {
                         e.State = ElementState.Normal;
@@ -1267,7 +1272,11 @@ namespace DH.Devices.Vision
             }
             catch (Exception ex)
             {
-               // Logger.Error($"保存检测结果失败: {ex.Message}");
+                // Logger.Error($"保存检测结果失败: {ex.Message}");
+            }
+            finally {
+                GC.Collect();
+                GC.WaitForPendingFinalizers();
             }
         }
         private void SaveNGImages(DetectStationResult result, string rootPath, string format)
@@ -1322,7 +1331,7 @@ namespace DH.Devices.Vision
                 using (Bitmap resultMask = result.DetectionOriginImage.CopyBitmap())
                 using (Bitmap preTreatedBitmap = result.DetectionOriginImage.CopyBitmap())
                 {
-                    var detectionResultShapes = new List<IShapeElement>(result.DetectionResultShapes)
+                    var detectionResultShapes = new List<IShapeElement>()
             {
                 new DetectResultDisplay(result, resultMask, displayTxt)
             };
@@ -1333,7 +1342,7 @@ namespace DH.Devices.Vision
                         string prefix = Path.Combine(rootPath, "OKFitImages", result.ResultLabel);
                         Directory.CreateDirectory(prefix);
                         string fullname = Path.Combine(prefix, $"{result.Pid}_OKFitImage_{result.DetectName}_{result.Id}.{format}");
-                        SaveImageAsync(fullname, result.DetectionOriginImage, result.ImageFormat);
+                        SaveImageAsync(fullname, detectionFitImage, result.ImageFormat);
                     }
                 
                 }
diff --git a/DH.UI.Model.Winform/DH.UI.Model.Winform.csproj b/DH.UI.Model.Winform/DH.UI.Model.Winform.csproj
index f2d0ff7..8eb4c38 100644
--- a/DH.UI.Model.Winform/DH.UI.Model.Winform.csproj
+++ b/DH.UI.Model.Winform/DH.UI.Model.Winform.csproj
@@ -10,6 +10,14 @@
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <Optimize>False</Optimize>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Optimize>False</Optimize>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\DH.Commons\DH.Commons.csproj" />
   </ItemGroup>
diff --git a/DH.UI.Model.Winform/Element/ElementBase.cs b/DH.UI.Model.Winform/Element/ElementBase.cs
index 0b529b4..e2e69d2 100644
--- a/DH.UI.Model.Winform/Element/ElementBase.cs
+++ b/DH.UI.Model.Winform/Element/ElementBase.cs
@@ -580,7 +580,7 @@ namespace DH.UI.Model.Winform
         /// </summary>
         [Browsable(false)]
         public Rectangle BaseRectangle { get; set; }
-        EnumHelper.ElementState IShapeElement.State { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+     
 
         public abstract bool IsMouseHover(PointF p);