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/CommunicatorPage/CreateCommunicatorForm.Designer.cs | 176 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 108 insertions(+), 68 deletions(-)
diff --git a/LB_SmartVision/Forms/Pages/CommunicatorPage/CreateCommunicatorForm.Designer.cs b/LB_SmartVision/Forms/Pages/CommunicatorPage/CreateCommunicatorForm.Designer.cs
index 5eb648d..3fb0581 100644
--- a/LB_SmartVision/Forms/Pages/CommunicatorPage/CreateCommunicatorForm.Designer.cs
+++ b/LB_SmartVision/Forms/Pages/CommunicatorPage/CreateCommunicatorForm.Designer.cs
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CreateCommunicatorForm));
uiLabelIP = new Label();
uiLabelPort = new Label();
uiButtonCancel = new Button();
@@ -40,14 +41,18 @@
uiComboBoxPort = new ComboBox();
uiIPTextBox = new TextBox();
uiTextBoxPath = new TextBox();
- rButtonMonitor = new RadioButton();
+ rButtonS7 = new RadioButton();
+ themeForm1 = new ReaLTaiizor.Forms.ThemeForm();
+ uiLabelS7Type = new Label();
+ uiComboBoxS7Type = new ComboBox();
+ themeForm1.SuspendLayout();
SuspendLayout();
//
// uiLabelIP
//
- uiLabelIP.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point);
- uiLabelIP.ForeColor = Color.FromArgb(48, 48, 48);
- uiLabelIP.Location = new Point(84, 111);
+ uiLabelIP.Font = new Font("瀹嬩綋", 12F);
+ uiLabelIP.ForeColor = SystemColors.Control;
+ uiLabelIP.Location = new Point(84, 169);
uiLabelIP.Name = "uiLabelIP";
uiLabelIP.Size = new Size(100, 23);
uiLabelIP.TabIndex = 1;
@@ -55,9 +60,9 @@
//
// uiLabelPort
//
- uiLabelPort.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point);
- uiLabelPort.ForeColor = Color.FromArgb(48, 48, 48);
- uiLabelPort.Location = new Point(84, 177);
+ uiLabelPort.Font = new Font("瀹嬩綋", 12F);
+ uiLabelPort.ForeColor = SystemColors.Control;
+ uiLabelPort.Location = new Point(84, 235);
uiLabelPort.Name = "uiLabelPort";
uiLabelPort.Size = new Size(100, 23);
uiLabelPort.TabIndex = 2;
@@ -65,8 +70,9 @@
//
// uiButtonCancel
//
- uiButtonCancel.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point);
- uiButtonCancel.Location = new Point(343, 234);
+ uiButtonCancel.Font = new Font("瀹嬩綋", 12F);
+ uiButtonCancel.ForeColor = SystemColors.Control;
+ uiButtonCancel.Location = new Point(343, 351);
uiButtonCancel.MinimumSize = new Size(1, 1);
uiButtonCancel.Name = "uiButtonCancel";
uiButtonCancel.Size = new Size(100, 35);
@@ -76,23 +82,20 @@
//
// uiTextBoxPort
//
- uiTextBoxPort.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point);
- uiTextBoxPort.Location = new Point(191, 175);
+ uiTextBoxPort.Font = new Font("瀹嬩綋", 12F);
+ uiTextBoxPort.Location = new Point(191, 233);
uiTextBoxPort.Margin = new Padding(4, 5, 4, 5);
uiTextBoxPort.MinimumSize = new Size(1, 16);
uiTextBoxPort.Name = "uiTextBoxPort";
- uiTextBoxPort.Padding = new Padding(5);
- //uiTextBoxPort.ShowText = false;
- uiTextBoxPort.Size = new Size(205, 29);
+ uiTextBoxPort.Size = new Size(205, 26);
uiTextBoxPort.TabIndex = 5;
- //uiTextBoxPort.TextAlignment = ContentAlignment.MiddleLeft;
- //uiTextBoxPort.Watermark = "";
uiTextBoxPort.TextChanged += uiTextBoxPort_TextChanged;
//
// rButtonUART
//
- rButtonUART.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point);
- rButtonUART.Location = new Point(51, 12);
+ rButtonUART.Font = new Font("瀹嬩綋", 12F);
+ rButtonUART.ForeColor = SystemColors.Control;
+ rButtonUART.Location = new Point(51, 71);
rButtonUART.MinimumSize = new Size(1, 1);
rButtonUART.Name = "rButtonUART";
rButtonUART.Size = new Size(150, 29);
@@ -102,8 +105,9 @@
//
// rButtonTCPServer
//
- rButtonTCPServer.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point);
- rButtonTCPServer.Location = new Point(51, 47);
+ rButtonTCPServer.Font = new Font("瀹嬩綋", 12F);
+ rButtonTCPServer.ForeColor = SystemColors.Control;
+ rButtonTCPServer.Location = new Point(51, 106);
rButtonTCPServer.MinimumSize = new Size(1, 1);
rButtonTCPServer.Name = "rButtonTCPServer";
rButtonTCPServer.Size = new Size(150, 29);
@@ -113,8 +117,9 @@
//
// rButtonTCPClient
//
- rButtonTCPClient.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point);
- rButtonTCPClient.Location = new Point(293, 47);
+ rButtonTCPClient.Font = new Font("瀹嬩綋", 12F);
+ rButtonTCPClient.ForeColor = SystemColors.Control;
+ rButtonTCPClient.Location = new Point(293, 106);
rButtonTCPClient.MinimumSize = new Size(1, 1);
rButtonTCPClient.Name = "rButtonTCPClient";
rButtonTCPClient.Size = new Size(150, 29);
@@ -125,8 +130,9 @@
// uiButtonCreate
//
uiButtonCreate.Enabled = false;
- uiButtonCreate.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point);
- uiButtonCreate.Location = new Point(191, 234);
+ uiButtonCreate.Font = new Font("瀹嬩綋", 12F);
+ uiButtonCreate.ForeColor = SystemColors.Control;
+ uiButtonCreate.Location = new Point(191, 351);
uiButtonCreate.MinimumSize = new Size(1, 1);
uiButtonCreate.Name = "uiButtonCreate";
uiButtonCreate.Size = new Size(100, 35);
@@ -136,8 +142,9 @@
//
// uiButtonTest
//
- uiButtonTest.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point);
- uiButtonTest.Location = new Point(31, 234);
+ uiButtonTest.Font = new Font("瀹嬩綋", 12F);
+ uiButtonTest.ForeColor = SystemColors.Control;
+ uiButtonTest.Location = new Point(31, 351);
uiButtonTest.MinimumSize = new Size(1, 1);
uiButtonTest.Name = "uiButtonTest";
uiButtonTest.Size = new Size(100, 35);
@@ -147,70 +154,97 @@
//
// uiComboBoxPort
//
- uiComboBoxPort.DataSource = null;
- //uiComboBoxPort.FillColor = Color.White;
- uiComboBoxPort.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point);
- //uiComboBoxPort.ItemHoverColor = Color.FromArgb(155, 200, 255);
- //uiComboBoxPort.ItemSelectForeColor = Color.FromArgb(235, 243, 255);
- uiComboBoxPort.Location = new Point(191, 108);
+ uiComboBoxPort.Font = new Font("瀹嬩綋", 12F);
+ uiComboBoxPort.Location = new Point(191, 167);
uiComboBoxPort.Margin = new Padding(4, 5, 4, 5);
uiComboBoxPort.MinimumSize = new Size(63, 0);
uiComboBoxPort.Name = "uiComboBoxPort";
- uiComboBoxPort.Padding = new Padding(0, 0, 30, 2);
- uiComboBoxPort.Size = new Size(205, 29);
- //uiComboBoxPort.SymbolSize = 24;
+ uiComboBoxPort.Size = new Size(205, 24);
uiComboBoxPort.TabIndex = 11;
- //uiComboBoxPort.TextAlignment = ContentAlignment.MiddleLeft;
- //uiComboBoxPort.Watermark = "";
uiComboBoxPort.MouseClick += uiComboBoxPort_MouseClick;
//
// uiIPTextBox
//
- //uiIPTextBox.FillColor2 = Color.FromArgb(235, 243, 255);
- uiIPTextBox.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point);
- uiIPTextBox.Location = new Point(191, 108);
+ uiIPTextBox.Font = new Font("瀹嬩綋", 12F);
+ uiIPTextBox.Location = new Point(191, 168);
uiIPTextBox.Margin = new Padding(4, 5, 4, 5);
uiIPTextBox.MinimumSize = new Size(1, 1);
uiIPTextBox.Name = "uiIPTextBox";
- uiIPTextBox.Padding = new Padding(1);
- //uiIPTextBox.ShowText = false;
- uiIPTextBox.Size = new Size(205, 29);
+ uiIPTextBox.Size = new Size(205, 26);
uiIPTextBox.TabIndex = 12;
- //uiIPTextBox.TextAlignment = ContentAlignment.MiddleCenter;
uiIPTextBox.MouseClick += uiIPTextBox_MouseClick;
//
// uiTextBoxPath
//
- uiTextBoxPath.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point);
- uiTextBoxPath.Location = new Point(191, 108);
+ uiTextBoxPath.Font = new Font("瀹嬩綋", 12F);
+ uiTextBoxPath.Location = new Point(191, 168);
uiTextBoxPath.Margin = new Padding(4, 5, 4, 5);
uiTextBoxPath.MinimumSize = new Size(1, 16);
uiTextBoxPath.Name = "uiTextBoxPath";
- uiTextBoxPath.Padding = new Padding(5);
- //uiTextBoxPath.ShowText = false;
- uiTextBoxPath.Size = new Size(205, 29);
+ uiTextBoxPath.Size = new Size(205, 26);
uiTextBoxPath.TabIndex = 13;
- //uiTextBoxPath.TextAlignment = ContentAlignment.MiddleLeft;
- //uiTextBoxPath.Watermark = "";
//
- // rButtonMonitor
+ // rButtonS7
//
- rButtonMonitor.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point);
- rButtonMonitor.Location = new Point(293, 12);
- rButtonMonitor.MinimumSize = new Size(1, 1);
- rButtonMonitor.Name = "rButtonMonitor";
- rButtonMonitor.Size = new Size(150, 29);
- rButtonMonitor.TabIndex = 14;
- rButtonMonitor.Text = "鏈湴鐩戞帶";
- rButtonMonitor.CheckedChanged += rButtonMonitor_CheckedChanged;
+ rButtonS7.Font = new Font("瀹嬩綋", 12F);
+ rButtonS7.ForeColor = SystemColors.Control;
+ rButtonS7.Location = new Point(293, 71);
+ rButtonS7.MinimumSize = new Size(1, 1);
+ rButtonS7.Name = "rButtonS7";
+ rButtonS7.Size = new Size(150, 29);
+ rButtonS7.TabIndex = 14;
+ rButtonS7.Text = "瑗块棬瀛怱7";
+ rButtonS7.CheckedChanged += rButtonS7_CheckedChanged;
+ //
+ // themeForm1
+ //
+ themeForm1.BackColor = Color.FromArgb(32, 41, 50);
+ themeForm1.Controls.Add(uiLabelS7Type);
+ themeForm1.Controls.Add(uiComboBoxS7Type);
+ themeForm1.Dock = DockStyle.Fill;
+ themeForm1.Font = new Font("Microsoft Sans Serif", 9F);
+ themeForm1.Image = (Image)resources.GetObject("themeForm1.Image");
+ themeForm1.Location = new Point(0, 0);
+ themeForm1.Name = "themeForm1";
+ themeForm1.Padding = new Padding(10, 70, 10, 9);
+ themeForm1.RoundCorners = true;
+ themeForm1.Sizable = true;
+ themeForm1.Size = new Size(480, 413);
+ themeForm1.SmartBounds = true;
+ themeForm1.StartPosition = FormStartPosition.WindowsDefaultLocation;
+ themeForm1.TabIndex = 15;
+ themeForm1.Text = "鍒涘缓閫氳";
+ //
+ // uiLabelS7Type
+ //
+ uiLabelS7Type.Font = new Font("瀹嬩綋", 12F);
+ uiLabelS7Type.ForeColor = SystemColors.Control;
+ uiLabelS7Type.Location = new Point(84, 302);
+ uiLabelS7Type.Name = "uiLabelS7Type";
+ uiLabelS7Type.Size = new Size(100, 23);
+ uiLabelS7Type.TabIndex = 2;
+ uiLabelS7Type.Text = "鍨嬪彿";
+ //
+ // uiComboBoxS7Type
+ //
+ uiComboBoxS7Type.DropDownStyle = ComboBoxStyle.DropDownList;
+ uiComboBoxS7Type.Font = new Font("瀹嬩綋", 12F);
+ uiComboBoxS7Type.Location = new Point(191, 299);
+ uiComboBoxS7Type.Margin = new Padding(4, 5, 4, 5);
+ uiComboBoxS7Type.MinimumSize = new Size(63, 0);
+ uiComboBoxS7Type.Name = "uiComboBoxS7Type";
+ uiComboBoxS7Type.Size = new Size(205, 24);
+ uiComboBoxS7Type.TabIndex = 11;
+ uiComboBoxS7Type.SelectedIndexChanged += uiComboBoxS7Type_SelectedIndexChanged;
+ uiComboBoxS7Type.MouseClick += uiComboBoxPort_MouseClick;
//
// CreateCommunicatorForm
//
- //AllowShowTitle = false;
- AutoScaleMode = AutoScaleMode.None;
- ClientSize = new Size(484, 285);
+ AutoScaleDimensions = new SizeF(96F, 96F);
+ AutoScaleMode = AutoScaleMode.Dpi;
+ ClientSize = new Size(480, 413);
ControlBox = false;
- Controls.Add(rButtonMonitor);
+ Controls.Add(rButtonS7);
Controls.Add(uiTextBoxPath);
Controls.Add(uiIPTextBox);
Controls.Add(uiComboBoxPort);
@@ -223,14 +257,17 @@
Controls.Add(uiButtonCancel);
Controls.Add(uiLabelPort);
Controls.Add(uiLabelIP);
+ Controls.Add(themeForm1);
+ FormBorderStyle = FormBorderStyle.None;
MaximizeBox = false;
MinimizeBox = false;
+ MinimumSize = new Size(261, 61);
Name = "CreateCommunicatorForm";
- Padding = new Padding(0);
- //ShowTitle = false;
Text = "鍒涘缓閫氳";
- //ZoomScaleRect = new Rectangle(15, 15, 800, 450);
+ TransparencyKey = Color.Fuchsia;
+ themeForm1.ResumeLayout(false);
ResumeLayout(false);
+ PerformLayout();
}
#endregion
@@ -246,6 +283,9 @@
private ComboBox uiComboBoxPort;
private TextBox uiIPTextBox;
private TextBox uiTextBoxPath;
- private RadioButton rButtonMonitor;
+ private RadioButton rButtonS7;
+ private ReaLTaiizor.Forms.ThemeForm themeForm1;
+ private Label uiLabelS7Type;
+ private ComboBox uiComboBoxS7Type;
}
}
\ No newline at end of file
--
Gitblit v1.9.3