From f86733cc917a45c463c61453a87198b7dc31ff1d Mon Sep 17 00:00:00 2001 From: YZJ Date: Wed, 24 Jul 2024 15:56:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=87=AA=E5=8A=A8=E6=8F=92?= =?UTF-8?q?=E5=85=A5=EF=BC=8C=E5=B0=86=E6=9D=A5=E8=A6=81=E5=8A=A0=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=A2=9C=E8=89=B2=E5=88=A4=E5=88=AB=E5=92=8C=E6=9C=BA?= =?UTF-8?q?=E8=BA=AB=E5=80=BE=E6=96=9C=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HisenceYoloDetection/CheckDiffSciHelper.cs | 2 +- HisenceYoloDetection/MainForm.Designer.cs | 191 +++++++++++---------- HisenceYoloDetection/MainForm.cs | 95 +++++----- 3 files changed, 143 insertions(+), 145 deletions(-) diff --git a/HisenceYoloDetection/CheckDiffSciHelper.cs b/HisenceYoloDetection/CheckDiffSciHelper.cs index aa1b589..b26df86 100644 --- a/HisenceYoloDetection/CheckDiffSciHelper.cs +++ b/HisenceYoloDetection/CheckDiffSciHelper.cs @@ -262,7 +262,7 @@ namespace HisenceYoloDetection double ratio1 = whiteArea1 / (thr1.Rows * thr1.Cols); double ratio2 = whiteArea2 / (thr2.Rows * thr2.Cols); - if (Math.Abs(ratio1 - ratio2) >= 0.9) + if (Math.Abs(ratio1 - ratio2) >= 0.95) { isMatch = true; } diff --git a/HisenceYoloDetection/MainForm.Designer.cs b/HisenceYoloDetection/MainForm.Designer.cs index 3bb5e5b..bb446eb 100644 --- a/HisenceYoloDetection/MainForm.Designer.cs +++ b/HisenceYoloDetection/MainForm.Designer.cs @@ -219,11 +219,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(1306, 816); + tabPage2.Size = new Size(1276, 823); tabPage2.TabIndex = 1; tabPage2.Text = "PLC"; tabPage2.UseVisualStyleBackColor = true; @@ -271,7 +271,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 @@ -280,7 +280,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 = "测距"; // @@ -289,7 +289,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 @@ -358,7 +358,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 @@ -366,7 +366,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 @@ -374,7 +374,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 @@ -382,7 +382,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 @@ -390,7 +390,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 @@ -398,7 +398,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 @@ -406,7 +406,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 @@ -414,7 +414,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 @@ -422,7 +422,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 @@ -431,7 +431,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 = "定位位置"; // @@ -441,7 +441,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 @@ -450,7 +450,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 @@ -459,7 +459,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 @@ -468,7 +468,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 = "当前定位速度"; // @@ -478,7 +478,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 @@ -487,7 +487,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 @@ -496,7 +496,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 @@ -505,7 +505,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 = "当前手动速度"; // @@ -515,7 +515,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"; // @@ -525,7 +525,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"; // @@ -535,7 +535,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"; // @@ -545,7 +545,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 @@ -554,7 +554,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"; // @@ -564,7 +564,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"; // @@ -574,7 +574,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"; // @@ -584,7 +584,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 = "当前位置"; // @@ -790,7 +790,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 @@ -799,7 +799,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 = "值"; // @@ -809,7 +809,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 = "地址"; // @@ -829,7 +829,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 @@ -837,7 +837,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 @@ -846,7 +846,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 = "值"; // @@ -856,7 +856,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 = "地址"; // @@ -887,7 +887,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 @@ -895,18 +895,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(1306, 815); + tabPage1.Size = new Size(1276, 823); tabPage1.TabIndex = 0; tabPage1.Text = "相机"; tabPage1.UseVisualStyleBackColor = true; @@ -970,7 +970,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 = "链接相机"; // @@ -1001,7 +1001,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 @@ -1009,7 +1009,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 @@ -1018,7 +1018,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 = "增益"; // @@ -1028,7 +1028,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 = "曝光"; // @@ -1093,7 +1093,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 = "链接相机"; // @@ -1124,7 +1124,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 @@ -1132,7 +1132,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 @@ -1141,7 +1141,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 = "增益"; // @@ -1151,7 +1151,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 = "曝光"; // @@ -1166,17 +1166,17 @@ tabControl1.Margin = new Padding(4, 2, 4, 2); tabControl1.Name = "tabControl1"; tabControl1.SelectedIndex = 0; - tabControl1.Size = new Size(1314, 853); + tabControl1.Size = new Size(1284, 853); 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(1306, 815); + tabPage5.Size = new Size(1276, 823); tabPage5.TabIndex = 3; tabPage5.Text = "流程"; tabPage5.UseVisualStyleBackColor = true; @@ -1188,11 +1188,12 @@ panel4.Location = new Point(0, 0); panel4.Margin = new Padding(4, 2, 4, 2); panel4.Name = "panel4"; - panel4.Size = new Size(1306, 815); + panel4.Size = new Size(1276, 823); panel4.TabIndex = 0; // // panel5 // + panel5.BackColor = SystemColors.Control; panel5.Controls.Add(groupBox9); panel5.Controls.Add(groupBox2); panel5.Controls.Add(panel8); @@ -1200,7 +1201,7 @@ panel5.Location = new Point(0, 0); panel5.Margin = new Padding(4, 2, 4, 2); panel5.Name = "panel5"; - panel5.Size = new Size(1306, 813); + panel5.Size = new Size(1276, 813); panel5.TabIndex = 0; // // groupBox9 @@ -1220,7 +1221,7 @@ DevNameCombo.Location = new Point(7, 33); DevNameCombo.Margin = new Padding(4, 2, 4, 2); DevNameCombo.Name = "DevNameCombo"; - DevNameCombo.Size = new Size(386, 33); + DevNameCombo.Size = new Size(386, 25); DevNameCombo.TabIndex = 1; // // ScanDevList @@ -1379,7 +1380,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 = "检测结果"; // @@ -1389,7 +1390,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; @@ -1400,7 +1401,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 @@ -1409,7 +1410,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产品数"; // @@ -1419,7 +1420,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 @@ -1438,7 +1439,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 @@ -1447,7 +1448,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产品数"; // @@ -1457,7 +1458,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 @@ -1465,7 +1466,7 @@ label35.AutoSize = true; label35.Location = new Point(437, 75); label35.Name = "label35"; - label35.Size = new Size(75, 25); + label35.Size = new Size(50, 17); label35.TabIndex = 14; label35.Text = "误检率"; // @@ -1533,7 +1534,7 @@ textBox3.Margin = new Padding(4, 2, 4, 2); textBox3.Name = "textBox3"; textBox3.ReadOnly = true; - textBox3.Size = new Size(402, 31); + textBox3.Size = new Size(402, 23); textBox3.TabIndex = 21; // // label25 @@ -1542,7 +1543,7 @@ label25.Location = new Point(7, 95); 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; @@ -1553,7 +1554,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; @@ -1564,7 +1565,7 @@ ScannerBox.Margin = new Padding(4, 2, 4, 2); ScannerBox.Name = "ScannerBox"; ScannerBox.ReadOnly = true; - ScannerBox.Size = new Size(402, 31); + ScannerBox.Size = new Size(402, 23); ScannerBox.TabIndex = 18; // // linkLabel1 @@ -1572,16 +1573,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, 33); + tabPage3.Location = new Point(4, 26); tabPage3.Margin = new Padding(4, 2, 4, 2); tabPage3.Name = "tabPage3"; - tabPage3.Size = new Size(1306, 816); + tabPage3.Size = new Size(1276, 823); tabPage3.TabIndex = 4; tabPage3.Text = "录入新型号"; tabPage3.UseVisualStyleBackColor = true; @@ -1647,7 +1648,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; @@ -1658,7 +1659,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 = "面板第二块区域是白板吗"; // @@ -1668,7 +1669,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轴"; // @@ -1688,7 +1689,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"; // @@ -1698,7 +1699,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 = "面板语言选择"; // @@ -1729,7 +1730,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"; // @@ -1739,7 +1740,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 = "面板第二张图"; // @@ -1748,7 +1749,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"; // @@ -1758,7 +1759,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 = "面板第一张图"; // @@ -1789,7 +1790,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"; // @@ -1798,7 +1799,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"; // @@ -1808,7 +1809,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轴"; // @@ -1817,7 +1818,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"; // @@ -1827,7 +1828,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轴"; // @@ -1836,7 +1837,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"; // @@ -1846,7 +1847,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"; // @@ -1855,7 +1856,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"; // @@ -1876,7 +1877,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 = "类型"; // @@ -1897,16 +1898,16 @@ richTextBox1.Location = new Point(0, 844); richTextBox1.Margin = new Padding(4, 2, 4, 2); richTextBox1.Name = "richTextBox1"; - richTextBox1.Size = new Size(1314, 109); + richTextBox1.Size = new Size(1284, 109); 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(1314, 953); + ClientSize = new Size(1284, 953); 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 231911f..c6eca8e 100644 --- a/HisenceYoloDetection/MainForm.cs +++ b/HisenceYoloDetection/MainForm.cs @@ -1290,6 +1290,7 @@ namespace HisenceYoloDetection } if (iNum1 >= 2) { + myLog("ʱ" + iNum3, DateTime.Now); if (!StopM) { melsecPLCTCPDriver.WriteInt("550", 1);// @@ -1310,7 +1311,7 @@ namespace HisenceYoloDetection textBox3.Text = OcrBar; })); - myLog("ɨ" + m_sKEYENCEBar, DateTime.Now); + //myLog("ɨ" + m_sKEYENCEBar, DateTime.Now); //#if false //ǷPosʱ䳬ʱ @@ -1330,13 +1331,13 @@ namespace HisenceYoloDetection - if (Regex.IsMatch(xKNow.MoveX.ToString(), @"^[0-9]+$") && Regex.IsMatch(xKNow.MoveY.ToString(), @"^[0-9]+$") && Regex.IsMatch(xKNow.MoveZ.ToString(), @"^[0-9]+$")) - { + //if (Regex.IsMatch(xKNow.MoveX.ToString(), @"^[0-9]+$") && Regex.IsMatch(xKNow.MoveY.ToString(), @"^[0-9]+$") && Regex.IsMatch(xKNow.MoveZ.ToString(), @"^[0-9]+$")) + //{ - // myLog("ͺƥɹ" + xKNow.OcrBar, DateTime.Now); + // // myLog("ͺƥɹ" + xKNow.OcrBar, DateTime.Now); - } + //} } // Thread.Sleep(2); @@ -1471,7 +1472,7 @@ namespace HisenceYoloDetection } - if (iNum3 >= 2) + if (iNum3 >= 10) { melsecPLCTCPDriver.WriteInt("550", 1);// } @@ -1607,21 +1608,43 @@ namespace HisenceYoloDetection //ݿȶ _runHandleAfter.Reset(); - //if (xKNow == null) - //{ - // myLog("δƥ", DateTime.Now); - // break; - //} + //if (xKNow == null) + //{ + // myLog("δƥ", DateTime.Now); + // break; + //} - //if (xKNow.OcrBar == null) - //{ - // myLog("δƥɹ" + xKNow.OcrBar, DateTime.Now); - // myLog("ʼģ", DateTime.Now); - // Insert_auto(true, Cam1ImgOne, m_sKEYENCEBar, 8974, 0, 0); + //if (xKNow.OcrBar == null) + //{ + // myLog("δƥɹ" + xKNow.OcrBar, DateTime.Now); + // myLog("ʼģ", DateTime.Now); + // Insert_auto(true, Cam1ImgOne, m_sKEYENCEBar, 8974, 0, 0); - // break; - //} - string IOcrBAr = xKNow.OcrBar; + // break; + //} + + + if (m_sKEYENCEBar != null) + { + if (xKNow == null) + { + myLog("ݿûƥ" + m_sKEYENCEBar, DateTime.Now); + myLog("ʼģ", DateTime.Now); + Insert_auto(true, Cam1ImgOne, m_sKEYENCEBar, 8974, 0, 0); + Thread.Sleep(2000); + OcrBar = FormBarType(m_sKEYENCEBar); + xKNow = GetModeFromBar(OcrBar); // »ȡ + if (xKNow != null) + { + myLog("ģɹ", DateTime.Now); + + } + + + } + + } + string IOcrBAr = xKNow.OcrBar; //xKNow = GetModeFromBar(IOcrBAr);//ݿвѯֵ //ijɺͺŵĶԽ IfCam1TwoTriger = false; @@ -1775,15 +1798,7 @@ namespace HisenceYoloDetection } else { - NGDsums++; - myLog("ƥʧ", DateTime.Now); - //ʾ - // InsertXK_HisenceWordMatchData(xK_MatchDet, true); - this.Invoke(new Action(() => - { - OKOrNGShow.Image = NGbitmap; - })); - + melsecPLCTCPDriver.WriteInt(RedLightingAdress, 1);// melsecPLCTCPDriver.WriteInt(YellowLightingAdress, 0);//Ƶ melsecPLCTCPDriver.WriteInt(GreenLightingAdress, 0);//̵ @@ -2135,28 +2150,10 @@ namespace HisenceYoloDetection meachineState = MeachineState.machine_opening; TriggerCameral2();//紥 SNȡͺ ݿеõֵ - if (xKNow == null) - { - myLog("ݿûƥ" + m_sKEYENCEBar, DateTime.Now); - myLog("ʼģ", DateTime.Now); - Insert_auto(true, Cam1ImgOne, m_sKEYENCEBar, 8974, 0, 0); - Thread.Sleep(5000); - xKNow = GetModeFromBar(m_sKEYENCEBar); // »ȡ - if(xKNow!=null) - { - myLog("ģɹ", DateTime.Now); - ReadyDetect();//պ߳ - } - + ReadyDetect();//պ߳ - } - else { - ReadyDetect();//պ߳ - - } - - //ThreadPost();//պȡյͺ - myLog("̳ɹ", DateTime.Now); + //ThreadPost();//պȡյͺ + myLog("̳ɹ", DateTime.Now); } private void RefeshData_Click(object sender, EventArgs e)