From bb943740daff30f685ddf82f78ee516927d00694 Mon Sep 17 00:00:00 2001
From: Admin <Admin@DESKTOP-C8FFBDV>
Date: Wed, 30 Apr 2025 09:21:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B=E4=BF=9D=E6=8A=A4=20=E8=AE=BE=E7=BD=AE=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=B7=A5=E4=BD=8D=E5=A4=B1=E6=95=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DHSoftware/MainWindow.cs          | 97 ++++++++++++++++---------------
 DHSoftware/Views/SettingWindow.cs |  4 +-
 2 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/DHSoftware/MainWindow.cs b/DHSoftware/MainWindow.cs
index 3c88c9b..ecf50e0 100644
--- a/DHSoftware/MainWindow.cs
+++ b/DHSoftware/MainWindow.cs
@@ -424,60 +424,61 @@ namespace DHSoftware
         private void InitialCameraSumsView()
         {
 
-
-
-            dgvCamreaNums.Columns.Clear();
-
-            // 添加 CCD 列
-            dgvCamreaNums.Columns.Add(new DataGridViewTextBoxColumn
+            this.BeginInvoke(new MethodInvoker(delegate ()
             {
-                HeaderText = "CCD",
-                DataPropertyName = "CameraName"
-            });
-            // 添加 触发数 列
-            var TiggerCountColumn = new DataGridViewTextBoxColumn
-            {
-                HeaderText = "触发数",
-                DataPropertyName = "TiggerCount"
-            };
 
-            dgvCamreaNums.Columns.Add(TiggerCountColumn);
+                dgvCamreaNums.Columns.Clear();
 
-            // 添加 合格 列
-            var okColumn = new DataGridViewTextBoxColumn
-            {
-                HeaderText = "合格",
-                DataPropertyName = "OKCount"
-            };
-            okColumn.DefaultCellStyle.ForeColor = Color.Green; // 设置背景为绿色
-            dgvCamreaNums.Columns.Add(okColumn);
+                // 添加 CCD 列
+                dgvCamreaNums.Columns.Add(new DataGridViewTextBoxColumn
+                {
+                    HeaderText = "CCD",
+                    DataPropertyName = "CameraName"
+                });
+                // 添加 触发数 列
+                var TiggerCountColumn = new DataGridViewTextBoxColumn
+                {
+                    HeaderText = "触发数",
+                    DataPropertyName = "TiggerCount"
+                };
 
-            // 添加 不合格 列
-            var ngColumn = new DataGridViewTextBoxColumn
-            {
-                HeaderText = "不合格",
-                DataPropertyName = "NGCount"
-            };
-            ngColumn.DefaultCellStyle.ForeColor = Color.LightCoral; // 设置背景为红色
-            dgvCamreaNums.Columns.Add(ngColumn);
+                dgvCamreaNums.Columns.Add(TiggerCountColumn);
 
-            // 添加 总数 列
-            dgvCamreaNums.Columns.Add(new DataGridViewTextBoxColumn
-            {
-                HeaderText = "总数",
-                DataPropertyName = "TotalCount"
+                // 添加 合格 列
+                var okColumn = new DataGridViewTextBoxColumn
+                {
+                    HeaderText = "合格",
+                    DataPropertyName = "OKCount"
+                };
+                okColumn.DefaultCellStyle.ForeColor = Color.Green; // 设置背景为绿色
+                dgvCamreaNums.Columns.Add(okColumn);
 
-            });
+                // 添加 不合格 列
+                var ngColumn = new DataGridViewTextBoxColumn
+                {
+                    HeaderText = "不合格",
+                    DataPropertyName = "NGCount"
+                };
+                ngColumn.DefaultCellStyle.ForeColor = Color.LightCoral; // 设置背景为红色
+                dgvCamreaNums.Columns.Add(ngColumn);
 
-            // 添加 良率 列
-            dgvCamreaNums.Columns.Add(new DataGridViewTextBoxColumn
-            {
-                HeaderText = "良率",
-                DataPropertyName = "YieldStr"
-            });
-            dgvCamreaNums.AutoGenerateColumns = false;
-            dgvCamreaNums.DataSource = new BindingList<CameraSummary>(CameraSummaries);
-        }
+                // 添加 总数 列
+                dgvCamreaNums.Columns.Add(new DataGridViewTextBoxColumn
+                {
+                    HeaderText = "总数",
+                    DataPropertyName = "TotalCount"
+
+                });
+
+                // 添加 良率 列
+                dgvCamreaNums.Columns.Add(new DataGridViewTextBoxColumn
+                {
+                    HeaderText = "良率",
+                    DataPropertyName = "YieldStr"
+                });
+                dgvCamreaNums.AutoGenerateColumns = false;
+                dgvCamreaNums.DataSource = new BindingList<CameraSummary>(CameraSummaries);
+            })); }
         #endregion
 
         /// <summary>
@@ -1014,7 +1015,7 @@ namespace DHSoftware
                         //EmergencyStop(null, null, null);
                     }
 
-                    Thread.Sleep(100); 
+                    Thread.Sleep(150); 
                 }
                 catch (Exception ex)
                 {
diff --git a/DHSoftware/Views/SettingWindow.cs b/DHSoftware/Views/SettingWindow.cs
index 4c71eda..30aa869 100644
--- a/DHSoftware/Views/SettingWindow.cs
+++ b/DHSoftware/Views/SettingWindow.cs
@@ -571,6 +571,7 @@ namespace DHSoftware.Views
                                         if (result == DialogResult.OK)
                                         {
                                             menu1.Remove(clickedItem);
+                                            ConfigModel.CameraBaseList.RemoveAll(c => c.CameraName == clickedItem.Text);
                                             foreach (var tab in tabs1.Pages)
                                             {
                                                 if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")
@@ -583,7 +584,7 @@ namespace DHSoftware.Views
                                                     return;
                                                 }
                                             }
-                                            ConfigModel.CameraBaseList.RemoveAll(c => c.CameraName == clickedItem.Text);
+                                          
                                         }
                                         break;
 
@@ -658,6 +659,7 @@ namespace DHSoftware.Views
                                         if (result == DialogResult.OK)
                                         {
                                             menu1.Remove(clickedItem);
+                                            ConfigModel.CameraBaseList.RemoveAll(c => c.CameraName == clickedItem.Text);
                                             foreach (var tab in tabs1.Pages)
                                             {
                                                 if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")