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_VisionProcesses/Forms/GlobalVarForm.Designer.cs | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/LB_VisionProcesses/Forms/GlobalVarForm.Designer.cs b/LB_VisionProcesses/Forms/GlobalVarForm.Designer.cs
index 9c8b465..c71f731 100644
--- a/LB_VisionProcesses/Forms/GlobalVarForm.Designer.cs
+++ b/LB_VisionProcesses/Forms/GlobalVarForm.Designer.cs
@@ -30,12 +30,12 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GlobalVarForm));
theme_GlobalVarForm = new ReaLTaiizor.Forms.ThemeForm();
- controlBox_GlobalVarForm = new ReaLTaiizor.Controls.ControlBox();
- controlsPanel = new ReaLTaiizor.Controls.Panel();
tlp_GlobalVarForm = new Sunny.UI.UITableLayoutPanel();
tlp_GlobalVarFormOperator = new Sunny.UI.UITableLayoutPanel();
btn_Delete = new ReaLTaiizor.Controls.Button();
btn_Add = new ReaLTaiizor.Controls.Button();
+ controlsPanel = new ReaLTaiizor.Controls.Panel();
+ controlBox_GlobalVarForm = new ReaLTaiizor.Controls.ControlBox();
theme_GlobalVarForm.SuspendLayout();
tlp_GlobalVarForm.SuspendLayout();
tlp_GlobalVarFormOperator.SuspendLayout();
@@ -59,37 +59,6 @@
theme_GlobalVarForm.StartPosition = FormStartPosition.WindowsDefaultLocation;
theme_GlobalVarForm.TabIndex = 0;
theme_GlobalVarForm.Text = "鍏ㄥ眬鍙橀噺";
- //
- // controlBox_GlobalVarForm
- //
- controlBox_GlobalVarForm.Anchor = AnchorStyles.Top | AnchorStyles.Right;
- controlBox_GlobalVarForm.BackColor = Color.FromArgb(32, 34, 37);
- controlBox_GlobalVarForm.CloseHoverColor = Color.FromArgb(230, 17, 35);
- controlBox_GlobalVarForm.DefaultLocation = true;
- controlBox_GlobalVarForm.EnableHoverHighlight = true;
- controlBox_GlobalVarForm.EnableMaximizeButton = false;
- controlBox_GlobalVarForm.EnableMinimizeButton = false;
- controlBox_GlobalVarForm.ForeColor = Color.FromArgb(155, 155, 155);
- controlBox_GlobalVarForm.Location = new Point(700, 18);
- controlBox_GlobalVarForm.MaximizeHoverColor = Color.FromArgb(74, 74, 74);
- controlBox_GlobalVarForm.MinimizeHoverColor = Color.FromArgb(63, 63, 65);
- controlBox_GlobalVarForm.Name = "controlBox_GlobalVarForm";
- controlBox_GlobalVarForm.Size = new Size(90, 25);
- controlBox_GlobalVarForm.TabIndex = 1;
- //
- // controlsPanel
- //
- controlsPanel.BackColor = Color.FromArgb(39, 51, 63);
- controlsPanel.Dock = DockStyle.Fill;
- controlsPanel.EdgeColor = Color.FromArgb(32, 41, 50);
- controlsPanel.Location = new Point(3, 3);
- controlsPanel.Name = "controlsPanel";
- controlsPanel.Padding = new Padding(5);
- controlsPanel.Size = new Size(774, 455);
- controlsPanel.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
- controlsPanel.TabIndex = 0;
- controlsPanel.Text = "panel1";
- controlsPanel.SizeChanged += controlsPanel_SizeChanged;
//
// tlp_GlobalVarForm
//
@@ -169,10 +138,41 @@
btn_Add.TextAlignment = StringAlignment.Center;
btn_Add.Click += btn_Add_Click;
//
+ // controlsPanel
+ //
+ controlsPanel.BackColor = Color.FromArgb(39, 51, 63);
+ controlsPanel.Dock = DockStyle.Fill;
+ controlsPanel.EdgeColor = Color.FromArgb(32, 41, 50);
+ controlsPanel.Location = new Point(3, 3);
+ controlsPanel.Name = "controlsPanel";
+ controlsPanel.Padding = new Padding(5);
+ controlsPanel.Size = new Size(774, 455);
+ controlsPanel.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+ controlsPanel.TabIndex = 0;
+ controlsPanel.Text = "panel1";
+ controlsPanel.SizeChanged += controlsPanel_SizeChanged;
+ //
+ // controlBox_GlobalVarForm
+ //
+ controlBox_GlobalVarForm.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+ controlBox_GlobalVarForm.BackColor = Color.FromArgb(32, 34, 37);
+ controlBox_GlobalVarForm.CloseHoverColor = Color.FromArgb(230, 17, 35);
+ controlBox_GlobalVarForm.DefaultLocation = true;
+ controlBox_GlobalVarForm.EnableHoverHighlight = true;
+ controlBox_GlobalVarForm.EnableMaximizeButton = false;
+ controlBox_GlobalVarForm.EnableMinimizeButton = false;
+ controlBox_GlobalVarForm.ForeColor = Color.FromArgb(155, 155, 155);
+ controlBox_GlobalVarForm.Location = new Point(700, 18);
+ controlBox_GlobalVarForm.MaximizeHoverColor = Color.FromArgb(74, 74, 74);
+ controlBox_GlobalVarForm.MinimizeHoverColor = Color.FromArgb(63, 63, 65);
+ controlBox_GlobalVarForm.Name = "controlBox_GlobalVarForm";
+ controlBox_GlobalVarForm.Size = new Size(90, 25);
+ controlBox_GlobalVarForm.TabIndex = 1;
+ //
// GlobalVarForm
//
- AutoScaleDimensions = new SizeF(7F, 17F);
- AutoScaleMode = AutoScaleMode.Font;
+ AutoScaleDimensions = new SizeF(96F, 96F);
+ AutoScaleMode = AutoScaleMode.Dpi;
ClientSize = new Size(800, 600);
Controls.Add(theme_GlobalVarForm);
FormBorderStyle = FormBorderStyle.None;
--
Gitblit v1.9.3