From eb503eb0b578fb7e4219cb7e913d7c268b641d31 Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期三, 31 十二月 2025 13:29:33 +0800
Subject: [PATCH] 优化相机运动控制界面设计显示
---
LB_SmartVision/Forms/Pages/CameraPage/CameraForm.resx | 36 +++++++++---------
LB_SmartVision/Forms/Pages/CameraPage/CameraForm.Designer.cs | 59 +++++++++++++++--------------
2 files changed, 48 insertions(+), 47 deletions(-)
diff --git a/LB_SmartVision/Forms/Pages/CameraPage/CameraForm.Designer.cs b/LB_SmartVision/Forms/Pages/CameraPage/CameraForm.Designer.cs
index 87e242a..797a1a4 100644
--- a/LB_SmartVision/Forms/Pages/CameraPage/CameraForm.Designer.cs
+++ b/LB_SmartVision/Forms/Pages/CameraPage/CameraForm.Designer.cs
@@ -78,7 +78,7 @@
uiComboBoxBrand.Margin = new Padding(4, 5, 4, 5);
uiComboBoxBrand.MinimumSize = new Size(63, 0);
uiComboBoxBrand.Name = "uiComboBoxBrand";
- uiComboBoxBrand.Size = new Size(260, 28);
+ uiComboBoxBrand.Size = new Size(260, 24);
uiComboBoxBrand.TabIndex = 24;
uiComboBoxBrand.SelectedIndexChanged += cob_Brand_SelectedIndexChanged;
//
@@ -86,10 +86,10 @@
//
uiRadioButtonSoftTrigger.Dock = DockStyle.Fill;
uiRadioButtonSoftTrigger.Font = new Font("瀹嬩綋", 12F);
- uiRadioButtonSoftTrigger.Location = new Point(3, 54);
+ uiRadioButtonSoftTrigger.Location = new Point(3, 55);
uiRadioButtonSoftTrigger.MinimumSize = new Size(1, 1);
uiRadioButtonSoftTrigger.Name = "uiRadioButtonSoftTrigger";
- uiRadioButtonSoftTrigger.Size = new Size(368, 45);
+ uiRadioButtonSoftTrigger.Size = new Size(368, 46);
uiRadioButtonSoftTrigger.TabIndex = 25;
uiRadioButtonSoftTrigger.Text = "杞Е鍙�";
uiRadioButtonSoftTrigger.CheckedChanged += uiRadioButtonSoftTrigger_CheckedChanged;
@@ -98,10 +98,10 @@
//
uiRadioButtonHardTrigger.Dock = DockStyle.Fill;
uiRadioButtonHardTrigger.Font = new Font("瀹嬩綋", 12F);
- uiRadioButtonHardTrigger.Location = new Point(3, 156);
+ uiRadioButtonHardTrigger.Location = new Point(3, 159);
uiRadioButtonHardTrigger.MinimumSize = new Size(1, 1);
uiRadioButtonHardTrigger.Name = "uiRadioButtonHardTrigger";
- uiRadioButtonHardTrigger.Size = new Size(368, 45);
+ uiRadioButtonHardTrigger.Size = new Size(368, 46);
uiRadioButtonHardTrigger.TabIndex = 26;
uiRadioButtonHardTrigger.Text = "纭Е鍙�";
//
@@ -139,6 +139,7 @@
//
// btnSetting
//
+ btnSetting.ForeColor = SystemColors.ControlText;
btnSetting.Location = new Point(3, 18);
btnSetting.Name = "btnSetting";
btnSetting.Size = new Size(97, 29);
@@ -162,7 +163,7 @@
tableLayoutPanel2.Controls.Add(tableLayoutPanel5, 0, 6);
tableLayoutPanel2.Controls.Add(tableLayoutPanel6, 0, 7);
tableLayoutPanel2.Dock = DockStyle.Fill;
- tableLayoutPanel2.Location = new Point(0, 55);
+ tableLayoutPanel2.Location = new Point(0, 51);
tableLayoutPanel2.Name = "tableLayoutPanel2";
tableLayoutPanel2.RowCount = 9;
tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 10F));
@@ -174,7 +175,7 @@
tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 10F));
tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 10F));
tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 10F));
- tableLayoutPanel2.Size = new Size(374, 466);
+ tableLayoutPanel2.Size = new Size(374, 470);
tableLayoutPanel2.TabIndex = 17;
//
// tableLayoutPanel3
@@ -189,7 +190,7 @@
tableLayoutPanel3.Name = "tableLayoutPanel3";
tableLayoutPanel3.RowCount = 1;
tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel3.Size = new Size(368, 45);
+ tableLayoutPanel3.Size = new Size(368, 46);
tableLayoutPanel3.TabIndex = 0;
//
// uiMarkLabel1
@@ -200,7 +201,7 @@
uiMarkLabel1.Location = new Point(3, 0);
uiMarkLabel1.Name = "uiMarkLabel1";
uiMarkLabel1.Padding = new Padding(5, 0, 0, 0);
- uiMarkLabel1.Size = new Size(94, 45);
+ uiMarkLabel1.Size = new Size(94, 46);
uiMarkLabel1.TabIndex = 25;
uiMarkLabel1.Text = "鍝佺墝";
uiMarkLabel1.TextAlign = ContentAlignment.MiddleLeft;
@@ -215,11 +216,11 @@
tableLayoutPanel1.Controls.Add(uiButtonStartSoftGrab, 1, 0);
tableLayoutPanel1.Controls.Add(uiButtonCloseSoftGrab, 2, 0);
tableLayoutPanel1.Dock = DockStyle.Fill;
- tableLayoutPanel1.Location = new Point(3, 105);
+ tableLayoutPanel1.Location = new Point(3, 107);
tableLayoutPanel1.Name = "tableLayoutPanel1";
tableLayoutPanel1.RowCount = 1;
tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel1.Size = new Size(368, 45);
+ tableLayoutPanel1.Size = new Size(368, 46);
tableLayoutPanel1.TabIndex = 30;
//
// uiButtonGrabOnce
@@ -229,7 +230,7 @@
uiButtonGrabOnce.Location = new Point(3, 3);
uiButtonGrabOnce.MinimumSize = new Size(1, 1);
uiButtonGrabOnce.Name = "uiButtonGrabOnce";
- uiButtonGrabOnce.Size = new Size(116, 39);
+ uiButtonGrabOnce.Size = new Size(116, 40);
uiButtonGrabOnce.TabIndex = 31;
uiButtonGrabOnce.Text = "鍗曞紶閲囬泦";
uiButtonGrabOnce.Click += uiButtonGrabOnce_Click;
@@ -241,7 +242,7 @@
uiButtonStartSoftGrab.Location = new Point(125, 3);
uiButtonStartSoftGrab.MinimumSize = new Size(1, 1);
uiButtonStartSoftGrab.Name = "uiButtonStartSoftGrab";
- uiButtonStartSoftGrab.Size = new Size(116, 39);
+ uiButtonStartSoftGrab.Size = new Size(116, 40);
uiButtonStartSoftGrab.TabIndex = 31;
uiButtonStartSoftGrab.Text = "杩炵画閲囬泦";
uiButtonStartSoftGrab.Click += uiButtonStartSoftGrab_Click;
@@ -253,7 +254,7 @@
uiButtonCloseSoftGrab.Location = new Point(247, 3);
uiButtonCloseSoftGrab.MinimumSize = new Size(1, 1);
uiButtonCloseSoftGrab.Name = "uiButtonCloseSoftGrab";
- uiButtonCloseSoftGrab.Size = new Size(118, 39);
+ uiButtonCloseSoftGrab.Size = new Size(118, 40);
uiButtonCloseSoftGrab.TabIndex = 31;
uiButtonCloseSoftGrab.Text = "鍏抽棴閲囬泦";
uiButtonCloseSoftGrab.Click += uiButtonCloseSoftGrab_Click;
@@ -262,10 +263,10 @@
//
uiButtonStartHardGrab.Dock = DockStyle.Fill;
uiButtonStartHardGrab.Font = new Font("瀹嬩綋", 12F);
- uiButtonStartHardGrab.Location = new Point(3, 207);
+ uiButtonStartHardGrab.Location = new Point(3, 211);
uiButtonStartHardGrab.MinimumSize = new Size(1, 1);
uiButtonStartHardGrab.Name = "uiButtonStartHardGrab";
- uiButtonStartHardGrab.Size = new Size(368, 45);
+ uiButtonStartHardGrab.Size = new Size(368, 46);
uiButtonStartHardGrab.TabIndex = 27;
uiButtonStartHardGrab.Text = "绛夊緟纭欢瑙﹀彂";
uiButtonStartHardGrab.Click += uiButtonStartHardGrab_Click;
@@ -278,11 +279,11 @@
tableLayoutPanel4.Controls.Add(uiMarkLabel2, 0, 0);
tableLayoutPanel4.Controls.Add(uiTextBoxExp, 1, 0);
tableLayoutPanel4.Dock = DockStyle.Fill;
- tableLayoutPanel4.Location = new Point(3, 258);
+ tableLayoutPanel4.Location = new Point(3, 263);
tableLayoutPanel4.Name = "tableLayoutPanel4";
tableLayoutPanel4.RowCount = 1;
tableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel4.Size = new Size(368, 45);
+ tableLayoutPanel4.Size = new Size(368, 46);
tableLayoutPanel4.TabIndex = 28;
//
// uiMarkLabel2
@@ -293,7 +294,7 @@
uiMarkLabel2.Location = new Point(3, 0);
uiMarkLabel2.Name = "uiMarkLabel2";
uiMarkLabel2.Padding = new Padding(5, 0, 0, 0);
- uiMarkLabel2.Size = new Size(94, 45);
+ uiMarkLabel2.Size = new Size(94, 46);
uiMarkLabel2.TabIndex = 31;
uiMarkLabel2.Text = "鏇濆厜(us)";
uiMarkLabel2.TextAlign = ContentAlignment.MiddleLeft;
@@ -306,7 +307,7 @@
uiTextBoxExp.Margin = new Padding(4, 5, 4, 5);
uiTextBoxExp.MinimumSize = new Size(1, 16);
uiTextBoxExp.Name = "uiTextBoxExp";
- uiTextBoxExp.Size = new Size(260, 30);
+ uiTextBoxExp.Size = new Size(260, 26);
uiTextBoxExp.TabIndex = 31;
uiTextBoxExp.Text = "1000";
uiTextBoxExp.TextChanged += uiTextBoxExp_TextChanged;
@@ -319,11 +320,11 @@
tableLayoutPanel5.Controls.Add(uiMarkLabel3, 0, 0);
tableLayoutPanel5.Controls.Add(uiTextBoxGain, 1, 0);
tableLayoutPanel5.Dock = DockStyle.Fill;
- tableLayoutPanel5.Location = new Point(3, 309);
+ tableLayoutPanel5.Location = new Point(3, 315);
tableLayoutPanel5.Name = "tableLayoutPanel5";
tableLayoutPanel5.RowCount = 1;
tableLayoutPanel5.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel5.Size = new Size(368, 45);
+ tableLayoutPanel5.Size = new Size(368, 46);
tableLayoutPanel5.TabIndex = 29;
//
// uiMarkLabel3
@@ -334,7 +335,7 @@
uiMarkLabel3.Location = new Point(3, 0);
uiMarkLabel3.Name = "uiMarkLabel3";
uiMarkLabel3.Padding = new Padding(5, 0, 0, 0);
- uiMarkLabel3.Size = new Size(94, 45);
+ uiMarkLabel3.Size = new Size(94, 46);
uiMarkLabel3.TabIndex = 31;
uiMarkLabel3.Text = "澧炵泭";
uiMarkLabel3.TextAlign = ContentAlignment.MiddleLeft;
@@ -347,7 +348,7 @@
uiTextBoxGain.Margin = new Padding(4, 5, 4, 5);
uiTextBoxGain.MinimumSize = new Size(1, 16);
uiTextBoxGain.Name = "uiTextBoxGain";
- uiTextBoxGain.Size = new Size(260, 30);
+ uiTextBoxGain.Size = new Size(260, 26);
uiTextBoxGain.TabIndex = 32;
uiTextBoxGain.Text = "1";
uiTextBoxGain.TextChanged += uiTextBoxGain_TextChanged;
@@ -360,11 +361,11 @@
tableLayoutPanel6.Controls.Add(uiMarkLabel4, 0, 0);
tableLayoutPanel6.Controls.Add(uiTextBoxGrabTime, 1, 0);
tableLayoutPanel6.Dock = DockStyle.Fill;
- tableLayoutPanel6.Location = new Point(3, 360);
+ tableLayoutPanel6.Location = new Point(3, 367);
tableLayoutPanel6.Name = "tableLayoutPanel6";
tableLayoutPanel6.RowCount = 1;
tableLayoutPanel6.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel6.Size = new Size(368, 45);
+ tableLayoutPanel6.Size = new Size(368, 46);
tableLayoutPanel6.TabIndex = 31;
//
// uiMarkLabel4
@@ -375,7 +376,7 @@
uiMarkLabel4.Location = new Point(3, 0);
uiMarkLabel4.Name = "uiMarkLabel4";
uiMarkLabel4.Padding = new Padding(5, 0, 0, 0);
- uiMarkLabel4.Size = new Size(94, 45);
+ uiMarkLabel4.Size = new Size(94, 46);
uiMarkLabel4.TabIndex = 31;
uiMarkLabel4.Text = "鑰楁椂(ms)";
uiMarkLabel4.TextAlign = ContentAlignment.MiddleLeft;
@@ -389,7 +390,7 @@
uiTextBoxGrabTime.Margin = new Padding(4, 5, 4, 5);
uiTextBoxGrabTime.MinimumSize = new Size(1, 16);
uiTextBoxGrabTime.Name = "uiTextBoxGrabTime";
- uiTextBoxGrabTime.Size = new Size(260, 30);
+ uiTextBoxGrabTime.Size = new Size(260, 26);
uiTextBoxGrabTime.TabIndex = 31;
//
// uiSplitContainer1
@@ -441,7 +442,7 @@
controlBox1.EnableMaximizeButton = true;
controlBox1.EnableMinimizeButton = true;
controlBox1.ForeColor = Color.FromArgb(155, 155, 155);
- controlBox1.Location = new Point(800, 18);
+ controlBox1.Location = new Point(800, 12);
controlBox1.MaximizeHoverColor = Color.FromArgb(74, 74, 74);
controlBox1.MinimizeHoverColor = Color.FromArgb(63, 63, 65);
controlBox1.Name = "controlBox1";
diff --git a/LB_SmartVision/Forms/Pages/CameraPage/CameraForm.resx b/LB_SmartVision/Forms/Pages/CameraPage/CameraForm.resx
index 547fe4f..ef7524c 100644
--- a/LB_SmartVision/Forms/Pages/CameraPage/CameraForm.resx
+++ b/LB_SmartVision/Forms/Pages/CameraPage/CameraForm.resx
@@ -121,24 +121,24 @@
<data name="themeForm1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAA+xJREFUWEftV0loFUkYbvcNFzJi0lWdBEPQruqXKEYdcRgz4AYqeplBwYiXEUVB
- UHAhCEG8iR509OBlmIsOjJ5EBvQSRVHzuvslxjAy8eCG+75GozF+f716L6873fqe2ykffDR59e9/1V8V
- ow99KARtUg72J5aypGNN8xy2yJPWcleylb5gS13HnJdy+KSW6uJx3b8ZA7TKl6PbMPq3SbMsBUcpyf/2
- BP8PDh96kr32BX/rS/4O30789grfO1j/k4LQ6p8POO6XdFgpDNbDSZsn2Bt8u2MpWGdKsCPeBNMm3TZp
- FaUc6/cW20pQEtpsflCllmwxjDbpLKOd9vAZuBPOx5J+86TyMdDbBxsdYLsn+SpUZYQy/imQILLdBIP3
- cxzEU7Dbns3WejXmcNK/NPGHkajabtUiLYO/nyOgXWdRFeUkDmdnWMOg2ACFFwEn8fzfFeaSxlpjIOlT
- EHC0HVm/CstSC13B93sVFaOVszDQpwGuYGtQLipnQDlMyLzH12t2zJ8adH/TbeMbVLYROmmyDvjYRrLK
- aS4Q3Y/gtWjFALtg6KSf4NW02Uj3HwSPzOuw9iAk24sI/p5rm3OV0wyOo+++ww7pzCIViVjvAk+02GyC
- VlWnpUmw2Qggn+AV0eZ/A61oEtYsOttRwjlE5vy4L61KrabQmjBtV3I/JPtRUptcmy9UBuiM+tLc+bHs
- aQ1Rn8rNnEC7Gpvr8KcqF0XoHVCbl0qB8p2OEspS8OZmySZrvwqNtbUDMRm3Yj9kj1uB9NXcwLkfjwyu
- RAhoshuYcHMyGy4DT5T+jKrcjNbJh+yW75QIw62yqhDAvUghwV/Cybrw5UKTDn08GqmTJ9GCx660pscG
- oPoq2MHzlUWjtN8skjZbRsGFdQpiJoBkVVkFnF3tLcCv+7ZZo31mcYZGLY5RL/kCiQrcaRLFTvrikOxc
- YJF2PeZ5ZsTmAkNkCtaiW1YAkcTF1sT4YjXFEM3ekMADz+YztM8AULqlqE5nSL5wor3Zkew51nxU4WnP
- Ij9DlVGLIWCtDhV6FzBWIJH9a3pNaZOGQRsNT6tjWSHB/6LK6OUA/ETJVER/O9dgwcQ7w7XLTG0yjSTO
- Onp7Ny3A92VuuTD0rbcFbXsUMJonaQwnBV8Rniu4y2sGYbEe5emA8cORV6ZGY3n5UNycC9AKvBHZZRh+
- iqxoX9BlRWMZozvLLiSEV5V6HT2Bjz9iX0ftaAWE9sDoBV+UlOufY9FeWTmE5OhdgLH8Kxyvhv5GON3q
- C3NzSvD19C70MTco4JTDZsbtrSzUlLP5DnBV3D745riOp5nr8F/OJcYV65++P2iTfNV/MPoQCcP4AKXR
- FGYxo/VGAAAAAElFTkSuQmCC
+ vAAADrwBlbxySQAAA+JJREFUWEftVkuIHGUQbt34iMEoq2S2q3p3yTJsuqpnJ+L6WBRdwaigohfFgEou
+ BkVBUPCBCEG8BXNQ48GLeImCehIJxMsqhsSZruod46K4HtSIGjU+4iOr0c1I9fSsM3/PLNtCPO0H36m/
+ evz/X11VnreKVRTAHPOZumkY6lFwqURws3BwZ8ywTQnuiCP/+iTCzY1qaUPzdm/Atf3PaHre6XPsjyQM
+ 2xLGV4XwIyX4QRj+UMK/lPFvJTyhBMeV8IgQvmRJuH4Ko+l5p9UjGBbCJ5RxTgj+VMZmXxKcSAjekHE/
+ NNs5DgaTKLinEQYVO4Trf1mkV81wixLUslPmA3bzF2XcKeP+hWY/u3n0fCXcrQwLyjAvjNsb1dI6N05P
+ mFAIHlHG73sEypPgGwnhfpn0zzH7jzddcK4Q7kqfKNMI4a9K+MwBDgbdeF04MBWsFYYdQvhbLlBvfhKT
+ f+vMtLfG7C0JJXxKGY67WnvCmPAFGRs7z42boul5AzHBfdK6TjdQtzPGk8oos5F/5Y7sfVvPhg+lp+1h
+ 0yIsxARPmtaN78WEl8eEX+SNclxUhne0glUrNrN9zfMGlPAuZTzaQ99FYfwuDv3ruoLvq5bWaQSvZCfL
+ GXUYLwrj240Qxtu2lkSN4FpdWfKZH9jb9RQ1Cq62f9sVOlxUxn3KQXnJ0PO8QxU/jBm1h74v7ZniEG9K
+ Hdg/quzvXO709k0Y3u08ucGqWgheX862H4XgxbR47SqU8D1X0EXC2VmGizqDz0xPr0kYH9eO360gNe0b
+ jWppozB+1kOQEb5MCLa0C64NoeGrhOGrvH6lhK81GiIvnggmrDLzgvTkvwvDA+5wsU4nhG/m9AUoBD/F
+ HFzWN4H0XQn2vF8eXN8Z3FAPYasl59oUYjuB+sTImDB+nhfgYQ39STf4fmu1DHtz+oIUgiM1KkWtwcFw
+ sOujVT3hrnaL7UQc+hcL5W+sKIXhw0OVjaW0iwnBc47gqIQ45QY32PKRzv8eTguRYM9SS5YouEEZjv37
+ EffbzbjBDdZyxZYQ12EB2qS0bWrJqRVazPDWkojwZbuZrsgZtDJ0iY1g12khEtTicMTvclwn2CKE32YJ
+ 7G5PORfZ1HtMCH7MOV4BrQ3XCe92+4onk5Nn2PolDAvWXnuOzAwzo6Nnx4Q3SrojwqfKeMxWMpsXWVs+
+ 2WrfKRdbW1W6Hf0shM/33Y7my4PrleFZIfhAaWjU/e5ivlw+y3S2FySMtynjvcrwsFiLJv/RhPBB2ws1
+ hK2WcBLBFf1qawlplwvxaQlxe786OOU4PBWsjSO85mBlQ8n99r/BisSdAas4FfgHpdEUZpwUX7sAAAAA
+ SUVORK5CYII=
</value>
</data>
</root>
\ No newline at end of file
--
Gitblit v1.9.3