From 2913bc722c51b6b20f69eadc2bfc708ab2a2898d Mon Sep 17 00:00:00 2001 From: YZJ Date: Thu, 1 Aug 2024 13:25:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E7=BB=88=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HisenceYoloDetection/CheckDiffSciHelper.cs | 4 +- HisenceYoloDetection/MainForm.Designer.cs | 202 ++++++++++----------- HisenceYoloDetection/MainForm.cs | 28 +-- 3 files changed, 120 insertions(+), 114 deletions(-) diff --git a/HisenceYoloDetection/CheckDiffSciHelper.cs b/HisenceYoloDetection/CheckDiffSciHelper.cs index 58d5e83..f200f1c 100644 --- a/HisenceYoloDetection/CheckDiffSciHelper.cs +++ b/HisenceYoloDetection/CheckDiffSciHelper.cs @@ -247,7 +247,7 @@ namespace HisenceYoloDetection Cv2.Resize(img2, img2, new Size(550, 270)); Cv2.Rectangle(img2, boundingRect, Scalar.Red, thickness: 2); isMatch = false; - string savePath2 = Path.Combine("D:\\Hisence\\Test\\2\\ng", Path.GetFileNameWithoutExtension(path1) + filename + "_Rect.png"); + string savePath2 = Path.Combine("D:\\Hisence\\Test\\2\\ng",filename + "_Rect.png"); // 保存结果 //string savePath = Path.Combine(saveDir, Path.GetFileNameWithoutExtension(path2) + "_diff.png"); Cv2.ImWrite(savePath2, img2); @@ -498,7 +498,7 @@ namespace HisenceYoloDetection // 保存结果 //string savePath = Path.Combine(saveDir, Path.GetFileNameWithoutExtension(path2) + "_diff.png"); Cv2.ImWrite(savePath2, img2); - ResizeImage(savePath2, savePath2, 640, 480, 75); + //ResizeImage(savePath2, savePath2, 640, 480, 75); //string savePath = Path.Combine(saveDir, Path.GetFileNameWithoutExtension(path1) + filename + "_diff.png"); // 保存结果 //string savePath = Path.Combine(saveDir, Path.GetFileNameWithoutExtension(path2) + "_diff.png"); diff --git a/HisenceYoloDetection/MainForm.Designer.cs b/HisenceYoloDetection/MainForm.Designer.cs index a7fc875..a4afd43 100644 --- a/HisenceYoloDetection/MainForm.Designer.cs +++ b/HisenceYoloDetection/MainForm.Designer.cs @@ -228,11 +228,11 @@ // tabPage2 // tabPage2.Controls.Add(panel1); - tabPage2.Location = new Point(4, 33); + tabPage2.Location = new Point(4, 26); tabPage2.Margin = new Padding(4, 2, 4, 2); tabPage2.Name = "tabPage2"; tabPage2.Padding = new Padding(4, 2, 4, 2); - tabPage2.Size = new Size(1276, 816); + tabPage2.Size = new Size(1276, 923); tabPage2.TabIndex = 1; tabPage2.Text = "PLC"; tabPage2.UseVisualStyleBackColor = true; @@ -258,7 +258,7 @@ panel1.Location = new Point(0, 6); panel1.Margin = new Padding(4, 2, 4, 2); panel1.Name = "panel1"; - panel1.Size = new Size(1514, 713); + panel1.Size = new Size(1514, 921); panel1.TabIndex = 4; // // groupBox5 @@ -280,7 +280,7 @@ DistanceShow.Margin = new Padding(4, 2, 4, 2); DistanceShow.Name = "DistanceShow"; DistanceShow.ReadOnly = true; - DistanceShow.Size = new Size(127, 31); + DistanceShow.Size = new Size(127, 23); DistanceShow.TabIndex = 10; // // label21 @@ -289,7 +289,7 @@ label21.Location = new Point(36, 31); label21.Margin = new Padding(4, 0, 4, 0); label21.Name = "label21"; - label21.Size = new Size(54, 25); + label21.Size = new Size(36, 17); label21.TabIndex = 0; label21.Text = "测距"; // @@ -298,7 +298,7 @@ txtSetValue.Location = new Point(738, 73); txtSetValue.Margin = new Padding(4, 2, 4, 2); txtSetValue.Name = "txtSetValue"; - txtSetValue.Size = new Size(251, 31); + txtSetValue.Size = new Size(251, 23); txtSetValue.TabIndex = 14; // // groupBox4 @@ -367,7 +367,7 @@ SetlnEditmiZOP.Location = new Point(526, 296); SetlnEditmiZOP.Margin = new Padding(4, 2, 4, 2); SetlnEditmiZOP.Name = "SetlnEditmiZOP"; - SetlnEditmiZOP.Size = new Size(127, 31); + SetlnEditmiZOP.Size = new Size(127, 23); SetlnEditmiZOP.TabIndex = 27; // // SetlnEditmiYOP @@ -375,7 +375,7 @@ SetlnEditmiYOP.Location = new Point(329, 296); SetlnEditmiYOP.Margin = new Padding(4, 2, 4, 2); SetlnEditmiYOP.Name = "SetlnEditmiYOP"; - SetlnEditmiYOP.Size = new Size(127, 31); + SetlnEditmiYOP.Size = new Size(127, 23); SetlnEditmiYOP.TabIndex = 26; // // SetlnEditmiXOP @@ -383,7 +383,7 @@ SetlnEditmiXOP.Location = new Point(138, 296); SetlnEditmiXOP.Margin = new Padding(4, 2, 4, 2); SetlnEditmiXOP.Name = "SetlnEditmiXOP"; - SetlnEditmiXOP.Size = new Size(127, 31); + SetlnEditmiXOP.Size = new Size(127, 23); SetlnEditmiXOP.TabIndex = 25; // // SetlnEditmiZH @@ -391,7 +391,7 @@ SetlnEditmiZH.Location = new Point(526, 242); SetlnEditmiZH.Margin = new Padding(4, 2, 4, 2); SetlnEditmiZH.Name = "SetlnEditmiZH"; - SetlnEditmiZH.Size = new Size(127, 31); + SetlnEditmiZH.Size = new Size(127, 23); SetlnEditmiZH.TabIndex = 23; // // SetlnEditmiYH @@ -399,7 +399,7 @@ SetlnEditmiYH.Location = new Point(329, 242); SetlnEditmiYH.Margin = new Padding(4, 2, 4, 2); SetlnEditmiYH.Name = "SetlnEditmiYH"; - SetlnEditmiYH.Size = new Size(127, 31); + SetlnEditmiYH.Size = new Size(127, 23); SetlnEditmiYH.TabIndex = 22; // // SetlnEditmiXH @@ -407,7 +407,7 @@ SetlnEditmiXH.Location = new Point(138, 242); SetlnEditmiXH.Margin = new Padding(4, 2, 4, 2); SetlnEditmiXH.Name = "SetlnEditmiXH"; - SetlnEditmiXH.Size = new Size(127, 31); + SetlnEditmiXH.Size = new Size(127, 23); SetlnEditmiXH.TabIndex = 21; // // lnEditmiZOP @@ -415,7 +415,7 @@ lnEditmiZOP.Location = new Point(526, 189); lnEditmiZOP.Margin = new Padding(4, 2, 4, 2); lnEditmiZOP.Name = "lnEditmiZOP"; - lnEditmiZOP.Size = new Size(127, 31); + lnEditmiZOP.Size = new Size(127, 23); lnEditmiZOP.TabIndex = 19; // // lnEditmiYOP @@ -423,7 +423,7 @@ lnEditmiYOP.Location = new Point(329, 189); lnEditmiYOP.Margin = new Padding(4, 2, 4, 2); lnEditmiYOP.Name = "lnEditmiYOP"; - lnEditmiYOP.Size = new Size(127, 31); + lnEditmiYOP.Size = new Size(127, 23); lnEditmiYOP.TabIndex = 18; // // lnEditmiXOP @@ -431,7 +431,7 @@ lnEditmiXOP.Location = new Point(138, 189); lnEditmiXOP.Margin = new Padding(4, 2, 4, 2); lnEditmiXOP.Name = "lnEditmiXOP"; - lnEditmiXOP.Size = new Size(127, 31); + lnEditmiXOP.Size = new Size(127, 23); lnEditmiXOP.TabIndex = 17; // // label17 @@ -440,7 +440,7 @@ label17.Location = new Point(41, 191); label17.Margin = new Padding(4, 0, 4, 0); label17.Name = "label17"; - label17.Size = new Size(96, 25); + label17.Size = new Size(64, 17); label17.TabIndex = 16; label17.Text = "定位位置"; // @@ -450,7 +450,7 @@ lnEditmiZS.Margin = new Padding(4, 2, 4, 2); lnEditmiZS.Name = "lnEditmiZS"; lnEditmiZS.ReadOnly = true; - lnEditmiZS.Size = new Size(127, 31); + lnEditmiZS.Size = new Size(127, 23); lnEditmiZS.TabIndex = 15; // // lnEditmiYS @@ -459,7 +459,7 @@ lnEditmiYS.Margin = new Padding(4, 2, 4, 2); lnEditmiYS.Name = "lnEditmiYS"; lnEditmiYS.ReadOnly = true; - lnEditmiYS.Size = new Size(127, 31); + lnEditmiYS.Size = new Size(127, 23); lnEditmiYS.TabIndex = 14; // // lnEditmiXS @@ -468,7 +468,7 @@ lnEditmiXS.Margin = new Padding(4, 2, 4, 2); lnEditmiXS.Name = "lnEditmiXS"; lnEditmiXS.ReadOnly = true; - lnEditmiXS.Size = new Size(127, 31); + lnEditmiXS.Size = new Size(127, 23); lnEditmiXS.TabIndex = 13; // // label16 @@ -477,7 +477,7 @@ label16.Location = new Point(10, 138); label16.Margin = new Padding(4, 0, 4, 0); label16.Name = "label16"; - label16.Size = new Size(138, 25); + label16.Size = new Size(92, 17); label16.TabIndex = 12; label16.Text = "当前定位速度"; // @@ -487,7 +487,7 @@ lnEditmiZHS.Margin = new Padding(4, 2, 4, 2); lnEditmiZHS.Name = "lnEditmiZHS"; lnEditmiZHS.ReadOnly = true; - lnEditmiZHS.Size = new Size(127, 31); + lnEditmiZHS.Size = new Size(127, 23); lnEditmiZHS.TabIndex = 11; // // lnEditmiYHS @@ -496,7 +496,7 @@ lnEditmiYHS.Margin = new Padding(4, 2, 4, 2); lnEditmiYHS.Name = "lnEditmiYHS"; lnEditmiYHS.ReadOnly = true; - lnEditmiYHS.Size = new Size(127, 31); + lnEditmiYHS.Size = new Size(127, 23); lnEditmiYHS.TabIndex = 10; // // lnEditmiXHS @@ -505,7 +505,7 @@ lnEditmiXHS.Margin = new Padding(4, 2, 4, 2); lnEditmiXHS.Name = "lnEditmiXHS"; lnEditmiXHS.ReadOnly = true; - lnEditmiXHS.Size = new Size(127, 31); + lnEditmiXHS.Size = new Size(127, 23); lnEditmiXHS.TabIndex = 9; // // label15 @@ -514,7 +514,7 @@ label15.Location = new Point(10, 85); label15.Margin = new Padding(4, 0, 4, 0); label15.Name = "label15"; - label15.Size = new Size(138, 25); + label15.Size = new Size(92, 17); label15.TabIndex = 8; label15.Text = "当前手动速度"; // @@ -524,7 +524,7 @@ ZPostion.Location = new Point(580, 42); ZPostion.Margin = new Padding(4, 0, 4, 0); ZPostion.Name = "ZPostion"; - ZPostion.Size = new Size(24, 25); + ZPostion.Size = new Size(16, 17); ZPostion.TabIndex = 7; ZPostion.Text = "0"; // @@ -534,7 +534,7 @@ YPostion.Location = new Point(386, 42); YPostion.Margin = new Padding(4, 0, 4, 0); YPostion.Name = "YPostion"; - YPostion.Size = new Size(24, 25); + YPostion.Size = new Size(16, 17); YPostion.TabIndex = 6; YPostion.Text = "0"; // @@ -544,7 +544,7 @@ XPostion.Location = new Point(185, 42); XPostion.Margin = new Padding(4, 0, 4, 0); XPostion.Name = "XPostion"; - XPostion.Size = new Size(24, 25); + XPostion.Size = new Size(16, 17); XPostion.TabIndex = 5; XPostion.Text = "0"; // @@ -554,7 +554,7 @@ XCurrentPostion.Location = new Point(170, 42); XCurrentPostion.Margin = new Padding(4, 0, 4, 0); XCurrentPostion.Name = "XCurrentPostion"; - XCurrentPostion.Size = new Size(0, 25); + XCurrentPostion.Size = new Size(0, 17); XCurrentPostion.TabIndex = 4; // // label14 @@ -563,7 +563,7 @@ label14.Location = new Point(580, 21); label14.Margin = new Padding(4, 0, 4, 0); label14.Name = "label14"; - label14.Size = new Size(25, 25); + label14.Size = new Size(17, 17); label14.TabIndex = 3; label14.Text = "Z"; // @@ -573,7 +573,7 @@ label13.Location = new Point(386, 18); label13.Margin = new Padding(4, 0, 4, 0); label13.Name = "label13"; - label13.Size = new Size(27, 25); + label13.Size = new Size(17, 17); label13.TabIndex = 2; label13.Text = "Y"; // @@ -583,7 +583,7 @@ label12.Location = new Point(184, 18); label12.Margin = new Padding(4, 0, 4, 0); label12.Name = "label12"; - label12.Size = new Size(26, 25); + label12.Size = new Size(17, 17); label12.TabIndex = 1; label12.Text = "X"; // @@ -593,7 +593,7 @@ label11.Location = new Point(41, 42); label11.Margin = new Padding(4, 0, 4, 0); label11.Name = "label11"; - label11.Size = new Size(96, 25); + label11.Size = new Size(64, 17); label11.TabIndex = 0; label11.Text = "当前位置"; // @@ -799,7 +799,7 @@ writePLCValue.Location = new Point(861, 9); writePLCValue.Margin = new Padding(4, 2, 4, 2); writePLCValue.Name = "writePLCValue"; - writePLCValue.Size = new Size(127, 31); + writePLCValue.Size = new Size(127, 23); writePLCValue.TabIndex = 11; // // label9 @@ -808,7 +808,7 @@ label9.Location = new Point(514, 49); label9.Margin = new Padding(4, 0, 4, 0); label9.Name = "label9"; - label9.Size = new Size(33, 25); + label9.Size = new Size(22, 17); label9.TabIndex = 10; label9.Text = "值"; // @@ -818,7 +818,7 @@ label10.Location = new Point(514, 15); label10.Margin = new Padding(4, 0, 4, 0); label10.Name = "label10"; - label10.Size = new Size(54, 25); + label10.Size = new Size(36, 17); label10.TabIndex = 9; label10.Text = "地址"; // @@ -838,7 +838,7 @@ PLCValue.Location = new Point(577, 43); PLCValue.Margin = new Padding(4, 2, 4, 2); PLCValue.Name = "PLCValue"; - PLCValue.Size = new Size(127, 31); + PLCValue.Size = new Size(127, 23); PLCValue.TabIndex = 8; // // WriteAdress @@ -846,7 +846,7 @@ WriteAdress.Location = new Point(577, 13); WriteAdress.Margin = new Padding(4, 2, 4, 2); WriteAdress.Name = "WriteAdress"; - WriteAdress.Size = new Size(127, 31); + WriteAdress.Size = new Size(127, 23); WriteAdress.TabIndex = 6; // // label6 @@ -855,7 +855,7 @@ label6.Location = new Point(162, 51); label6.Margin = new Padding(4, 0, 4, 0); label6.Name = "label6"; - label6.Size = new Size(33, 25); + label6.Size = new Size(22, 17); label6.TabIndex = 5; label6.Text = "值"; // @@ -865,7 +865,7 @@ label3.Location = new Point(162, 18); label3.Margin = new Padding(4, 0, 4, 0); label3.Name = "label3"; - label3.Size = new Size(54, 25); + label3.Size = new Size(36, 17); label3.TabIndex = 4; label3.Text = "地址"; // @@ -896,7 +896,7 @@ showPLC.Location = new Point(225, 46); showPLC.Margin = new Padding(4, 2, 4, 2); showPLC.Name = "showPLC"; - showPLC.Size = new Size(127, 31); + showPLC.Size = new Size(127, 23); showPLC.TabIndex = 3; // // readPLc @@ -904,18 +904,18 @@ readPLc.Location = new Point(225, 15); readPLc.Margin = new Padding(4, 2, 4, 2); readPLc.Name = "readPLc"; - readPLc.Size = new Size(127, 31); + readPLc.Size = new Size(127, 23); readPLc.TabIndex = 1; // // tabPage1 // tabPage1.Controls.Add(groupBox3); tabPage1.Controls.Add(groupBox1); - tabPage1.Location = new Point(4, 34); + tabPage1.Location = new Point(4, 26); tabPage1.Margin = new Padding(4, 2, 4, 2); tabPage1.Name = "tabPage1"; tabPage1.Padding = new Padding(4, 2, 4, 2); - tabPage1.Size = new Size(1276, 815); + tabPage1.Size = new Size(1276, 923); tabPage1.TabIndex = 0; tabPage1.Text = "相机"; tabPage1.UseVisualStyleBackColor = true; @@ -979,7 +979,7 @@ label5.Location = new Point(257, 18); label5.Margin = new Padding(4, 0, 4, 0); label5.Name = "label5"; - label5.Size = new Size(96, 25); + label5.Size = new Size(64, 17); label5.TabIndex = 2; label5.Text = "链接相机"; // @@ -1010,7 +1010,7 @@ tbGain2.Location = new Point(93, 54); tbGain2.Margin = new Padding(4, 2, 4, 2); tbGain2.Name = "tbGain2"; - tbGain2.Size = new Size(127, 31); + tbGain2.Size = new Size(127, 23); tbGain2.TabIndex = 4; // // tbExposure2 @@ -1018,7 +1018,7 @@ tbExposure2.Location = new Point(93, 22); tbExposure2.Margin = new Padding(4, 2, 4, 2); tbExposure2.Name = "tbExposure2"; - tbExposure2.Size = new Size(127, 31); + tbExposure2.Size = new Size(127, 23); tbExposure2.TabIndex = 3; // // label7 @@ -1027,7 +1027,7 @@ label7.Location = new Point(15, 56); label7.Margin = new Padding(4, 0, 4, 0); label7.Name = "label7"; - label7.Size = new Size(54, 25); + label7.Size = new Size(36, 17); label7.TabIndex = 1; label7.Text = "增益"; // @@ -1037,7 +1037,7 @@ label8.Location = new Point(15, 24); label8.Margin = new Padding(4, 0, 4, 0); label8.Name = "label8"; - label8.Size = new Size(54, 25); + label8.Size = new Size(36, 17); label8.TabIndex = 0; label8.Text = "曝光"; // @@ -1102,7 +1102,7 @@ label1.Location = new Point(257, 18); label1.Margin = new Padding(4, 0, 4, 0); label1.Name = "label1"; - label1.Size = new Size(96, 25); + label1.Size = new Size(64, 17); label1.TabIndex = 2; label1.Text = "链接相机"; // @@ -1133,7 +1133,7 @@ tbGain.Location = new Point(93, 54); tbGain.Margin = new Padding(4, 2, 4, 2); tbGain.Name = "tbGain"; - tbGain.Size = new Size(127, 31); + tbGain.Size = new Size(127, 23); tbGain.TabIndex = 4; // // tbExposure @@ -1141,7 +1141,7 @@ tbExposure.Location = new Point(93, 22); tbExposure.Margin = new Padding(4, 2, 4, 2); tbExposure.Name = "tbExposure"; - tbExposure.Size = new Size(127, 31); + tbExposure.Size = new Size(127, 23); tbExposure.TabIndex = 3; // // label2 @@ -1150,7 +1150,7 @@ label2.Location = new Point(15, 56); label2.Margin = new Padding(4, 0, 4, 0); label2.Name = "label2"; - label2.Size = new Size(54, 25); + label2.Size = new Size(36, 17); label2.TabIndex = 1; label2.Text = "增益"; // @@ -1160,7 +1160,7 @@ label4.Location = new Point(15, 24); label4.Margin = new Padding(4, 0, 4, 0); label4.Name = "label4"; - label4.Size = new Size(54, 25); + label4.Size = new Size(36, 17); label4.TabIndex = 0; label4.Text = "曝光"; // @@ -1175,17 +1175,17 @@ tabControl1.Margin = new Padding(4, 2, 4, 2); tabControl1.Name = "tabControl1"; tabControl1.SelectedIndex = 0; - tabControl1.Size = new Size(1284, 853); + tabControl1.Size = new Size(1284, 930); tabControl1.TabIndex = 0; tabControl1.SelectedIndexChanged += tabControl1_SelectedIndexChanged; // // tabPage5 // tabPage5.Controls.Add(panel4); - tabPage5.Location = new Point(4, 34); + tabPage5.Location = new Point(4, 26); tabPage5.Margin = new Padding(4, 2, 4, 2); tabPage5.Name = "tabPage5"; - tabPage5.Size = new Size(1276, 815); + tabPage5.Size = new Size(1276, 900); tabPage5.TabIndex = 3; tabPage5.Text = "流程"; tabPage5.UseVisualStyleBackColor = true; @@ -1197,7 +1197,7 @@ panel4.Location = new Point(0, 0); panel4.Margin = new Padding(4, 2, 4, 2); panel4.Name = "panel4"; - panel4.Size = new Size(1276, 815); + panel4.Size = new Size(1276, 900); panel4.TabIndex = 0; // // panel5 @@ -1210,7 +1210,7 @@ panel5.Location = new Point(0, 0); panel5.Margin = new Padding(4, 2, 4, 2); panel5.Name = "panel5"; - panel5.Size = new Size(1276, 821); + panel5.Size = new Size(1276, 820); panel5.TabIndex = 0; // // groupBox9 @@ -1231,7 +1231,7 @@ DevNameCombo.Location = new Point(8, 33); DevNameCombo.Margin = new Padding(4, 2, 4, 2); DevNameCombo.Name = "DevNameCombo"; - DevNameCombo.Size = new Size(524, 33); + DevNameCombo.Size = new Size(524, 25); DevNameCombo.TabIndex = 1; // // ScanDevList @@ -1404,7 +1404,7 @@ textBox4.Margin = new Padding(4, 2, 4, 2); textBox4.Name = "textBox4"; textBox4.ReadOnly = true; - textBox4.Size = new Size(67, 31); + textBox4.Size = new Size(67, 23); textBox4.TabIndex = 18; // // label36 @@ -1412,7 +1412,7 @@ label36.AutoSize = true; label36.Location = new Point(426, 99); label36.Name = "label36"; - label36.Size = new Size(96, 25); + label36.Size = new Size(64, 17); label36.TabIndex = 17; label36.Text = "机身倾斜"; // @@ -1423,7 +1423,7 @@ label26.Location = new Point(42, 262); label26.Margin = new Padding(4, 0, 4, 0); label26.Name = "label26"; - label26.Size = new Size(195, 44); + label26.Size = new Size(133, 30); label26.TabIndex = 16; label26.Text = "检测结果"; // @@ -1433,7 +1433,7 @@ label18.Location = new Point(7, 67); label18.Margin = new Padding(4, 0, 4, 0); label18.Name = "label18"; - label18.Size = new Size(96, 25); + label18.Size = new Size(64, 17); label18.TabIndex = 5; label18.Text = "总产量数"; label18.Click += label18_Click; @@ -1444,7 +1444,7 @@ AllDSum.Margin = new Padding(4, 2, 4, 2); AllDSum.Name = "AllDSum"; AllDSum.ReadOnly = true; - AllDSum.Size = new Size(74, 31); + AllDSum.Size = new Size(74, 23); AllDSum.TabIndex = 6; // // label19 @@ -1453,7 +1453,7 @@ label19.Location = new Point(205, 96); label19.Margin = new Padding(4, 0, 4, 0); label19.Name = "label19"; - label19.Size = new Size(106, 25); + label19.Size = new Size(71, 17); label19.TabIndex = 7; label19.Text = "NG产品数"; // @@ -1463,7 +1463,7 @@ NGDNum.Margin = new Padding(4, 2, 4, 2); NGDNum.Name = "NGDNum"; NGDNum.ReadOnly = true; - NGDNum.Size = new Size(76, 31); + NGDNum.Size = new Size(76, 23); NGDNum.TabIndex = 8; // // OKOrNGShow @@ -1482,7 +1482,7 @@ OKDNum.Margin = new Padding(4, 2, 4, 2); OKDNum.Name = "OKDNum"; OKDNum.ReadOnly = true; - OKDNum.Size = new Size(76, 31); + OKDNum.Size = new Size(76, 23); OKDNum.TabIndex = 10; // // label20 @@ -1491,7 +1491,7 @@ label20.Location = new Point(206, 41); label20.Margin = new Padding(4, 0, 4, 0); label20.Name = "label20"; - label20.Size = new Size(105, 25); + label20.Size = new Size(70, 17); label20.TabIndex = 9; label20.Text = "OK产品数"; // @@ -1501,7 +1501,7 @@ textBox1.Margin = new Padding(4, 2, 4, 2); textBox1.Name = "textBox1"; textBox1.ReadOnly = true; - textBox1.Size = new Size(67, 31); + textBox1.Size = new Size(67, 23); textBox1.TabIndex = 15; // // label35 @@ -1509,7 +1509,7 @@ label35.AutoSize = true; label35.Location = new Point(426, 45); label35.Name = "label35"; - label35.Size = new Size(75, 25); + label35.Size = new Size(50, 17); label35.TabIndex = 14; label35.Text = "误检数"; // @@ -1615,7 +1615,7 @@ textBox2.Margin = new Padding(4, 2, 4, 2); textBox2.Name = "textBox2"; textBox2.ReadOnly = true; - textBox2.Size = new Size(115, 31); + textBox2.Size = new Size(115, 23); textBox2.TabIndex = 23; // // label37 @@ -1624,7 +1624,7 @@ label37.Location = new Point(7, 172); label37.Margin = new Padding(4, 0, 4, 0); label37.Name = "label37"; - label37.Size = new Size(96, 25); + label37.Size = new Size(64, 17); label37.TabIndex = 22; label37.Text = "旋钮颜色"; label37.Click += label37_Click; @@ -1635,7 +1635,7 @@ textBox3.Margin = new Padding(4, 2, 4, 2); textBox3.Name = "textBox3"; textBox3.ReadOnly = true; - textBox3.Size = new Size(279, 31); + textBox3.Size = new Size(279, 23); textBox3.TabIndex = 21; // // label25 @@ -1644,7 +1644,7 @@ label25.Location = new Point(7, 110); label25.Margin = new Padding(4, 0, 4, 0); label25.Name = "label25"; - label25.Size = new Size(96, 25); + label25.Size = new Size(64, 17); label25.TabIndex = 20; label25.Text = "产品型号"; label25.Click += label25_Click; @@ -1655,7 +1655,7 @@ label24.Location = new Point(7, 40); label24.Margin = new Padding(4, 0, 4, 0); label24.Name = "label24"; - label24.Size = new Size(96, 25); + label24.Size = new Size(64, 17); label24.TabIndex = 19; label24.Text = "产品条码"; label24.Click += label24_Click; @@ -1666,7 +1666,7 @@ ScannerBox.Margin = new Padding(4, 2, 4, 2); ScannerBox.Name = "ScannerBox"; ScannerBox.ReadOnly = true; - ScannerBox.Size = new Size(279, 31); + ScannerBox.Size = new Size(279, 23); ScannerBox.TabIndex = 18; // // linkLabel1 @@ -1674,16 +1674,16 @@ linkLabel1.AutoSize = true; linkLabel1.Location = new Point(161, 387); linkLabel1.Name = "linkLabel1"; - linkLabel1.Size = new Size(0, 25); + linkLabel1.Size = new Size(0, 17); linkLabel1.TabIndex = 21; // // tabPage3 // tabPage3.Controls.Add(panel2); - tabPage3.Location = new Point(4, 34); + tabPage3.Location = new Point(4, 26); tabPage3.Margin = new Padding(4, 2, 4, 2); tabPage3.Name = "tabPage3"; - tabPage3.Size = new Size(1276, 815); + tabPage3.Size = new Size(1276, 923); tabPage3.TabIndex = 4; tabPage3.Text = "录入新型号"; tabPage3.UseVisualStyleBackColor = true; @@ -1719,7 +1719,7 @@ panel2.Location = new Point(0, 2); panel2.Margin = new Padding(4, 2, 4, 2); panel2.Name = "panel2"; - panel2.Size = new Size(1630, 717); + panel2.Size = new Size(1630, 925); panel2.TabIndex = 1; panel2.Paint += panel2_Paint; // @@ -1749,7 +1749,7 @@ WhiteBanCbx.Location = new Point(867, 146); WhiteBanCbx.Margin = new Padding(4, 2, 4, 2); WhiteBanCbx.Name = "WhiteBanCbx"; - WhiteBanCbx.Size = new Size(59, 29); + WhiteBanCbx.Size = new Size(41, 21); WhiteBanCbx.TabIndex = 40; WhiteBanCbx.Text = "是"; WhiteBanCbx.UseVisualStyleBackColor = true; @@ -1760,7 +1760,7 @@ label33.Location = new Point(596, 147); label33.Margin = new Padding(4, 0, 4, 0); label33.Name = "label33"; - label33.Size = new Size(243, 25); + label33.Size = new Size(162, 17); label33.TabIndex = 39; label33.Text = "面板第二块区域是白板吗"; // @@ -1770,7 +1770,7 @@ label28.Location = new Point(23, 187); label28.Margin = new Padding(4, 0, 4, 0); label28.Name = "label28"; - label28.Size = new Size(151, 25); + label28.Size = new Size(101, 17); label28.TabIndex = 14; label28.Text = "第一次拍照Z轴"; // @@ -1790,7 +1790,7 @@ modelChangeCbx.Location = new Point(750, 14); modelChangeCbx.Margin = new Padding(4, 2, 4, 2); modelChangeCbx.Name = "modelChangeCbx"; - modelChangeCbx.Size = new Size(241, 31); + modelChangeCbx.Size = new Size(241, 23); modelChangeCbx.TabIndex = 34; modelChangeCbx.Text = "D:\\Hisence\\config\\chinese.json"; // @@ -1800,7 +1800,7 @@ label34.Location = new Point(597, 14); label34.Margin = new Padding(4, 0, 4, 0); label34.Name = "label34"; - label34.Size = new Size(138, 25); + label34.Size = new Size(92, 17); label34.TabIndex = 33; label34.Text = "面板语言选择"; // @@ -1831,7 +1831,7 @@ Cam2MatCbx.Location = new Point(750, 111); Cam2MatCbx.Margin = new Padding(4, 2, 4, 2); Cam2MatCbx.Name = "Cam2MatCbx"; - Cam2MatCbx.Size = new Size(279, 31); + Cam2MatCbx.Size = new Size(279, 23); Cam2MatCbx.TabIndex = 29; Cam2MatCbx.Text = "D:\\Hisence\\类型\\Lp\\002jpg"; // @@ -1841,7 +1841,7 @@ label22.Location = new Point(596, 105); label22.Margin = new Padding(4, 0, 4, 0); label22.Name = "label22"; - label22.Size = new Size(138, 25); + label22.Size = new Size(92, 17); label22.TabIndex = 28; label22.Text = "面板第二张图"; // @@ -1850,7 +1850,7 @@ Cam1MatCbx.Location = new Point(750, 59); Cam1MatCbx.Margin = new Padding(4, 2, 4, 2); Cam1MatCbx.Name = "Cam1MatCbx"; - Cam1MatCbx.Size = new Size(279, 31); + Cam1MatCbx.Size = new Size(279, 23); Cam1MatCbx.TabIndex = 27; Cam1MatCbx.Text = "D:\\Hisence\\类型\\Lp\\001.jpg"; // @@ -1860,7 +1860,7 @@ label23.Location = new Point(597, 62); label23.Margin = new Padding(4, 0, 4, 0); label23.Name = "label23"; - label23.Size = new Size(138, 25); + label23.Size = new Size(92, 17); label23.TabIndex = 26; label23.Text = "面板第一张图"; // @@ -1891,7 +1891,7 @@ moveZbox.Location = new Point(183, 184); moveZbox.Margin = new Padding(4, 2, 4, 2); moveZbox.Name = "moveZbox"; - moveZbox.Size = new Size(287, 31); + moveZbox.Size = new Size(287, 23); moveZbox.TabIndex = 15; moveZbox.Text = "0"; // @@ -1900,7 +1900,7 @@ moveYbox.Location = new Point(183, 141); moveYbox.Margin = new Padding(4, 2, 4, 2); moveYbox.Name = "moveYbox"; - moveYbox.Size = new Size(287, 31); + moveYbox.Size = new Size(287, 23); moveYbox.TabIndex = 13; moveYbox.Text = "0"; // @@ -1910,7 +1910,7 @@ label29.Location = new Point(22, 143); label29.Margin = new Padding(4, 0, 4, 0); label29.Name = "label29"; - label29.Size = new Size(153, 25); + label29.Size = new Size(101, 17); label29.TabIndex = 12; label29.Text = "第一次拍照Y轴"; // @@ -1919,7 +1919,7 @@ moveXbox.Location = new Point(182, 101); moveXbox.Margin = new Padding(4, 2, 4, 2); moveXbox.Name = "moveXbox"; - moveXbox.Size = new Size(287, 31); + moveXbox.Size = new Size(287, 23); moveXbox.TabIndex = 11; moveXbox.Text = "8974"; // @@ -1929,7 +1929,7 @@ label30.Location = new Point(22, 104); label30.Margin = new Padding(4, 0, 4, 0); label30.Name = "label30"; - label30.Size = new Size(152, 25); + label30.Size = new Size(101, 17); label30.TabIndex = 10; label30.Text = "第一次拍照X轴"; // @@ -1938,7 +1938,7 @@ OcrBarBox.Location = new Point(183, 56); OcrBarBox.Margin = new Padding(4, 2, 4, 2); OcrBarBox.Name = "OcrBarBox"; - OcrBarBox.Size = new Size(287, 31); + OcrBarBox.Size = new Size(287, 23); OcrBarBox.TabIndex = 5; OcrBarBox.Text = "1234567890"; // @@ -1948,7 +1948,7 @@ label31.Location = new Point(23, 59); label31.Margin = new Padding(4, 0, 4, 0); label31.Name = "label31"; - label31.Size = new Size(41, 25); + label31.Size = new Size(27, 17); label31.TabIndex = 4; label31.Text = "SN"; // @@ -1957,7 +1957,7 @@ TypeBox.Location = new Point(183, 14); TypeBox.Margin = new Padding(4, 2, 4, 2); TypeBox.Name = "TypeBox"; - TypeBox.Size = new Size(287, 31); + TypeBox.Size = new Size(287, 23); TypeBox.TabIndex = 3; TypeBox.Text = "1"; // @@ -1978,7 +1978,7 @@ label32.Location = new Point(18, 17); label32.Margin = new Padding(4, 0, 4, 0); label32.Name = "label32"; - label32.Size = new Size(54, 25); + label32.Size = new Size(36, 17); label32.TabIndex = 1; label32.Text = "类型"; // @@ -1999,16 +1999,16 @@ richTextBox1.Location = new Point(0, 844); richTextBox1.Margin = new Padding(4, 2, 4, 2); richTextBox1.Name = "richTextBox1"; - richTextBox1.Size = new Size(1284, 109); + richTextBox1.Size = new Size(1284, 161); richTextBox1.TabIndex = 1; richTextBox1.Text = ""; // // MainForm // - AutoScaleDimensions = new SizeF(12F, 25F); + AutoScaleDimensions = new SizeF(8F, 17F); AutoScaleMode = AutoScaleMode.Font; BackColor = SystemColors.ActiveCaption; - ClientSize = new Size(1284, 953); + ClientSize = new Size(1284, 1005); Controls.Add(richTextBox1); Controls.Add(tabControl1); Font = new Font("Microsoft Sans Serif", 10.5F, FontStyle.Regular, GraphicsUnit.Point); diff --git a/HisenceYoloDetection/MainForm.cs b/HisenceYoloDetection/MainForm.cs index 4080dae..bfe5c92 100644 --- a/HisenceYoloDetection/MainForm.cs +++ b/HisenceYoloDetection/MainForm.cs @@ -1555,8 +1555,8 @@ namespace HisenceYoloDetection //originMatShow2.Image = cameraMat.ToBitmap(); } - - string pathfile = fitImageFolder + m_sKEYENCEBar + ".jpg"; + string SN = m_sKEYENCEBar.Substring(0, m_sKEYENCEBar.Length - 1); + string pathfile = fitImageFolder + SN + ".jpg"; //CamShow1.ImaMAt = cameraMat; cameraMat.ImWrite(pathfile); CheckDiffSciHelper1.ResizeImage(pathfile, pathfile, 640, 480, 75); @@ -1700,8 +1700,11 @@ namespace HisenceYoloDetection if (mL.ResultMap != null) { - mL.ResultMap.Save("D://cam1//" + m_sKEYENCEBar + "result.jpg"); + string SN = m_sKEYENCEBar.Substring(0, m_sKEYENCEBar.Length - 1); + string filepath = "D://rect//" + SN + "result.jpg"; + mL.ResultMap.Save(filepath); ResultMatShow.Image = mL.ResultMap; + CheckDiffSciHelper1.ResizeImage(filepath, filepath, 640, 480, 75); } @@ -3346,7 +3349,7 @@ namespace HisenceYoloDetection string TextWoidStr = OcrFuzzyTextInsert.Join("##"); //ʵʵļ string SQLStr = "";//־ʾݿĹؼ bool juanjiMatch = false; - string filenameone = m_sKEYENCEBar; + string SN = m_sKEYENCEBar.Substring(0, m_sKEYENCEBar.Length - 1); switch (blockIndex) { case "1"://ȫƥ Ϣ @@ -3369,16 +3372,16 @@ namespace HisenceYoloDetection DisplayResult(mLcut); Defet_OnDetectionDone(mLcut.ResultMap.ToMat(), 1); - string Path_1 = Path.Combine("D:\\Hisence\\Test\\1\\ng", filenameone + "_res.png"); + string Path_1 = Path.Combine("D:\\Hisence\\Test\\1\\ng", SN + "_res.png"); Cv2.ImWrite(Path_1, mLcut.ResultMap.ToMat()); - CheckDiffSciHelper1.ResizeImage(Path_1, Path_1, 640, 480, 75); + //CheckDiffSciHelper1.ResizeImage(Path_1, Path_1, 640, 480, 75); } else { OneIF = true; Defet_OnDetectionDone(OKMat, 1); - string Path_2 = Path.Combine("D:\\Hisence\\Test\\1\\ok", filenameone + "_res.png"); + string Path_2 = Path.Combine("D:\\Hisence\\Test\\1\\ok", SN + "_res.png"); Cv2.ImWrite(Path_2, OKMat); } @@ -3406,8 +3409,10 @@ namespace HisenceYoloDetection Mat SqlImg = Cv2.ImRead(PathSql); Mat SqlBtn = GetCroppedImage(SqlImg, rectsql); + Mat BtnImg = GetCroppedImage(CutBlockMat, rectDet);//ȡʵʱͼťͼƬ Bitmap bitmap = MatToBitmap(BtnImg); + pictureBox1.Image = bitmap;//չʾʵʱťͼƬ Rect newRect = GetCenterCroppedRect(SqlBtn, 30); string color = BtnColor(SqlBtn, newRect); @@ -3418,7 +3423,8 @@ namespace HisenceYoloDetection })); Mat matresult = CutBlockMat.Clone(); - juanjiMatch = CheckDiffSciHelper.CheckDiffSci(PathSql, CutBlockMat, ref matresult, rectsql, rectDet, iswhite, "D://Hisence//Test", m_sKEYENCEBar); + + juanjiMatch = CheckDiffSciHelper.CheckDiffSci(PathSql, CutBlockMat, ref matresult, rectsql, rectDet, iswhite, "D://Hisence//Test", SN); // juanjiMatch = true; if (!OneIF1 || !juanjiMatch) @@ -3780,11 +3786,11 @@ namespace HisenceYoloDetection double averageGray = (r + g + b) / 3; // жɫ - if (averageGray < 60) + if (averageGray < 70) { return "ɫ"; } - else if (averageGray >= 60 && averageGray <= 150) + else if (averageGray >= 70 && averageGray <= 150) { return "ɫ"; } @@ -3928,7 +3934,7 @@ namespace HisenceYoloDetection { try { - string FolderPath = "D:\\Hisence\\cam1"; + string FolderPath = "D:\\cam1"; // ȷļ· if (System.IO.Directory.Exists(FolderPath)) {