From a9bc7819f4f7e66159a93e955944728c25ba3e53 Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期三, 07 一月 2026 14:10:11 +0800
Subject: [PATCH] 优化相机管理和界面布局 - 在 `CreateCameraForm.cs` 中添加对 `LBCameras` 的引用，并修复相机创建逻辑。 - 调整 `VisionForm.Designer.cs` 和 `2DCameraForm.Designer.cs` 中多个控件的大小和位置，改善界面布局。 - 在 `VisionForm.cs` 中添加对 `LBCameras` 的引用以支持新相机类型。 - 注释掉 `PHM6000Sensor.cs` 和 `PHM6000Profiler.cs` 中与相机信息获取相关的 P/Invoke 方法。 - 重构 `LBCamera.cs`，添加新的相机初始化和参数设置逻辑，确保与 PHM6000 SDK 的兼容性。 - 移除 `PHM6000Camera.cs` 中与 `PHM6000Camera` 相关的代码，简化相机管理逻辑。 Merge branch 'master' of http://lanpucloud.cn:1111/r/~zhengyabo/LB_TyreAppearanceInspectionSoftware
---
LB_VisionControl/ScriptEditControl/ScriptEditControl.Designer.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/LB_VisionControl/ScriptEditControl/ScriptEditControl.Designer.cs b/LB_VisionControl/ScriptEditControl/ScriptEditControl.Designer.cs
index 4098727..4cacf20 100644
--- a/LB_VisionControl/ScriptEditControl/ScriptEditControl.Designer.cs
+++ b/LB_VisionControl/ScriptEditControl/ScriptEditControl.Designer.cs
@@ -74,7 +74,7 @@
fctb_ScriptEditControl.Language = Language.CSharp;
fctb_ScriptEditControl.LineNumberColor = Color.Black;
fctb_ScriptEditControl.Location = new Point(0, 0);
- fctb_ScriptEditControl.Margin = new Padding(4, 4, 4, 4);
+ fctb_ScriptEditControl.Margin = new Padding(4);
fctb_ScriptEditControl.Name = "fctb_ScriptEditControl";
fctb_ScriptEditControl.Paddings = new Padding(0);
fctb_ScriptEditControl.SelectionColor = Color.FromArgb(100, 255, 255, 128);
@@ -178,30 +178,30 @@
pnl_ScriptEditControl.BackColor = Color.DarkSlateGray;
pnl_ScriptEditControl.Controls.Add(pnl_ControlView);
pnl_ScriptEditControl.Location = new Point(-75, 128);
- pnl_ScriptEditControl.Margin = new Padding(4, 4, 4, 4);
+ pnl_ScriptEditControl.Margin = new Padding(4);
pnl_ScriptEditControl.Name = "pnl_ScriptEditControl";
pnl_ScriptEditControl.Size = new Size(719, 42);
pnl_ScriptEditControl.TabIndex = 2;
pnl_ScriptEditControl.Visible = false;
//
- // panControlView
+ // pnl_ControlView
//
pnl_ControlView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
pnl_ControlView.Location = new Point(2, 3);
- pnl_ControlView.Margin = new Padding(4, 4, 4, 4);
- pnl_ControlView.Name = "panControlView";
+ pnl_ControlView.Margin = new Padding(4);
+ pnl_ControlView.Name = "pnl_ControlView";
pnl_ControlView.Size = new Size(1292, 0);
pnl_ControlView.TabIndex = 8;
//
// ScriptEditControl
//
- AutoScaleDimensions = new SizeF(7F, 17F);
- AutoScaleMode = AutoScaleMode.Font;
+ AutoScaleDimensions = new SizeF(96F, 96F);
+ AutoScaleMode = AutoScaleMode.Dpi;
BackColor = Color.DimGray;
Controls.Add(pnl_ScriptEditControl);
Controls.Add(fctb_ScriptEditControl);
DoubleBuffered = true;
- Margin = new Padding(4, 4, 4, 4);
+ Margin = new Padding(4);
Name = "ScriptEditControl";
Size = new Size(568, 298);
KeyDown += Form1_KeyDown;
--
Gitblit v1.9.3