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

97
DHSoftware/MainWindow.cs
View File

@ -424,60 +424,61 @@ namespace DHSoftware
private void InitialCameraSumsView() private void InitialCameraSumsView()
{ {
this.BeginInvoke(new MethodInvoker(delegate ()
dgvCamreaNums.Columns.Clear();
// 添加 CCD 列
dgvCamreaNums.Columns.Add(new DataGridViewTextBoxColumn
{ {
HeaderText = "CCD",
DataPropertyName = "CameraName"
});
// 添加 触发数 列
var TiggerCountColumn = new DataGridViewTextBoxColumn
{
HeaderText = "触发数",
DataPropertyName = "TiggerCount"
};
dgvCamreaNums.Columns.Add(TiggerCountColumn); dgvCamreaNums.Columns.Clear();
// 添加 合格 列 // 添加 CCD 列
var okColumn = new DataGridViewTextBoxColumn dgvCamreaNums.Columns.Add(new DataGridViewTextBoxColumn
{ {
HeaderText = "合格", HeaderText = "CCD",
DataPropertyName = "OKCount" DataPropertyName = "CameraName"
}; });
okColumn.DefaultCellStyle.ForeColor = Color.Green; // 设置背景为绿色 // 添加 触发数 列
dgvCamreaNums.Columns.Add(okColumn); var TiggerCountColumn = new DataGridViewTextBoxColumn
{
HeaderText = "触发数",
DataPropertyName = "TiggerCount"
};
// 添加 不合格 列 dgvCamreaNums.Columns.Add(TiggerCountColumn);
var ngColumn = new DataGridViewTextBoxColumn
{
HeaderText = "不合格",
DataPropertyName = "NGCount"
};
ngColumn.DefaultCellStyle.ForeColor = Color.LightCoral; // 设置背景为红色
dgvCamreaNums.Columns.Add(ngColumn);
// 添加 总数 列 // 添加 合格 列
dgvCamreaNums.Columns.Add(new DataGridViewTextBoxColumn var okColumn = new DataGridViewTextBoxColumn
{ {
HeaderText = "总数", HeaderText = "合格",
DataPropertyName = "TotalCount" 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 dgvCamreaNums.Columns.Add(new DataGridViewTextBoxColumn
{ {
HeaderText = "良率", HeaderText = "总数",
DataPropertyName = "YieldStr" DataPropertyName = "TotalCount"
});
dgvCamreaNums.AutoGenerateColumns = false; });
dgvCamreaNums.DataSource = new BindingList<CameraSummary>(CameraSummaries);
} // 添加 良率 列
dgvCamreaNums.Columns.Add(new DataGridViewTextBoxColumn
{
HeaderText = "良率",
DataPropertyName = "YieldStr"
});
dgvCamreaNums.AutoGenerateColumns = false;
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}")