diff --git a/HisenceYoloDetection/MainForm.Designer.cs b/HisenceYoloDetection/MainForm.Designer.cs index 95ff819..8f84e5c 100644 --- a/HisenceYoloDetection/MainForm.Designer.cs +++ b/HisenceYoloDetection/MainForm.Designer.cs @@ -150,8 +150,6 @@ StartDecBtn = new Button(); CloseDecBtn = new Button(); groupBox6 = new GroupBox(); - textBox2 = new TextBox(); - label27 = new Label(); textBox3 = new TextBox(); label25 = new Label(); label24 = new Label(); @@ -223,11 +221,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, 823); tabPage2.TabIndex = 1; tabPage2.Text = "PLC"; tabPage2.UseVisualStyleBackColor = true; @@ -275,7 +273,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 @@ -284,7 +282,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 = "测距"; // @@ -293,7 +291,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 @@ -362,7 +360,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 @@ -370,7 +368,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 @@ -378,7 +376,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 @@ -386,7 +384,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 @@ -394,7 +392,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 @@ -402,7 +400,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 @@ -410,7 +408,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 @@ -418,7 +416,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 @@ -426,7 +424,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 @@ -435,7 +433,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 = "定位位置"; // @@ -445,7 +443,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 @@ -454,7 +452,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 @@ -463,7 +461,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 @@ -472,7 +470,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 = "当前定位速度"; // @@ -482,7 +480,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 @@ -491,7 +489,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 @@ -500,7 +498,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 @@ -509,7 +507,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 = "当前手动速度"; // @@ -519,7 +517,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"; // @@ -529,7 +527,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"; // @@ -539,7 +537,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"; // @@ -549,7 +547,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 @@ -558,7 +556,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"; // @@ -568,7 +566,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"; // @@ -578,7 +576,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"; // @@ -588,7 +586,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 = "当前位置"; // @@ -794,7 +792,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 @@ -803,7 +801,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 = "值"; // @@ -813,7 +811,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 = "地址"; // @@ -833,7 +831,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 @@ -841,7 +839,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 @@ -850,7 +848,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 = "值"; // @@ -860,7 +858,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 = "地址"; // @@ -891,7 +889,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 @@ -899,18 +897,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, 823); tabPage1.TabIndex = 0; tabPage1.Text = "相机"; tabPage1.UseVisualStyleBackColor = true; @@ -974,7 +972,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 = "链接相机"; // @@ -1005,7 +1003,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 @@ -1013,7 +1011,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 @@ -1022,7 +1020,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 = "增益"; // @@ -1032,7 +1030,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 = "曝光"; // @@ -1097,7 +1095,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 = "链接相机"; // @@ -1128,7 +1126,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 @@ -1136,7 +1134,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 @@ -1145,7 +1143,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 = "增益"; // @@ -1155,7 +1153,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 = "曝光"; // @@ -1177,10 +1175,10 @@ // 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, 823); tabPage5.TabIndex = 3; tabPage5.Text = "流程"; tabPage5.UseVisualStyleBackColor = true; @@ -1192,7 +1190,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, 823); panel4.TabIndex = 0; // // panel5 @@ -1205,7 +1203,7 @@ panel5.Location = new Point(0, 0); panel5.Margin = new Padding(4, 2, 4, 2); panel5.Name = "panel5"; - panel5.Size = new Size(1276, 813); + panel5.Size = new Size(1276, 821); panel5.TabIndex = 0; // // groupBox9 @@ -1225,7 +1223,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 @@ -1251,7 +1249,7 @@ groupBox2.Margin = new Padding(4, 2, 4, 2); groupBox2.Name = "groupBox2"; groupBox2.Padding = new Padding(4, 2, 4, 2); - groupBox2.Size = new Size(669, 686); + groupBox2.Size = new Size(669, 694); groupBox2.TabIndex = 0; groupBox2.TabStop = false; groupBox2.Text = "结果展示"; @@ -1354,7 +1352,7 @@ panel8.Location = new Point(673, 0); panel8.Margin = new Padding(4, 2, 4, 2); panel8.Name = "panel8"; - panel8.Size = new Size(633, 806); + panel8.Size = new Size(633, 819); panel8.TabIndex = 2; panel8.Paint += panel8_Paint; // @@ -1372,9 +1370,9 @@ groupBox8.Controls.Add(label20); groupBox8.Controls.Add(textBox1); groupBox8.Controls.Add(label35); - groupBox8.Location = new Point(11, 345); + groupBox8.Location = new Point(11, 260); groupBox8.Name = "groupBox8"; - groupBox8.Size = new Size(596, 443); + groupBox8.Size = new Size(596, 528); groupBox8.TabIndex = 24; groupBox8.TabStop = false; groupBox8.Text = "生产信息"; @@ -1385,7 +1383,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 @@ -1393,7 +1391,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 = "机身倾斜"; // @@ -1404,7 +1402,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 = "检测结果"; // @@ -1414,7 +1412,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; @@ -1425,7 +1423,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 @@ -1434,7 +1432,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产品数"; // @@ -1444,7 +1442,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 @@ -1463,7 +1461,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 @@ -1472,7 +1470,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产品数"; // @@ -1482,7 +1480,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 @@ -1490,7 +1488,7 @@ label35.AutoSize = true; label35.Location = new Point(447, 42); label35.Name = "label35"; - label35.Size = new Size(75, 25); + label35.Size = new Size(50, 17); label35.TabIndex = 14; label35.Text = "误检率"; // @@ -1541,45 +1539,24 @@ // // groupBox6 // - groupBox6.Controls.Add(textBox2); - groupBox6.Controls.Add(label27); groupBox6.Controls.Add(textBox3); groupBox6.Controls.Add(label25); groupBox6.Controls.Add(label24); groupBox6.Controls.Add(ScannerBox); groupBox6.Location = new Point(11, 120); groupBox6.Name = "groupBox6"; - groupBox6.Size = new Size(582, 196); + groupBox6.Size = new Size(582, 134); groupBox6.TabIndex = 22; groupBox6.TabStop = false; groupBox6.Text = "基础信息"; // - // textBox2 - // - textBox2.Location = new Point(130, 147); - textBox2.Margin = new Padding(4, 2, 4, 2); - textBox2.Name = "textBox2"; - textBox2.ReadOnly = true; - textBox2.Size = new Size(136, 31); - textBox2.TabIndex = 23; - // - // label27 - // - label27.AutoSize = true; - label27.Location = new Point(7, 150); - label27.Margin = new Padding(4, 0, 4, 0); - label27.Name = "label27"; - label27.Size = new Size(96, 25); - label27.TabIndex = 22; - label27.Text = "旋钮颜色"; - // // textBox3 // textBox3.Location = new Point(128, 95); 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 @@ -1588,7 +1565,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; @@ -1599,7 +1576,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; @@ -1610,7 +1587,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 @@ -1618,16 +1595,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(1276, 816); + tabPage3.Size = new Size(1276, 823); tabPage3.TabIndex = 4; tabPage3.Text = "录入新型号"; tabPage3.UseVisualStyleBackColor = true; @@ -1693,7 +1670,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; @@ -1704,7 +1681,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 = "面板第二块区域是白板吗"; // @@ -1714,7 +1691,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轴"; // @@ -1734,7 +1711,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"; // @@ -1744,7 +1721,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 = "面板语言选择"; // @@ -1775,7 +1752,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"; // @@ -1785,7 +1762,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 = "面板第二张图"; // @@ -1794,7 +1771,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"; // @@ -1804,7 +1781,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 = "面板第一张图"; // @@ -1835,7 +1812,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"; // @@ -1844,7 +1821,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"; // @@ -1854,7 +1831,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轴"; // @@ -1863,7 +1840,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"; // @@ -1873,7 +1850,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轴"; // @@ -1882,7 +1859,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"; // @@ -1892,7 +1869,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"; // @@ -1901,7 +1878,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"; // @@ -1922,7 +1899,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 = "类型"; // @@ -1949,7 +1926,7 @@ // // MainForm // - AutoScaleDimensions = new SizeF(12F, 25F); + AutoScaleDimensions = new SizeF(8F, 17F); AutoScaleMode = AutoScaleMode.Font; BackColor = SystemColors.ActiveCaption; ClientSize = new Size(1284, 953); diff --git a/HisenceYoloDetection/MainForm.cs b/HisenceYoloDetection/MainForm.cs index 2cf9284..b1b92d9 100644 --- a/HisenceYoloDetection/MainForm.cs +++ b/HisenceYoloDetection/MainForm.cs @@ -729,7 +729,7 @@ namespace HisenceYoloDetection OKDNum.Text = OKDsums.ToString(); NGDNum.Text = NGDsums.ToString(); textBox1.Text = WUsums.ToString(); - textBox4.Text= WAIsums.ToString(); + textBox4.Text = WAIsums.ToString(); using (StreamWriter stream = new StreamWriter("D://information.log", true)) { stream.WriteLine(Logtxt); @@ -1291,7 +1291,7 @@ namespace HisenceYoloDetection } if (iNum1 >= 2) { - myLog("ʱ" + iNum3, DateTime.Now); + //myLog("ʱ" + iNum3, DateTime.Now); if (!StopM) { melsecPLCTCPDriver.WriteInt("550", 1);// @@ -1330,7 +1330,7 @@ namespace HisenceYoloDetection xKNow = GetModeFromBar(OcrBar);//ݿвѯֵ - + //if (Regex.IsMatch(xKNow.MoveX.ToString(), @"^[0-9]+$") && Regex.IsMatch(xKNow.MoveY.ToString(), @"^[0-9]+$") && Regex.IsMatch(xKNow.MoveZ.ToString(), @"^[0-9]+$")) //{ @@ -1392,9 +1392,9 @@ namespace HisenceYoloDetection //Cam1.Snapshot(); MoveToP(5815, YPos, ZPos); melsecPLCTCPDriver.WriteInt("550", 0);// - - - + + + Thread.Sleep(1000);//ϴ»ܹȥ //if (xKNow != null) @@ -1608,8 +1608,8 @@ namespace HisenceYoloDetection //if (IfCam2Triger) //{ - //ݿȶ - _runHandleAfter.Reset(); + //ݿȶ + _runHandleAfter.Reset(); //if (xKNow == null) //{ // myLog("δƥ", DateTime.Now); @@ -1647,27 +1647,27 @@ namespace HisenceYoloDetection } string IOcrBAr = xKNow.OcrBar; - //xKNow = GetModeFromBar(IOcrBAr);//ݿвѯֵ - //ijɺͺŵĶԽ - IfCam1TwoTriger = false; + //xKNow = GetModeFromBar(IOcrBAr);//ݿвѯֵ + //ijɺͺŵĶԽ + IfCam1TwoTriger = false; - List xkWordList = ManagerModelHelper.GetModeWordFromBar(IOcrBAr); - if (xkWordList.Count() == 1) - { - xK_HisenceSQLWord = xkWordList[0]; - } + List xkWordList = ManagerModelHelper.GetModeWordFromBar(IOcrBAr); + if (xkWordList.Count() == 1) + { + xK_HisenceSQLWord = xkWordList[0]; + } - if (xKNow.Detect != "") - { + if (xKNow.Detect != "") + { - myLog("ͺƥɹ" + IOcrBAr, DateTime.Now); + myLog("ͺƥɹ" + IOcrBAr, DateTime.Now); - } + } - //ݿƥſԽģƶ - //ͺźϴεͺһ Ͳûʶģll + //ݿƥſԽģƶ + //ͺźϴεͺһ Ͳûʶģll @@ -1676,183 +1676,180 @@ namespace HisenceYoloDetection // if (IfCam1TwoTriger && bBarTriger) //{ - //ʼ - Defet_OnDetectionDone(whiteMat, 1); - Defet_OnDetectionDone(whiteMat, 2); - Defet_OnDetectionDone(whiteMat, 3); - //Defet_OnDetectionDone(whiteMat, 4); - //Defet_OnDetectionDone(whiteMat, 5); - //Defet_OnDetectionDone(whiteMat, 6); - //Defet_OnDetectionDone(whiteMat, 7); + //ʼ + Defet_OnDetectionDone(whiteMat, 1); + Defet_OnDetectionDone(whiteMat, 2); + Defet_OnDetectionDone(whiteMat, 3); + //Defet_OnDetectionDone(whiteMat, 4); + //Defet_OnDetectionDone(whiteMat, 5); + //Defet_OnDetectionDone(whiteMat, 6); + //Defet_OnDetectionDone(whiteMat, 7); - XK_HisenceWord xK_MatchDet = new XK_HisenceWord(); - xK_MatchDet.TwoIFWhile = xK_HisenceSQLWord.TwoIFWhile; - AllDsums++; - // - MLRequest req = new MLRequest(); - req.currentMat = Cam1ImgOne; - req.ResizeWidth = 640; - req.ResizeHeight = 640; - req.Score = 0.3f; - req.in_lable_path = LablePath;//ǩ· - req.confThreshold = 0.3f;//ģŶ - req.iouThreshold = 0.4f;//IOU - req.out_node_name = "output"; - MLResult mL = simboObjectDetection.RunInferenceFixed(req); - MLResult mLButton = simboObjectDetButton.RunInferenceFixed(req); + XK_HisenceWord xK_MatchDet = new XK_HisenceWord(); + xK_MatchDet.TwoIFWhile = xK_HisenceSQLWord.TwoIFWhile; + AllDsums++; + // + MLRequest req = new MLRequest(); + req.currentMat = Cam1ImgOne; + req.ResizeWidth = 640; + req.ResizeHeight = 640; + req.Score = 0.3f; + req.in_lable_path = LablePath;//ǩ· + req.confThreshold = 0.3f;//ģŶ + req.iouThreshold = 0.4f;//IOU + req.out_node_name = "output"; + MLResult mL = simboObjectDetection.RunInferenceFixed(req); + MLResult mLButton = simboObjectDetButton.RunInferenceFixed(req); - DateTime dt = DateTime.Now; - //еĿü ʶַԱַ - List strMatListOne = new List(); - List strMatFuzzyListOne = new List(); - Mat mResultCut = req.currentMat.Clone(); + DateTime dt = DateTime.Now; + //еĿü ʶַԱַ + List strMatListOne = new List(); + List strMatFuzzyListOne = new List(); + Mat mResultCut = req.currentMat.Clone(); - if (mL.ResultMap != null) + if (mL.ResultMap != null) + { + mL.ResultMap.Save("D://cam1//" + dt.Year.ToString() + dt.Month.ToString() + dt.Day.ToString() + dt.Hour.ToString() + dt.Minute.ToString() + dt.Millisecond.ToString() + "1result.jpg"); + ResultMatShow.Image = mL.ResultMap; + + } + + + List strMatListTwo = new List(); + List strMatFuzzyListTwo = new List(); + // Mat mResultCut2 = req2.currentMat.Clone(); + Dictionary keyValueResult = new Dictionary(); + Dictionary keyValueResult2 = new Dictionary(); + #region ִжλȶ + //ִжλ + string[] listLabels = xKNow.Detect.Split(","); + + MLResult MLsum = mL; + //for (int i = 0; i < mL2.ResultDetails.Count; i++) + //{ + // MLsum.ResultDetails.Add((DetectionResultDetail)mL2.ResultDetails[i]); + //} + + string[] RealCFLabels = new string[MLsum.ResultDetails.Count]; + + for (int i = 0; i < MLsum.ResultDetails.Count; i++) + { + RealCFLabels[i] = MLsum.ResultDetails[i].LabelName; + + + } + + RealCFLabels = RealCFLabels.Distinct().ToArray();//ȥ + string detstr = string.Join(",", RealCFLabels); //Ϊabc-def-ghi -,Ҳʡ + //ȶԿ + + bool MatchStr = listLabels.SequenceEqual(RealCFLabels); + if (MatchStr == false) + + { + WAIsums++; + } + #endregion + //ȶ ϸȶ + if (MatchStr) + { + //Mat mCut = new Mat(); + Stopwatch sw = new Stopwatch(); + sw.Start(); + + InsertSqlRunDataButton(ref keyValueResult, false, ref mResultCut, mL, mLButton, ref xK_HisenceSQLWord, ref xK_MatchDet, ref strMatListOne, ref strMatFuzzyListOne, ref paddleOcrModel); + + + // InsertSqlRunData(ref keyValueResult2, false, ref mResultCut2, mL2, ref xK_HisenceSQLWord, ref xK_MatchDet, ref strMatListTwo, ref strMatFuzzyListTwo, ref paddleOcrModel); + sw.Stop(); + //myLog("ʱ" + sw.ElapsedMilliseconds, DateTime.Now); + + } + + + + + if (MatchStr) + { + //жϿֵǷкƥfalse + bool containsFalseValue = keyValueResult.ContainsValue(false); + + if (containsFalseValue) + MatchStr = false; + + + } + ///ִбȶ Сͼ + //bool MatchStr = ManagerModelHelper.IsMatchSQLText(ref mCut, ref xK_HisenceSQLWord, ref xK_MatchDet); + + + // int sqlblocksum= + + + melsecPLCTCPDriver.WriteInt("550", 0);// + if (MatchStr) + { + OKDsums++; + myLog("ƥɹ", DateTime.Now); + //ʾ + // InsertXK_HisenceWordMatchData(xK_MatchDet, true); + this.Invoke(new Action(() => { - mL.ResultMap.Save("D://cam1//" + dt.Year.ToString() + dt.Month.ToString() + dt.Day.ToString() + dt.Hour.ToString() + dt.Minute.ToString() + dt.Millisecond.ToString() + "1result.jpg"); - ResultMatShow.Image = mL.ResultMap; - - } + OKOrNGShow.Image = OKbitmap; + })); - List strMatListTwo = new List(); - List strMatFuzzyListTwo = new List(); - // Mat mResultCut2 = req2.currentMat.Clone(); - Dictionary keyValueResult = new Dictionary(); - Dictionary keyValueResult2 = new Dictionary(); - #region ִжλȶ - //ִжλ - string[] listLabels = xKNow.Detect.Split(","); + } + else + { - MLResult MLsum = mL; - //for (int i = 0; i < mL2.ResultDetails.Count; i++) - //{ - // MLsum.ResultDetails.Add((DetectionResultDetail)mL2.ResultDetails[i]); - //} - string[] RealLabels = new string[MLsum.ResultDetails.Count]; - string detstr = ""; - for (int i = 0; i < MLsum.ResultDetails.Count; i++) + melsecPLCTCPDriver.WriteInt(RedLightingAdress, 1);// + melsecPLCTCPDriver.WriteInt(YellowLightingAdress, 0);//Ƶ + melsecPLCTCPDriver.WriteInt(GreenLightingAdress, 0);//̵ + melsecPLCTCPDriver.WriteInt(WaringAdress, 1);// + + + + //ΪжǷNGϴ» + DialogResult dr = MessageBox.Show("Ƿ죿", "Ƿ", MessageBoxButtons.OKCancel, MessageBoxIcon.Question); + if (dr == DialogResult.OK) { - RealLabels[i] = MLsum.ResultDetails[i].LabelName; - if (i < MLsum.ResultDetails.Count - 1) - { - detstr += RealLabels[i] + ","; - } - else - { - detstr += RealLabels[i]; - } - } - //ȶԿ + melsecPLCTCPDriver.WriteInt(RedLightingAdress, 0);// + melsecPLCTCPDriver.WriteInt(GreenLightingAdress, 1);//̵ + melsecPLCTCPDriver.WriteInt(WaringAdress, 0);// - bool MatchStr = listLabels.SequenceEqual(RealLabels); - if(MatchStr==false) - - { - WAIsums++; - } - #endregion - //ȶ ϸȶ - if (MatchStr) - { - //Mat mCut = new Mat(); - Stopwatch sw = new Stopwatch(); - sw.Start(); - - InsertSqlRunDataButton(ref keyValueResult, false, ref mResultCut, mL, mLButton, ref xK_HisenceSQLWord, ref xK_MatchDet, ref strMatListOne, ref strMatFuzzyListOne, ref paddleOcrModel); - - - // InsertSqlRunData(ref keyValueResult2, false, ref mResultCut2, mL2, ref xK_HisenceSQLWord, ref xK_MatchDet, ref strMatListTwo, ref strMatFuzzyListTwo, ref paddleOcrModel); - sw.Stop(); - myLog("ʱ" + sw.ElapsedMilliseconds, DateTime.Now); - - } - - - - - if (MatchStr) - { - //жϿֵǷкƥfalse - bool containsFalseValue = keyValueResult.ContainsValue(false); - - if (containsFalseValue) - MatchStr = false; - - - } - ///ִбȶ Сͼ - //bool MatchStr = ManagerModelHelper.IsMatchSQLText(ref mCut, ref xK_HisenceSQLWord, ref xK_MatchDet); - - - // int sqlblocksum= - - - melsecPLCTCPDriver.WriteInt("550", 0);// - if (MatchStr) - { OKDsums++; - myLog("ƥɹ", DateTime.Now); - //ʾ - // InsertXK_HisenceWordMatchData(xK_MatchDet, true); + WUsums++; this.Invoke(new Action(() => { + double percent = (double)WUsums / AllDsums; + string percentText = percent.ToString("0.0%");//percentTextֵΪ10.0% + textBox1.Text = percentText; OKOrNGShow.Image = OKbitmap; })); - - + myLog("ƥʧ", DateTime.Now); } else { - - melsecPLCTCPDriver.WriteInt(RedLightingAdress, 1);// - melsecPLCTCPDriver.WriteInt(YellowLightingAdress, 0);//Ƶ - melsecPLCTCPDriver.WriteInt(GreenLightingAdress, 0);//̵ - melsecPLCTCPDriver.WriteInt(WaringAdress, 1);// + NGDsums++; + + melsecPLCTCPDriver.WriteInt(WaringAdress, 0);// + melsecPLCTCPDriver.WriteInt(RedLightingAdress, 0);// + melsecPLCTCPDriver.WriteInt(GreenLightingAdress, 1);//̵ - - //ΪжǷNGϴ» - DialogResult dr = MessageBox.Show("Ƿ죿", "Ƿ", MessageBoxButtons.OKCancel, MessageBoxIcon.Question); - if (dr == DialogResult.OK) + this.Invoke(new Action(() => { - - melsecPLCTCPDriver.WriteInt(RedLightingAdress, 0);// - melsecPLCTCPDriver.WriteInt(GreenLightingAdress, 1);//̵ - melsecPLCTCPDriver.WriteInt(WaringAdress, 0);// - - OKDsums++; - WUsums++; - this.Invoke(new Action(() => - { - double percent = (double)WUsums / AllDsums; - string percentText = percent.ToString("0.0%");//percentTextֵΪ10.0% - textBox1.Text = percentText; - OKOrNGShow.Image = OKbitmap; - })); - myLog("ƥʧ", DateTime.Now); - } - else - { - NGDsums++; - - melsecPLCTCPDriver.WriteInt(WaringAdress, 0);// - melsecPLCTCPDriver.WriteInt(RedLightingAdress, 0);// - melsecPLCTCPDriver.WriteInt(GreenLightingAdress, 1);//̵ - - - this.Invoke(new Action(() => - { - OKOrNGShow.Image = NGbitmap; - })); - myLog("ƥɹ", DateTime.Now); - } - - - + OKOrNGShow.Image = NGbitmap; + })); + myLog("ƥɹ", DateTime.Now); } + + + } + //} } @@ -2607,24 +2604,17 @@ namespace HisenceYoloDetection string detstr = ""; - - //ҵʶ - MLResult MLsum = mL3; - //for (int v = 0; v < mL4.ResultDetails.Count; v++) - //{ - // MLsum.ResultDetails.Add(mL4.ResultDetails[v]); - //} - for (int v = 0; v < MLsum.ResultDetails.Count; v++) + + for (int v = 0; v < keyValueResult.Count; v++) { - - if (v < MLsum.ResultDetails.Count - 1) + var item = keyValueResult.ElementAt(v); + if (v < keyValueResult.Count - 1) { - detstr += MLsum.ResultDetails[v].LabelName + ","; + detstr += item.Key + ","; } else { - detstr += MLsum.ResultDetails[v].LabelName; - + detstr += item.Key; } } @@ -2738,23 +2728,16 @@ namespace HisenceYoloDetection //} string detstr = ""; - //ҵʶ - MLResult MLsum = mL3; - //for (int v = 0; v < mL4.ResultDetails.Count; v++) - //{ - // MLsum.ResultDetails.Add(mL4.ResultDetails[v]); - //} - for (int v = 0; v < MLsum.ResultDetails.Count; v++) + for (int v = 0; v < keyValueResult.Count; v++) { - - if (v < MLsum.ResultDetails.Count - 1) + var item = keyValueResult.ElementAt(v); + if (v < keyValueResult.Count - 1) { - detstr += MLsum.ResultDetails[v].LabelName + ","; + detstr += item.Key + ","; } else { - detstr += MLsum.ResultDetails[v].LabelName; - + detstr += item.Key; } } @@ -3194,14 +3177,21 @@ namespace HisenceYoloDetection rectsHeight = Math.Min(rectsHeight, currentMatC.Height - rectsy); string blockIndex = cam1TwoML.ResultDetails[i].LabelDisplay; + //ֹťұߵ¶λʶ2 + ֹλЧ͵3ͬλЧij4 if (keyValueResult.Keys.Contains(blockIndex)) { int indexof = keyValueResult.Keys.ToList().IndexOf(blockIndex); int rectsxof = cam1TwoML.ResultDetails[indexof].Rect.X; + int rectsYof = cam1TwoML.ResultDetails[indexof].Rect.Y; if (rectsx > rectsxof) { blockIndex = "3"; } + if (rectsy > rectsYof) + { + continue; + } + } Rect area2 = new Rect(0, 0, 0, 0); @@ -3235,7 +3225,7 @@ namespace HisenceYoloDetection bool blockMatchI = BlockChangeFun(saveimage, blockIndex, ref matCut, ref mLCut, ref SQlxK_HisenceWord, ref xK_HisenceWord); sw.Stop(); - myLog("ÿҪʱ" + sw.ElapsedMilliseconds, DateTime.Now); + //myLog("ÿҪʱ" + sw.ElapsedMilliseconds, DateTime.Now); keyValueResult.Add(blockIndex, blockMatchI); } @@ -3286,7 +3276,7 @@ namespace HisenceYoloDetection bool blockMatchI = BlockChangeFun(saveimage, blockIndex, ref matCut, ref mLCut, ref SQlxK_HisenceWord, ref xK_HisenceWord); keyValueResult2.Add(blockIndex, blockMatchI); sw.Stop(); - myLog("ÿҪʱ" + sw.ElapsedMilliseconds, DateTime.Now); + //myLog("ÿҪʱ" + sw.ElapsedMilliseconds, DateTime.Now); } @@ -3413,7 +3403,8 @@ namespace HisenceYoloDetection Rect rectsql = CheckDiffSciHelper.strChangeRect(SQlxK_HisenceWord.TwoRect); Rect rectDet = CheckDiffSciHelper.strChangeRect(xK_HisenceWord.TwoRect); bool iswhite = IsMostlyWhite(PathSql); - textBox2.Text=BtnColor(CutBlockMat,rectDet); + string color = BtnColor(CutBlockMat, rectsql); + //textBox2.Text = color; juanjiMatch = CheckDiffSciHelper.CheckDiffSci(PathSql, CutBlockMat, rectsql, rectDet, iswhite, "D://Hisence//Test"); // juanjiMatch = true; @@ -3643,10 +3634,11 @@ namespace HisenceYoloDetection int blackCount = 0; int whiteCount = 0; + int rectSize = 30; - for (int y = 0; y < height; y++) + for (int y = height - rectSize; y < height; y++) { - for (int x = 0; x < width; x++) + for (int x = 0; x < rectSize; x++) { Color pixelColor = bitmap.GetPixel(x, y); int r = pixelColor.R; @@ -3671,36 +3663,6 @@ namespace HisenceYoloDetection // ɫڵ0.6false򷵻true return blackRatio < 0.6; } - static string matchBtnColor(Mat img, Rect rect) - { - // ȡָ - Mat roi = new Mat(img, rect); - - // ƽɫ - Scalar mean = Cv2.Mean(roi); - - // ȡƽɫRGBֵ - double r = mean.Val2; - double g = mean.Val1; - double b = mean.Val0; - - // ƽҶֵ - double averageGray = (r + g + b) / 3; - - // жɫ - if (averageGray < 60) - { - return "ɫ"; - } - else if (averageGray >= 60 && averageGray <= 150) - { - return "ɫ"; - } - else - { - return "ɫ"; - } - } private void bnGetParam2_Click_1(object sender, EventArgs e) {