修复一部分工具图像转换问题以及内存释放问题。以及合并史工提交的相机和用户设计模块

C3204

2025-12-31 365ba3913b3b59e0149f85dc835818e45a979488

 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, 24);
            uiComboBoxBrand.Size = new Size(260, 28);
            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, 55);
            uiRadioButtonSoftTrigger.Location = new Point(3, 54);
            uiRadioButtonSoftTrigger.MinimumSize = new Size(1, 1);
            uiRadioButtonSoftTrigger.Name = "uiRadioButtonSoftTrigger";
            uiRadioButtonSoftTrigger.Size = new Size(368, 46);
            uiRadioButtonSoftTrigger.Size = new Size(368, 45);
            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, 159);
            uiRadioButtonHardTrigger.Location = new Point(3, 156);
            uiRadioButtonHardTrigger.MinimumSize = new Size(1, 1);
            uiRadioButtonHardTrigger.Name = "uiRadioButtonHardTrigger";
            uiRadioButtonHardTrigger.Size = new Size(368, 46);
            uiRadioButtonHardTrigger.Size = new Size(368, 45);
            uiRadioButtonHardTrigger.TabIndex = 26;
            uiRadioButtonHardTrigger.Text = "硬触发";
            // 
@@ -162,7 +162,7 @@
            tableLayoutPanel2.Controls.Add(tableLayoutPanel5, 0, 6);
            tableLayoutPanel2.Controls.Add(tableLayoutPanel6, 0, 7);
            tableLayoutPanel2.Dock = DockStyle.Fill;
            tableLayoutPanel2.Location = new Point(0, 51);
            tableLayoutPanel2.Location = new Point(0, 55);
            tableLayoutPanel2.Name = "tableLayoutPanel2";
            tableLayoutPanel2.RowCount = 9;
            tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 10F));
@@ -174,7 +174,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, 470);
            tableLayoutPanel2.Size = new Size(374, 466);
            tableLayoutPanel2.TabIndex = 17;
            // 
            // tableLayoutPanel3
@@ -189,7 +189,7 @@
            tableLayoutPanel3.Name = "tableLayoutPanel3";
            tableLayoutPanel3.RowCount = 1;
            tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
            tableLayoutPanel3.Size = new Size(368, 46);
            tableLayoutPanel3.Size = new Size(368, 45);
            tableLayoutPanel3.TabIndex = 0;
            // 
            // uiMarkLabel1
@@ -200,7 +200,7 @@
            uiMarkLabel1.Location = new Point(3, 0);
            uiMarkLabel1.Name = "uiMarkLabel1";
            uiMarkLabel1.Padding = new Padding(5, 0, 0, 0);
            uiMarkLabel1.Size = new Size(94, 46);
            uiMarkLabel1.Size = new Size(94, 45);
            uiMarkLabel1.TabIndex = 25;
            uiMarkLabel1.Text = "品牌";
            uiMarkLabel1.TextAlign = ContentAlignment.MiddleLeft;
@@ -215,11 +215,11 @@
            tableLayoutPanel1.Controls.Add(uiButtonStartSoftGrab, 1, 0);
            tableLayoutPanel1.Controls.Add(uiButtonCloseSoftGrab, 2, 0);
            tableLayoutPanel1.Dock = DockStyle.Fill;
            tableLayoutPanel1.Location = new Point(3, 107);
            tableLayoutPanel1.Location = new Point(3, 105);
            tableLayoutPanel1.Name = "tableLayoutPanel1";
            tableLayoutPanel1.RowCount = 1;
            tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
            tableLayoutPanel1.Size = new Size(368, 46);
            tableLayoutPanel1.Size = new Size(368, 45);
            tableLayoutPanel1.TabIndex = 30;
            // 
            // uiButtonGrabOnce
@@ -229,7 +229,7 @@
            uiButtonGrabOnce.Location = new Point(3, 3);
            uiButtonGrabOnce.MinimumSize = new Size(1, 1);
            uiButtonGrabOnce.Name = "uiButtonGrabOnce";
            uiButtonGrabOnce.Size = new Size(116, 40);
            uiButtonGrabOnce.Size = new Size(116, 39);
            uiButtonGrabOnce.TabIndex = 31;
            uiButtonGrabOnce.Text = "单张采集";
            uiButtonGrabOnce.Click += uiButtonGrabOnce_Click;
@@ -241,7 +241,7 @@
            uiButtonStartSoftGrab.Location = new Point(125, 3);
            uiButtonStartSoftGrab.MinimumSize = new Size(1, 1);
            uiButtonStartSoftGrab.Name = "uiButtonStartSoftGrab";
            uiButtonStartSoftGrab.Size = new Size(116, 40);
            uiButtonStartSoftGrab.Size = new Size(116, 39);
            uiButtonStartSoftGrab.TabIndex = 31;
            uiButtonStartSoftGrab.Text = "连续采集";
            uiButtonStartSoftGrab.Click += uiButtonStartSoftGrab_Click;
@@ -253,7 +253,7 @@
            uiButtonCloseSoftGrab.Location = new Point(247, 3);
            uiButtonCloseSoftGrab.MinimumSize = new Size(1, 1);
            uiButtonCloseSoftGrab.Name = "uiButtonCloseSoftGrab";
            uiButtonCloseSoftGrab.Size = new Size(118, 40);
            uiButtonCloseSoftGrab.Size = new Size(118, 39);
            uiButtonCloseSoftGrab.TabIndex = 31;
            uiButtonCloseSoftGrab.Text = "关闭采集";
            uiButtonCloseSoftGrab.Click += uiButtonCloseSoftGrab_Click;
@@ -262,10 +262,10 @@
            // 
            uiButtonStartHardGrab.Dock = DockStyle.Fill;
            uiButtonStartHardGrab.Font = new Font("宋体", 12F);
            uiButtonStartHardGrab.Location = new Point(3, 211);
            uiButtonStartHardGrab.Location = new Point(3, 207);
            uiButtonStartHardGrab.MinimumSize = new Size(1, 1);
            uiButtonStartHardGrab.Name = "uiButtonStartHardGrab";
            uiButtonStartHardGrab.Size = new Size(368, 46);
            uiButtonStartHardGrab.Size = new Size(368, 45);
            uiButtonStartHardGrab.TabIndex = 27;
            uiButtonStartHardGrab.Text = "等待硬件触发";
            uiButtonStartHardGrab.Click += uiButtonStartHardGrab_Click;
@@ -278,11 +278,11 @@
            tableLayoutPanel4.Controls.Add(uiMarkLabel2, 0, 0);
            tableLayoutPanel4.Controls.Add(uiTextBoxExp, 1, 0);
            tableLayoutPanel4.Dock = DockStyle.Fill;
            tableLayoutPanel4.Location = new Point(3, 263);
            tableLayoutPanel4.Location = new Point(3, 258);
            tableLayoutPanel4.Name = "tableLayoutPanel4";
            tableLayoutPanel4.RowCount = 1;
            tableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
            tableLayoutPanel4.Size = new Size(368, 46);
            tableLayoutPanel4.Size = new Size(368, 45);
            tableLayoutPanel4.TabIndex = 28;
            // 
            // uiMarkLabel2
@@ -293,7 +293,7 @@
            uiMarkLabel2.Location = new Point(3, 0);
            uiMarkLabel2.Name = "uiMarkLabel2";
            uiMarkLabel2.Padding = new Padding(5, 0, 0, 0);
            uiMarkLabel2.Size = new Size(94, 46);
            uiMarkLabel2.Size = new Size(94, 45);
            uiMarkLabel2.TabIndex = 31;
            uiMarkLabel2.Text = "曝光(us)";
            uiMarkLabel2.TextAlign = ContentAlignment.MiddleLeft;
@@ -306,7 +306,7 @@
            uiTextBoxExp.Margin = new Padding(4, 5, 4, 5);
            uiTextBoxExp.MinimumSize = new Size(1, 16);
            uiTextBoxExp.Name = "uiTextBoxExp";
            uiTextBoxExp.Size = new Size(260, 26);
            uiTextBoxExp.Size = new Size(260, 30);
            uiTextBoxExp.TabIndex = 31;
            uiTextBoxExp.Text = "1000";
            uiTextBoxExp.TextChanged += uiTextBoxExp_TextChanged;
@@ -319,11 +319,11 @@
            tableLayoutPanel5.Controls.Add(uiMarkLabel3, 0, 0);
            tableLayoutPanel5.Controls.Add(uiTextBoxGain, 1, 0);
            tableLayoutPanel5.Dock = DockStyle.Fill;
            tableLayoutPanel5.Location = new Point(3, 315);
            tableLayoutPanel5.Location = new Point(3, 309);
            tableLayoutPanel5.Name = "tableLayoutPanel5";
            tableLayoutPanel5.RowCount = 1;
            tableLayoutPanel5.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
            tableLayoutPanel5.Size = new Size(368, 46);
            tableLayoutPanel5.Size = new Size(368, 45);
            tableLayoutPanel5.TabIndex = 29;
            // 
            // uiMarkLabel3
@@ -334,7 +334,7 @@
            uiMarkLabel3.Location = new Point(3, 0);
            uiMarkLabel3.Name = "uiMarkLabel3";
            uiMarkLabel3.Padding = new Padding(5, 0, 0, 0);
            uiMarkLabel3.Size = new Size(94, 46);
            uiMarkLabel3.Size = new Size(94, 45);
            uiMarkLabel3.TabIndex = 31;
            uiMarkLabel3.Text = "增益";
            uiMarkLabel3.TextAlign = ContentAlignment.MiddleLeft;
@@ -347,7 +347,7 @@
            uiTextBoxGain.Margin = new Padding(4, 5, 4, 5);
            uiTextBoxGain.MinimumSize = new Size(1, 16);
            uiTextBoxGain.Name = "uiTextBoxGain";
            uiTextBoxGain.Size = new Size(260, 26);
            uiTextBoxGain.Size = new Size(260, 30);
            uiTextBoxGain.TabIndex = 32;
            uiTextBoxGain.Text = "1";
            uiTextBoxGain.TextChanged += uiTextBoxGain_TextChanged;
@@ -360,11 +360,11 @@
            tableLayoutPanel6.Controls.Add(uiMarkLabel4, 0, 0);
            tableLayoutPanel6.Controls.Add(uiTextBoxGrabTime, 1, 0);
            tableLayoutPanel6.Dock = DockStyle.Fill;
            tableLayoutPanel6.Location = new Point(3, 367);
            tableLayoutPanel6.Location = new Point(3, 360);
            tableLayoutPanel6.Name = "tableLayoutPanel6";
            tableLayoutPanel6.RowCount = 1;
            tableLayoutPanel6.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
            tableLayoutPanel6.Size = new Size(368, 46);
            tableLayoutPanel6.Size = new Size(368, 45);
            tableLayoutPanel6.TabIndex = 31;
            // 
            // uiMarkLabel4
@@ -375,7 +375,7 @@
            uiMarkLabel4.Location = new Point(3, 0);
            uiMarkLabel4.Name = "uiMarkLabel4";
            uiMarkLabel4.Padding = new Padding(5, 0, 0, 0);
            uiMarkLabel4.Size = new Size(94, 46);
            uiMarkLabel4.Size = new Size(94, 45);
            uiMarkLabel4.TabIndex = 31;
            uiMarkLabel4.Text = "耗时(ms)";
            uiMarkLabel4.TextAlign = ContentAlignment.MiddleLeft;
@@ -389,7 +389,7 @@
            uiTextBoxGrabTime.Margin = new Padding(4, 5, 4, 5);
            uiTextBoxGrabTime.MinimumSize = new Size(1, 16);
            uiTextBoxGrabTime.Name = "uiTextBoxGrabTime";
            uiTextBoxGrabTime.Size = new Size(260, 26);
            uiTextBoxGrabTime.Size = new Size(260, 30);
            uiTextBoxGrabTime.TabIndex = 31;
            // 
            // uiSplitContainer1
@@ -451,8 +451,7 @@
            // 
            // CameraForm
            // 
            AutoScaleDimensions = new SizeF(96F, 96F);
            AutoScaleMode = AutoScaleMode.Dpi;
            AutoScaleMode = AutoScaleMode.None;
            ClientSize = new Size(900, 600);
            Controls.Add(themeForm1);
            FormBorderStyle = FormBorderStyle.None;