diff --git a/HisenceYoloDetection/MainForm.Designer.cs b/HisenceYoloDetection/MainForm.Designer.cs index 8f84e5c..05f5877 100644 --- a/HisenceYoloDetection/MainForm.Designer.cs +++ b/HisenceYoloDetection/MainForm.Designer.cs @@ -192,6 +192,8 @@ timer6 = new System.Windows.Forms.Timer(components); richTextBox1 = new RichTextBox(); backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); + label37 = new Label(); + textBox2 = new TextBox(); tabPage2.SuspendLayout(); panel1.SuspendLayout(); groupBox5.SuspendLayout(); @@ -221,11 +223,11 @@ // tabPage2 // tabPage2.Controls.Add(panel1); - tabPage2.Location = new Point(4, 26); + tabPage2.Location = new Point(4, 33); tabPage2.Margin = new Padding(4, 2, 4, 2); tabPage2.Name = "tabPage2"; tabPage2.Padding = new Padding(4, 2, 4, 2); - tabPage2.Size = new Size(1276, 823); + tabPage2.Size = new Size(1276, 816); tabPage2.TabIndex = 1; tabPage2.Text = "PLC"; tabPage2.UseVisualStyleBackColor = true; @@ -273,7 +275,7 @@ DistanceShow.Margin = new Padding(4, 2, 4, 2); DistanceShow.Name = "DistanceShow"; DistanceShow.ReadOnly = true; - DistanceShow.Size = new Size(127, 23); + DistanceShow.Size = new Size(127, 31); DistanceShow.TabIndex = 10; // // label21 @@ -282,7 +284,7 @@ label21.Location = new Point(36, 31); label21.Margin = new Padding(4, 0, 4, 0); label21.Name = "label21"; - label21.Size = new Size(36, 17); + label21.Size = new Size(54, 25); label21.TabIndex = 0; label21.Text = "测距"; // @@ -291,7 +293,7 @@ txtSetValue.Location = new Point(738, 73); txtSetValue.Margin = new Padding(4, 2, 4, 2); txtSetValue.Name = "txtSetValue"; - txtSetValue.Size = new Size(251, 23); + txtSetValue.Size = new Size(251, 31); txtSetValue.TabIndex = 14; // // groupBox4 @@ -360,7 +362,7 @@ SetlnEditmiZOP.Location = new Point(526, 296); SetlnEditmiZOP.Margin = new Padding(4, 2, 4, 2); SetlnEditmiZOP.Name = "SetlnEditmiZOP"; - SetlnEditmiZOP.Size = new Size(127, 23); + SetlnEditmiZOP.Size = new Size(127, 31); SetlnEditmiZOP.TabIndex = 27; // // SetlnEditmiYOP @@ -368,7 +370,7 @@ SetlnEditmiYOP.Location = new Point(329, 296); SetlnEditmiYOP.Margin = new Padding(4, 2, 4, 2); SetlnEditmiYOP.Name = "SetlnEditmiYOP"; - SetlnEditmiYOP.Size = new Size(127, 23); + SetlnEditmiYOP.Size = new Size(127, 31); SetlnEditmiYOP.TabIndex = 26; // // SetlnEditmiXOP @@ -376,7 +378,7 @@ SetlnEditmiXOP.Location = new Point(138, 296); SetlnEditmiXOP.Margin = new Padding(4, 2, 4, 2); SetlnEditmiXOP.Name = "SetlnEditmiXOP"; - SetlnEditmiXOP.Size = new Size(127, 23); + SetlnEditmiXOP.Size = new Size(127, 31); SetlnEditmiXOP.TabIndex = 25; // // SetlnEditmiZH @@ -384,7 +386,7 @@ SetlnEditmiZH.Location = new Point(526, 242); SetlnEditmiZH.Margin = new Padding(4, 2, 4, 2); SetlnEditmiZH.Name = "SetlnEditmiZH"; - SetlnEditmiZH.Size = new Size(127, 23); + SetlnEditmiZH.Size = new Size(127, 31); SetlnEditmiZH.TabIndex = 23; // // SetlnEditmiYH @@ -392,7 +394,7 @@ SetlnEditmiYH.Location = new Point(329, 242); SetlnEditmiYH.Margin = new Padding(4, 2, 4, 2); SetlnEditmiYH.Name = "SetlnEditmiYH"; - SetlnEditmiYH.Size = new Size(127, 23); + SetlnEditmiYH.Size = new Size(127, 31); SetlnEditmiYH.TabIndex = 22; // // SetlnEditmiXH @@ -400,7 +402,7 @@ SetlnEditmiXH.Location = new Point(138, 242); SetlnEditmiXH.Margin = new Padding(4, 2, 4, 2); SetlnEditmiXH.Name = "SetlnEditmiXH"; - SetlnEditmiXH.Size = new Size(127, 23); + SetlnEditmiXH.Size = new Size(127, 31); SetlnEditmiXH.TabIndex = 21; // // lnEditmiZOP @@ -408,7 +410,7 @@ lnEditmiZOP.Location = new Point(526, 189); lnEditmiZOP.Margin = new Padding(4, 2, 4, 2); lnEditmiZOP.Name = "lnEditmiZOP"; - lnEditmiZOP.Size = new Size(127, 23); + lnEditmiZOP.Size = new Size(127, 31); lnEditmiZOP.TabIndex = 19; // // lnEditmiYOP @@ -416,7 +418,7 @@ lnEditmiYOP.Location = new Point(329, 189); lnEditmiYOP.Margin = new Padding(4, 2, 4, 2); lnEditmiYOP.Name = "lnEditmiYOP"; - lnEditmiYOP.Size = new Size(127, 23); + lnEditmiYOP.Size = new Size(127, 31); lnEditmiYOP.TabIndex = 18; // // lnEditmiXOP @@ -424,7 +426,7 @@ lnEditmiXOP.Location = new Point(138, 189); lnEditmiXOP.Margin = new Padding(4, 2, 4, 2); lnEditmiXOP.Name = "lnEditmiXOP"; - lnEditmiXOP.Size = new Size(127, 23); + lnEditmiXOP.Size = new Size(127, 31); lnEditmiXOP.TabIndex = 17; // // label17 @@ -433,7 +435,7 @@ label17.Location = new Point(41, 191); label17.Margin = new Padding(4, 0, 4, 0); label17.Name = "label17"; - label17.Size = new Size(64, 17); + label17.Size = new Size(96, 25); label17.TabIndex = 16; label17.Text = "定位位置"; // @@ -443,7 +445,7 @@ lnEditmiZS.Margin = new Padding(4, 2, 4, 2); lnEditmiZS.Name = "lnEditmiZS"; lnEditmiZS.ReadOnly = true; - lnEditmiZS.Size = new Size(127, 23); + lnEditmiZS.Size = new Size(127, 31); lnEditmiZS.TabIndex = 15; // // lnEditmiYS @@ -452,7 +454,7 @@ lnEditmiYS.Margin = new Padding(4, 2, 4, 2); lnEditmiYS.Name = "lnEditmiYS"; lnEditmiYS.ReadOnly = true; - lnEditmiYS.Size = new Size(127, 23); + lnEditmiYS.Size = new Size(127, 31); lnEditmiYS.TabIndex = 14; // // lnEditmiXS @@ -461,7 +463,7 @@ lnEditmiXS.Margin = new Padding(4, 2, 4, 2); lnEditmiXS.Name = "lnEditmiXS"; lnEditmiXS.ReadOnly = true; - lnEditmiXS.Size = new Size(127, 23); + lnEditmiXS.Size = new Size(127, 31); lnEditmiXS.TabIndex = 13; // // label16 @@ -470,7 +472,7 @@ label16.Location = new Point(10, 138); label16.Margin = new Padding(4, 0, 4, 0); label16.Name = "label16"; - label16.Size = new Size(92, 17); + label16.Size = new Size(138, 25); label16.TabIndex = 12; label16.Text = "当前定位速度"; // @@ -480,7 +482,7 @@ lnEditmiZHS.Margin = new Padding(4, 2, 4, 2); lnEditmiZHS.Name = "lnEditmiZHS"; lnEditmiZHS.ReadOnly = true; - lnEditmiZHS.Size = new Size(127, 23); + lnEditmiZHS.Size = new Size(127, 31); lnEditmiZHS.TabIndex = 11; // // lnEditmiYHS @@ -489,7 +491,7 @@ lnEditmiYHS.Margin = new Padding(4, 2, 4, 2); lnEditmiYHS.Name = "lnEditmiYHS"; lnEditmiYHS.ReadOnly = true; - lnEditmiYHS.Size = new Size(127, 23); + lnEditmiYHS.Size = new Size(127, 31); lnEditmiYHS.TabIndex = 10; // // lnEditmiXHS @@ -498,7 +500,7 @@ lnEditmiXHS.Margin = new Padding(4, 2, 4, 2); lnEditmiXHS.Name = "lnEditmiXHS"; lnEditmiXHS.ReadOnly = true; - lnEditmiXHS.Size = new Size(127, 23); + lnEditmiXHS.Size = new Size(127, 31); lnEditmiXHS.TabIndex = 9; // // label15 @@ -507,7 +509,7 @@ label15.Location = new Point(10, 85); label15.Margin = new Padding(4, 0, 4, 0); label15.Name = "label15"; - label15.Size = new Size(92, 17); + label15.Size = new Size(138, 25); label15.TabIndex = 8; label15.Text = "当前手动速度"; // @@ -517,7 +519,7 @@ ZPostion.Location = new Point(580, 42); ZPostion.Margin = new Padding(4, 0, 4, 0); ZPostion.Name = "ZPostion"; - ZPostion.Size = new Size(16, 17); + ZPostion.Size = new Size(24, 25); ZPostion.TabIndex = 7; ZPostion.Text = "0"; // @@ -527,7 +529,7 @@ YPostion.Location = new Point(386, 42); YPostion.Margin = new Padding(4, 0, 4, 0); YPostion.Name = "YPostion"; - YPostion.Size = new Size(16, 17); + YPostion.Size = new Size(24, 25); YPostion.TabIndex = 6; YPostion.Text = "0"; // @@ -537,7 +539,7 @@ XPostion.Location = new Point(185, 42); XPostion.Margin = new Padding(4, 0, 4, 0); XPostion.Name = "XPostion"; - XPostion.Size = new Size(16, 17); + XPostion.Size = new Size(24, 25); XPostion.TabIndex = 5; XPostion.Text = "0"; // @@ -547,7 +549,7 @@ XCurrentPostion.Location = new Point(170, 42); XCurrentPostion.Margin = new Padding(4, 0, 4, 0); XCurrentPostion.Name = "XCurrentPostion"; - XCurrentPostion.Size = new Size(0, 17); + XCurrentPostion.Size = new Size(0, 25); XCurrentPostion.TabIndex = 4; // // label14 @@ -556,7 +558,7 @@ label14.Location = new Point(580, 21); label14.Margin = new Padding(4, 0, 4, 0); label14.Name = "label14"; - label14.Size = new Size(17, 17); + label14.Size = new Size(25, 25); label14.TabIndex = 3; label14.Text = "Z"; // @@ -566,7 +568,7 @@ label13.Location = new Point(386, 18); label13.Margin = new Padding(4, 0, 4, 0); label13.Name = "label13"; - label13.Size = new Size(17, 17); + label13.Size = new Size(27, 25); label13.TabIndex = 2; label13.Text = "Y"; // @@ -576,7 +578,7 @@ label12.Location = new Point(184, 18); label12.Margin = new Padding(4, 0, 4, 0); label12.Name = "label12"; - label12.Size = new Size(17, 17); + label12.Size = new Size(26, 25); label12.TabIndex = 1; label12.Text = "X"; // @@ -586,7 +588,7 @@ label11.Location = new Point(41, 42); label11.Margin = new Padding(4, 0, 4, 0); label11.Name = "label11"; - label11.Size = new Size(64, 17); + label11.Size = new Size(96, 25); label11.TabIndex = 0; label11.Text = "当前位置"; // @@ -792,7 +794,7 @@ writePLCValue.Location = new Point(861, 9); writePLCValue.Margin = new Padding(4, 2, 4, 2); writePLCValue.Name = "writePLCValue"; - writePLCValue.Size = new Size(127, 23); + writePLCValue.Size = new Size(127, 31); writePLCValue.TabIndex = 11; // // label9 @@ -801,7 +803,7 @@ label9.Location = new Point(514, 49); label9.Margin = new Padding(4, 0, 4, 0); label9.Name = "label9"; - label9.Size = new Size(22, 17); + label9.Size = new Size(33, 25); label9.TabIndex = 10; label9.Text = "值"; // @@ -811,7 +813,7 @@ label10.Location = new Point(514, 15); label10.Margin = new Padding(4, 0, 4, 0); label10.Name = "label10"; - label10.Size = new Size(36, 17); + label10.Size = new Size(54, 25); label10.TabIndex = 9; label10.Text = "地址"; // @@ -831,7 +833,7 @@ PLCValue.Location = new Point(577, 43); PLCValue.Margin = new Padding(4, 2, 4, 2); PLCValue.Name = "PLCValue"; - PLCValue.Size = new Size(127, 23); + PLCValue.Size = new Size(127, 31); PLCValue.TabIndex = 8; // // WriteAdress @@ -839,7 +841,7 @@ WriteAdress.Location = new Point(577, 13); WriteAdress.Margin = new Padding(4, 2, 4, 2); WriteAdress.Name = "WriteAdress"; - WriteAdress.Size = new Size(127, 23); + WriteAdress.Size = new Size(127, 31); WriteAdress.TabIndex = 6; // // label6 @@ -848,7 +850,7 @@ label6.Location = new Point(162, 51); label6.Margin = new Padding(4, 0, 4, 0); label6.Name = "label6"; - label6.Size = new Size(22, 17); + label6.Size = new Size(33, 25); label6.TabIndex = 5; label6.Text = "值"; // @@ -858,7 +860,7 @@ label3.Location = new Point(162, 18); label3.Margin = new Padding(4, 0, 4, 0); label3.Name = "label3"; - label3.Size = new Size(36, 17); + label3.Size = new Size(54, 25); label3.TabIndex = 4; label3.Text = "地址"; // @@ -889,7 +891,7 @@ showPLC.Location = new Point(225, 46); showPLC.Margin = new Padding(4, 2, 4, 2); showPLC.Name = "showPLC"; - showPLC.Size = new Size(127, 23); + showPLC.Size = new Size(127, 31); showPLC.TabIndex = 3; // // readPLc @@ -897,18 +899,18 @@ readPLc.Location = new Point(225, 15); readPLc.Margin = new Padding(4, 2, 4, 2); readPLc.Name = "readPLc"; - readPLc.Size = new Size(127, 23); + readPLc.Size = new Size(127, 31); readPLc.TabIndex = 1; // // tabPage1 // tabPage1.Controls.Add(groupBox3); tabPage1.Controls.Add(groupBox1); - tabPage1.Location = new Point(4, 26); + tabPage1.Location = new Point(4, 34); tabPage1.Margin = new Padding(4, 2, 4, 2); tabPage1.Name = "tabPage1"; tabPage1.Padding = new Padding(4, 2, 4, 2); - tabPage1.Size = new Size(1276, 823); + tabPage1.Size = new Size(1276, 815); tabPage1.TabIndex = 0; tabPage1.Text = "相机"; tabPage1.UseVisualStyleBackColor = true; @@ -972,7 +974,7 @@ label5.Location = new Point(257, 18); label5.Margin = new Padding(4, 0, 4, 0); label5.Name = "label5"; - label5.Size = new Size(64, 17); + label5.Size = new Size(96, 25); label5.TabIndex = 2; label5.Text = "链接相机"; // @@ -1003,7 +1005,7 @@ tbGain2.Location = new Point(93, 54); tbGain2.Margin = new Padding(4, 2, 4, 2); tbGain2.Name = "tbGain2"; - tbGain2.Size = new Size(127, 23); + tbGain2.Size = new Size(127, 31); tbGain2.TabIndex = 4; // // tbExposure2 @@ -1011,7 +1013,7 @@ tbExposure2.Location = new Point(93, 22); tbExposure2.Margin = new Padding(4, 2, 4, 2); tbExposure2.Name = "tbExposure2"; - tbExposure2.Size = new Size(127, 23); + tbExposure2.Size = new Size(127, 31); tbExposure2.TabIndex = 3; // // label7 @@ -1020,7 +1022,7 @@ label7.Location = new Point(15, 56); label7.Margin = new Padding(4, 0, 4, 0); label7.Name = "label7"; - label7.Size = new Size(36, 17); + label7.Size = new Size(54, 25); label7.TabIndex = 1; label7.Text = "增益"; // @@ -1030,7 +1032,7 @@ label8.Location = new Point(15, 24); label8.Margin = new Padding(4, 0, 4, 0); label8.Name = "label8"; - label8.Size = new Size(36, 17); + label8.Size = new Size(54, 25); label8.TabIndex = 0; label8.Text = "曝光"; // @@ -1095,7 +1097,7 @@ label1.Location = new Point(257, 18); label1.Margin = new Padding(4, 0, 4, 0); label1.Name = "label1"; - label1.Size = new Size(64, 17); + label1.Size = new Size(96, 25); label1.TabIndex = 2; label1.Text = "链接相机"; // @@ -1126,7 +1128,7 @@ tbGain.Location = new Point(93, 54); tbGain.Margin = new Padding(4, 2, 4, 2); tbGain.Name = "tbGain"; - tbGain.Size = new Size(127, 23); + tbGain.Size = new Size(127, 31); tbGain.TabIndex = 4; // // tbExposure @@ -1134,7 +1136,7 @@ tbExposure.Location = new Point(93, 22); tbExposure.Margin = new Padding(4, 2, 4, 2); tbExposure.Name = "tbExposure"; - tbExposure.Size = new Size(127, 23); + tbExposure.Size = new Size(127, 31); tbExposure.TabIndex = 3; // // label2 @@ -1143,7 +1145,7 @@ label2.Location = new Point(15, 56); label2.Margin = new Padding(4, 0, 4, 0); label2.Name = "label2"; - label2.Size = new Size(36, 17); + label2.Size = new Size(54, 25); label2.TabIndex = 1; label2.Text = "增益"; // @@ -1153,7 +1155,7 @@ label4.Location = new Point(15, 24); label4.Margin = new Padding(4, 0, 4, 0); label4.Name = "label4"; - label4.Size = new Size(36, 17); + label4.Size = new Size(54, 25); label4.TabIndex = 0; label4.Text = "曝光"; // @@ -1175,10 +1177,10 @@ // tabPage5 // tabPage5.Controls.Add(panel4); - tabPage5.Location = new Point(4, 26); + tabPage5.Location = new Point(4, 34); tabPage5.Margin = new Padding(4, 2, 4, 2); tabPage5.Name = "tabPage5"; - tabPage5.Size = new Size(1276, 823); + tabPage5.Size = new Size(1276, 815); tabPage5.TabIndex = 3; tabPage5.Text = "流程"; tabPage5.UseVisualStyleBackColor = true; @@ -1190,7 +1192,7 @@ panel4.Location = new Point(0, 0); panel4.Margin = new Padding(4, 2, 4, 2); panel4.Name = "panel4"; - panel4.Size = new Size(1276, 823); + panel4.Size = new Size(1276, 815); panel4.TabIndex = 0; // // panel5 @@ -1216,6 +1218,7 @@ groupBox9.TabIndex = 25; groupBox9.TabStop = false; groupBox9.Text = "设备状态"; + groupBox9.Enter += groupBox9_Enter; // // DevNameCombo // @@ -1223,7 +1226,7 @@ DevNameCombo.Location = new Point(7, 33); DevNameCombo.Margin = new Padding(4, 2, 4, 2); DevNameCombo.Name = "DevNameCombo"; - DevNameCombo.Size = new Size(386, 25); + DevNameCombo.Size = new Size(386, 33); DevNameCombo.TabIndex = 1; // // ScanDevList @@ -1358,6 +1361,7 @@ // // groupBox8 // + groupBox8.BackColor = SystemColors.Control; groupBox8.Controls.Add(textBox4); groupBox8.Controls.Add(label36); groupBox8.Controls.Add(label26); @@ -1370,9 +1374,9 @@ groupBox8.Controls.Add(label20); groupBox8.Controls.Add(textBox1); groupBox8.Controls.Add(label35); - groupBox8.Location = new Point(11, 260); + groupBox8.Location = new Point(11, 326); groupBox8.Name = "groupBox8"; - groupBox8.Size = new Size(596, 528); + groupBox8.Size = new Size(596, 462); groupBox8.TabIndex = 24; groupBox8.TabStop = false; groupBox8.Text = "生产信息"; @@ -1383,7 +1387,7 @@ textBox4.Margin = new Padding(4, 2, 4, 2); textBox4.Name = "textBox4"; textBox4.ReadOnly = true; - textBox4.Size = new Size(67, 23); + textBox4.Size = new Size(67, 31); textBox4.TabIndex = 18; // // label36 @@ -1391,7 +1395,7 @@ label36.AutoSize = true; label36.Location = new Point(426, 99); label36.Name = "label36"; - label36.Size = new Size(64, 17); + label36.Size = new Size(96, 25); label36.TabIndex = 17; label36.Text = "机身倾斜"; // @@ -1402,7 +1406,7 @@ label26.Location = new Point(42, 262); label26.Margin = new Padding(4, 0, 4, 0); label26.Name = "label26"; - label26.Size = new Size(133, 30); + label26.Size = new Size(195, 44); label26.TabIndex = 16; label26.Text = "检测结果"; // @@ -1412,7 +1416,7 @@ label18.Location = new Point(7, 67); label18.Margin = new Padding(4, 0, 4, 0); label18.Name = "label18"; - label18.Size = new Size(64, 17); + label18.Size = new Size(96, 25); label18.TabIndex = 5; label18.Text = "总产量数"; label18.Click += label18_Click; @@ -1423,7 +1427,7 @@ AllDSum.Margin = new Padding(4, 2, 4, 2); AllDSum.Name = "AllDSum"; AllDSum.ReadOnly = true; - AllDSum.Size = new Size(74, 23); + AllDSum.Size = new Size(74, 31); AllDSum.TabIndex = 6; // // label19 @@ -1432,7 +1436,7 @@ label19.Location = new Point(205, 96); label19.Margin = new Padding(4, 0, 4, 0); label19.Name = "label19"; - label19.Size = new Size(71, 17); + label19.Size = new Size(106, 25); label19.TabIndex = 7; label19.Text = "NG产品数"; // @@ -1442,7 +1446,7 @@ NGDNum.Margin = new Padding(4, 2, 4, 2); NGDNum.Name = "NGDNum"; NGDNum.ReadOnly = true; - NGDNum.Size = new Size(76, 23); + NGDNum.Size = new Size(76, 31); NGDNum.TabIndex = 8; // // OKOrNGShow @@ -1461,7 +1465,7 @@ OKDNum.Margin = new Padding(4, 2, 4, 2); OKDNum.Name = "OKDNum"; OKDNum.ReadOnly = true; - OKDNum.Size = new Size(76, 23); + OKDNum.Size = new Size(76, 31); OKDNum.TabIndex = 10; // // label20 @@ -1470,7 +1474,7 @@ label20.Location = new Point(206, 41); label20.Margin = new Padding(4, 0, 4, 0); label20.Name = "label20"; - label20.Size = new Size(70, 17); + label20.Size = new Size(105, 25); label20.TabIndex = 9; label20.Text = "OK产品数"; // @@ -1480,15 +1484,15 @@ textBox1.Margin = new Padding(4, 2, 4, 2); textBox1.Name = "textBox1"; textBox1.ReadOnly = true; - textBox1.Size = new Size(67, 23); + textBox1.Size = new Size(67, 31); textBox1.TabIndex = 15; // // label35 // label35.AutoSize = true; - label35.Location = new Point(447, 42); + label35.Location = new Point(426, 45); label35.Name = "label35"; - label35.Size = new Size(50, 17); + label35.Size = new Size(75, 25); label35.TabIndex = 14; label35.Text = "误检率"; // @@ -1539,13 +1543,15 @@ // // groupBox6 // + groupBox6.Controls.Add(textBox2); + groupBox6.Controls.Add(label37); 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, 134); + groupBox6.Size = new Size(582, 191); groupBox6.TabIndex = 22; groupBox6.TabStop = false; groupBox6.Text = "基础信息"; @@ -1556,7 +1562,7 @@ textBox3.Margin = new Padding(4, 2, 4, 2); textBox3.Name = "textBox3"; textBox3.ReadOnly = true; - textBox3.Size = new Size(402, 23); + textBox3.Size = new Size(402, 31); textBox3.TabIndex = 21; // // label25 @@ -1565,7 +1571,7 @@ label25.Location = new Point(7, 95); label25.Margin = new Padding(4, 0, 4, 0); label25.Name = "label25"; - label25.Size = new Size(64, 17); + label25.Size = new Size(96, 25); label25.TabIndex = 20; label25.Text = "产品型号"; label25.Click += label25_Click; @@ -1576,7 +1582,7 @@ label24.Location = new Point(7, 40); label24.Margin = new Padding(4, 0, 4, 0); label24.Name = "label24"; - label24.Size = new Size(64, 17); + label24.Size = new Size(96, 25); label24.TabIndex = 19; label24.Text = "产品条码"; label24.Click += label24_Click; @@ -1587,7 +1593,7 @@ ScannerBox.Margin = new Padding(4, 2, 4, 2); ScannerBox.Name = "ScannerBox"; ScannerBox.ReadOnly = true; - ScannerBox.Size = new Size(402, 23); + ScannerBox.Size = new Size(402, 31); ScannerBox.TabIndex = 18; // // linkLabel1 @@ -1595,16 +1601,16 @@ linkLabel1.AutoSize = true; linkLabel1.Location = new Point(161, 387); linkLabel1.Name = "linkLabel1"; - linkLabel1.Size = new Size(0, 17); + linkLabel1.Size = new Size(0, 25); linkLabel1.TabIndex = 21; // // tabPage3 // tabPage3.Controls.Add(panel2); - tabPage3.Location = new Point(4, 26); + tabPage3.Location = new Point(4, 33); tabPage3.Margin = new Padding(4, 2, 4, 2); tabPage3.Name = "tabPage3"; - tabPage3.Size = new Size(1276, 823); + tabPage3.Size = new Size(1276, 816); tabPage3.TabIndex = 4; tabPage3.Text = "录入新型号"; tabPage3.UseVisualStyleBackColor = true; @@ -1670,7 +1676,7 @@ WhiteBanCbx.Location = new Point(867, 146); WhiteBanCbx.Margin = new Padding(4, 2, 4, 2); WhiteBanCbx.Name = "WhiteBanCbx"; - WhiteBanCbx.Size = new Size(41, 21); + WhiteBanCbx.Size = new Size(59, 29); WhiteBanCbx.TabIndex = 40; WhiteBanCbx.Text = "是"; WhiteBanCbx.UseVisualStyleBackColor = true; @@ -1681,7 +1687,7 @@ label33.Location = new Point(596, 147); label33.Margin = new Padding(4, 0, 4, 0); label33.Name = "label33"; - label33.Size = new Size(162, 17); + label33.Size = new Size(243, 25); label33.TabIndex = 39; label33.Text = "面板第二块区域是白板吗"; // @@ -1691,7 +1697,7 @@ label28.Location = new Point(23, 187); label28.Margin = new Padding(4, 0, 4, 0); label28.Name = "label28"; - label28.Size = new Size(101, 17); + label28.Size = new Size(151, 25); label28.TabIndex = 14; label28.Text = "第一次拍照Z轴"; // @@ -1711,7 +1717,7 @@ modelChangeCbx.Location = new Point(750, 14); modelChangeCbx.Margin = new Padding(4, 2, 4, 2); modelChangeCbx.Name = "modelChangeCbx"; - modelChangeCbx.Size = new Size(241, 23); + modelChangeCbx.Size = new Size(241, 31); modelChangeCbx.TabIndex = 34; modelChangeCbx.Text = "D:\\Hisence\\config\\chinese.json"; // @@ -1721,7 +1727,7 @@ label34.Location = new Point(597, 14); label34.Margin = new Padding(4, 0, 4, 0); label34.Name = "label34"; - label34.Size = new Size(92, 17); + label34.Size = new Size(138, 25); label34.TabIndex = 33; label34.Text = "面板语言选择"; // @@ -1752,7 +1758,7 @@ Cam2MatCbx.Location = new Point(750, 111); Cam2MatCbx.Margin = new Padding(4, 2, 4, 2); Cam2MatCbx.Name = "Cam2MatCbx"; - Cam2MatCbx.Size = new Size(279, 23); + Cam2MatCbx.Size = new Size(279, 31); Cam2MatCbx.TabIndex = 29; Cam2MatCbx.Text = "D:\\Hisence\\类型\\Lp\\002jpg"; // @@ -1762,7 +1768,7 @@ label22.Location = new Point(596, 105); label22.Margin = new Padding(4, 0, 4, 0); label22.Name = "label22"; - label22.Size = new Size(92, 17); + label22.Size = new Size(138, 25); label22.TabIndex = 28; label22.Text = "面板第二张图"; // @@ -1771,7 +1777,7 @@ Cam1MatCbx.Location = new Point(750, 59); Cam1MatCbx.Margin = new Padding(4, 2, 4, 2); Cam1MatCbx.Name = "Cam1MatCbx"; - Cam1MatCbx.Size = new Size(279, 23); + Cam1MatCbx.Size = new Size(279, 31); Cam1MatCbx.TabIndex = 27; Cam1MatCbx.Text = "D:\\Hisence\\类型\\Lp\\001.jpg"; // @@ -1781,7 +1787,7 @@ label23.Location = new Point(597, 62); label23.Margin = new Padding(4, 0, 4, 0); label23.Name = "label23"; - label23.Size = new Size(92, 17); + label23.Size = new Size(138, 25); label23.TabIndex = 26; label23.Text = "面板第一张图"; // @@ -1812,7 +1818,7 @@ moveZbox.Location = new Point(183, 184); moveZbox.Margin = new Padding(4, 2, 4, 2); moveZbox.Name = "moveZbox"; - moveZbox.Size = new Size(287, 23); + moveZbox.Size = new Size(287, 31); moveZbox.TabIndex = 15; moveZbox.Text = "0"; // @@ -1821,7 +1827,7 @@ moveYbox.Location = new Point(183, 141); moveYbox.Margin = new Padding(4, 2, 4, 2); moveYbox.Name = "moveYbox"; - moveYbox.Size = new Size(287, 23); + moveYbox.Size = new Size(287, 31); moveYbox.TabIndex = 13; moveYbox.Text = "0"; // @@ -1831,7 +1837,7 @@ label29.Location = new Point(22, 143); label29.Margin = new Padding(4, 0, 4, 0); label29.Name = "label29"; - label29.Size = new Size(101, 17); + label29.Size = new Size(153, 25); label29.TabIndex = 12; label29.Text = "第一次拍照Y轴"; // @@ -1840,7 +1846,7 @@ moveXbox.Location = new Point(182, 101); moveXbox.Margin = new Padding(4, 2, 4, 2); moveXbox.Name = "moveXbox"; - moveXbox.Size = new Size(287, 23); + moveXbox.Size = new Size(287, 31); moveXbox.TabIndex = 11; moveXbox.Text = "8974"; // @@ -1850,7 +1856,7 @@ label30.Location = new Point(22, 104); label30.Margin = new Padding(4, 0, 4, 0); label30.Name = "label30"; - label30.Size = new Size(101, 17); + label30.Size = new Size(152, 25); label30.TabIndex = 10; label30.Text = "第一次拍照X轴"; // @@ -1859,7 +1865,7 @@ OcrBarBox.Location = new Point(183, 56); OcrBarBox.Margin = new Padding(4, 2, 4, 2); OcrBarBox.Name = "OcrBarBox"; - OcrBarBox.Size = new Size(287, 23); + OcrBarBox.Size = new Size(287, 31); OcrBarBox.TabIndex = 5; OcrBarBox.Text = "1234567890"; // @@ -1869,7 +1875,7 @@ label31.Location = new Point(23, 59); label31.Margin = new Padding(4, 0, 4, 0); label31.Name = "label31"; - label31.Size = new Size(27, 17); + label31.Size = new Size(41, 25); label31.TabIndex = 4; label31.Text = "SN"; // @@ -1878,7 +1884,7 @@ TypeBox.Location = new Point(183, 14); TypeBox.Margin = new Padding(4, 2, 4, 2); TypeBox.Name = "TypeBox"; - TypeBox.Size = new Size(287, 23); + TypeBox.Size = new Size(287, 31); TypeBox.TabIndex = 3; TypeBox.Text = "1"; // @@ -1899,7 +1905,7 @@ label32.Location = new Point(18, 17); label32.Margin = new Padding(4, 0, 4, 0); label32.Name = "label32"; - label32.Size = new Size(36, 17); + label32.Size = new Size(54, 25); label32.TabIndex = 1; label32.Text = "类型"; // @@ -1924,9 +1930,29 @@ richTextBox1.TabIndex = 1; richTextBox1.Text = ""; // + // label37 + // + label37.AutoSize = true; + label37.Location = new Point(7, 146); + label37.Margin = new Padding(4, 0, 4, 0); + label37.Name = "label37"; + label37.Size = new Size(96, 25); + label37.TabIndex = 22; + label37.Text = "旋钮颜色"; + label37.Click += label37_Click; + // + // textBox2 + // + textBox2.Location = new Point(128, 146); + textBox2.Margin = new Padding(4, 2, 4, 2); + textBox2.Name = "textBox2"; + textBox2.ReadOnly = true; + textBox2.Size = new Size(115, 31); + textBox2.TabIndex = 23; + // // MainForm // - AutoScaleDimensions = new SizeF(8F, 17F); + AutoScaleDimensions = new SizeF(12F, 25F); AutoScaleMode = AutoScaleMode.Font; BackColor = SystemColors.ActiveCaption; ClientSize = new Size(1284, 953); @@ -2157,5 +2183,6 @@ private Label label27; private TextBox textBox4; private Label label36; + private Label label37; } } diff --git a/HisenceYoloDetection/MainForm.cs b/HisenceYoloDetection/MainForm.cs index b1b92d9..8153961 100644 --- a/HisenceYoloDetection/MainForm.cs +++ b/HisenceYoloDetection/MainForm.cs @@ -2604,7 +2604,7 @@ namespace HisenceYoloDetection string detstr = ""; - + for (int v = 0; v < keyValueResult.Count; v++) { var item = keyValueResult.ElementAt(v); @@ -3403,8 +3403,25 @@ namespace HisenceYoloDetection Rect rectsql = CheckDiffSciHelper.strChangeRect(SQlxK_HisenceWord.TwoRect); Rect rectDet = CheckDiffSciHelper.strChangeRect(xK_HisenceWord.TwoRect); bool iswhite = IsMostlyWhite(PathSql); - string color = BtnColor(CutBlockMat, rectsql); - //textBox2.Text = color; + int centerX = rectsql.X + rectsql.Width / 2; + int centerY = rectsql.Y + rectsql.Height / 2; + + // ȷµľοϽͿ + int rectSize = 60; // 30չ + int rectX = Math.Max(0, centerX - rectSize / 2); + int rectY = Math.Max(0, centerY - rectSize / 2); + int rectWidth = Math.Min(rectSize, rectsql.Width - rectX); + int rectHeight = Math.Min(rectSize, rectsql.Height - rectY); + + // µľο + Rect newRect = new Rect(rectX, rectY, rectWidth, rectHeight); + string color = BtnColor(CutBlockMat, newRect); + this.Invoke(new Action(() => + { + + textBox2.Text = color; + + })); juanjiMatch = CheckDiffSciHelper.CheckDiffSci(PathSql, CutBlockMat, rectsql, rectDet, iswhite, "D://Hisence//Test"); // juanjiMatch = true; @@ -3646,7 +3663,7 @@ namespace HisenceYoloDetection int b = pixelColor.B; // жǷΪɫ - if (r <= 70 && g <= 70 && b <= 70) + if (r <= 100 && g <= 100 && b <= 100) { blackCount++; } @@ -3819,5 +3836,15 @@ namespace HisenceYoloDetection { } + + private void label37_Click(object sender, EventArgs e) + { + + } + + private void groupBox9_Enter(object sender, EventArgs e) + { + + } } }