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_SmartVision/Forms/Pages/ProcessPage/ProcessInputsSelectForm.Designer.cs | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/LB_SmartVision/Forms/Pages/ProcessPage/ProcessInputsSelectForm.Designer.cs b/LB_SmartVision/Forms/Pages/ProcessPage/ProcessInputsSelectForm.Designer.cs
index cec136a..a7252aa 100644
--- a/LB_SmartVision/Forms/Pages/ProcessPage/ProcessInputsSelectForm.Designer.cs
+++ b/LB_SmartVision/Forms/Pages/ProcessPage/ProcessInputsSelectForm.Designer.cs
@@ -30,21 +30,21 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProcessInputsSelectForm));
themeForm1 = new ReaLTaiizor.Forms.ThemeForm();
+ panel = new Panel();
controlBox1 = new ReaLTaiizor.Controls.ControlBox();
- panel = new ReaLTaiizor.Controls.Panel();
themeForm1.SuspendLayout();
SuspendLayout();
//
// themeForm1
//
themeForm1.BackColor = Color.FromArgb(32, 41, 50);
- themeForm1.Controls.Add(controlBox1);
themeForm1.Controls.Add(panel);
+ themeForm1.Controls.Add(controlBox1);
themeForm1.Dock = DockStyle.Fill;
themeForm1.Font = new Font("Microsoft Sans Serif", 9F);
themeForm1.Image = (Image)resources.GetObject("themeForm1.Image");
themeForm1.Location = new Point(0, 0);
- themeForm1.Name = "theme_ProcessInputsSelectForm";
+ themeForm1.Name = "themeForm1";
themeForm1.Padding = new Padding(10, 70, 10, 9);
themeForm1.RoundCorners = true;
themeForm1.Sizable = true;
@@ -53,6 +53,17 @@
themeForm1.StartPosition = FormStartPosition.WindowsDefaultLocation;
themeForm1.TabIndex = 2;
themeForm1.Text = "ProcessInputsSelectForm";
+ //
+ // panel
+ //
+ panel.AutoScroll = true;
+ panel.Dock = DockStyle.Fill;
+ panel.ForeColor = SystemColors.Control;
+ panel.Location = new Point(10, 70);
+ panel.Name = "panel";
+ panel.Size = new Size(887, 405);
+ panel.TabIndex = 2;
+ panel.SizeChanged += panel_SizeChanged;
//
// controlBox1
//
@@ -72,23 +83,10 @@
controlBox1.TabIndex = 1;
controlBox1.Text = "controlBox1";
//
- // panel
- //
- panel.BackColor = Color.FromArgb(39, 51, 63);
- panel.Dock = DockStyle.Fill;
- panel.EdgeColor = Color.FromArgb(32, 41, 50);
- panel.Location = new Point(10, 70);
- panel.Name = "panel";
- panel.Padding = new Padding(5);
- panel.Size = new Size(887, 405);
- panel.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
- panel.TabIndex = 0;
- panel.Text = "panel1";
- //
// ProcessInputsSelectForm
//
- AutoScaleDimensions = new SizeF(7F, 17F);
- AutoScaleMode = AutoScaleMode.Font;
+ AutoScaleDimensions = new SizeF(96F, 96F);
+ AutoScaleMode = AutoScaleMode.Dpi;
ClientSize = new Size(907, 484);
Controls.Add(themeForm1);
FormBorderStyle = FormBorderStyle.None;
@@ -104,7 +102,7 @@
#endregion
private Button uiButtonOK;
private ReaLTaiizor.Forms.ThemeForm themeForm1;
- private ReaLTaiizor.Controls.Panel panel;
private ReaLTaiizor.Controls.ControlBox controlBox1;
+ private Panel panel;
}
}
--
Gitblit v1.9.3