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/MotionControlPage/MotionControlForm.Designer.cs | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/LB_SmartVision/Forms/Pages/MotionControlPage/MotionControlForm.Designer.cs b/LB_SmartVision/Forms/Pages/MotionControlPage/MotionControlForm.Designer.cs
index 3e8decd..1df002a 100644
--- a/LB_SmartVision/Forms/Pages/MotionControlPage/MotionControlForm.Designer.cs
+++ b/LB_SmartVision/Forms/Pages/MotionControlPage/MotionControlForm.Designer.cs
@@ -232,9 +232,9 @@
//
textBoxAngleNow.Anchor = AnchorStyles.Left | AnchorStyles.Right;
textBoxAngleNow.Enabled = false;
- textBoxAngleNow.Location = new Point(160, 146);
+ textBoxAngleNow.Location = new Point(160, 144);
textBoxAngleNow.Name = "textBoxAngleNow";
- textBoxAngleNow.Size = new Size(205, 26);
+ textBoxAngleNow.Size = new Size(205, 30);
textBoxAngleNow.TabIndex = 17;
textBoxAngleNow.Text = "0";
textBoxAngleNow.TextChanged += textBoxAngleNow_TextChanged;
@@ -255,9 +255,9 @@
//
textBoxPositionNow.Anchor = AnchorStyles.Left | AnchorStyles.Right;
textBoxPositionNow.Enabled = false;
- textBoxPositionNow.Location = new Point(160, 99);
+ textBoxPositionNow.Location = new Point(160, 97);
textBoxPositionNow.Name = "textBoxPositionNow";
- textBoxPositionNow.Size = new Size(205, 26);
+ textBoxPositionNow.Size = new Size(205, 30);
textBoxPositionNow.TabIndex = 15;
textBoxPositionNow.Text = "(0,0,0)";
textBoxPositionNow.TextChanged += textBoxPositionNow_TextChanged;
@@ -277,9 +277,9 @@
// textBoxAngSpeed
//
textBoxAngSpeed.Anchor = AnchorStyles.Left | AnchorStyles.Right;
- textBoxAngSpeed.Location = new Point(160, 54);
+ textBoxAngSpeed.Location = new Point(160, 52);
textBoxAngSpeed.Name = "textBoxAngSpeed";
- textBoxAngSpeed.Size = new Size(205, 26);
+ textBoxAngSpeed.Size = new Size(205, 30);
textBoxAngSpeed.TabIndex = 13;
textBoxAngSpeed.Text = "0";
textBoxAngSpeed.TextChanged += textBoxAngSpeed_TextChanged;
@@ -301,9 +301,9 @@
// textBoxPointSpeed
//
textBoxPointSpeed.Anchor = AnchorStyles.Left | AnchorStyles.Right;
- textBoxPointSpeed.Location = new Point(160, 9);
+ textBoxPointSpeed.Location = new Point(160, 7);
textBoxPointSpeed.Name = "textBoxPointSpeed";
- textBoxPointSpeed.Size = new Size(205, 26);
+ textBoxPointSpeed.Size = new Size(205, 30);
textBoxPointSpeed.TabIndex = 11;
textBoxPointSpeed.Text = "0";
textBoxPointSpeed.TextChanged += textBoxPointSpeed_TextChanged;
@@ -561,14 +561,15 @@
tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
tableLayoutPanel1.Size = new Size(368, 39);
tableLayoutPanel1.TabIndex = 4;
+ tableLayoutPanel1.Paint += tableLayoutPanel1_Paint;
//
// textBox1
//
textBox1.Anchor = AnchorStyles.Left | AnchorStyles.Right;
textBox1.Enabled = false;
- textBox1.Location = new Point(78, 6);
+ textBox1.Location = new Point(78, 4);
textBox1.Name = "textBox1";
- textBox1.Size = new Size(287, 26);
+ textBox1.Size = new Size(287, 30);
textBox1.TabIndex = 20;
//
// uiMarkLabelSN
@@ -602,9 +603,9 @@
//
textBox2.Anchor = AnchorStyles.Left | AnchorStyles.Right;
textBox2.Enabled = false;
- textBox2.Location = new Point(78, 6);
+ textBox2.Location = new Point(78, 4);
textBox2.Name = "textBox2";
- textBox2.Size = new Size(287, 26);
+ textBox2.Size = new Size(287, 30);
textBox2.TabIndex = 21;
//
// uiMarkLabelName
@@ -694,7 +695,8 @@
//
// MotionControlForm
//
- AutoScaleMode = AutoScaleMode.None;
+ AutoScaleDimensions = new SizeF(120F, 120F);
+ AutoScaleMode = AutoScaleMode.Dpi;
AutoSize = true;
ClientSize = new Size(900, 763);
Controls.Add(themeForm1);
--
Gitblit v1.9.3