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/ProcessControl.Designer.cs | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/LB_SmartVision/Forms/Pages/ProcessPage/ProcessControl.Designer.cs b/LB_SmartVision/Forms/Pages/ProcessPage/ProcessControl.Designer.cs
index 10f35aa..217409e 100644
--- a/LB_SmartVision/Forms/Pages/ProcessPage/ProcessControl.Designer.cs
+++ b/LB_SmartVision/Forms/Pages/ProcessPage/ProcessControl.Designer.cs
@@ -13,6 +13,7 @@
/// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
protected override void Dispose(bool disposing)
{
+ this.isClosed = true;
if (disposing && (components != null))
{
components.Dispose();
@@ -46,10 +47,11 @@
//
// toolStrip1
//
+ toolStrip1.ImageScalingSize = new Size(20, 20);
toolStrip1.Items.AddRange(new ToolStripItem[] { lblTitle, btnRun, btnCircleRun });
toolStrip1.Location = new Point(0, 0);
toolStrip1.Name = "toolStrip1";
- toolStrip1.Size = new Size(360, 25);
+ toolStrip1.Size = new Size(450, 27);
toolStrip1.TabIndex = 0;
toolStrip1.Text = "toolStrip1";
//
@@ -57,7 +59,7 @@
//
lblTitle.ForeColor = SystemColors.ControlText;
lblTitle.Name = "lblTitle";
- lblTitle.Size = new Size(56, 22);
+ lblTitle.Size = new Size(69, 24);
lblTitle.Text = "娴佺▼鍚嶇О";
//
// btnRun
@@ -66,7 +68,7 @@
btnRun.Image = (Image)resources.GetObject("btnRun.Image");
btnRun.ImageTransparentColor = Color.Magenta;
btnRun.Name = "btnRun";
- btnRun.Size = new Size(76, 22);
+ btnRun.Size = new Size(93, 24);
btnRun.Text = "鍗曟杩愯";
btnRun.ToolTipText = "鍗曟杩愯";
btnRun.Click += btnRun_Click;
@@ -77,7 +79,7 @@
btnCircleRun.Image = (Image)resources.GetObject("btnCircleRun.Image");
btnCircleRun.ImageTransparentColor = Color.Magenta;
btnCircleRun.Name = "btnCircleRun";
- btnCircleRun.Size = new Size(76, 22);
+ btnCircleRun.Size = new Size(93, 24);
btnCircleRun.Text = "杩炵画杩愯";
btnCircleRun.ToolTipText = "杩炵画";
btnCircleRun.Click += btnCircleRun_Click;
@@ -87,7 +89,7 @@
panel1.Dock = DockStyle.Fill;
panel1.Location = new Point(3, 3);
panel1.Name = "panel1";
- panel1.Size = new Size(354, 187);
+ panel1.Size = new Size(444, 224);
panel1.TabIndex = 1;
//
// tableLayoutPanel1
@@ -101,8 +103,8 @@
tableLayoutPanel1.Name = "tableLayoutPanel1";
tableLayoutPanel1.RowCount = 2;
tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 22F));
- tableLayoutPanel1.Size = new Size(360, 215);
+ tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 30F));
+ tableLayoutPanel1.Size = new Size(450, 260);
tableLayoutPanel1.TabIndex = 2;
//
// tableLayoutPanel2
@@ -113,11 +115,11 @@
tableLayoutPanel2.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
tableLayoutPanel2.Controls.Add(label1, 0, 0);
tableLayoutPanel2.Dock = DockStyle.Fill;
- tableLayoutPanel2.Location = new Point(3, 196);
+ tableLayoutPanel2.Location = new Point(3, 233);
tableLayoutPanel2.Name = "tableLayoutPanel2";
tableLayoutPanel2.RowCount = 1;
tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel2.Size = new Size(354, 16);
+ tableLayoutPanel2.Size = new Size(444, 24);
tableLayoutPanel2.TabIndex = 2;
//
// label1
@@ -127,7 +129,7 @@
label1.ForeColor = SystemColors.Control;
label1.Location = new Point(3, 0);
label1.Name = "label1";
- label1.Size = new Size(112, 16);
+ label1.Size = new Size(141, 24);
label1.TabIndex = 0;
label1.Text = "鎬绘暟锛�0";
label1.DoubleClick += lblCount_DoubleClick;
@@ -138,24 +140,25 @@
uiPanel1.Controls.Add(tableLayoutPanel1);
uiPanel1.Dock = DockStyle.Fill;
uiPanel1.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
- uiPanel1.Location = new Point(0, 25);
- uiPanel1.Margin = new Padding(4, 5, 4, 5);
+ uiPanel1.Location = new Point(0, 27);
+ uiPanel1.Margin = new Padding(5, 6, 5, 6);
uiPanel1.MinimumSize = new Size(1, 1);
uiPanel1.Name = "uiPanel1";
- uiPanel1.Size = new Size(360, 215);
+ uiPanel1.Size = new Size(450, 260);
uiPanel1.TabIndex = 3;
uiPanel1.Text = "uiPanel1";
uiPanel1.TextAlignment = ContentAlignment.MiddleCenter;
//
// ProcessControl
//
- AutoScaleDimensions = new SizeF(96F, 96F);
+ AutoScaleDimensions = new SizeF(120F, 120F);
AutoScaleMode = AutoScaleMode.Dpi;
BackColor = Color.FromArgb(32, 41, 50);
Controls.Add(uiPanel1);
Controls.Add(toolStrip1);
+ Margin = new Padding(4, 4, 4, 4);
Name = "ProcessControl";
- Size = new Size(360, 240);
+ Size = new Size(450, 287);
Load += ProcessControl_Load;
toolStrip1.ResumeLayout(false);
toolStrip1.PerformLayout();
--
Gitblit v1.9.3