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/UserManagementPage/UserManagementEditPage.Designer.cs | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.Designer.cs b/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.Designer.cs
index a81aa2b..6996dcc 100644
--- a/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.Designer.cs
+++ b/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.Designer.cs
@@ -50,9 +50,9 @@
comboBoxPermission = new ComboBox();
dataGridViewUM = new DataGridView();
tableLayoutPanel4 = new TableLayoutPanel();
- btnDel = new HopeButton();
btnEdit = new HopeButton();
btnFind = new HopeButton();
+ btnDel = new HopeButton();
btnAdd = new ForeverButton();
grpSetting.SuspendLayout();
tableLayoutPanel1.SuspendLayout();
@@ -96,8 +96,8 @@
// tableLayoutPanel2
//
tableLayoutPanel2.ColumnCount = 2;
- tableLayoutPanel2.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 40F));
- tableLayoutPanel2.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 60F));
+ tableLayoutPanel2.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 340F));
+ tableLayoutPanel2.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
tableLayoutPanel2.Controls.Add(tableLayoutPanel3, 0, 0);
tableLayoutPanel2.Controls.Add(dataGridViewUM, 1, 0);
tableLayoutPanel2.Dock = DockStyle.Fill;
@@ -240,10 +240,10 @@
//
dataGridViewUM.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridViewUM.Dock = DockStyle.Fill;
- dataGridViewUM.Location = new Point(344, 3);
+ dataGridViewUM.Location = new Point(343, 3);
dataGridViewUM.Name = "dataGridViewUM";
dataGridViewUM.RowHeadersWidth = 51;
- dataGridViewUM.Size = new Size(507, 494);
+ dataGridViewUM.Size = new Size(508, 494);
dataGridViewUM.TabIndex = 1;
//
// tableLayoutPanel4
@@ -264,26 +264,6 @@
tableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
tableLayoutPanel4.Size = new Size(400, 39);
tableLayoutPanel4.TabIndex = 1;
- //
- // btnDel
- //
- btnDel.BorderColor = Color.FromArgb(220, 223, 230);
- btnDel.ButtonType = ReaLTaiizor.Util.HopeButtonType.Primary;
- btnDel.DangerColor = Color.FromArgb(245, 108, 108);
- btnDel.DefaultColor = Color.FromArgb(255, 255, 255);
- btnDel.Font = new Font("Segoe UI", 12F);
- btnDel.HoverTextColor = Color.FromArgb(48, 49, 51);
- btnDel.InfoColor = Color.FromArgb(144, 147, 153);
- btnDel.Location = new Point(303, 3);
- btnDel.Name = "btnDel";
- btnDel.PrimaryColor = Color.FromArgb(64, 158, 255);
- btnDel.Size = new Size(94, 33);
- btnDel.SuccessColor = Color.FromArgb(103, 194, 58);
- btnDel.TabIndex = 3;
- btnDel.Text = "鍒犻櫎";
- btnDel.TextColor = Color.White;
- btnDel.WarningColor = Color.FromArgb(230, 162, 60);
- btnDel.Click += btnDel_Click;
//
// btnEdit
//
@@ -323,6 +303,26 @@
btnFind.TextColor = Color.White;
btnFind.WarningColor = Color.FromArgb(230, 162, 60);
//
+ // btnDel
+ //
+ btnDel.BorderColor = Color.FromArgb(220, 223, 230);
+ btnDel.ButtonType = ReaLTaiizor.Util.HopeButtonType.Primary;
+ btnDel.DangerColor = Color.FromArgb(245, 108, 108);
+ btnDel.DefaultColor = Color.FromArgb(255, 255, 255);
+ btnDel.Font = new Font("Segoe UI", 12F);
+ btnDel.HoverTextColor = Color.FromArgb(48, 49, 51);
+ btnDel.InfoColor = Color.FromArgb(144, 147, 153);
+ btnDel.Location = new Point(303, 3);
+ btnDel.Name = "btnDel";
+ btnDel.PrimaryColor = Color.FromArgb(64, 158, 255);
+ btnDel.Size = new Size(94, 33);
+ btnDel.SuccessColor = Color.FromArgb(103, 194, 58);
+ btnDel.TabIndex = 3;
+ btnDel.Text = "鍒犻櫎";
+ btnDel.TextColor = Color.White;
+ btnDel.WarningColor = Color.FromArgb(230, 162, 60);
+ btnDel.Click += btnDel_Click;
+ //
// btnAdd
//
btnAdd.BackColor = Color.Transparent;
--
Gitblit v1.9.3