From 9b2ad9bafb0739f8ba1e76107011fada5e5883c3 Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期五, 10 四月 2026 16:23:08 +0800
Subject: [PATCH] 修复LB3D相机参数设置问题以及新增兰宝3D相机参数存储在本地以及初始化给相机参数。
---
LB_SmartVision/Forms/Pages/CameraPage/CameraForm.cs | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/LB_SmartVision/Forms/Pages/CameraPage/CameraForm.cs b/LB_SmartVision/Forms/Pages/CameraPage/CameraForm.cs
index 2453a6e..305e1f9 100644
--- a/LB_SmartVision/Forms/Pages/CameraPage/CameraForm.cs
+++ b/LB_SmartVision/Forms/Pages/CameraPage/CameraForm.cs
@@ -1,4 +1,6 @@
-锘縰sing LB_VisionControls;
+锘縰sing LB_SmartVisionCameraDevice.PHM6000;
+using LB_SmartVisionCommon;
+using LB_VisionControls;
using LB_VisionProcesses.Cameras;
using LB_VisionProcesses.Cameras.HikCameras;
using LB_VisionProcesses.Cameras.HRCameras;
@@ -8,6 +10,7 @@
using LB_VisionProcesses.Cameras.MindCameras;
using ReaLTaiizor.Forms;
using System;
+using System.Collections.Concurrent;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -61,7 +64,7 @@
{
uiComboBoxBrand.SelectedIndex = uiComboBoxBrand.FindString(typeof(LBCamera).Name);
}
- else if(camera is LocalCamera)
+ else if (camera is LocalCamera)
{
uiComboBoxBrand.SelectedIndex = uiComboBoxBrand.FindString(typeof(LocalCamera).Name);
}
@@ -112,6 +115,7 @@
//鍔犺浇鍥炶皟鍑芥暟
Subscribe();
+ uiButtonStartHardGrab.ForeColor = Color.White;
}
private void CameraForm_FormClosing(object sender, FormClosingEventArgs e)
@@ -252,7 +256,7 @@
{
camera.StopGrabbing();
camera.SetTriggerMode(TriggerMode.On, TriggerSource.Software);
- camera.StartGrabbing();
+ //camera.StartGrabbing();
});
}
@@ -397,7 +401,7 @@
private void cob_Brand_SelectedIndexChanged(object sender, EventArgs e)
{
- if (uiComboBoxBrand.Text == "MindCamera")
+ if (uiComboBoxBrand.Text == "MindCamera" || uiComboBoxBrand.Text == "LBCamera")
{
btnSetting.Visible = true;
}
@@ -417,6 +421,44 @@
{
localCamera.SetSetting();
}
+ else
+ {
+ using (Form editForm = new Form())
+ {
+ editForm.Text = "楂樼骇鍙傛暟璁剧疆 - " + camera.SN;
+ editForm.Size = new System.Drawing.Size(400, 500);
+ editForm.StartPosition = FormStartPosition.CenterParent;
+ editForm.FormBorderStyle = FormBorderStyle.SizableToolWindow;
+
+ PropertyGrid pg = new PropertyGrid();
+ pg.Dock = DockStyle.Fill;
+
+ if (camera is LBCamera phmCamera)
+ {
+ pg.SelectedObject = phmCamera.GetSensorConfig();
+ pg.PropertyValueChanged += (s, ev) =>
+ {
+ phmCamera.UpdateSensorConfig((PHM6000SensorConfig)pg.SelectedObject);
+ //鐩告満鍙傛暟淇濆瓨鍒版湰鍦�
+ if (GlobalVar.allLBCameras.Keys.Contains(phmCamera.SN))
+ {
+ GlobalVar.allLBCameras[phmCamera.SN] = (PHM6000SensorConfig)pg.SelectedObject;
+ }
+ else
+ {
+ GlobalVar.allLBCameras.TryAdd(phmCamera.SN, (PHM6000SensorConfig)pg.SelectedObject);
+ }
+ ConfigManager<ConcurrentDictionary<string, PHM6000SensorConfig>>.SaveConfig<ConcurrentDictionary<string, PHM6000SensorConfig>>(GlobalVar.allLBCameras, GlobalVar.allCamerasLBPath);
+ };
+ }
+ else
+ {
+ pg.SelectedObject = new CameraAdvancedSettings(camera);
+ }
+ editForm.Controls.Add(pg);
+ editForm.ShowDialog();
+ }
+ }
}
}
}
--
Gitblit v1.9.3