xiaohuimin/DHDHSoftware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据统计线程保护

Browse Source 
设置删除工位失效bug
This commit is contained in:
Admin
2025-04-30 09:21:06 +08:00
parent 71bbea56a7
commit bb943740da
2 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DHSoftware/MainWindow.cs
View File

@ -424,7 +424,8 @@ namespace DHSoftware
private void InitialCameraSumsView() private void InitialCameraSumsView()
{ {
this.BeginInvoke(new MethodInvoker(delegate ()
{
dgvCamreaNums.Columns.Clear(); dgvCamreaNums.Columns.Clear();
@ -477,7 +478,7 @@ namespace DHSoftware
}); });
dgvCamreaNums.AutoGenerateColumns = false; dgvCamreaNums.AutoGenerateColumns = false;
dgvCamreaNums.DataSource = new BindingList<CameraSummary>(CameraSummaries); dgvCamreaNums.DataSource = new BindingList<CameraSummary>(CameraSummaries);
} })); }
#endregion #endregion
/// <summary> /// <summary>
@ -1014,7 +1015,7 @@ namespace DHSoftware
//EmergencyStop(null, null, null); //EmergencyStop(null, null, null);
} }
Thread.Sleep(100); Thread.Sleep(150);
} }
catch (Exception ex) catch (Exception ex)
{ {

4
DHSoftware/Views/SettingWindow.cs
View File

@ -571,6 +571,7 @@ namespace DHSoftware.Views
if (result == DialogResult.OK) if (result == DialogResult.OK)
{ {
menu1.Remove(clickedItem); menu1.Remove(clickedItem);
ConfigModel.CameraBaseList.RemoveAll(c => c.CameraName == clickedItem.Text);
foreach (var tab in tabs1.Pages) foreach (var tab in tabs1.Pages)
{ {
if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}") if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")
@ -583,7 +584,7 @@ namespace DHSoftware.Views
return; return;
} }
} }
ConfigModel.CameraBaseList.RemoveAll(c => c.CameraName == clickedItem.Text);
} }
break; break;
@ -658,6 +659,7 @@ namespace DHSoftware.Views
if (result == DialogResult.OK) if (result == DialogResult.OK)
{ {
menu1.Remove(clickedItem); menu1.Remove(clickedItem);
ConfigModel.CameraBaseList.RemoveAll(c => c.CameraName == clickedItem.Text);
foreach (var tab in tabs1.Pages) foreach (var tab in tabs1.Pages)
{ {
if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}") if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")