Merge branch 'feature/Camera3D'

C3032

2026-01-06 aea40fb6e71126ca9d737140237782b69fcd801e

 LB_VisionProcesses/Cameras/2DCameraForm.cs

@@ -1,6 +1,8 @@
using HalconDotNet;
using LB_SmartVisionCameraDevice.PHM6000;
using LB_VisionControl;
using LB_VisionProcesses.Cameras.HRCameras;
using LB_VisionProcesses.Cameras.LBCameras;
using MVSDK_Net;
using Newtonsoft.Json.Linq;
using OpenCvSharp;
@@ -164,7 +166,7 @@
                        camera = new HRCamera();
                        break;
                    case CameraBrand.LBCamera:
                        //camera = new LBCamera();
                        camera = new PHM6000Camera();
                        break;
                    default:
                        Debug.WriteLine("未知品牌");
@@ -240,7 +242,7 @@
                switch (brand)
                {
                    case CameraBrand.LBCamera:
                        //camera = new LBCamera();
                        camera = new PHM6000Camera();
                        break;
                    case CameraBrand.HRCamera:
                        camera = new HRCamera();
@@ -313,7 +315,19 @@

                PropertyGrid pg = new PropertyGrid();
                pg.Dock = DockStyle.Fill;
                pg.SelectedObject = new CameraAdvancedSettings(camera);

                if (camera is PHM6000Camera phmCamera)
                {
                    pg.SelectedObject = phmCamera.GetSensorConfig();
                    pg.PropertyValueChanged += (s, ev) =>
                    {
                        phmCamera.UpdateSensorConfig((PHM6000SensorConfig)pg.SelectedObject);
                    };
                }
                else
                {
                    pg.SelectedObject = new CameraAdvancedSettings(camera);
                }

                editForm.Controls.Add(pg);
                editForm.ShowDialog();