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/Alogrithms/Halcon/2D/HFindLineTool/HFindLineToolEdit.Designer.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/LB_VisionProcesses/Alogrithms/Halcon/2D/HFindLineTool/HFindLineToolEdit.Designer.cs b/LB_VisionProcesses/Alogrithms/Halcon/2D/HFindLineTool/HFindLineToolEdit.Designer.cs
index b053403..7190e9e 100644
--- a/LB_VisionProcesses/Alogrithms/Halcon/2D/HFindLineTool/HFindLineToolEdit.Designer.cs
+++ b/LB_VisionProcesses/Alogrithms/Halcon/2D/HFindLineTool/HFindLineToolEdit.Designer.cs
@@ -47,7 +47,6 @@
label13 = new Label();
cmbTransition = new ComboBox();
cmbSelect = new ComboBox();
- btnShowROI = new Button();
pnlInputImage = new Panel();
TopToolStrip = new ToolStrip();
btnRun = new ToolStripButton();
@@ -86,6 +85,7 @@
tabPageInputImage = new TabPage();
tabPageRecordImage = new TabPage();
pnlRecordImage = new Panel();
+ btnShowROI = new Button();
tablePanelParas.SuspendLayout();
TopToolStrip.SuspendLayout();
BtmStatusStrip.SuspendLayout();
@@ -321,17 +321,6 @@
cmbSelect.Name = "cmbSelect";
cmbSelect.Size = new Size(103, 25);
cmbSelect.TabIndex = 14;
- //
- // btnShowROI
- //
- btnShowROI.Dock = DockStyle.Fill;
- btnShowROI.Location = new Point(3, 207);
- btnShowROI.Name = "btnShowROI";
- btnShowROI.Size = new Size(84, 45);
- btnShowROI.TabIndex = 15;
- btnShowROI.Text = "鏄剧ず鎵剧嚎鍖哄煙";
- btnShowROI.UseVisualStyleBackColor = true;
- btnShowROI.Click += btnShowROI_Click;
//
// pnlInputImage
//
@@ -765,10 +754,21 @@
pnlRecordImage.Size = new Size(607, 510);
pnlRecordImage.TabIndex = 45;
//
+ // btnShowROI
+ //
+ btnShowROI.Dock = DockStyle.Fill;
+ btnShowROI.Location = new Point(3, 207);
+ btnShowROI.Name = "btnShowROI";
+ btnShowROI.Size = new Size(84, 45);
+ btnShowROI.TabIndex = 15;
+ btnShowROI.Text = "鏄剧ず鎵剧嚎鍖哄煙";
+ btnShowROI.UseVisualStyleBackColor = true;
+ btnShowROI.Click += btnShowROI_Click;
+ //
// HFindLineToolEdit
//
- AutoScaleDimensions = new SizeF(96F, 96F);
- AutoScaleMode = AutoScaleMode.Dpi;
+ AutoScaleDimensions = new SizeF(7F, 17F);
+ AutoScaleMode = AutoScaleMode.Font;
Controls.Add(MainTableLayoutPanel);
Controls.Add(BtmStatusStrip);
Controls.Add(TopToolStrip);
--
Gitblit v1.9.3