ZengQingming/JoyD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

led

Browse Source
This commit is contained in:
zqm
2026-03-27 15:51:17 +08:00
parent 66d40a0a6a
commit 028dd4c61b
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Windows/CS/Framework4.0/Camera/Camera/Camera.cs
View File

@@ -34,6 +34,7 @@ namespace Camera
private ConcurrentDictionary<int, Color> _ledZoneColors = new ConcurrentDictionary<int, Color>(); private ConcurrentDictionary<int, Color> _ledZoneColors = new ConcurrentDictionary<int, Color>();
private ConcurrentDictionary<int, string> _ledZoneDetectionResults = new ConcurrentDictionary<int, string>(); private ConcurrentDictionary<int, string> _ledZoneDetectionResults = new ConcurrentDictionary<int, string>();
private ConcurrentDictionary<int, Tuple<double, double, double>> _ledZoneHsvValues = new ConcurrentDictionary<int, Tuple<double, double, double>>(); private ConcurrentDictionary<int, Tuple<double, double, double>> _ledZoneHsvValues = new ConcurrentDictionary<int, Tuple<double, double, double>>();
private ConcurrentDictionary<int, bool> _ledZoneVisibility = new ConcurrentDictionary<int, bool>();
private LedDetector _ledDetector = new LedDetector(); private LedDetector _ledDetector = new LedDetector();
public void SetLedDetectorParams(int brightLimit, int satLimit) public void SetLedDetectorParams(int brightLimit, int satLimit)
@@ -427,6 +428,18 @@ namespace Camera
return Color.Lime; return Color.Lime;
} }
public bool GetLedZoneVisibility(int index)
{
if (_ledZoneVisibility.ContainsKey(index))
return _ledZoneVisibility[index];
return true;
}
public void SetLedZoneVisibility(int index, bool visible)
{
_ledZoneVisibility[index] = visible;
}
/// <summary> /// <summary>
/// 获取LED区域检测结果 /// 获取LED区域检测结果
/// </summary> /// </summary>

14
Windows/CS/Framework4.0/Camera/Camera/Setting.cs
View File

@@ -132,7 +132,6 @@ namespace Camera
private bool _isEditingLedZone = false; private bool _isEditingLedZone = false;
private bool _isDrawingLedMode = false; private bool _isDrawingLedMode = false;
private int _ledZoneState = 0; private int _ledZoneState = 0;
private bool _showLedZones = true;
private Color _detectionZoneColor = Color.Black; private Color _detectionZoneColor = Color.Black;
private ConcurrentDictionary<int, Color> _ledZoneColors = new ConcurrentDictionary<int, Color>(); private ConcurrentDictionary<int, Color> _ledZoneColors = new ConcurrentDictionary<int, Color>();
private ConcurrentDictionary<int, string> _ledZoneDetectionResults = new ConcurrentDictionary<int, string>(); private ConcurrentDictionary<int, string> _ledZoneDetectionResults = new ConcurrentDictionary<int, string>();
@@ -382,8 +381,8 @@ namespace Camera
var hsvValues = _camera.GetLedZoneHsvValues(); var hsvValues = _camera.GetLedZoneHsvValues();
foreach (var kvp in allLedZones) foreach (var kvp in allLedZones)
{ {
if (!_showLedZones) continue;
int index = kvp.Key; int index = kvp.Key;
if (index == _selectedZoneIndex && _selectedZoneIndex >= 0 && !_camera.GetLedZoneVisibility(_selectedZoneIndex)) continue;
Rectangle ledZone = kvp.Value; Rectangle ledZone = kvp.Value;
Color ledColor = _camera.GetLedZoneColor(index); Color ledColor = _camera.GetLedZoneColor(index);
string detectionResult = _camera.GetLedZoneDetectionResult(index); string detectionResult = _camera.GetLedZoneDetectionResult(index);
@@ -598,6 +597,7 @@ namespace Camera
foreach (var kvp in allLedZones) foreach (var kvp in allLedZones)
{ {
int index = kvp.Key; int index = kvp.Key;
if (index == _selectedZoneIndex && _selectedZoneIndex >= 0 && !_camera.GetLedZoneVisibility(_selectedZoneIndex)) continue;
Rectangle ledZone = kvp.Value; Rectangle ledZone = kvp.Value;
Color ledColor = _camera.GetLedZoneColor(index); Color ledColor = _camera.GetLedZoneColor(index);
@@ -651,6 +651,7 @@ namespace Camera
foreach (var kvp in allLedZones) foreach (var kvp in allLedZones)
{ {
int index = kvp.Key; int index = kvp.Key;
if (index == _selectedZoneIndex && _selectedZoneIndex >= 0 && !_camera.GetLedZoneVisibility(_selectedZoneIndex)) continue;
Rectangle ledZone = kvp.Value; Rectangle ledZone = kvp.Value;
Color ledColor = _camera.GetLedZoneColor(index); Color ledColor = _camera.GetLedZoneColor(index);
@@ -705,6 +706,7 @@ namespace Camera
foreach (var kvp in allLedZones) foreach (var kvp in allLedZones)
{ {
int index = kvp.Key; int index = kvp.Key;
if (!_camera.GetLedZoneVisibility(index)) continue;
Rectangle ledZone = kvp.Value; Rectangle ledZone = kvp.Value;
Color ledColor = _camera.GetLedZoneColor(index); Color ledColor = _camera.GetLedZoneColor(index);
@@ -1295,6 +1297,7 @@ namespace Camera
toolStripNumericUpDown2.Value = zone.Y; toolStripNumericUpDown2.Value = zone.Y;
toolStripNumericUpDown3.Value = zone.Width; toolStripNumericUpDown3.Value = zone.Width;
toolStripNumericUpDown4.Value = zone.Height; toolStripNumericUpDown4.Value = zone.Height;
toolStripButton5.Checked = _camera.GetLedZoneVisibility(_selectedZoneIndex);
} }
foreach (DataGridViewRow row in dataGridView2.Rows) foreach (DataGridViewRow row in dataGridView2.Rows)
{ {
@@ -1710,8 +1713,11 @@ namespace Camera
// 显示Led框复选框事件 // 显示Led框复选框事件
private void ToolStripButton5_Click(object sender, EventArgs e) private void ToolStripButton5_Click(object sender, EventArgs e)
{ {
_showLedZones = toolStripButton5.Checked; if (_camera != null && _selectedZoneIndex >= 0)
picBoxCamera.Invalidate(); {
_camera.SetLedZoneVisibility(_selectedZoneIndex, toolStripButton5.Checked);
}
picBoxCamera.Refresh();
} }
// 红绿蓝阈值事件 // 红绿蓝阈值事件