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/Cameras/2DCameraForm.Designer.cs | 270 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 161 insertions(+), 109 deletions(-)
diff --git a/LB_VisionProcesses/Cameras/2DCameraForm.Designer.cs b/LB_VisionProcesses/Cameras/2DCameraForm.Designer.cs
index 894b11f..3064cbf 100644
--- a/LB_VisionProcesses/Cameras/2DCameraForm.Designer.cs
+++ b/LB_VisionProcesses/Cameras/2DCameraForm.Designer.cs
@@ -104,18 +104,20 @@
//
cmbBrand.Dock = DockStyle.Fill;
cmbBrand.FormattingEnabled = true;
- cmbBrand.Location = new Point(53, 3);
+ cmbBrand.Location = new Point(66, 4);
+ cmbBrand.Margin = new Padding(4);
cmbBrand.Name = "cmbBrand";
- cmbBrand.Size = new Size(296, 25);
+ cmbBrand.Size = new Size(369, 28);
cmbBrand.TabIndex = 0;
//
// cmbSN
//
cmbSN.Dock = DockStyle.Fill;
cmbSN.FormattingEnabled = true;
- cmbSN.Location = new Point(53, 3);
+ cmbSN.Location = new Point(66, 4);
+ cmbSN.Margin = new Padding(4);
cmbSN.Name = "cmbSN";
- cmbSN.Size = new Size(296, 25);
+ cmbSN.Size = new Size(369, 28);
cmbSN.TabIndex = 1;
cmbSN.SelectedIndexChanged += cmbSN_SelectedIndexChanged;
cmbSN.MouseDown += cmbSN_MouseDown;
@@ -124,9 +126,10 @@
//
label1.AutoSize = true;
label1.Dock = DockStyle.Fill;
- label1.Location = new Point(3, 0);
+ label1.Location = new Point(4, 0);
+ label1.Margin = new Padding(4, 0, 4, 0);
label1.Name = "label1";
- label1.Size = new Size(44, 34);
+ label1.Size = new Size(54, 42);
label1.TabIndex = 2;
label1.Text = "鍝佺墝";
label1.TextAlign = ContentAlignment.MiddleCenter;
@@ -135,9 +138,10 @@
//
label2.AutoSize = true;
label2.Dock = DockStyle.Fill;
- label2.Location = new Point(3, 0);
+ label2.Location = new Point(4, 0);
+ label2.Margin = new Padding(4, 0, 4, 0);
label2.Name = "label2";
- label2.Size = new Size(44, 34);
+ label2.Size = new Size(54, 42);
label2.TabIndex = 3;
label2.Text = "SN";
label2.TextAlign = ContentAlignment.MiddleCenter;
@@ -146,9 +150,10 @@
//
btnStartGrab.Dock = DockStyle.Fill;
btnStartGrab.ForeColor = SystemColors.ControlText;
- btnStartGrab.Location = new Point(91, 3);
+ btnStartGrab.Location = new Point(113, 4);
+ btnStartGrab.Margin = new Padding(4);
btnStartGrab.Name = "btnStartGrab";
- btnStartGrab.Size = new Size(82, 28);
+ btnStartGrab.Size = new Size(101, 34);
btnStartGrab.TabIndex = 5;
btnStartGrab.Text = "杩炵画閲囬泦";
btnStartGrab.UseVisualStyleBackColor = true;
@@ -158,9 +163,10 @@
//
btnCloseGrab.Dock = DockStyle.Fill;
btnCloseGrab.ForeColor = SystemColors.Desktop;
- btnCloseGrab.Location = new Point(179, 3);
+ btnCloseGrab.Location = new Point(222, 4);
+ btnCloseGrab.Margin = new Padding(4);
btnCloseGrab.Name = "btnCloseGrab";
- btnCloseGrab.Size = new Size(82, 28);
+ btnCloseGrab.Size = new Size(101, 34);
btnCloseGrab.TabIndex = 6;
btnCloseGrab.Text = "鍏抽棴閲囬泦";
btnCloseGrab.UseVisualStyleBackColor = true;
@@ -170,9 +176,10 @@
//
btnGrabOnce.Dock = DockStyle.Fill;
btnGrabOnce.ForeColor = SystemColors.ControlText;
- btnGrabOnce.Location = new Point(3, 3);
+ btnGrabOnce.Location = new Point(4, 4);
+ btnGrabOnce.Margin = new Padding(4);
btnGrabOnce.Name = "btnGrabOnce";
- btnGrabOnce.Size = new Size(82, 28);
+ btnGrabOnce.Size = new Size(101, 34);
btnGrabOnce.TabIndex = 7;
btnGrabOnce.Text = "鍗曞紶閲囬泦";
btnGrabOnce.UseVisualStyleBackColor = true;
@@ -182,9 +189,10 @@
//
btnOpen.Dock = DockStyle.Fill;
btnOpen.ForeColor = SystemColors.ControlText;
- btnOpen.Location = new Point(3, 3);
+ btnOpen.Location = new Point(4, 4);
+ btnOpen.Margin = new Padding(4);
btnOpen.Name = "btnOpen";
- btnOpen.Size = new Size(82, 28);
+ btnOpen.Size = new Size(101, 34);
btnOpen.TabIndex = 8;
btnOpen.Text = "鎵撳紑";
btnOpen.UseVisualStyleBackColor = true;
@@ -194,9 +202,10 @@
//
btnClose.Dock = DockStyle.Fill;
btnClose.ForeColor = SystemColors.ControlText;
- btnClose.Location = new Point(91, 3);
+ btnClose.Location = new Point(113, 4);
+ btnClose.Margin = new Padding(4);
btnClose.Name = "btnClose";
- btnClose.Size = new Size(82, 28);
+ btnClose.Size = new Size(101, 34);
btnClose.TabIndex = 9;
btnClose.Text = "鍏抽棴";
btnClose.UseVisualStyleBackColor = true;
@@ -206,9 +215,10 @@
//
label5.AutoSize = true;
label5.Dock = DockStyle.Fill;
- label5.Location = new Point(3, 0);
+ label5.Location = new Point(4, 0);
+ label5.Margin = new Padding(4, 0, 4, 0);
label5.Name = "label5";
- label5.Size = new Size(114, 34);
+ label5.Size = new Size(142, 42);
label5.TabIndex = 15;
label5.Text = "鍙栧浘鏁伴噺锛�";
label5.TextAlign = ContentAlignment.MiddleCenter;
@@ -217,9 +227,10 @@
//
lblPicCount.AutoSize = true;
lblPicCount.Dock = DockStyle.Fill;
- lblPicCount.Location = new Point(123, 0);
+ lblPicCount.Location = new Point(154, 0);
+ lblPicCount.Margin = new Padding(4, 0, 4, 0);
lblPicCount.Name = "lblPicCount";
- lblPicCount.Size = new Size(226, 34);
+ lblPicCount.Size = new Size(281, 42);
lblPicCount.TabIndex = 16;
lblPicCount.Text = "0";
lblPicCount.TextAlign = ContentAlignment.MiddleLeft;
@@ -227,18 +238,20 @@
// txtGain
//
txtGain.Dock = DockStyle.Fill;
- txtGain.Location = new Point(53, 3);
+ txtGain.Location = new Point(66, 4);
+ txtGain.Margin = new Padding(4);
txtGain.Name = "txtGain";
- txtGain.Size = new Size(296, 23);
+ txtGain.Size = new Size(369, 27);
txtGain.TabIndex = 21;
txtGain.TextChanged += txtGain_TextChanged;
//
// txtExp
//
txtExp.Dock = DockStyle.Fill;
- txtExp.Location = new Point(53, 3);
+ txtExp.Location = new Point(66, 4);
+ txtExp.Margin = new Padding(4);
txtExp.Name = "txtExp";
- txtExp.Size = new Size(296, 23);
+ txtExp.Size = new Size(369, 27);
txtExp.TabIndex = 20;
txtExp.TextChanged += txtExp_TextChanged;
//
@@ -246,9 +259,10 @@
//
label4.AutoSize = true;
label4.Dock = DockStyle.Fill;
- label4.Location = new Point(3, 0);
+ label4.Location = new Point(4, 0);
+ label4.Margin = new Padding(4, 0, 4, 0);
label4.Name = "label4";
- label4.Size = new Size(44, 34);
+ label4.Size = new Size(54, 42);
label4.TabIndex = 19;
label4.Text = "澧炵泭";
label4.TextAlign = ContentAlignment.MiddleCenter;
@@ -257,9 +271,10 @@
//
label3.AutoSize = true;
label3.Dock = DockStyle.Fill;
- label3.Location = new Point(3, 0);
+ label3.Location = new Point(4, 0);
+ label3.Margin = new Padding(4, 0, 4, 0);
label3.Name = "label3";
- label3.Size = new Size(44, 34);
+ label3.Size = new Size(54, 42);
label3.TabIndex = 18;
label3.Text = "鏇濆厜";
label3.TextAlign = ContentAlignment.MiddleCenter;
@@ -271,8 +286,10 @@
groupBox1.Dock = DockStyle.Fill;
groupBox1.ForeColor = SystemColors.Control;
groupBox1.Location = new Point(0, 0);
+ groupBox1.Margin = new Padding(4);
groupBox1.Name = "groupBox1";
- groupBox1.Size = new Size(487, 591);
+ groupBox1.Padding = new Padding(4);
+ groupBox1.Size = new Size(610, 739);
groupBox1.TabIndex = 17;
groupBox1.TabStop = false;
groupBox1.Text = "瀹炴椂閲囬泦";
@@ -280,18 +297,20 @@
// panel_Picture
//
panel_Picture.Dock = DockStyle.Fill;
- panel_Picture.Location = new Point(3, 19);
+ panel_Picture.Location = new Point(4, 24);
+ panel_Picture.Margin = new Padding(4);
panel_Picture.Name = "panel_Picture";
- panel_Picture.Size = new Size(481, 569);
+ panel_Picture.Size = new Size(602, 711);
panel_Picture.TabIndex = 0;
//
// radioButtonSoft
//
radioButtonSoft.AutoSize = true;
radioButtonSoft.Dock = DockStyle.Fill;
- radioButtonSoft.Location = new Point(3, 123);
+ radioButtonSoft.Location = new Point(4, 154);
+ radioButtonSoft.Margin = new Padding(4);
radioButtonSoft.Name = "radioButtonSoft";
- radioButtonSoft.Size = new Size(352, 34);
+ radioButtonSoft.Size = new Size(439, 42);
radioButtonSoft.TabIndex = 23;
radioButtonSoft.TabStop = true;
radioButtonSoft.Text = "杞Е鍙�";
@@ -302,9 +321,10 @@
//
radioButtonHard.AutoSize = true;
radioButtonHard.Dock = DockStyle.Fill;
- radioButtonHard.Location = new Point(3, 203);
+ radioButtonHard.Location = new Point(4, 254);
+ radioButtonHard.Margin = new Padding(4);
radioButtonHard.Name = "radioButtonHard";
- radioButtonHard.Size = new Size(352, 34);
+ radioButtonHard.Size = new Size(439, 42);
radioButtonHard.TabIndex = 24;
radioButtonHard.TabStop = true;
radioButtonHard.Text = "纭Е鍙�";
@@ -313,7 +333,8 @@
// splitContainer1
//
splitContainer1.Dock = DockStyle.Fill;
- splitContainer1.Location = new Point(5, 5);
+ splitContainer1.Location = new Point(6, 6);
+ splitContainer1.Margin = new Padding(4);
splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
@@ -323,8 +344,9 @@
// splitContainer1.Panel2
//
splitContainer1.Panel2.Controls.Add(groupBox1);
- splitContainer1.Size = new Size(855, 591);
- splitContainer1.SplitterDistance = 364;
+ splitContainer1.Size = new Size(1070, 739);
+ splitContainer1.SplitterDistance = 455;
+ splitContainer1.SplitterWidth = 5;
splitContainer1.TabIndex = 19;
//
// groupBox2
@@ -334,9 +356,11 @@
groupBox2.Dock = DockStyle.Fill;
groupBox2.ForeColor = SystemColors.Control;
groupBox2.Location = new Point(0, 0);
- groupBox2.MinimumSize = new Size(261, 61);
+ groupBox2.Margin = new Padding(4);
+ groupBox2.MinimumSize = new Size(326, 76);
groupBox2.Name = "groupBox2";
- groupBox2.Size = new Size(364, 591);
+ groupBox2.Padding = new Padding(4);
+ groupBox2.Size = new Size(455, 739);
groupBox2.TabIndex = 0;
groupBox2.TabStop = false;
groupBox2.Text = "鐩告満鍙傛暟";
@@ -360,7 +384,8 @@
tableLayoutPanel2.Controls.Add(tableLayoutPanel9, 0, 10);
tableLayoutPanel2.Controls.Add(tableLayoutPanel10, 0, 9);
tableLayoutPanel2.Dock = DockStyle.Fill;
- tableLayoutPanel2.Location = new Point(3, 19);
+ tableLayoutPanel2.Location = new Point(4, 24);
+ tableLayoutPanel2.Margin = new Padding(4);
tableLayoutPanel2.Name = "tableLayoutPanel2";
tableLayoutPanel2.RowCount = 14;
tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 7.14301062F));
@@ -377,38 +402,40 @@
tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 7.14301062F));
tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 7.143011F));
tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 7.14086771F));
- tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 20F));
- tableLayoutPanel2.Size = new Size(358, 569);
+ tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 25F));
+ tableLayoutPanel2.Size = new Size(447, 711);
tableLayoutPanel2.TabIndex = 25;
//
// tableLayoutPanel3
//
tableLayoutPanel3.ColumnCount = 2;
- tableLayoutPanel3.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 50F));
+ tableLayoutPanel3.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 62F));
tableLayoutPanel3.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
tableLayoutPanel3.Controls.Add(label1, 0, 0);
tableLayoutPanel3.Controls.Add(cmbBrand, 1, 0);
tableLayoutPanel3.Dock = DockStyle.Fill;
- tableLayoutPanel3.Location = new Point(3, 3);
+ tableLayoutPanel3.Location = new Point(4, 4);
+ tableLayoutPanel3.Margin = new Padding(4);
tableLayoutPanel3.Name = "tableLayoutPanel3";
tableLayoutPanel3.RowCount = 1;
tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel3.Size = new Size(352, 34);
+ tableLayoutPanel3.Size = new Size(439, 42);
tableLayoutPanel3.TabIndex = 0;
//
// tableLayoutPanel4
//
tableLayoutPanel4.ColumnCount = 2;
- tableLayoutPanel4.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 50F));
+ tableLayoutPanel4.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 62F));
tableLayoutPanel4.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
tableLayoutPanel4.Controls.Add(label2, 0, 0);
tableLayoutPanel4.Controls.Add(cmbSN, 1, 0);
tableLayoutPanel4.Dock = DockStyle.Fill;
- tableLayoutPanel4.Location = new Point(3, 43);
+ tableLayoutPanel4.Location = new Point(4, 54);
+ tableLayoutPanel4.Margin = new Padding(4);
tableLayoutPanel4.Name = "tableLayoutPanel4";
tableLayoutPanel4.RowCount = 1;
tableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel4.Size = new Size(352, 34);
+ tableLayoutPanel4.Size = new Size(439, 42);
tableLayoutPanel4.TabIndex = 1;
//
// tableLayoutPanel5
@@ -422,11 +449,12 @@
tableLayoutPanel5.Controls.Add(btnClose, 1, 0);
tableLayoutPanel5.Controls.Add(btnEdit, 3, 0);
tableLayoutPanel5.Dock = DockStyle.Fill;
- tableLayoutPanel5.Location = new Point(3, 83);
+ tableLayoutPanel5.Location = new Point(4, 104);
+ tableLayoutPanel5.Margin = new Padding(4);
tableLayoutPanel5.Name = "tableLayoutPanel5";
tableLayoutPanel5.RowCount = 1;
tableLayoutPanel5.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel5.Size = new Size(352, 34);
+ tableLayoutPanel5.Size = new Size(439, 42);
tableLayoutPanel5.TabIndex = 2;
//
// btnEdit
@@ -434,9 +462,10 @@
btnEdit.Dock = DockStyle.Fill;
btnEdit.Enabled = false;
btnEdit.ForeColor = SystemColors.ControlText;
- btnEdit.Location = new Point(267, 3);
+ btnEdit.Location = new Point(331, 4);
+ btnEdit.Margin = new Padding(4);
btnEdit.Name = "btnEdit";
- btnEdit.Size = new Size(82, 28);
+ btnEdit.Size = new Size(104, 34);
btnEdit.TabIndex = 10;
btnEdit.Text = "缂栬緫";
btnEdit.UseVisualStyleBackColor = true;
@@ -454,21 +483,22 @@
tableLayoutPanel6.Controls.Add(btnCloseGrab, 2, 0);
tableLayoutPanel6.Controls.Add(btnSaveImage, 3, 0);
tableLayoutPanel6.Dock = DockStyle.Fill;
- tableLayoutPanel6.Location = new Point(3, 163);
+ tableLayoutPanel6.Location = new Point(4, 204);
+ tableLayoutPanel6.Margin = new Padding(4);
tableLayoutPanel6.Name = "tableLayoutPanel6";
tableLayoutPanel6.RowCount = 1;
tableLayoutPanel6.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel6.Size = new Size(352, 34);
+ tableLayoutPanel6.Size = new Size(439, 42);
tableLayoutPanel6.TabIndex = 24;
//
// btnSaveImage
//
btnSaveImage.Dock = DockStyle.Fill;
btnSaveImage.ForeColor = SystemColors.Desktop;
- btnSaveImage.Location = new Point(266, 2);
+ btnSaveImage.Location = new Point(329, 2);
btnSaveImage.Margin = new Padding(2);
btnSaveImage.Name = "btnSaveImage";
- btnSaveImage.Size = new Size(84, 30);
+ btnSaveImage.Size = new Size(108, 38);
btnSaveImage.TabIndex = 8;
btnSaveImage.Text = "淇濆瓨鍥剧墖";
btnSaveImage.UseVisualStyleBackColor = true;
@@ -477,31 +507,33 @@
// tableLayoutPanel7
//
tableLayoutPanel7.ColumnCount = 2;
- tableLayoutPanel7.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 50F));
+ tableLayoutPanel7.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 62F));
tableLayoutPanel7.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
tableLayoutPanel7.Controls.Add(label3, 0, 0);
tableLayoutPanel7.Controls.Add(txtExp, 1, 0);
tableLayoutPanel7.Dock = DockStyle.Fill;
- tableLayoutPanel7.Location = new Point(3, 283);
+ tableLayoutPanel7.Location = new Point(4, 354);
+ tableLayoutPanel7.Margin = new Padding(4);
tableLayoutPanel7.Name = "tableLayoutPanel7";
tableLayoutPanel7.RowCount = 1;
tableLayoutPanel7.RowStyles.Add(new RowStyle(SizeType.Percent, 50F));
- tableLayoutPanel7.Size = new Size(352, 34);
+ tableLayoutPanel7.Size = new Size(439, 42);
tableLayoutPanel7.TabIndex = 25;
//
// tableLayoutPanel8
//
tableLayoutPanel8.ColumnCount = 2;
- tableLayoutPanel8.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 50F));
+ tableLayoutPanel8.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 62F));
tableLayoutPanel8.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
tableLayoutPanel8.Controls.Add(label4, 0, 0);
tableLayoutPanel8.Controls.Add(txtGain, 1, 0);
tableLayoutPanel8.Dock = DockStyle.Fill;
- tableLayoutPanel8.Location = new Point(3, 323);
+ tableLayoutPanel8.Location = new Point(4, 404);
+ tableLayoutPanel8.Margin = new Padding(4);
tableLayoutPanel8.Name = "tableLayoutPanel8";
tableLayoutPanel8.RowCount = 1;
tableLayoutPanel8.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel8.Size = new Size(352, 34);
+ tableLayoutPanel8.Size = new Size(439, 42);
tableLayoutPanel8.TabIndex = 26;
//
// tableLayoutPanel1
@@ -514,19 +546,21 @@
tableLayoutPanel1.Controls.Add(ckbUpParams, 1, 0);
tableLayoutPanel1.Controls.Add(ckbRegrab, 2, 0);
tableLayoutPanel1.Dock = DockStyle.Fill;
- tableLayoutPanel1.Location = new Point(3, 243);
+ tableLayoutPanel1.Location = new Point(4, 304);
+ tableLayoutPanel1.Margin = new Padding(4);
tableLayoutPanel1.Name = "tableLayoutPanel1";
tableLayoutPanel1.RowCount = 1;
tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel1.Size = new Size(352, 34);
+ tableLayoutPanel1.Size = new Size(439, 42);
tableLayoutPanel1.TabIndex = 29;
//
// btnStartHard
//
btnStartHard.Dock = DockStyle.Fill;
- btnStartHard.Location = new Point(3, 3);
+ btnStartHard.Location = new Point(4, 4);
+ btnStartHard.Margin = new Padding(4);
btnStartHard.Name = "btnStartHard";
- btnStartHard.Size = new Size(64, 28);
+ btnStartHard.Size = new Size(79, 34);
btnStartHard.TabIndex = 22;
btnStartHard.Text = "绛夊緟瑙﹀彂";
btnStartHard.UseVisualStyleBackColor = true;
@@ -536,9 +570,10 @@
//
ckbUpParams.AutoSize = true;
ckbUpParams.Dock = DockStyle.Fill;
- ckbUpParams.Location = new Point(73, 3);
+ ckbUpParams.Location = new Point(91, 4);
+ ckbUpParams.Margin = new Padding(4);
ckbUpParams.Name = "ckbUpParams";
- ckbUpParams.Size = new Size(134, 28);
+ ckbUpParams.Size = new Size(167, 34);
ckbUpParams.TabIndex = 23;
ckbUpParams.Text = "鏄惁姣忔鍐欏叆鍙傛暟";
ckbUpParams.UseVisualStyleBackColor = true;
@@ -547,9 +582,10 @@
//
ckbRegrab.AutoSize = true;
ckbRegrab.Dock = DockStyle.Fill;
- ckbRegrab.Location = new Point(213, 3);
+ ckbRegrab.Location = new Point(266, 4);
+ ckbRegrab.Margin = new Padding(4);
ckbRegrab.Name = "ckbRegrab";
- ckbRegrab.Size = new Size(136, 28);
+ ckbRegrab.Size = new Size(169, 34);
ckbRegrab.TabIndex = 24;
ckbRegrab.Text = "鏄惁澶辫触閲嶆柊鍙栧浘";
ckbRegrab.UseVisualStyleBackColor = true;
@@ -557,25 +593,27 @@
// tableLayoutPanel12
//
tableLayoutPanel12.ColumnCount = 2;
- tableLayoutPanel12.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 120F));
+ tableLayoutPanel12.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 150F));
tableLayoutPanel12.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
tableLayoutPanel12.Controls.Add(lblCapTime, 1, 0);
tableLayoutPanel12.Controls.Add(label7, 0, 0);
tableLayoutPanel12.Dock = DockStyle.Fill;
- tableLayoutPanel12.Location = new Point(3, 523);
+ tableLayoutPanel12.Location = new Point(4, 654);
+ tableLayoutPanel12.Margin = new Padding(4);
tableLayoutPanel12.Name = "tableLayoutPanel12";
tableLayoutPanel12.RowCount = 1;
tableLayoutPanel12.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel12.Size = new Size(352, 43);
+ tableLayoutPanel12.Size = new Size(439, 53);
tableLayoutPanel12.TabIndex = 31;
//
// lblCapTime
//
lblCapTime.AutoSize = true;
lblCapTime.Dock = DockStyle.Fill;
- lblCapTime.Location = new Point(123, 0);
+ lblCapTime.Location = new Point(154, 0);
+ lblCapTime.Margin = new Padding(4, 0, 4, 0);
lblCapTime.Name = "lblCapTime";
- lblCapTime.Size = new Size(226, 43);
+ lblCapTime.Size = new Size(281, 53);
lblCapTime.TabIndex = 16;
lblCapTime.Text = "0ms";
lblCapTime.TextAlign = ContentAlignment.MiddleLeft;
@@ -584,9 +622,10 @@
//
label7.AutoSize = true;
label7.Dock = DockStyle.Fill;
- label7.Location = new Point(3, 0);
+ label7.Location = new Point(4, 0);
+ label7.Margin = new Padding(4, 0, 4, 0);
label7.Name = "label7";
- label7.Size = new Size(114, 43);
+ label7.Size = new Size(142, 53);
label7.TabIndex = 15;
label7.Text = "鍙栧浘鏃堕棿锛�";
label7.TextAlign = ContentAlignment.MiddleCenter;
@@ -594,16 +633,17 @@
// tableLayoutPanel11
//
tableLayoutPanel11.ColumnCount = 2;
- tableLayoutPanel11.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 120F));
+ tableLayoutPanel11.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 150F));
tableLayoutPanel11.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
tableLayoutPanel11.Controls.Add(label5, 0, 0);
tableLayoutPanel11.Controls.Add(lblPicCount, 1, 0);
tableLayoutPanel11.Dock = DockStyle.Fill;
- tableLayoutPanel11.Location = new Point(3, 483);
+ tableLayoutPanel11.Location = new Point(4, 604);
+ tableLayoutPanel11.Margin = new Padding(4);
tableLayoutPanel11.Name = "tableLayoutPanel11";
tableLayoutPanel11.RowCount = 1;
tableLayoutPanel11.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel11.Size = new Size(352, 34);
+ tableLayoutPanel11.Size = new Size(439, 42);
tableLayoutPanel11.TabIndex = 30;
//
// cmbImagesPath
@@ -612,9 +652,10 @@
cmbImagesPath.Dock = DockStyle.Fill;
cmbImagesPath.ForeColor = SystemColors.ControlText;
cmbImagesPath.FormattingEnabled = true;
- cmbImagesPath.Location = new Point(3, 443);
+ cmbImagesPath.Location = new Point(4, 554);
+ cmbImagesPath.Margin = new Padding(4);
cmbImagesPath.Name = "cmbImagesPath";
- cmbImagesPath.Size = new Size(352, 25);
+ cmbImagesPath.Size = new Size(439, 28);
cmbImagesPath.TabIndex = 0;
cmbImagesPath.SelectedIndexChanged += cmbImagesPath_SelectedIndexChanged;
cmbImagesPath.MouseHover += cmbImagesPath_MouseHover;
@@ -629,20 +670,22 @@
tableLayoutPanel9.Controls.Add(btnAddImages, 1, 0);
tableLayoutPanel9.Controls.Add(btnLocalGrab, 2, 0);
tableLayoutPanel9.Dock = DockStyle.Fill;
- tableLayoutPanel9.Location = new Point(3, 403);
+ tableLayoutPanel9.Location = new Point(4, 504);
+ tableLayoutPanel9.Margin = new Padding(4);
tableLayoutPanel9.Name = "tableLayoutPanel9";
tableLayoutPanel9.RowCount = 1;
tableLayoutPanel9.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel9.Size = new Size(352, 34);
+ tableLayoutPanel9.Size = new Size(439, 42);
tableLayoutPanel9.TabIndex = 27;
//
// ckbLocalTest
//
ckbLocalTest.AutoSize = true;
ckbLocalTest.Dock = DockStyle.Fill;
- ckbLocalTest.Location = new Point(3, 3);
+ ckbLocalTest.Location = new Point(4, 4);
+ ckbLocalTest.Margin = new Padding(4);
ckbLocalTest.Name = "ckbLocalTest";
- ckbLocalTest.Size = new Size(111, 28);
+ ckbLocalTest.Size = new Size(138, 34);
ckbLocalTest.TabIndex = 0;
ckbLocalTest.Text = "鏈湴鍙栧浘";
ckbLocalTest.UseVisualStyleBackColor = true;
@@ -651,9 +694,10 @@
//
btnAddImages.Dock = DockStyle.Fill;
btnAddImages.ForeColor = SystemColors.Desktop;
- btnAddImages.Location = new Point(120, 3);
+ btnAddImages.Location = new Point(150, 4);
+ btnAddImages.Margin = new Padding(4);
btnAddImages.Name = "btnAddImages";
- btnAddImages.Size = new Size(111, 28);
+ btnAddImages.Size = new Size(138, 34);
btnAddImages.TabIndex = 1;
btnAddImages.Text = "娣诲姞鍥剧墖";
btnAddImages.UseVisualStyleBackColor = true;
@@ -663,9 +707,10 @@
//
btnLocalGrab.Dock = DockStyle.Fill;
btnLocalGrab.ForeColor = SystemColors.Desktop;
- btnLocalGrab.Location = new Point(237, 3);
+ btnLocalGrab.Location = new Point(296, 4);
+ btnLocalGrab.Margin = new Padding(4);
btnLocalGrab.Name = "btnLocalGrab";
- btnLocalGrab.Size = new Size(112, 28);
+ btnLocalGrab.Size = new Size(139, 34);
btnLocalGrab.TabIndex = 2;
btnLocalGrab.Text = "鏈湴鍙栧浘";
btnLocalGrab.UseVisualStyleBackColor = true;
@@ -674,25 +719,27 @@
// tableLayoutPanel10
//
tableLayoutPanel10.ColumnCount = 2;
- tableLayoutPanel10.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 50F));
+ tableLayoutPanel10.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 62F));
tableLayoutPanel10.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
tableLayoutPanel10.Controls.Add(label6, 0, 0);
tableLayoutPanel10.Controls.Add(txtTimeout, 1, 0);
tableLayoutPanel10.Dock = DockStyle.Fill;
- tableLayoutPanel10.Location = new Point(3, 363);
+ tableLayoutPanel10.Location = new Point(4, 454);
+ tableLayoutPanel10.Margin = new Padding(4);
tableLayoutPanel10.Name = "tableLayoutPanel10";
tableLayoutPanel10.RowCount = 1;
tableLayoutPanel10.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel10.Size = new Size(352, 34);
+ tableLayoutPanel10.Size = new Size(439, 42);
tableLayoutPanel10.TabIndex = 32;
//
// label6
//
label6.AutoSize = true;
label6.Dock = DockStyle.Fill;
- label6.Location = new Point(3, 0);
+ label6.Location = new Point(4, 0);
+ label6.Margin = new Padding(4, 0, 4, 0);
label6.Name = "label6";
- label6.Size = new Size(44, 34);
+ label6.Size = new Size(54, 42);
label6.TabIndex = 0;
label6.Text = "瓒呮椂";
label6.TextAlign = ContentAlignment.MiddleCenter;
@@ -700,9 +747,10 @@
// txtTimeout
//
txtTimeout.Dock = DockStyle.Fill;
- txtTimeout.Location = new Point(53, 3);
+ txtTimeout.Location = new Point(66, 4);
+ txtTimeout.Margin = new Padding(4);
txtTimeout.Name = "txtTimeout";
- txtTimeout.Size = new Size(296, 23);
+ txtTimeout.Size = new Size(369, 27);
txtTimeout.TabIndex = 1;
//
// theme_2DCameraForm
@@ -715,11 +763,12 @@
theme_2DCameraForm.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
theme_2DCameraForm.Image = (Image)resources.GetObject("theme_2DCameraForm.Image");
theme_2DCameraForm.Location = new Point(0, 0);
+ theme_2DCameraForm.Margin = new Padding(4);
theme_2DCameraForm.Name = "theme_2DCameraForm";
- theme_2DCameraForm.Padding = new Padding(10, 70, 10, 9);
+ theme_2DCameraForm.Padding = new Padding(12, 88, 12, 11);
theme_2DCameraForm.RoundCorners = true;
theme_2DCameraForm.Sizable = true;
- theme_2DCameraForm.Size = new Size(885, 680);
+ theme_2DCameraForm.Size = new Size(1106, 850);
theme_2DCameraForm.SmartBounds = true;
theme_2DCameraForm.StartPosition = FormStartPosition.WindowsDefaultLocation;
theme_2DCameraForm.TabIndex = 20;
@@ -736,7 +785,8 @@
controlBox1.EnableMaximizeButton = false;
controlBox1.EnableMinimizeButton = false;
controlBox1.ForeColor = Color.FromArgb(155, 155, 155);
- controlBox1.Location = new Point(785, 18);
+ controlBox1.Location = new Point(981, 18);
+ controlBox1.Margin = new Padding(4);
controlBox1.MaximizeHoverColor = Color.FromArgb(74, 74, 74);
controlBox1.MinimizeHoverColor = Color.FromArgb(63, 63, 65);
controlBox1.Name = "controlBox1";
@@ -750,22 +800,24 @@
panel_2DCameraForm.Controls.Add(splitContainer1);
panel_2DCameraForm.Dock = DockStyle.Fill;
panel_2DCameraForm.EdgeColor = Color.FromArgb(32, 41, 50);
- panel_2DCameraForm.Location = new Point(10, 70);
+ panel_2DCameraForm.Location = new Point(12, 88);
+ panel_2DCameraForm.Margin = new Padding(4);
panel_2DCameraForm.Name = "panel_2DCameraForm";
- panel_2DCameraForm.Padding = new Padding(5);
- panel_2DCameraForm.Size = new Size(865, 601);
+ panel_2DCameraForm.Padding = new Padding(6);
+ panel_2DCameraForm.Size = new Size(1082, 751);
panel_2DCameraForm.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
panel_2DCameraForm.TabIndex = 20;
panel_2DCameraForm.Text = "panel2";
//
// CameraForm
//
- AutoScaleDimensions = new SizeF(96F, 96F);
+ AutoScaleDimensions = new SizeF(120F, 120F);
AutoScaleMode = AutoScaleMode.Dpi;
- ClientSize = new Size(885, 680);
+ ClientSize = new Size(1106, 850);
Controls.Add(theme_2DCameraForm);
FormBorderStyle = FormBorderStyle.None;
- MinimumSize = new Size(261, 61);
+ Margin = new Padding(4);
+ MinimumSize = new Size(326, 76);
Name = "CameraForm";
Text = "2D鐩告満璁剧疆鐣岄潰";
TransparencyKey = Color.Fuchsia;
--
Gitblit v1.9.3