From ab94f070d797edbe927d7d58a460cc4eddf48b03 Mon Sep 17 00:00:00 2001
From: jace.tang <1536884497@qq.com>
Date: 星期一, 13 六月 2022 10:58:40 +0800
Subject: [PATCH] 1.添加检测异常抛出时图片保存动作
---
DetectionData.cs | 45
ConfigForm.Designer.cs | 1349 +++++++++++++++++------------
HeightDetection.cs | 15
MainForm.cs | 640 ++++++++++++-
MainForm.Designer.cs | 619 +++++++-----
OPC.cs | 47
SizeDetection.cs | 14
OPCConfigStruct.cs | 9
FormPLCIO.cs | 18
9 files changed, 1,846 insertions(+), 910 deletions(-)
diff --git a/ConfigForm.Designer.cs b/ConfigForm.Designer.cs
index 41c9a89..812ef72 100644
--- a/ConfigForm.Designer.cs
+++ b/ConfigForm.Designer.cs
@@ -237,6 +237,7 @@
this.nudCellMaxLength = new System.Windows.Forms.NumericUpDown();
this.label148 = new System.Windows.Forms.Label();
this.label147 = new System.Windows.Forms.Label();
+ this.chkSaveHeightOK = new System.Windows.Forms.CheckBox();
this.chkSaveOKLWImage = new System.Windows.Forms.CheckBox();
this.btnClearCheck = new System.Windows.Forms.Button();
this.btnHandInit = new System.Windows.Forms.Button();
@@ -456,7 +457,6 @@
this.groupBox27 = new System.Windows.Forms.GroupBox();
this.groupBox28 = new System.Windows.Forms.GroupBox();
this.groupBox29 = new System.Windows.Forms.GroupBox();
- this.chkSaveHeightOK = new System.Windows.Forms.CheckBox();
this.tabControl1.SuspendLayout();
this.tpSetConfig.SuspendLayout();
this.groupBox4.SuspendLayout();
@@ -501,9 +501,10 @@
//
// btnSaveConfig
//
- this.btnSaveConfig.Location = new System.Drawing.Point(716, 409);
+ this.btnSaveConfig.Location = new System.Drawing.Point(955, 511);
+ this.btnSaveConfig.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSaveConfig.Name = "btnSaveConfig";
- this.btnSaveConfig.Size = new System.Drawing.Size(92, 74);
+ this.btnSaveConfig.Size = new System.Drawing.Size(123, 92);
this.btnSaveConfig.TabIndex = 0;
this.btnSaveConfig.Text = "淇濆瓨閰嶇疆";
this.btnSaveConfig.UseVisualStyleBackColor = true;
@@ -516,9 +517,10 @@
this.tabControl1.Controls.Add(this.tbSoft);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(0, 0);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(825, 499);
+ this.tabControl1.Size = new System.Drawing.Size(1100, 624);
this.tabControl1.TabIndex = 1;
//
// tpSetConfig
@@ -534,10 +536,11 @@
this.tpSetConfig.Controls.Add(this.groupBox13);
this.tpSetConfig.Controls.Add(this.groupBox2);
this.tpSetConfig.Controls.Add(this.btnSaveConfig);
- this.tpSetConfig.Location = new System.Drawing.Point(4, 22);
+ this.tpSetConfig.Location = new System.Drawing.Point(4, 25);
+ this.tpSetConfig.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tpSetConfig.Name = "tpSetConfig";
- this.tpSetConfig.Padding = new System.Windows.Forms.Padding(3);
- this.tpSetConfig.Size = new System.Drawing.Size(817, 473);
+ this.tpSetConfig.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tpSetConfig.Size = new System.Drawing.Size(1092, 595);
this.tpSetConfig.TabIndex = 0;
this.tpSetConfig.Text = "鍙傛暟閰嶇疆";
this.tpSetConfig.UseVisualStyleBackColor = true;
@@ -551,9 +554,11 @@
this.groupBox4.Controls.Add(this.cbUploadPath);
this.groupBox4.Controls.Add(this.tbUpload);
this.groupBox4.Controls.Add(this.btnUploadPath);
- this.groupBox4.Location = new System.Drawing.Point(352, 393);
+ this.groupBox4.Location = new System.Drawing.Point(469, 491);
+ this.groupBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox4.Name = "groupBox4";
- this.groupBox4.Size = new System.Drawing.Size(333, 102);
+ this.groupBox4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox4.Size = new System.Drawing.Size(444, 128);
this.groupBox4.TabIndex = 15;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "鎶ヨ〃涓婁紶璺緞璁剧疆";
@@ -561,41 +566,46 @@
// label142
//
this.label142.AutoSize = true;
- this.label142.Location = new System.Drawing.Point(158, 78);
+ this.label142.Location = new System.Drawing.Point(211, 98);
+ this.label142.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label142.Name = "label142";
- this.label142.Size = new System.Drawing.Size(35, 12);
+ this.label142.Size = new System.Drawing.Size(45, 15);
this.label142.TabIndex = 6;
this.label142.Text = "绔欏垾:";
//
// tbStation
//
- this.tbStation.Location = new System.Drawing.Point(195, 73);
+ this.tbStation.Location = new System.Drawing.Point(260, 91);
+ this.tbStation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tbStation.Name = "tbStation";
- this.tbStation.Size = new System.Drawing.Size(93, 21);
+ this.tbStation.Size = new System.Drawing.Size(123, 25);
this.tbStation.TabIndex = 5;
//
// label141
//
this.label141.AutoSize = true;
- this.label141.Location = new System.Drawing.Point(13, 78);
+ this.label141.Location = new System.Drawing.Point(17, 98);
+ this.label141.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label141.Name = "label141";
- this.label141.Size = new System.Drawing.Size(35, 12);
+ this.label141.Size = new System.Drawing.Size(45, 15);
this.label141.TabIndex = 4;
this.label141.Text = "绶氬垾:";
//
// tbLine
//
- this.tbLine.Location = new System.Drawing.Point(50, 73);
+ this.tbLine.Location = new System.Drawing.Point(67, 91);
+ this.tbLine.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tbLine.Name = "tbLine";
- this.tbLine.Size = new System.Drawing.Size(93, 21);
+ this.tbLine.Size = new System.Drawing.Size(123, 25);
this.tbLine.TabIndex = 3;
//
// cbUploadPath
//
this.cbUploadPath.AutoSize = true;
- this.cbUploadPath.Location = new System.Drawing.Point(15, 21);
+ this.cbUploadPath.Location = new System.Drawing.Point(20, 26);
+ this.cbUploadPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbUploadPath.Name = "cbUploadPath";
- this.cbUploadPath.Size = new System.Drawing.Size(144, 16);
+ this.cbUploadPath.Size = new System.Drawing.Size(179, 19);
this.cbUploadPath.TabIndex = 0;
this.cbUploadPath.Text = "閬告搰鏄惁涓婂偝娓噺绲愭灉";
this.cbUploadPath.UseVisualStyleBackColor = true;
@@ -603,18 +613,20 @@
//
// tbUpload
//
- this.tbUpload.Location = new System.Drawing.Point(15, 42);
+ this.tbUpload.Location = new System.Drawing.Point(20, 52);
+ this.tbUpload.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tbUpload.Name = "tbUpload";
this.tbUpload.ReadOnly = true;
- this.tbUpload.Size = new System.Drawing.Size(214, 21);
+ this.tbUpload.Size = new System.Drawing.Size(284, 25);
this.tbUpload.TabIndex = 2;
this.tbUpload.Visible = false;
//
// btnUploadPath
//
- this.btnUploadPath.Location = new System.Drawing.Point(232, 39);
+ this.btnUploadPath.Location = new System.Drawing.Point(309, 49);
+ this.btnUploadPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUploadPath.Name = "btnUploadPath";
- this.btnUploadPath.Size = new System.Drawing.Size(95, 29);
+ this.btnUploadPath.Size = new System.Drawing.Size(127, 36);
this.btnUploadPath.TabIndex = 1;
this.btnUploadPath.Text = "涓婁紶璺緞閫夋嫨";
this.btnUploadPath.UseVisualStyleBackColor = true;
@@ -628,9 +640,11 @@
this.groupBox11.Controls.Add(this.tbTST);
this.groupBox11.Controls.Add(this.btnExcelPath);
this.groupBox11.Controls.Add(this.btnTstPath);
- this.groupBox11.Location = new System.Drawing.Point(3, 392);
+ this.groupBox11.Location = new System.Drawing.Point(4, 490);
+ this.groupBox11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox11.Name = "groupBox11";
- this.groupBox11.Size = new System.Drawing.Size(343, 103);
+ this.groupBox11.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox11.Size = new System.Drawing.Size(457, 129);
this.groupBox11.TabIndex = 14;
this.groupBox11.TabStop = false;
this.groupBox11.Text = "鎶ヨ〃璺緞璁剧疆";
@@ -638,9 +652,10 @@
// cbExcel
//
this.cbExcel.AutoSize = true;
- this.cbExcel.Location = new System.Drawing.Point(14, 69);
+ this.cbExcel.Location = new System.Drawing.Point(19, 86);
+ this.cbExcel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbExcel.Name = "cbExcel";
- this.cbExcel.Size = new System.Drawing.Size(15, 14);
+ this.cbExcel.Size = new System.Drawing.Size(18, 17);
this.cbExcel.TabIndex = 5;
this.cbExcel.UseVisualStyleBackColor = true;
this.cbExcel.CheckedChanged += new System.EventHandler(this.cbTST_CheckedChanged);
@@ -648,43 +663,48 @@
// cbTST
//
this.cbTST.AutoSize = true;
- this.cbTST.Location = new System.Drawing.Point(14, 32);
+ this.cbTST.Location = new System.Drawing.Point(19, 40);
+ this.cbTST.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbTST.Name = "cbTST";
- this.cbTST.Size = new System.Drawing.Size(15, 14);
+ this.cbTST.Size = new System.Drawing.Size(18, 17);
this.cbTST.TabIndex = 5;
this.cbTST.UseVisualStyleBackColor = true;
this.cbTST.CheckedChanged += new System.EventHandler(this.cbTST_CheckedChanged);
//
// tbExcel
//
- this.tbExcel.Location = new System.Drawing.Point(141, 66);
+ this.tbExcel.Location = new System.Drawing.Point(188, 82);
+ this.tbExcel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tbExcel.Name = "tbExcel";
this.tbExcel.ReadOnly = true;
- this.tbExcel.Size = new System.Drawing.Size(191, 21);
+ this.tbExcel.Size = new System.Drawing.Size(253, 25);
this.tbExcel.TabIndex = 1;
//
// tbTST
//
- this.tbTST.Location = new System.Drawing.Point(141, 29);
+ this.tbTST.Location = new System.Drawing.Point(188, 36);
+ this.tbTST.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tbTST.Name = "tbTST";
this.tbTST.ReadOnly = true;
- this.tbTST.Size = new System.Drawing.Size(191, 21);
+ this.tbTST.Size = new System.Drawing.Size(253, 25);
this.tbTST.TabIndex = 1;
//
// btnExcelPath
//
- this.btnExcelPath.Location = new System.Drawing.Point(37, 60);
+ this.btnExcelPath.Location = new System.Drawing.Point(49, 75);
+ this.btnExcelPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnExcelPath.Name = "btnExcelPath";
- this.btnExcelPath.Size = new System.Drawing.Size(98, 30);
+ this.btnExcelPath.Size = new System.Drawing.Size(131, 38);
this.btnExcelPath.TabIndex = 0;
this.btnExcelPath.Text = "Excel璺緞閫夋嫨";
this.btnExcelPath.UseVisualStyleBackColor = true;
//
// btnTstPath
//
- this.btnTstPath.Location = new System.Drawing.Point(37, 23);
+ this.btnTstPath.Location = new System.Drawing.Point(49, 29);
+ this.btnTstPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnTstPath.Name = "btnTstPath";
- this.btnTstPath.Size = new System.Drawing.Size(98, 31);
+ this.btnTstPath.Size = new System.Drawing.Size(131, 39);
this.btnTstPath.TabIndex = 0;
this.btnTstPath.Text = "TST璺緞閫夋嫨";
this.btnTstPath.UseVisualStyleBackColor = true;
@@ -692,9 +712,10 @@
// label37
//
this.label37.AutoSize = true;
- this.label37.Location = new System.Drawing.Point(678, 361);
+ this.label37.Location = new System.Drawing.Point(904, 451);
+ this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label37.Name = "label37";
- this.label37.Size = new System.Drawing.Size(23, 12);
+ this.label37.Size = new System.Drawing.Size(30, 15);
this.label37.TabIndex = 14;
this.label37.Text = "闀�:";
this.label37.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -716,19 +737,23 @@
this.groupBox3.Controls.Add(this.label133);
this.groupBox3.Controls.Add(this.textBox20);
this.groupBox3.Controls.Add(this.label118);
- this.groupBox3.Location = new System.Drawing.Point(664, 173);
+ this.groupBox3.Location = new System.Drawing.Point(885, 216);
+ this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(148, 178);
+ this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox3.Size = new System.Drawing.Size(197, 222);
this.groupBox3.TabIndex = 13;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "瀹藉害琛ュ伩鍊艰瀹�";
+ this.groupBox3.Visible = false;
//
// label140
//
this.label140.AutoSize = true;
- this.label140.Location = new System.Drawing.Point(7, 154);
+ this.label140.Location = new System.Drawing.Point(9, 192);
+ this.label140.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label140.Name = "label140";
- this.label140.Size = new System.Drawing.Size(41, 12);
+ this.label140.Size = new System.Drawing.Size(53, 15);
this.label140.TabIndex = 15;
this.label140.Text = "宸ヤ綅5:";
this.label140.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -736,9 +761,10 @@
// label138
//
this.label138.AutoSize = true;
- this.label138.Location = new System.Drawing.Point(7, 120);
+ this.label138.Location = new System.Drawing.Point(9, 150);
+ this.label138.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label138.Name = "label138";
- this.label138.Size = new System.Drawing.Size(41, 12);
+ this.label138.Size = new System.Drawing.Size(53, 15);
this.label138.TabIndex = 15;
this.label138.Text = "宸ヤ綅4:";
this.label138.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -746,9 +772,10 @@
// label136
//
this.label136.AutoSize = true;
- this.label136.Location = new System.Drawing.Point(7, 89);
+ this.label136.Location = new System.Drawing.Point(9, 111);
+ this.label136.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label136.Name = "label136";
- this.label136.Size = new System.Drawing.Size(41, 12);
+ this.label136.Size = new System.Drawing.Size(53, 15);
this.label136.TabIndex = 15;
this.label136.Text = "宸ヤ綅3:";
this.label136.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -756,9 +783,10 @@
// label134
//
this.label134.AutoSize = true;
- this.label134.Location = new System.Drawing.Point(7, 58);
+ this.label134.Location = new System.Drawing.Point(9, 72);
+ this.label134.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label134.Name = "label134";
- this.label134.Size = new System.Drawing.Size(41, 12);
+ this.label134.Size = new System.Drawing.Size(53, 15);
this.label134.TabIndex = 15;
this.label134.Text = "宸ヤ綅2:";
this.label134.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -766,105 +794,118 @@
// label36
//
this.label36.AutoSize = true;
- this.label36.Location = new System.Drawing.Point(7, 26);
+ this.label36.Location = new System.Drawing.Point(9, 32);
+ this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label36.Name = "label36";
- this.label36.Size = new System.Drawing.Size(41, 12);
+ this.label36.Size = new System.Drawing.Size(53, 15);
this.label36.TabIndex = 15;
this.label36.Text = "宸ヤ綅1:";
this.label36.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// textBox89
//
- this.textBox89.Location = new System.Drawing.Point(52, 149);
+ this.textBox89.Location = new System.Drawing.Point(69, 186);
+ this.textBox89.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox89.Name = "textBox89";
- this.textBox89.Size = new System.Drawing.Size(58, 21);
+ this.textBox89.Size = new System.Drawing.Size(76, 25);
this.textBox89.TabIndex = 18;
this.textBox89.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label139
//
this.label139.AutoSize = true;
- this.label139.Location = new System.Drawing.Point(116, 152);
+ this.label139.Location = new System.Drawing.Point(155, 190);
+ this.label139.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label139.Name = "label139";
- this.label139.Size = new System.Drawing.Size(17, 12);
+ this.label139.Size = new System.Drawing.Size(23, 15);
this.label139.TabIndex = 16;
this.label139.Text = "mm";
//
// textBox88
//
- this.textBox88.Location = new System.Drawing.Point(52, 115);
+ this.textBox88.Location = new System.Drawing.Point(69, 144);
+ this.textBox88.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox88.Name = "textBox88";
- this.textBox88.Size = new System.Drawing.Size(58, 21);
+ this.textBox88.Size = new System.Drawing.Size(76, 25);
this.textBox88.TabIndex = 18;
this.textBox88.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label137
//
this.label137.AutoSize = true;
- this.label137.Location = new System.Drawing.Point(116, 118);
+ this.label137.Location = new System.Drawing.Point(155, 148);
+ this.label137.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label137.Name = "label137";
- this.label137.Size = new System.Drawing.Size(17, 12);
+ this.label137.Size = new System.Drawing.Size(23, 15);
this.label137.TabIndex = 16;
this.label137.Text = "mm";
//
// textBox87
//
- this.textBox87.Location = new System.Drawing.Point(52, 84);
+ this.textBox87.Location = new System.Drawing.Point(69, 105);
+ this.textBox87.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox87.Name = "textBox87";
- this.textBox87.Size = new System.Drawing.Size(58, 21);
+ this.textBox87.Size = new System.Drawing.Size(76, 25);
this.textBox87.TabIndex = 18;
this.textBox87.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label135
//
this.label135.AutoSize = true;
- this.label135.Location = new System.Drawing.Point(116, 87);
+ this.label135.Location = new System.Drawing.Point(155, 109);
+ this.label135.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label135.Name = "label135";
- this.label135.Size = new System.Drawing.Size(17, 12);
+ this.label135.Size = new System.Drawing.Size(23, 15);
this.label135.TabIndex = 16;
this.label135.Text = "mm";
//
// textBox86
//
- this.textBox86.Location = new System.Drawing.Point(52, 53);
+ this.textBox86.Location = new System.Drawing.Point(69, 66);
+ this.textBox86.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox86.Name = "textBox86";
- this.textBox86.Size = new System.Drawing.Size(58, 21);
+ this.textBox86.Size = new System.Drawing.Size(76, 25);
this.textBox86.TabIndex = 18;
this.textBox86.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label133
//
this.label133.AutoSize = true;
- this.label133.Location = new System.Drawing.Point(116, 56);
+ this.label133.Location = new System.Drawing.Point(155, 70);
+ this.label133.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label133.Name = "label133";
- this.label133.Size = new System.Drawing.Size(17, 12);
+ this.label133.Size = new System.Drawing.Size(23, 15);
this.label133.TabIndex = 16;
this.label133.Text = "mm";
//
// textBox20
//
- this.textBox20.Location = new System.Drawing.Point(52, 21);
+ this.textBox20.Location = new System.Drawing.Point(69, 26);
+ this.textBox20.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox20.Name = "textBox20";
- this.textBox20.Size = new System.Drawing.Size(58, 21);
+ this.textBox20.Size = new System.Drawing.Size(76, 25);
this.textBox20.TabIndex = 18;
this.textBox20.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label118
//
this.label118.AutoSize = true;
- this.label118.Location = new System.Drawing.Point(116, 24);
+ this.label118.Location = new System.Drawing.Point(155, 30);
+ this.label118.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label118.Name = "label118";
- this.label118.Size = new System.Drawing.Size(17, 12);
+ this.label118.Size = new System.Drawing.Size(23, 15);
this.label118.TabIndex = 16;
this.label118.Text = "mm";
//
// textBox21
//
- this.textBox21.Location = new System.Drawing.Point(709, 358);
+ this.textBox21.Location = new System.Drawing.Point(945, 448);
+ this.textBox21.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox21.Name = "textBox21";
- this.textBox21.Size = new System.Drawing.Size(58, 21);
+ this.textBox21.Size = new System.Drawing.Size(76, 25);
this.textBox21.TabIndex = 19;
this.textBox21.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ this.textBox21.Visible = false;
//
// groupBox1
//
@@ -883,73 +924,83 @@
this.groupBox1.Controls.Add(this.textBox19);
this.groupBox1.Controls.Add(this.label115);
this.groupBox1.Controls.Add(this.label113);
- this.groupBox1.Location = new System.Drawing.Point(664, 3);
+ this.groupBox1.Location = new System.Drawing.Point(885, 4);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(149, 166);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox1.Size = new System.Drawing.Size(199, 208);
this.groupBox1.TabIndex = 12;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "鍘氬害琛ュ伩鍊艰瀹�";
+ this.groupBox1.Visible = false;
//
// label132
//
this.label132.AutoSize = true;
- this.label132.Location = new System.Drawing.Point(4, 137);
+ this.label132.Location = new System.Drawing.Point(5, 171);
+ this.label132.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label132.Name = "label132";
- this.label132.Size = new System.Drawing.Size(41, 12);
+ this.label132.Size = new System.Drawing.Size(53, 15);
this.label132.TabIndex = 11;
this.label132.Text = "宸ヤ綅5:";
this.label132.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// textBox85
//
- this.textBox85.Location = new System.Drawing.Point(52, 134);
+ this.textBox85.Location = new System.Drawing.Point(69, 168);
+ this.textBox85.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox85.Name = "textBox85";
- this.textBox85.Size = new System.Drawing.Size(58, 21);
+ this.textBox85.Size = new System.Drawing.Size(76, 25);
this.textBox85.TabIndex = 13;
this.textBox85.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label130
//
this.label130.AutoSize = true;
- this.label130.Location = new System.Drawing.Point(4, 109);
+ this.label130.Location = new System.Drawing.Point(5, 136);
+ this.label130.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label130.Name = "label130";
- this.label130.Size = new System.Drawing.Size(41, 12);
+ this.label130.Size = new System.Drawing.Size(53, 15);
this.label130.TabIndex = 11;
this.label130.Text = "宸ヤ綅4:";
this.label130.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// textBox84
//
- this.textBox84.Location = new System.Drawing.Point(52, 106);
+ this.textBox84.Location = new System.Drawing.Point(69, 132);
+ this.textBox84.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox84.Name = "textBox84";
- this.textBox84.Size = new System.Drawing.Size(58, 21);
+ this.textBox84.Size = new System.Drawing.Size(76, 25);
this.textBox84.TabIndex = 13;
this.textBox84.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label128
//
this.label128.AutoSize = true;
- this.label128.Location = new System.Drawing.Point(4, 82);
+ this.label128.Location = new System.Drawing.Point(5, 102);
+ this.label128.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label128.Name = "label128";
- this.label128.Size = new System.Drawing.Size(41, 12);
+ this.label128.Size = new System.Drawing.Size(53, 15);
this.label128.TabIndex = 11;
this.label128.Text = "宸ヤ綅3:";
this.label128.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// textBox83
//
- this.textBox83.Location = new System.Drawing.Point(52, 79);
+ this.textBox83.Location = new System.Drawing.Point(69, 99);
+ this.textBox83.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox83.Name = "textBox83";
- this.textBox83.Size = new System.Drawing.Size(58, 21);
+ this.textBox83.Size = new System.Drawing.Size(76, 25);
this.textBox83.TabIndex = 13;
this.textBox83.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label116
//
this.label116.AutoSize = true;
- this.label116.Location = new System.Drawing.Point(4, 53);
+ this.label116.Location = new System.Drawing.Point(5, 66);
+ this.label116.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label116.Name = "label116";
- this.label116.Size = new System.Drawing.Size(41, 12);
+ this.label116.Size = new System.Drawing.Size(53, 15);
this.label116.TabIndex = 11;
this.label116.Text = "宸ヤ綅2:";
this.label116.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -957,35 +1008,39 @@
// label131
//
this.label131.AutoSize = true;
- this.label131.Location = new System.Drawing.Point(116, 137);
+ this.label131.Location = new System.Drawing.Point(155, 171);
+ this.label131.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label131.Name = "label131";
- this.label131.Size = new System.Drawing.Size(17, 12);
+ this.label131.Size = new System.Drawing.Size(23, 15);
this.label131.TabIndex = 12;
this.label131.Text = "mm";
//
// textBox82
//
- this.textBox82.Location = new System.Drawing.Point(52, 50);
+ this.textBox82.Location = new System.Drawing.Point(69, 62);
+ this.textBox82.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox82.Name = "textBox82";
- this.textBox82.Size = new System.Drawing.Size(58, 21);
+ this.textBox82.Size = new System.Drawing.Size(76, 25);
this.textBox82.TabIndex = 13;
this.textBox82.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label129
//
this.label129.AutoSize = true;
- this.label129.Location = new System.Drawing.Point(116, 109);
+ this.label129.Location = new System.Drawing.Point(155, 136);
+ this.label129.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label129.Name = "label129";
- this.label129.Size = new System.Drawing.Size(17, 12);
+ this.label129.Size = new System.Drawing.Size(23, 15);
this.label129.TabIndex = 12;
this.label129.Text = "mm";
//
// label114
//
this.label114.AutoSize = true;
- this.label114.Location = new System.Drawing.Point(4, 25);
+ this.label114.Location = new System.Drawing.Point(5, 31);
+ this.label114.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label114.Name = "label114";
- this.label114.Size = new System.Drawing.Size(41, 12);
+ this.label114.Size = new System.Drawing.Size(53, 15);
this.label114.TabIndex = 11;
this.label114.Text = "宸ヤ綅1:";
this.label114.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -993,44 +1048,49 @@
// label117
//
this.label117.AutoSize = true;
- this.label117.Location = new System.Drawing.Point(116, 82);
+ this.label117.Location = new System.Drawing.Point(155, 102);
+ this.label117.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label117.Name = "label117";
- this.label117.Size = new System.Drawing.Size(17, 12);
+ this.label117.Size = new System.Drawing.Size(23, 15);
this.label117.TabIndex = 12;
this.label117.Text = "mm";
//
// textBox19
//
- this.textBox19.Location = new System.Drawing.Point(52, 22);
+ this.textBox19.Location = new System.Drawing.Point(69, 28);
+ this.textBox19.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox19.Name = "textBox19";
- this.textBox19.Size = new System.Drawing.Size(58, 21);
+ this.textBox19.Size = new System.Drawing.Size(76, 25);
this.textBox19.TabIndex = 13;
this.textBox19.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label115
//
this.label115.AutoSize = true;
- this.label115.Location = new System.Drawing.Point(116, 53);
+ this.label115.Location = new System.Drawing.Point(155, 66);
+ this.label115.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label115.Name = "label115";
- this.label115.Size = new System.Drawing.Size(17, 12);
+ this.label115.Size = new System.Drawing.Size(23, 15);
this.label115.TabIndex = 12;
this.label115.Text = "mm";
//
// label113
//
this.label113.AutoSize = true;
- this.label113.Location = new System.Drawing.Point(116, 25);
+ this.label113.Location = new System.Drawing.Point(155, 31);
+ this.label113.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label113.Name = "label113";
- this.label113.Size = new System.Drawing.Size(17, 12);
+ this.label113.Size = new System.Drawing.Size(23, 15);
this.label113.TabIndex = 12;
this.label113.Text = "mm";
//
// label119
//
this.label119.AutoSize = true;
- this.label119.Location = new System.Drawing.Point(773, 361);
+ this.label119.Location = new System.Drawing.Point(1031, 451);
+ this.label119.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label119.Name = "label119";
- this.label119.Size = new System.Drawing.Size(17, 12);
+ this.label119.Size = new System.Drawing.Size(23, 15);
this.label119.TabIndex = 17;
this.label119.Text = "mm";
//
@@ -1042,9 +1102,11 @@
this.gbOtherParams.Controls.Add(this.tbLoadRobotSpeed);
this.gbOtherParams.Controls.Add(this.label9);
this.gbOtherParams.Controls.Add(this.label120);
- this.gbOtherParams.Location = new System.Drawing.Point(499, 314);
+ this.gbOtherParams.Location = new System.Drawing.Point(665, 392);
+ this.gbOtherParams.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gbOtherParams.Name = "gbOtherParams";
- this.gbOtherParams.Size = new System.Drawing.Size(160, 76);
+ this.gbOtherParams.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbOtherParams.Size = new System.Drawing.Size(213, 95);
this.gbOtherParams.TabIndex = 11;
this.gbOtherParams.TabStop = false;
this.gbOtherParams.Text = "鏈烘鎵嬮�熷害璁惧畾";
@@ -1052,17 +1114,19 @@
// label12
//
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(4, 46);
+ this.label12.Location = new System.Drawing.Point(5, 58);
+ this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(95, 12);
+ this.label12.Size = new System.Drawing.Size(120, 15);
this.label12.TabIndex = 8;
this.label12.Text = "涓嬫枡鏈烘鎵嬮�熷害:";
//
// tbUnloadRobotSpeed
//
- this.tbUnloadRobotSpeed.Location = new System.Drawing.Point(100, 43);
+ this.tbUnloadRobotSpeed.Location = new System.Drawing.Point(133, 54);
+ this.tbUnloadRobotSpeed.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tbUnloadRobotSpeed.Name = "tbUnloadRobotSpeed";
- this.tbUnloadRobotSpeed.Size = new System.Drawing.Size(35, 21);
+ this.tbUnloadRobotSpeed.Size = new System.Drawing.Size(45, 25);
this.tbUnloadRobotSpeed.TabIndex = 10;
this.tbUnloadRobotSpeed.Text = "60";
this.tbUnloadRobotSpeed.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -1070,17 +1134,19 @@
// label121
//
this.label121.AutoSize = true;
- this.label121.Location = new System.Drawing.Point(4, 19);
+ this.label121.Location = new System.Drawing.Point(5, 24);
+ this.label121.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label121.Name = "label121";
- this.label121.Size = new System.Drawing.Size(95, 12);
+ this.label121.Size = new System.Drawing.Size(120, 15);
this.label121.TabIndex = 8;
this.label121.Text = "涓婃枡鏈烘鎵嬮�熷害:";
//
// tbLoadRobotSpeed
//
- this.tbLoadRobotSpeed.Location = new System.Drawing.Point(100, 16);
+ this.tbLoadRobotSpeed.Location = new System.Drawing.Point(133, 20);
+ this.tbLoadRobotSpeed.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tbLoadRobotSpeed.Name = "tbLoadRobotSpeed";
- this.tbLoadRobotSpeed.Size = new System.Drawing.Size(35, 21);
+ this.tbLoadRobotSpeed.Size = new System.Drawing.Size(45, 25);
this.tbLoadRobotSpeed.TabIndex = 10;
this.tbLoadRobotSpeed.Text = "60";
this.tbLoadRobotSpeed.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -1088,18 +1154,20 @@
// label9
//
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(139, 46);
+ this.label9.Location = new System.Drawing.Point(185, 58);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(11, 12);
+ this.label9.Size = new System.Drawing.Size(15, 15);
this.label9.TabIndex = 9;
this.label9.Text = "%";
//
// label120
//
this.label120.AutoSize = true;
- this.label120.Location = new System.Drawing.Point(139, 19);
+ this.label120.Location = new System.Drawing.Point(185, 24);
+ this.label120.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label120.Name = "label120";
- this.label120.Size = new System.Drawing.Size(11, 12);
+ this.label120.Size = new System.Drawing.Size(15, 15);
this.label120.TabIndex = 9;
this.label120.Text = "%";
//
@@ -1157,452 +1225,506 @@
this.groupBox13.Controls.Add(this.label38);
this.groupBox13.Controls.Add(this.label34);
this.groupBox13.Controls.Add(this.label33);
- this.groupBox13.Location = new System.Drawing.Point(3, 2);
+ this.groupBox13.Location = new System.Drawing.Point(4, 2);
+ this.groupBox13.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox13.Name = "groupBox13";
- this.groupBox13.Size = new System.Drawing.Size(493, 389);
+ this.groupBox13.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox13.Size = new System.Drawing.Size(657, 486);
this.groupBox13.TabIndex = 7;
this.groupBox13.TabStop = false;
this.groupBox13.Text = "杞磋瀹�";
//
// textBox80
//
- this.textBox80.Location = new System.Drawing.Point(423, 116);
+ this.textBox80.Location = new System.Drawing.Point(564, 145);
+ this.textBox80.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox80.Name = "textBox80";
- this.textBox80.Size = new System.Drawing.Size(65, 21);
+ this.textBox80.Size = new System.Drawing.Size(85, 25);
this.textBox80.TabIndex = 63;
this.textBox80.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox81
//
- this.textBox81.Location = new System.Drawing.Point(423, 84);
+ this.textBox81.Location = new System.Drawing.Point(564, 105);
+ this.textBox81.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox81.Name = "textBox81";
- this.textBox81.Size = new System.Drawing.Size(65, 21);
+ this.textBox81.Size = new System.Drawing.Size(85, 25);
this.textBox81.TabIndex = 64;
this.textBox81.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label122
//
this.label122.AutoSize = true;
- this.label122.Location = new System.Drawing.Point(314, 120);
+ this.label122.Location = new System.Drawing.Point(419, 150);
+ this.label122.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label122.Name = "label122";
- this.label122.Size = new System.Drawing.Size(107, 12);
+ this.label122.Size = new System.Drawing.Size(136, 15);
this.label122.TabIndex = 62;
this.label122.Text = "Y1杞存壂鎻忓洖褰掍綅缃�:";
//
// label123
//
this.label123.AutoSize = true;
- this.label123.Location = new System.Drawing.Point(314, 87);
+ this.label123.Location = new System.Drawing.Point(419, 109);
+ this.label123.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label123.Name = "label123";
- this.label123.Size = new System.Drawing.Size(107, 12);
+ this.label123.Size = new System.Drawing.Size(136, 15);
this.label123.TabIndex = 61;
this.label123.Text = "X1杞存壂鎻忓洖褰掍綅缃�:";
//
// textBox32
//
- this.textBox32.Location = new System.Drawing.Point(88, 154);
+ this.textBox32.Location = new System.Drawing.Point(117, 192);
+ this.textBox32.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox32.Name = "textBox32";
- this.textBox32.Size = new System.Drawing.Size(65, 21);
+ this.textBox32.Size = new System.Drawing.Size(85, 25);
this.textBox32.TabIndex = 56;
this.textBox32.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label42
//
this.label42.AutoSize = true;
- this.label42.Location = new System.Drawing.Point(15, 157);
+ this.label42.Location = new System.Drawing.Point(20, 196);
+ this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label42.Name = "label42";
- this.label42.Size = new System.Drawing.Size(59, 12);
+ this.label42.Size = new System.Drawing.Size(76, 15);
this.label42.TabIndex = 55;
this.label42.Text = "X1杞撮�熷害:";
//
// textBox27
//
- this.textBox27.Location = new System.Drawing.Point(244, 356);
+ this.textBox27.Location = new System.Drawing.Point(325, 445);
+ this.textBox27.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox27.Name = "textBox27";
- this.textBox27.Size = new System.Drawing.Size(65, 21);
+ this.textBox27.Size = new System.Drawing.Size(85, 25);
this.textBox27.TabIndex = 53;
this.textBox27.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox25
//
- this.textBox25.Location = new System.Drawing.Point(423, 47);
+ this.textBox25.Location = new System.Drawing.Point(564, 59);
+ this.textBox25.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox25.Name = "textBox25";
- this.textBox25.Size = new System.Drawing.Size(65, 21);
+ this.textBox25.Size = new System.Drawing.Size(85, 25);
this.textBox25.TabIndex = 53;
this.textBox25.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox33
//
- this.textBox33.Location = new System.Drawing.Point(243, 154);
+ this.textBox33.Location = new System.Drawing.Point(324, 192);
+ this.textBox33.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox33.Name = "textBox33";
- this.textBox33.Size = new System.Drawing.Size(65, 21);
+ this.textBox33.Size = new System.Drawing.Size(85, 25);
this.textBox33.TabIndex = 53;
this.textBox33.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox26
//
- this.textBox26.Location = new System.Drawing.Point(88, 356);
+ this.textBox26.Location = new System.Drawing.Point(117, 445);
+ this.textBox26.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox26.Name = "textBox26";
- this.textBox26.Size = new System.Drawing.Size(65, 21);
+ this.textBox26.Size = new System.Drawing.Size(85, 25);
this.textBox26.TabIndex = 54;
this.textBox26.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox24
//
- this.textBox24.Location = new System.Drawing.Point(423, 15);
+ this.textBox24.Location = new System.Drawing.Point(564, 19);
+ this.textBox24.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox24.Name = "textBox24";
- this.textBox24.Size = new System.Drawing.Size(65, 21);
+ this.textBox24.Size = new System.Drawing.Size(85, 25);
this.textBox24.TabIndex = 54;
this.textBox24.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label41
//
this.label41.AutoSize = true;
- this.label41.Location = new System.Drawing.Point(172, 359);
+ this.label41.Location = new System.Drawing.Point(229, 449);
+ this.label41.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label41.Name = "label41";
- this.label41.Size = new System.Drawing.Size(59, 12);
+ this.label41.Size = new System.Drawing.Size(76, 15);
this.label41.TabIndex = 52;
this.label41.Text = "Y2杞撮�熷害:";
//
// label18
//
this.label18.AutoSize = true;
- this.label18.Location = new System.Drawing.Point(314, 51);
+ this.label18.Location = new System.Drawing.Point(419, 64);
+ this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(107, 12);
+ this.label18.Size = new System.Drawing.Size(136, 15);
this.label18.TabIndex = 52;
this.label18.Text = "Y1杞存壂鎻忓畬鎴愪綅缃�:";
//
// label43
//
this.label43.AutoSize = true;
- this.label43.Location = new System.Drawing.Point(173, 157);
+ this.label43.Location = new System.Drawing.Point(231, 196);
+ this.label43.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label43.Name = "label43";
- this.label43.Size = new System.Drawing.Size(59, 12);
+ this.label43.Size = new System.Drawing.Size(76, 15);
this.label43.TabIndex = 52;
this.label43.Text = "Y1杞撮�熷害:";
//
// label40
//
this.label40.AutoSize = true;
- this.label40.Location = new System.Drawing.Point(14, 359);
+ this.label40.Location = new System.Drawing.Point(19, 449);
+ this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label40.Name = "label40";
- this.label40.Size = new System.Drawing.Size(59, 12);
+ this.label40.Size = new System.Drawing.Size(76, 15);
this.label40.TabIndex = 51;
this.label40.Text = "X2杞撮�熷害:";
//
// label15
//
this.label15.AutoSize = true;
- this.label15.Location = new System.Drawing.Point(314, 18);
+ this.label15.Location = new System.Drawing.Point(419, 22);
+ this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(107, 12);
+ this.label15.Size = new System.Drawing.Size(136, 15);
this.label15.TabIndex = 51;
this.label15.Text = "X1杞存壂鎻忓畬鎴愪綅缃�:";
//
// textBox1
//
- this.textBox1.Location = new System.Drawing.Point(243, 225);
+ this.textBox1.Location = new System.Drawing.Point(324, 281);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(65, 21);
+ this.textBox1.Size = new System.Drawing.Size(85, 25);
this.textBox1.TabIndex = 45;
this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox2
//
- this.textBox2.Location = new System.Drawing.Point(243, 327);
+ this.textBox2.Location = new System.Drawing.Point(324, 409);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(65, 21);
+ this.textBox2.Size = new System.Drawing.Size(85, 25);
this.textBox2.TabIndex = 46;
this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox3
//
- this.textBox3.Location = new System.Drawing.Point(243, 290);
+ this.textBox3.Location = new System.Drawing.Point(324, 362);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(65, 21);
+ this.textBox3.Size = new System.Drawing.Size(85, 25);
this.textBox3.TabIndex = 42;
this.textBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox4
//
- this.textBox4.Location = new System.Drawing.Point(88, 292);
+ this.textBox4.Location = new System.Drawing.Point(117, 365);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(65, 21);
+ this.textBox4.Size = new System.Drawing.Size(85, 25);
this.textBox4.TabIndex = 43;
this.textBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox5
//
- this.textBox5.Location = new System.Drawing.Point(88, 326);
+ this.textBox5.Location = new System.Drawing.Point(117, 408);
+ this.textBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox5.Name = "textBox5";
- this.textBox5.Size = new System.Drawing.Size(65, 21);
+ this.textBox5.Size = new System.Drawing.Size(85, 25);
this.textBox5.TabIndex = 44;
this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox6
//
- this.textBox6.Location = new System.Drawing.Point(243, 256);
+ this.textBox6.Location = new System.Drawing.Point(324, 320);
+ this.textBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox6.Name = "textBox6";
- this.textBox6.Size = new System.Drawing.Size(65, 21);
+ this.textBox6.Size = new System.Drawing.Size(85, 25);
this.textBox6.TabIndex = 41;
this.textBox6.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox8
//
- this.textBox8.Location = new System.Drawing.Point(88, 258);
+ this.textBox8.Location = new System.Drawing.Point(117, 322);
+ this.textBox8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox8.Name = "textBox8";
- this.textBox8.Size = new System.Drawing.Size(65, 21);
+ this.textBox8.Size = new System.Drawing.Size(85, 25);
this.textBox8.TabIndex = 40;
this.textBox8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox12
//
- this.textBox12.Location = new System.Drawing.Point(88, 224);
+ this.textBox12.Location = new System.Drawing.Point(117, 280);
+ this.textBox12.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox12.Name = "textBox12";
- this.textBox12.Size = new System.Drawing.Size(65, 21);
+ this.textBox12.Size = new System.Drawing.Size(85, 25);
this.textBox12.TabIndex = 50;
this.textBox12.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox13
//
- this.textBox13.Location = new System.Drawing.Point(243, 190);
+ this.textBox13.Location = new System.Drawing.Point(324, 238);
+ this.textBox13.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox13.Name = "textBox13";
- this.textBox13.Size = new System.Drawing.Size(65, 21);
+ this.textBox13.Size = new System.Drawing.Size(85, 25);
this.textBox13.TabIndex = 47;
this.textBox13.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox14
//
- this.textBox14.Location = new System.Drawing.Point(88, 190);
+ this.textBox14.Location = new System.Drawing.Point(117, 238);
+ this.textBox14.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox14.Name = "textBox14";
- this.textBox14.Size = new System.Drawing.Size(65, 21);
+ this.textBox14.Size = new System.Drawing.Size(85, 25);
this.textBox14.TabIndex = 48;
this.textBox14.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(160, 227);
+ this.label1.Location = new System.Drawing.Point(213, 284);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(83, 12);
+ this.label1.Size = new System.Drawing.Size(106, 15);
this.label1.TabIndex = 33;
this.label1.Text = "Y2杞村畾浣嶉�熷害:";
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(162, 295);
+ this.label2.Location = new System.Drawing.Point(216, 369);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(83, 12);
+ this.label2.Size = new System.Drawing.Size(106, 15);
this.label2.TabIndex = 30;
this.label2.Text = "Y2杞存墜鍔ㄩ�熷害:";
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(6, 295);
+ this.label3.Location = new System.Drawing.Point(8, 369);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(83, 12);
+ this.label3.Size = new System.Drawing.Size(106, 15);
this.label3.TabIndex = 29;
this.label3.Text = "X2杞存墜鍔ㄩ�熷害:";
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(160, 329);
+ this.label4.Location = new System.Drawing.Point(213, 411);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(83, 12);
+ this.label4.Size = new System.Drawing.Size(106, 15);
this.label4.TabIndex = 31;
this.label4.Text = "Y2杞寸瓑寰呬綅缃�:";
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(162, 261);
+ this.label5.Location = new System.Drawing.Point(216, 326);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(83, 12);
+ this.label5.Size = new System.Drawing.Size(106, 15);
this.label5.TabIndex = 34;
this.label5.Text = "Y2杞村畾浣嶄綅缃�:";
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(6, 261);
+ this.label6.Location = new System.Drawing.Point(8, 326);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(83, 12);
+ this.label6.Size = new System.Drawing.Size(106, 15);
this.label6.TabIndex = 35;
this.label6.Text = "X2杞村畾浣嶄綅缃�:";
//
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(6, 329);
+ this.label7.Location = new System.Drawing.Point(8, 411);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(83, 12);
+ this.label7.Size = new System.Drawing.Size(106, 15);
this.label7.TabIndex = 38;
this.label7.Text = "X2杞寸瓑寰呬綅缃�:";
//
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(6, 227);
+ this.label8.Location = new System.Drawing.Point(8, 284);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(83, 12);
+ this.label8.Size = new System.Drawing.Size(106, 15);
this.label8.TabIndex = 39;
this.label8.Text = "X2杞村畾浣嶉�熷害:";
//
// label10
//
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(160, 193);
+ this.label10.Location = new System.Drawing.Point(213, 241);
+ this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(83, 12);
+ this.label10.Size = new System.Drawing.Size(107, 15);
this.label10.TabIndex = 37;
this.label10.Text = "X2Y2涓よ酱鍑忛��:";
//
// label11
//
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(6, 193);
+ this.label11.Location = new System.Drawing.Point(8, 241);
+ this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(83, 12);
+ this.label11.Size = new System.Drawing.Size(107, 15);
this.label11.TabIndex = 32;
this.label11.Text = "X2Y2涓よ酱鍔犻��:";
//
// textBox29
//
- this.textBox29.Location = new System.Drawing.Point(243, 49);
+ this.textBox29.Location = new System.Drawing.Point(324, 61);
+ this.textBox29.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox29.Name = "textBox29";
- this.textBox29.Size = new System.Drawing.Size(65, 21);
+ this.textBox29.Size = new System.Drawing.Size(85, 25);
this.textBox29.TabIndex = 23;
this.textBox29.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox31
//
- this.textBox31.Location = new System.Drawing.Point(243, 118);
+ this.textBox31.Location = new System.Drawing.Point(324, 148);
+ this.textBox31.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox31.Name = "textBox31";
- this.textBox31.Size = new System.Drawing.Size(65, 21);
+ this.textBox31.Size = new System.Drawing.Size(85, 25);
this.textBox31.TabIndex = 21;
this.textBox31.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox28
//
- this.textBox28.Location = new System.Drawing.Point(88, 117);
+ this.textBox28.Location = new System.Drawing.Point(117, 146);
+ this.textBox28.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox28.Name = "textBox28";
- this.textBox28.Size = new System.Drawing.Size(65, 21);
+ this.textBox28.Size = new System.Drawing.Size(85, 25);
this.textBox28.TabIndex = 21;
this.textBox28.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox30
//
- this.textBox30.Location = new System.Drawing.Point(243, 84);
+ this.textBox30.Location = new System.Drawing.Point(324, 105);
+ this.textBox30.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox30.Name = "textBox30";
- this.textBox30.Size = new System.Drawing.Size(65, 21);
+ this.textBox30.Size = new System.Drawing.Size(85, 25);
this.textBox30.TabIndex = 20;
this.textBox30.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox23
//
- this.textBox23.Location = new System.Drawing.Point(88, 83);
+ this.textBox23.Location = new System.Drawing.Point(117, 104);
+ this.textBox23.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox23.Name = "textBox23";
- this.textBox23.Size = new System.Drawing.Size(65, 21);
+ this.textBox23.Size = new System.Drawing.Size(85, 25);
this.textBox23.TabIndex = 20;
this.textBox23.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox22
//
- this.textBox22.Location = new System.Drawing.Point(88, 49);
+ this.textBox22.Location = new System.Drawing.Point(117, 61);
+ this.textBox22.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox22.Name = "textBox22";
- this.textBox22.Size = new System.Drawing.Size(65, 21);
+ this.textBox22.Size = new System.Drawing.Size(85, 25);
this.textBox22.TabIndex = 28;
this.textBox22.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox18
//
- this.textBox18.Location = new System.Drawing.Point(243, 15);
+ this.textBox18.Location = new System.Drawing.Point(324, 19);
+ this.textBox18.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox18.Name = "textBox18";
- this.textBox18.Size = new System.Drawing.Size(65, 21);
+ this.textBox18.Size = new System.Drawing.Size(85, 25);
this.textBox18.TabIndex = 25;
this.textBox18.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox17
//
- this.textBox17.Location = new System.Drawing.Point(88, 15);
+ this.textBox17.Location = new System.Drawing.Point(117, 19);
+ this.textBox17.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox17.Name = "textBox17";
- this.textBox17.Size = new System.Drawing.Size(65, 21);
+ this.textBox17.Size = new System.Drawing.Size(85, 25);
this.textBox17.TabIndex = 26;
this.textBox17.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label50
//
this.label50.AutoSize = true;
- this.label50.Location = new System.Drawing.Point(158, 52);
+ this.label50.Location = new System.Drawing.Point(211, 65);
+ this.label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label50.Name = "label50";
- this.label50.Size = new System.Drawing.Size(83, 12);
+ this.label50.Size = new System.Drawing.Size(106, 15);
this.label50.TabIndex = 5;
this.label50.Text = "Y1杞村畾浣嶉�熷害:";
//
// label60
//
this.label60.AutoSize = true;
- this.label60.Location = new System.Drawing.Point(158, 120);
+ this.label60.Location = new System.Drawing.Point(211, 150);
+ this.label60.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label60.Name = "label60";
- this.label60.Size = new System.Drawing.Size(83, 12);
+ this.label60.Size = new System.Drawing.Size(106, 15);
this.label60.TabIndex = 2;
this.label60.Text = "Y1杞存墜鍔ㄩ�熷害:";
//
// label49
//
this.label49.AutoSize = true;
- this.label49.Location = new System.Drawing.Point(6, 120);
+ this.label49.Location = new System.Drawing.Point(8, 150);
+ this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label49.Name = "label49";
- this.label49.Size = new System.Drawing.Size(83, 12);
+ this.label49.Size = new System.Drawing.Size(106, 15);
this.label49.TabIndex = 2;
this.label49.Text = "X1杞存墜鍔ㄩ�熷害:";
//
// label59
//
this.label59.AutoSize = true;
- this.label59.Location = new System.Drawing.Point(160, 86);
+ this.label59.Location = new System.Drawing.Point(213, 108);
+ this.label59.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label59.Name = "label59";
- this.label59.Size = new System.Drawing.Size(83, 12);
+ this.label59.Size = new System.Drawing.Size(106, 15);
this.label59.TabIndex = 6;
this.label59.Text = "Y1杞村畾浣嶄綅缃�:";
//
// label39
//
this.label39.AutoSize = true;
- this.label39.Location = new System.Drawing.Point(6, 86);
+ this.label39.Location = new System.Drawing.Point(8, 108);
+ this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label39.Name = "label39";
- this.label39.Size = new System.Drawing.Size(83, 12);
+ this.label39.Size = new System.Drawing.Size(106, 15);
this.label39.TabIndex = 6;
this.label39.Text = "X1杞村畾浣嶄綅缃�:";
//
// label38
//
this.label38.AutoSize = true;
- this.label38.Location = new System.Drawing.Point(6, 52);
+ this.label38.Location = new System.Drawing.Point(8, 65);
+ this.label38.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(83, 12);
+ this.label38.Size = new System.Drawing.Size(106, 15);
this.label38.TabIndex = 10;
this.label38.Text = "X1杞村畾浣嶉�熷害:";
//
// label34
//
this.label34.AutoSize = true;
- this.label34.Location = new System.Drawing.Point(157, 18);
+ this.label34.Location = new System.Drawing.Point(209, 22);
+ this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label34.Name = "label34";
- this.label34.Size = new System.Drawing.Size(83, 12);
+ this.label34.Size = new System.Drawing.Size(107, 15);
this.label34.TabIndex = 8;
this.label34.Text = "X1Y1涓よ酱鍑忛��:";
//
// label33
//
this.label33.AutoSize = true;
- this.label33.Location = new System.Drawing.Point(6, 18);
+ this.label33.Location = new System.Drawing.Point(8, 22);
+ this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(83, 12);
+ this.label33.Size = new System.Drawing.Size(107, 15);
this.label33.TabIndex = 4;
this.label33.Text = "X1Y1涓よ酱鍔犻��:";
//
@@ -1612,9 +1734,11 @@
this.groupBox2.Controls.Add(this.groupBox8);
this.groupBox2.Controls.Add(this.groupBox6);
this.groupBox2.Controls.Add(this.groupBox7);
- this.groupBox2.Location = new System.Drawing.Point(499, 2);
+ this.groupBox2.Location = new System.Drawing.Point(665, 2);
+ this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(161, 286);
+ this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox2.Size = new System.Drawing.Size(215, 358);
this.groupBox2.TabIndex = 5;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "娴嬮噺椤瑰垽鏂潯浠惰瀹�";
@@ -1627,62 +1751,70 @@
this.groupBox12.Controls.Add(this.label144);
this.groupBox12.Controls.Add(this.label145);
this.groupBox12.Controls.Add(this.label146);
- this.groupBox12.Location = new System.Drawing.Point(5, 215);
+ this.groupBox12.Location = new System.Drawing.Point(7, 269);
+ this.groupBox12.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox12.Name = "groupBox12";
- this.groupBox12.Size = new System.Drawing.Size(150, 62);
+ this.groupBox12.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox12.Size = new System.Drawing.Size(200, 78);
this.groupBox12.TabIndex = 2;
this.groupBox12.TabStop = false;
this.groupBox12.Text = "Z-LSN";
//
// textBox90
//
- this.textBox90.Location = new System.Drawing.Point(42, 12);
+ this.textBox90.Location = new System.Drawing.Point(56, 15);
+ this.textBox90.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox90.Name = "textBox90";
- this.textBox90.Size = new System.Drawing.Size(81, 21);
+ this.textBox90.Size = new System.Drawing.Size(107, 25);
this.textBox90.TabIndex = 2;
this.textBox90.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label143
//
this.label143.AutoSize = true;
- this.label143.Location = new System.Drawing.Point(125, 15);
+ this.label143.Location = new System.Drawing.Point(167, 19);
+ this.label143.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label143.Name = "label143";
- this.label143.Size = new System.Drawing.Size(17, 12);
+ this.label143.Size = new System.Drawing.Size(23, 15);
this.label143.TabIndex = 0;
this.label143.Text = "mm";
//
// textBox91
//
- this.textBox91.Location = new System.Drawing.Point(41, 37);
+ this.textBox91.Location = new System.Drawing.Point(55, 46);
+ this.textBox91.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox91.Name = "textBox91";
- this.textBox91.Size = new System.Drawing.Size(81, 21);
+ this.textBox91.Size = new System.Drawing.Size(107, 25);
this.textBox91.TabIndex = 2;
this.textBox91.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label144
//
this.label144.AutoSize = true;
- this.label144.Location = new System.Drawing.Point(7, 15);
+ this.label144.Location = new System.Drawing.Point(9, 19);
+ this.label144.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label144.Name = "label144";
- this.label144.Size = new System.Drawing.Size(29, 12);
+ this.label144.Size = new System.Drawing.Size(39, 15);
this.label144.TabIndex = 0;
this.label144.Text = "Min:";
//
// label145
//
this.label145.AutoSize = true;
- this.label145.Location = new System.Drawing.Point(124, 40);
+ this.label145.Location = new System.Drawing.Point(165, 50);
+ this.label145.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label145.Name = "label145";
- this.label145.Size = new System.Drawing.Size(17, 12);
+ this.label145.Size = new System.Drawing.Size(23, 15);
this.label145.TabIndex = 0;
this.label145.Text = "mm";
//
// label146
//
this.label146.AutoSize = true;
- this.label146.Location = new System.Drawing.Point(6, 40);
+ this.label146.Location = new System.Drawing.Point(8, 50);
+ this.label146.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label146.Name = "label146";
- this.label146.Size = new System.Drawing.Size(29, 12);
+ this.label146.Size = new System.Drawing.Size(39, 15);
this.label146.TabIndex = 0;
this.label146.Text = "Max:";
//
@@ -1694,62 +1826,70 @@
this.groupBox8.Controls.Add(this.label126);
this.groupBox8.Controls.Add(this.label21);
this.groupBox8.Controls.Add(this.label24);
- this.groupBox8.Location = new System.Drawing.Point(6, 151);
+ this.groupBox8.Location = new System.Drawing.Point(8, 189);
+ this.groupBox8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox8.Name = "groupBox8";
- this.groupBox8.Size = new System.Drawing.Size(150, 62);
+ this.groupBox8.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox8.Size = new System.Drawing.Size(200, 78);
this.groupBox8.TabIndex = 1;
this.groupBox8.TabStop = false;
this.groupBox8.Text = "Z-ATL";
//
// textBox16
//
- this.textBox16.Location = new System.Drawing.Point(42, 12);
+ this.textBox16.Location = new System.Drawing.Point(56, 15);
+ this.textBox16.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox16.Name = "textBox16";
- this.textBox16.Size = new System.Drawing.Size(81, 21);
+ this.textBox16.Size = new System.Drawing.Size(107, 25);
this.textBox16.TabIndex = 2;
this.textBox16.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label127
//
this.label127.AutoSize = true;
- this.label127.Location = new System.Drawing.Point(125, 15);
+ this.label127.Location = new System.Drawing.Point(167, 19);
+ this.label127.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label127.Name = "label127";
- this.label127.Size = new System.Drawing.Size(17, 12);
+ this.label127.Size = new System.Drawing.Size(23, 15);
this.label127.TabIndex = 0;
this.label127.Text = "mm";
//
// textBox11
//
- this.textBox11.Location = new System.Drawing.Point(41, 37);
+ this.textBox11.Location = new System.Drawing.Point(55, 46);
+ this.textBox11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox11.Name = "textBox11";
- this.textBox11.Size = new System.Drawing.Size(81, 21);
+ this.textBox11.Size = new System.Drawing.Size(107, 25);
this.textBox11.TabIndex = 2;
this.textBox11.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label126
//
this.label126.AutoSize = true;
- this.label126.Location = new System.Drawing.Point(7, 15);
+ this.label126.Location = new System.Drawing.Point(9, 19);
+ this.label126.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label126.Name = "label126";
- this.label126.Size = new System.Drawing.Size(29, 12);
+ this.label126.Size = new System.Drawing.Size(39, 15);
this.label126.TabIndex = 0;
this.label126.Text = "Min:";
//
// label21
//
this.label21.AutoSize = true;
- this.label21.Location = new System.Drawing.Point(124, 40);
+ this.label21.Location = new System.Drawing.Point(165, 50);
+ this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(17, 12);
+ this.label21.Size = new System.Drawing.Size(23, 15);
this.label21.TabIndex = 0;
this.label21.Text = "mm";
//
// label24
//
this.label24.AutoSize = true;
- this.label24.Location = new System.Drawing.Point(6, 40);
+ this.label24.Location = new System.Drawing.Point(8, 50);
+ this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(29, 12);
+ this.label24.Size = new System.Drawing.Size(39, 15);
this.label24.TabIndex = 0;
this.label24.Text = "Max:";
//
@@ -1761,62 +1901,70 @@
this.groupBox6.Controls.Add(this.label14);
this.groupBox6.Controls.Add(this.label13);
this.groupBox6.Controls.Add(this.label16);
- this.groupBox6.Location = new System.Drawing.Point(6, 15);
+ this.groupBox6.Location = new System.Drawing.Point(8, 19);
+ this.groupBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox6.Name = "groupBox6";
- this.groupBox6.Size = new System.Drawing.Size(150, 67);
+ this.groupBox6.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox6.Size = new System.Drawing.Size(200, 84);
this.groupBox6.TabIndex = 1;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "X";
//
// textBox10
//
- this.textBox10.Location = new System.Drawing.Point(41, 14);
+ this.textBox10.Location = new System.Drawing.Point(55, 18);
+ this.textBox10.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox10.Name = "textBox10";
- this.textBox10.Size = new System.Drawing.Size(81, 21);
+ this.textBox10.Size = new System.Drawing.Size(107, 25);
this.textBox10.TabIndex = 2;
this.textBox10.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label35
//
this.label35.AutoSize = true;
- this.label35.Location = new System.Drawing.Point(124, 18);
+ this.label35.Location = new System.Drawing.Point(165, 22);
+ this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label35.Name = "label35";
- this.label35.Size = new System.Drawing.Size(17, 12);
+ this.label35.Size = new System.Drawing.Size(23, 15);
this.label35.TabIndex = 0;
this.label35.Text = "mm";
//
// textBox7
//
- this.textBox7.Location = new System.Drawing.Point(41, 39);
+ this.textBox7.Location = new System.Drawing.Point(55, 49);
+ this.textBox7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox7.Name = "textBox7";
- this.textBox7.Size = new System.Drawing.Size(81, 21);
+ this.textBox7.Size = new System.Drawing.Size(107, 25);
this.textBox7.TabIndex = 2;
this.textBox7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label14
//
this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(5, 18);
+ this.label14.Location = new System.Drawing.Point(7, 22);
+ this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(29, 12);
+ this.label14.Size = new System.Drawing.Size(39, 15);
this.label14.TabIndex = 0;
this.label14.Text = "Min:";
//
// label13
//
this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(124, 42);
+ this.label13.Location = new System.Drawing.Point(165, 52);
+ this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(17, 12);
+ this.label13.Size = new System.Drawing.Size(23, 15);
this.label13.TabIndex = 0;
this.label13.Text = "mm";
//
// label16
//
this.label16.AutoSize = true;
- this.label16.Location = new System.Drawing.Point(6, 42);
+ this.label16.Location = new System.Drawing.Point(8, 52);
+ this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(29, 12);
+ this.label16.Size = new System.Drawing.Size(39, 15);
this.label16.TabIndex = 0;
this.label16.Text = "Max:";
//
@@ -1828,62 +1976,70 @@
this.groupBox7.Controls.Add(this.label124);
this.groupBox7.Controls.Add(this.label17);
this.groupBox7.Controls.Add(this.label20);
- this.groupBox7.Location = new System.Drawing.Point(6, 83);
+ this.groupBox7.Location = new System.Drawing.Point(8, 104);
+ this.groupBox7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox7.Name = "groupBox7";
- this.groupBox7.Size = new System.Drawing.Size(150, 67);
+ this.groupBox7.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox7.Size = new System.Drawing.Size(200, 84);
this.groupBox7.TabIndex = 1;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "Y";
//
// textBox15
//
- this.textBox15.Location = new System.Drawing.Point(42, 13);
+ this.textBox15.Location = new System.Drawing.Point(56, 16);
+ this.textBox15.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox15.Name = "textBox15";
- this.textBox15.Size = new System.Drawing.Size(81, 21);
+ this.textBox15.Size = new System.Drawing.Size(107, 25);
this.textBox15.TabIndex = 2;
this.textBox15.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label125
//
this.label125.AutoSize = true;
- this.label125.Location = new System.Drawing.Point(125, 16);
+ this.label125.Location = new System.Drawing.Point(167, 20);
+ this.label125.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label125.Name = "label125";
- this.label125.Size = new System.Drawing.Size(17, 12);
+ this.label125.Size = new System.Drawing.Size(23, 15);
this.label125.TabIndex = 0;
this.label125.Text = "mm";
//
// textBox9
//
- this.textBox9.Location = new System.Drawing.Point(41, 38);
+ this.textBox9.Location = new System.Drawing.Point(55, 48);
+ this.textBox9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox9.Name = "textBox9";
- this.textBox9.Size = new System.Drawing.Size(81, 21);
+ this.textBox9.Size = new System.Drawing.Size(107, 25);
this.textBox9.TabIndex = 2;
this.textBox9.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label124
//
this.label124.AutoSize = true;
- this.label124.Location = new System.Drawing.Point(7, 16);
+ this.label124.Location = new System.Drawing.Point(9, 20);
+ this.label124.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label124.Name = "label124";
- this.label124.Size = new System.Drawing.Size(29, 12);
+ this.label124.Size = new System.Drawing.Size(39, 15);
this.label124.TabIndex = 0;
this.label124.Text = "Min:";
//
// label17
//
this.label17.AutoSize = true;
- this.label17.Location = new System.Drawing.Point(124, 41);
+ this.label17.Location = new System.Drawing.Point(165, 51);
+ this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(17, 12);
+ this.label17.Size = new System.Drawing.Size(23, 15);
this.label17.TabIndex = 0;
this.label17.Text = "mm";
//
// label20
//
this.label20.AutoSize = true;
- this.label20.Location = new System.Drawing.Point(6, 41);
+ this.label20.Location = new System.Drawing.Point(8, 51);
+ this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(29, 12);
+ this.label20.Size = new System.Drawing.Size(39, 15);
this.label20.TabIndex = 0;
this.label20.Text = "Max:";
//
@@ -1944,10 +2100,11 @@
this.tpPLC.Controls.Add(this.btnX1ToOri);
this.tpPLC.Controls.Add(this.btnXYStop);
this.tpPLC.Controls.Add(this.btnTableAction);
- this.tpPLC.Location = new System.Drawing.Point(4, 22);
+ this.tpPLC.Location = new System.Drawing.Point(4, 25);
+ this.tpPLC.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tpPLC.Name = "tpPLC";
- this.tpPLC.Padding = new System.Windows.Forms.Padding(3);
- this.tpPLC.Size = new System.Drawing.Size(817, 473);
+ this.tpPLC.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tpPLC.Size = new System.Drawing.Size(1092, 595);
this.tpPLC.TabIndex = 1;
this.tpPLC.Text = "PLC";
this.tpPLC.UseVisualStyleBackColor = true;
@@ -1955,9 +2112,10 @@
// cbY2AxisEnable
//
this.cbY2AxisEnable.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbY2AxisEnable.Location = new System.Drawing.Point(266, 329);
+ this.cbY2AxisEnable.Location = new System.Drawing.Point(355, 411);
+ this.cbY2AxisEnable.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbY2AxisEnable.Name = "cbY2AxisEnable";
- this.cbY2AxisEnable.Size = new System.Drawing.Size(80, 40);
+ this.cbY2AxisEnable.Size = new System.Drawing.Size(107, 50);
this.cbY2AxisEnable.TabIndex = 74;
this.cbY2AxisEnable.Text = "Y2杞翠娇鑳�";
this.cbY2AxisEnable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1967,9 +2125,10 @@
// cbX2AxisEnable
//
this.cbX2AxisEnable.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbX2AxisEnable.Location = new System.Drawing.Point(179, 329);
+ this.cbX2AxisEnable.Location = new System.Drawing.Point(239, 411);
+ this.cbX2AxisEnable.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbX2AxisEnable.Name = "cbX2AxisEnable";
- this.cbX2AxisEnable.Size = new System.Drawing.Size(80, 40);
+ this.cbX2AxisEnable.Size = new System.Drawing.Size(107, 50);
this.cbX2AxisEnable.TabIndex = 73;
this.cbX2AxisEnable.Text = "X2杞翠娇鑳�";
this.cbX2AxisEnable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1979,9 +2138,10 @@
// cbY1AxisEnable
//
this.cbY1AxisEnable.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbY1AxisEnable.Location = new System.Drawing.Point(93, 329);
+ this.cbY1AxisEnable.Location = new System.Drawing.Point(124, 411);
+ this.cbY1AxisEnable.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbY1AxisEnable.Name = "cbY1AxisEnable";
- this.cbY1AxisEnable.Size = new System.Drawing.Size(80, 40);
+ this.cbY1AxisEnable.Size = new System.Drawing.Size(107, 50);
this.cbY1AxisEnable.TabIndex = 72;
this.cbY1AxisEnable.Text = "Y1杞翠娇鑳�";
this.cbY1AxisEnable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1991,9 +2151,10 @@
// cbX1AxisEnable
//
this.cbX1AxisEnable.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbX1AxisEnable.Location = new System.Drawing.Point(7, 329);
+ this.cbX1AxisEnable.Location = new System.Drawing.Point(9, 411);
+ this.cbX1AxisEnable.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbX1AxisEnable.Name = "cbX1AxisEnable";
- this.cbX1AxisEnable.Size = new System.Drawing.Size(80, 40);
+ this.cbX1AxisEnable.Size = new System.Drawing.Size(107, 50);
this.cbX1AxisEnable.TabIndex = 71;
this.cbX1AxisEnable.Text = "X1杞翠娇鑳�";
this.cbX1AxisEnable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2002,9 +2163,10 @@
//
// btnChangeTuitou
//
- this.btnChangeTuitou.Location = new System.Drawing.Point(611, 217);
+ this.btnChangeTuitou.Location = new System.Drawing.Point(815, 271);
+ this.btnChangeTuitou.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnChangeTuitou.Name = "btnChangeTuitou";
- this.btnChangeTuitou.Size = new System.Drawing.Size(80, 40);
+ this.btnChangeTuitou.Size = new System.Drawing.Size(107, 50);
this.btnChangeTuitou.TabIndex = 70;
this.btnChangeTuitou.Text = "鍒囨崲鎺ㄥご";
this.btnChangeTuitou.UseVisualStyleBackColor = true;
@@ -2013,9 +2175,10 @@
// cbLineMachinePower4
//
this.cbLineMachinePower4.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbLineMachinePower4.Location = new System.Drawing.Point(266, 6);
+ this.cbLineMachinePower4.Location = new System.Drawing.Point(355, 8);
+ this.cbLineMachinePower4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbLineMachinePower4.Name = "cbLineMachinePower4";
- this.cbLineMachinePower4.Size = new System.Drawing.Size(80, 40);
+ this.cbLineMachinePower4.Size = new System.Drawing.Size(107, 50);
this.cbLineMachinePower4.TabIndex = 69;
this.cbLineMachinePower4.Text = "4#鐩寸嚎鐢垫満鐢垫簮";
this.cbLineMachinePower4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2025,9 +2188,10 @@
// cbLineMachinePower2
//
this.cbLineMachinePower2.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbLineMachinePower2.Location = new System.Drawing.Point(178, 6);
+ this.cbLineMachinePower2.Location = new System.Drawing.Point(237, 8);
+ this.cbLineMachinePower2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbLineMachinePower2.Name = "cbLineMachinePower2";
- this.cbLineMachinePower2.Size = new System.Drawing.Size(80, 40);
+ this.cbLineMachinePower2.Size = new System.Drawing.Size(107, 50);
this.cbLineMachinePower2.TabIndex = 69;
this.cbLineMachinePower2.Text = "2#鐩寸嚎鐢垫満鐢垫簮";
this.cbLineMachinePower2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2037,9 +2201,10 @@
// cbCylinder5
//
this.cbCylinder5.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbCylinder5.Location = new System.Drawing.Point(439, 219);
+ this.cbCylinder5.Location = new System.Drawing.Point(585, 274);
+ this.cbCylinder5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbCylinder5.Name = "cbCylinder5";
- this.cbCylinder5.Size = new System.Drawing.Size(80, 40);
+ this.cbCylinder5.Size = new System.Drawing.Size(107, 50);
this.cbCylinder5.TabIndex = 68;
this.cbCylinder5.Text = "5#姘旂几";
this.cbCylinder5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2049,9 +2214,10 @@
// cbValve5
//
this.cbValve5.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbValve5.Location = new System.Drawing.Point(352, 219);
+ this.cbValve5.Location = new System.Drawing.Point(469, 274);
+ this.cbValve5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbValve5.Name = "cbValve5";
- this.cbValve5.Size = new System.Drawing.Size(80, 40);
+ this.cbValve5.Size = new System.Drawing.Size(107, 50);
this.cbValve5.TabIndex = 68;
this.cbValve5.Text = "5#鍚搁榾";
this.cbValve5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2061,9 +2227,10 @@
// cbCylinder4
//
this.cbCylinder4.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbCylinder4.Location = new System.Drawing.Point(439, 165);
+ this.cbCylinder4.Location = new System.Drawing.Point(585, 206);
+ this.cbCylinder4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbCylinder4.Name = "cbCylinder4";
- this.cbCylinder4.Size = new System.Drawing.Size(80, 40);
+ this.cbCylinder4.Size = new System.Drawing.Size(107, 50);
this.cbCylinder4.TabIndex = 68;
this.cbCylinder4.Text = "4#姘旂几";
this.cbCylinder4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2073,9 +2240,10 @@
// cbValve4
//
this.cbValve4.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbValve4.Location = new System.Drawing.Point(352, 165);
+ this.cbValve4.Location = new System.Drawing.Point(469, 206);
+ this.cbValve4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbValve4.Name = "cbValve4";
- this.cbValve4.Size = new System.Drawing.Size(80, 40);
+ this.cbValve4.Size = new System.Drawing.Size(107, 50);
this.cbValve4.TabIndex = 68;
this.cbValve4.Text = "4#鍚搁榾";
this.cbValve4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2085,9 +2253,10 @@
// cbCylinder3
//
this.cbCylinder3.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbCylinder3.Location = new System.Drawing.Point(439, 111);
+ this.cbCylinder3.Location = new System.Drawing.Point(585, 139);
+ this.cbCylinder3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbCylinder3.Name = "cbCylinder3";
- this.cbCylinder3.Size = new System.Drawing.Size(80, 40);
+ this.cbCylinder3.Size = new System.Drawing.Size(107, 50);
this.cbCylinder3.TabIndex = 68;
this.cbCylinder3.Text = "3#姘旂几";
this.cbCylinder3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2097,9 +2266,10 @@
// cbValve3
//
this.cbValve3.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbValve3.Location = new System.Drawing.Point(352, 111);
+ this.cbValve3.Location = new System.Drawing.Point(469, 139);
+ this.cbValve3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbValve3.Name = "cbValve3";
- this.cbValve3.Size = new System.Drawing.Size(80, 40);
+ this.cbValve3.Size = new System.Drawing.Size(107, 50);
this.cbValve3.TabIndex = 68;
this.cbValve3.Text = "3#鍚搁榾";
this.cbValve3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2109,9 +2279,10 @@
// cbCylinder2
//
this.cbCylinder2.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbCylinder2.Location = new System.Drawing.Point(439, 57);
+ this.cbCylinder2.Location = new System.Drawing.Point(585, 71);
+ this.cbCylinder2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbCylinder2.Name = "cbCylinder2";
- this.cbCylinder2.Size = new System.Drawing.Size(80, 40);
+ this.cbCylinder2.Size = new System.Drawing.Size(107, 50);
this.cbCylinder2.TabIndex = 68;
this.cbCylinder2.Text = "2#姘旂几";
this.cbCylinder2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2121,9 +2292,10 @@
// cbValve2
//
this.cbValve2.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbValve2.Location = new System.Drawing.Point(352, 57);
+ this.cbValve2.Location = new System.Drawing.Point(469, 71);
+ this.cbValve2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbValve2.Name = "cbValve2";
- this.cbValve2.Size = new System.Drawing.Size(80, 40);
+ this.cbValve2.Size = new System.Drawing.Size(107, 50);
this.cbValve2.TabIndex = 68;
this.cbValve2.Text = "2#鍚搁榾";
this.cbValve2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2133,9 +2305,10 @@
// cbUnloadRbtControl
//
this.cbUnloadRbtControl.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbUnloadRbtControl.Location = new System.Drawing.Point(525, 273);
+ this.cbUnloadRbtControl.Location = new System.Drawing.Point(700, 341);
+ this.cbUnloadRbtControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbUnloadRbtControl.Name = "cbUnloadRbtControl";
- this.cbUnloadRbtControl.Size = new System.Drawing.Size(80, 40);
+ this.cbUnloadRbtControl.Size = new System.Drawing.Size(107, 50);
this.cbUnloadRbtControl.TabIndex = 68;
this.cbUnloadRbtControl.Text = "涓嬫枡鏈烘鎵嬫帶鍒舵潈";
this.cbUnloadRbtControl.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2145,9 +2318,10 @@
// cbLoadRbtControl
//
this.cbLoadRbtControl.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbLoadRbtControl.Location = new System.Drawing.Point(525, 219);
+ this.cbLoadRbtControl.Location = new System.Drawing.Point(700, 274);
+ this.cbLoadRbtControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbLoadRbtControl.Name = "cbLoadRbtControl";
- this.cbLoadRbtControl.Size = new System.Drawing.Size(80, 40);
+ this.cbLoadRbtControl.Size = new System.Drawing.Size(107, 50);
this.cbLoadRbtControl.TabIndex = 68;
this.cbLoadRbtControl.Text = "涓婃枡鏈烘鎵嬫帶鍒舵潈";
this.cbLoadRbtControl.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2157,9 +2331,10 @@
// cbRbtHandAuto
//
this.cbRbtHandAuto.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbRbtHandAuto.Location = new System.Drawing.Point(525, 165);
+ this.cbRbtHandAuto.Location = new System.Drawing.Point(700, 206);
+ this.cbRbtHandAuto.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbRbtHandAuto.Name = "cbRbtHandAuto";
- this.cbRbtHandAuto.Size = new System.Drawing.Size(80, 40);
+ this.cbRbtHandAuto.Size = new System.Drawing.Size(107, 50);
this.cbRbtHandAuto.TabIndex = 68;
this.cbRbtHandAuto.Text = "鏈烘鎵嬫墜鑷姩鍒囨崲";
this.cbRbtHandAuto.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2169,9 +2344,10 @@
// cbUnloadRbtAlarm
//
this.cbUnloadRbtAlarm.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbUnloadRbtAlarm.Location = new System.Drawing.Point(525, 111);
+ this.cbUnloadRbtAlarm.Location = new System.Drawing.Point(700, 139);
+ this.cbUnloadRbtAlarm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbUnloadRbtAlarm.Name = "cbUnloadRbtAlarm";
- this.cbUnloadRbtAlarm.Size = new System.Drawing.Size(80, 40);
+ this.cbUnloadRbtAlarm.Size = new System.Drawing.Size(107, 50);
this.cbUnloadRbtAlarm.TabIndex = 68;
this.cbUnloadRbtAlarm.Text = "涓嬫枡鏈烘鎵嬫姤璀�";
this.cbUnloadRbtAlarm.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2181,9 +2357,10 @@
// cbLoadRbtAlarm
//
this.cbLoadRbtAlarm.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbLoadRbtAlarm.Location = new System.Drawing.Point(525, 57);
+ this.cbLoadRbtAlarm.Location = new System.Drawing.Point(700, 71);
+ this.cbLoadRbtAlarm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbLoadRbtAlarm.Name = "cbLoadRbtAlarm";
- this.cbLoadRbtAlarm.Size = new System.Drawing.Size(80, 40);
+ this.cbLoadRbtAlarm.Size = new System.Drawing.Size(107, 50);
this.cbLoadRbtAlarm.TabIndex = 68;
this.cbLoadRbtAlarm.Text = "涓婃枡鏈烘鎵嬫姤璀�";
this.cbLoadRbtAlarm.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2193,9 +2370,10 @@
// cbZAxisStop
//
this.cbZAxisStop.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbZAxisStop.Location = new System.Drawing.Point(525, 6);
+ this.cbZAxisStop.Location = new System.Drawing.Point(700, 8);
+ this.cbZAxisStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbZAxisStop.Name = "cbZAxisStop";
- this.cbZAxisStop.Size = new System.Drawing.Size(80, 40);
+ this.cbZAxisStop.Size = new System.Drawing.Size(107, 50);
this.cbZAxisStop.TabIndex = 68;
this.cbZAxisStop.Text = "Z杞村埞杞�";
this.cbZAxisStop.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2205,9 +2383,10 @@
// cbCylinder1
//
this.cbCylinder1.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbCylinder1.Location = new System.Drawing.Point(439, 6);
+ this.cbCylinder1.Location = new System.Drawing.Point(585, 8);
+ this.cbCylinder1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbCylinder1.Name = "cbCylinder1";
- this.cbCylinder1.Size = new System.Drawing.Size(80, 40);
+ this.cbCylinder1.Size = new System.Drawing.Size(107, 50);
this.cbCylinder1.TabIndex = 68;
this.cbCylinder1.Text = "1#姘旂几";
this.cbCylinder1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2217,9 +2396,10 @@
// cbValve1
//
this.cbValve1.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbValve1.Location = new System.Drawing.Point(352, 6);
+ this.cbValve1.Location = new System.Drawing.Point(469, 8);
+ this.cbValve1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbValve1.Name = "cbValve1";
- this.cbValve1.Size = new System.Drawing.Size(80, 40);
+ this.cbValve1.Size = new System.Drawing.Size(107, 50);
this.cbValve1.TabIndex = 68;
this.cbValve1.Text = "1#鍚搁榾";
this.cbValve1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2228,9 +2408,10 @@
//
// btnY2axisLocation
//
- this.btnY2axisLocation.Location = new System.Drawing.Point(265, 111);
+ this.btnY2axisLocation.Location = new System.Drawing.Point(353, 139);
+ this.btnY2axisLocation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnY2axisLocation.Name = "btnY2axisLocation";
- this.btnY2axisLocation.Size = new System.Drawing.Size(80, 40);
+ this.btnY2axisLocation.Size = new System.Drawing.Size(107, 50);
this.btnY2axisLocation.TabIndex = 67;
this.btnY2axisLocation.Text = "Y2杞村畾浣�";
this.btnY2axisLocation.UseVisualStyleBackColor = true;
@@ -2239,9 +2420,10 @@
//
// btnX2axisLocation
//
- this.btnX2axisLocation.Location = new System.Drawing.Point(178, 111);
+ this.btnX2axisLocation.Location = new System.Drawing.Point(237, 139);
+ this.btnX2axisLocation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnX2axisLocation.Name = "btnX2axisLocation";
- this.btnX2axisLocation.Size = new System.Drawing.Size(80, 40);
+ this.btnX2axisLocation.Size = new System.Drawing.Size(107, 50);
this.btnX2axisLocation.TabIndex = 66;
this.btnX2axisLocation.Text = "X2杞村畾浣�";
this.btnX2axisLocation.UseVisualStyleBackColor = true;
@@ -2251,9 +2433,10 @@
//
// btnY2axistoL
//
- this.btnY2axistoL.Location = new System.Drawing.Point(265, 219);
+ this.btnY2axistoL.Location = new System.Drawing.Point(353, 274);
+ this.btnY2axistoL.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnY2axistoL.Name = "btnY2axistoL";
- this.btnY2axistoL.Size = new System.Drawing.Size(80, 40);
+ this.btnY2axistoL.Size = new System.Drawing.Size(107, 50);
this.btnY2axistoL.TabIndex = 65;
this.btnY2axistoL.Text = "Y2杞村乏绉�";
this.btnY2axistoL.UseVisualStyleBackColor = true;
@@ -2263,9 +2446,10 @@
//
// btnY2axistoR
//
- this.btnY2axistoR.Location = new System.Drawing.Point(265, 165);
+ this.btnY2axistoR.Location = new System.Drawing.Point(353, 206);
+ this.btnY2axistoR.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnY2axistoR.Name = "btnY2axistoR";
- this.btnY2axistoR.Size = new System.Drawing.Size(80, 40);
+ this.btnY2axistoR.Size = new System.Drawing.Size(107, 50);
this.btnY2axistoR.TabIndex = 64;
this.btnY2axistoR.Text = "Y2杞村彸绉�";
this.btnY2axistoR.UseVisualStyleBackColor = true;
@@ -2275,9 +2459,10 @@
//
// btnX2axistoL
//
- this.btnX2axistoL.Location = new System.Drawing.Point(178, 219);
+ this.btnX2axistoL.Location = new System.Drawing.Point(237, 274);
+ this.btnX2axistoL.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnX2axistoL.Name = "btnX2axistoL";
- this.btnX2axistoL.Size = new System.Drawing.Size(80, 40);
+ this.btnX2axistoL.Size = new System.Drawing.Size(107, 50);
this.btnX2axistoL.TabIndex = 63;
this.btnX2axistoL.Text = "X2杞村乏绉�";
this.btnX2axistoL.UseVisualStyleBackColor = true;
@@ -2287,9 +2472,10 @@
//
// btnX2axistoR
//
- this.btnX2axistoR.Location = new System.Drawing.Point(178, 165);
+ this.btnX2axistoR.Location = new System.Drawing.Point(237, 206);
+ this.btnX2axistoR.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnX2axistoR.Name = "btnX2axistoR";
- this.btnX2axistoR.Size = new System.Drawing.Size(80, 40);
+ this.btnX2axistoR.Size = new System.Drawing.Size(107, 50);
this.btnX2axistoR.TabIndex = 62;
this.btnX2axistoR.Text = "X2杞村彸绉�";
this.btnX2axistoR.UseVisualStyleBackColor = true;
@@ -2299,9 +2485,10 @@
//
// btnY2ToOri
//
- this.btnY2ToOri.Location = new System.Drawing.Point(265, 57);
+ this.btnY2ToOri.Location = new System.Drawing.Point(353, 71);
+ this.btnY2ToOri.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnY2ToOri.Name = "btnY2ToOri";
- this.btnY2ToOri.Size = new System.Drawing.Size(80, 40);
+ this.btnY2ToOri.Size = new System.Drawing.Size(107, 50);
this.btnY2ToOri.TabIndex = 61;
this.btnY2ToOri.Text = "Y2杞村洖鍘熺偣";
this.btnY2ToOri.UseVisualStyleBackColor = true;
@@ -2311,9 +2498,10 @@
//
// btnX2ToOri
//
- this.btnX2ToOri.Location = new System.Drawing.Point(178, 57);
+ this.btnX2ToOri.Location = new System.Drawing.Point(237, 71);
+ this.btnX2ToOri.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnX2ToOri.Name = "btnX2ToOri";
- this.btnX2ToOri.Size = new System.Drawing.Size(80, 40);
+ this.btnX2ToOri.Size = new System.Drawing.Size(107, 50);
this.btnX2ToOri.TabIndex = 60;
this.btnX2ToOri.Text = "X2杞村洖鍘熺偣";
this.btnX2ToOri.UseVisualStyleBackColor = true;
@@ -2324,9 +2512,10 @@
// cbSifuPower4
//
this.cbSifuPower4.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbSifuPower4.Location = new System.Drawing.Point(611, 165);
+ this.cbSifuPower4.Location = new System.Drawing.Point(815, 206);
+ this.cbSifuPower4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbSifuPower4.Name = "cbSifuPower4";
- this.cbSifuPower4.Size = new System.Drawing.Size(80, 40);
+ this.cbSifuPower4.Size = new System.Drawing.Size(107, 50);
this.cbSifuPower4.TabIndex = 51;
this.cbSifuPower4.Text = "4#浼烘湇鐢垫簮";
this.cbSifuPower4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2336,9 +2525,10 @@
// cbRingLight4
//
this.cbRingLight4.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbRingLight4.Location = new System.Drawing.Point(696, 57);
+ this.cbRingLight4.Location = new System.Drawing.Point(928, 71);
+ this.cbRingLight4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbRingLight4.Name = "cbRingLight4";
- this.cbRingLight4.Size = new System.Drawing.Size(80, 40);
+ this.cbRingLight4.Size = new System.Drawing.Size(107, 50);
this.cbRingLight4.TabIndex = 52;
this.cbRingLight4.Text = "4#鐜舰鍏�";
this.cbRingLight4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2348,9 +2538,10 @@
// cbPingbiGuangshan
//
this.cbPingbiGuangshan.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbPingbiGuangshan.Location = new System.Drawing.Point(697, 165);
+ this.cbPingbiGuangshan.Location = new System.Drawing.Point(929, 206);
+ this.cbPingbiGuangshan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbPingbiGuangshan.Name = "cbPingbiGuangshan";
- this.cbPingbiGuangshan.Size = new System.Drawing.Size(80, 40);
+ this.cbPingbiGuangshan.Size = new System.Drawing.Size(107, 50);
this.cbPingbiGuangshan.TabIndex = 48;
this.cbPingbiGuangshan.Text = "灞忚斀鍏夋爡";
this.cbPingbiGuangshan.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2360,9 +2551,10 @@
// cbPingbiSafeGuard
//
this.cbPingbiSafeGuard.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbPingbiSafeGuard.Location = new System.Drawing.Point(696, 111);
+ this.cbPingbiSafeGuard.Location = new System.Drawing.Point(928, 139);
+ this.cbPingbiSafeGuard.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbPingbiSafeGuard.Name = "cbPingbiSafeGuard";
- this.cbPingbiSafeGuard.Size = new System.Drawing.Size(80, 40);
+ this.cbPingbiSafeGuard.Size = new System.Drawing.Size(107, 50);
this.cbPingbiSafeGuard.TabIndex = 53;
this.cbPingbiSafeGuard.Text = "灞忚斀瀹夊叏闂�";
this.cbPingbiSafeGuard.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2372,9 +2564,10 @@
// cbRingLight2
//
this.cbRingLight2.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbRingLight2.Location = new System.Drawing.Point(696, 7);
+ this.cbRingLight2.Location = new System.Drawing.Point(928, 9);
+ this.cbRingLight2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbRingLight2.Name = "cbRingLight2";
- this.cbRingLight2.Size = new System.Drawing.Size(80, 40);
+ this.cbRingLight2.Size = new System.Drawing.Size(107, 50);
this.cbRingLight2.TabIndex = 58;
this.cbRingLight2.Text = "2#鐜舰鍏�";
this.cbRingLight2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2384,9 +2577,10 @@
// cbBackLight4
//
this.cbBackLight4.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbBackLight4.Location = new System.Drawing.Point(610, 57);
+ this.cbBackLight4.Location = new System.Drawing.Point(813, 71);
+ this.cbBackLight4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbBackLight4.Name = "cbBackLight4";
- this.cbBackLight4.Size = new System.Drawing.Size(80, 40);
+ this.cbBackLight4.Size = new System.Drawing.Size(107, 50);
this.cbBackLight4.TabIndex = 56;
this.cbBackLight4.Text = "4#鑳屽厜";
this.cbBackLight4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2396,9 +2590,10 @@
// cbLight
//
this.cbLight.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbLight.Location = new System.Drawing.Point(610, 7);
+ this.cbLight.Location = new System.Drawing.Point(813, 9);
+ this.cbLight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbLight.Name = "cbLight";
- this.cbLight.Size = new System.Drawing.Size(80, 40);
+ this.cbLight.Size = new System.Drawing.Size(107, 50);
this.cbLight.TabIndex = 55;
this.cbLight.Text = "鐓ф槑";
this.cbLight.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2407,9 +2602,10 @@
//
// btnCloseAlarm
//
- this.btnCloseAlarm.Location = new System.Drawing.Point(611, 111);
+ this.btnCloseAlarm.Location = new System.Drawing.Point(815, 139);
+ this.btnCloseAlarm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnCloseAlarm.Name = "btnCloseAlarm";
- this.btnCloseAlarm.Size = new System.Drawing.Size(80, 40);
+ this.btnCloseAlarm.Size = new System.Drawing.Size(107, 50);
this.btnCloseAlarm.TabIndex = 37;
this.btnCloseAlarm.Text = "鍏抽棴鎶ヨ澹�";
this.btnCloseAlarm.UseVisualStyleBackColor = true;
@@ -2419,9 +2615,10 @@
//
// btnNGCylinderBack
//
- this.btnNGCylinderBack.Location = new System.Drawing.Point(265, 273);
+ this.btnNGCylinderBack.Location = new System.Drawing.Point(353, 341);
+ this.btnNGCylinderBack.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnNGCylinderBack.Name = "btnNGCylinderBack";
- this.btnNGCylinderBack.Size = new System.Drawing.Size(80, 40);
+ this.btnNGCylinderBack.Size = new System.Drawing.Size(107, 50);
this.btnNGCylinderBack.TabIndex = 36;
this.btnNGCylinderBack.Text = "NG姘旂几閫�";
this.btnNGCylinderBack.UseVisualStyleBackColor = true;
@@ -2429,9 +2626,10 @@
//
// btnLoadCylinderBack
//
- this.btnLoadCylinderBack.Location = new System.Drawing.Point(91, 273);
+ this.btnLoadCylinderBack.Location = new System.Drawing.Point(121, 341);
+ this.btnLoadCylinderBack.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnLoadCylinderBack.Name = "btnLoadCylinderBack";
- this.btnLoadCylinderBack.Size = new System.Drawing.Size(80, 40);
+ this.btnLoadCylinderBack.Size = new System.Drawing.Size(107, 50);
this.btnLoadCylinderBack.TabIndex = 36;
this.btnLoadCylinderBack.Text = "涓婃枡姘旂几閫�";
this.btnLoadCylinderBack.UseVisualStyleBackColor = true;
@@ -2439,9 +2637,10 @@
//
// btnUnloadCylinderBack
//
- this.btnUnloadCylinderBack.Location = new System.Drawing.Point(438, 273);
+ this.btnUnloadCylinderBack.Location = new System.Drawing.Point(584, 341);
+ this.btnUnloadCylinderBack.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUnloadCylinderBack.Name = "btnUnloadCylinderBack";
- this.btnUnloadCylinderBack.Size = new System.Drawing.Size(80, 40);
+ this.btnUnloadCylinderBack.Size = new System.Drawing.Size(107, 50);
this.btnUnloadCylinderBack.TabIndex = 36;
this.btnUnloadCylinderBack.Text = "涓嬫枡姘旂几閫�";
this.btnUnloadCylinderBack.UseVisualStyleBackColor = true;
@@ -2449,9 +2648,10 @@
//
// btnUnloadCylinderEnter
//
- this.btnUnloadCylinderEnter.Location = new System.Drawing.Point(351, 273);
+ this.btnUnloadCylinderEnter.Location = new System.Drawing.Point(468, 341);
+ this.btnUnloadCylinderEnter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUnloadCylinderEnter.Name = "btnUnloadCylinderEnter";
- this.btnUnloadCylinderEnter.Size = new System.Drawing.Size(80, 40);
+ this.btnUnloadCylinderEnter.Size = new System.Drawing.Size(107, 50);
this.btnUnloadCylinderEnter.TabIndex = 36;
this.btnUnloadCylinderEnter.Text = "涓嬫枡姘旂几";
this.btnUnloadCylinderEnter.UseVisualStyleBackColor = true;
@@ -2459,9 +2659,10 @@
//
// btnNGCylinderEnter
//
- this.btnNGCylinderEnter.Location = new System.Drawing.Point(178, 273);
+ this.btnNGCylinderEnter.Location = new System.Drawing.Point(237, 341);
+ this.btnNGCylinderEnter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnNGCylinderEnter.Name = "btnNGCylinderEnter";
- this.btnNGCylinderEnter.Size = new System.Drawing.Size(80, 40);
+ this.btnNGCylinderEnter.Size = new System.Drawing.Size(107, 50);
this.btnNGCylinderEnter.TabIndex = 36;
this.btnNGCylinderEnter.Text = "NG姘旂几";
this.btnNGCylinderEnter.UseVisualStyleBackColor = true;
@@ -2469,9 +2670,10 @@
//
// btnLoadCylinderEnter
//
- this.btnLoadCylinderEnter.Location = new System.Drawing.Point(4, 273);
+ this.btnLoadCylinderEnter.Location = new System.Drawing.Point(5, 341);
+ this.btnLoadCylinderEnter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnLoadCylinderEnter.Name = "btnLoadCylinderEnter";
- this.btnLoadCylinderEnter.Size = new System.Drawing.Size(80, 40);
+ this.btnLoadCylinderEnter.Size = new System.Drawing.Size(107, 50);
this.btnLoadCylinderEnter.TabIndex = 36;
this.btnLoadCylinderEnter.Text = "涓婃枡姘旂几";
this.btnLoadCylinderEnter.UseVisualStyleBackColor = true;
@@ -2479,9 +2681,10 @@
//
// btnY1axistoL
//
- this.btnY1axistoL.Location = new System.Drawing.Point(91, 219);
+ this.btnY1axistoL.Location = new System.Drawing.Point(121, 274);
+ this.btnY1axistoL.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnY1axistoL.Name = "btnY1axistoL";
- this.btnY1axistoL.Size = new System.Drawing.Size(80, 40);
+ this.btnY1axistoL.Size = new System.Drawing.Size(107, 50);
this.btnY1axistoL.TabIndex = 36;
this.btnY1axistoL.Text = "Y1杞村乏绉�";
this.btnY1axistoL.UseVisualStyleBackColor = true;
@@ -2491,9 +2694,10 @@
//
// btnX1axistoL
//
- this.btnX1axistoL.Location = new System.Drawing.Point(4, 219);
+ this.btnX1axistoL.Location = new System.Drawing.Point(5, 274);
+ this.btnX1axistoL.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnX1axistoL.Name = "btnX1axistoL";
- this.btnX1axistoL.Size = new System.Drawing.Size(80, 40);
+ this.btnX1axistoL.Size = new System.Drawing.Size(107, 50);
this.btnX1axistoL.TabIndex = 33;
this.btnX1axistoL.Text = "X1杞村乏绉�";
this.btnX1axistoL.UseVisualStyleBackColor = true;
@@ -2503,9 +2707,10 @@
//
// btnY1axistoR
//
- this.btnY1axistoR.Location = new System.Drawing.Point(91, 165);
+ this.btnY1axistoR.Location = new System.Drawing.Point(121, 206);
+ this.btnY1axistoR.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnY1axistoR.Name = "btnY1axistoR";
- this.btnY1axistoR.Size = new System.Drawing.Size(80, 40);
+ this.btnY1axistoR.Size = new System.Drawing.Size(107, 50);
this.btnY1axistoR.TabIndex = 34;
this.btnY1axistoR.Text = "Y1杞村彸绉�";
this.btnY1axistoR.UseVisualStyleBackColor = true;
@@ -2515,9 +2720,10 @@
//
// btnX1axistoR
//
- this.btnX1axistoR.Location = new System.Drawing.Point(4, 165);
+ this.btnX1axistoR.Location = new System.Drawing.Point(5, 206);
+ this.btnX1axistoR.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnX1axistoR.Name = "btnX1axistoR";
- this.btnX1axistoR.Size = new System.Drawing.Size(80, 40);
+ this.btnX1axistoR.Size = new System.Drawing.Size(107, 50);
this.btnX1axistoR.TabIndex = 35;
this.btnX1axistoR.Text = "X1杞村彸绉�";
this.btnX1axistoR.UseVisualStyleBackColor = true;
@@ -2527,9 +2733,10 @@
//
// btnY1axisLocation
//
- this.btnY1axisLocation.Location = new System.Drawing.Point(91, 111);
+ this.btnY1axisLocation.Location = new System.Drawing.Point(121, 139);
+ this.btnY1axisLocation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnY1axisLocation.Name = "btnY1axisLocation";
- this.btnY1axisLocation.Size = new System.Drawing.Size(80, 40);
+ this.btnY1axisLocation.Size = new System.Drawing.Size(107, 50);
this.btnY1axisLocation.TabIndex = 40;
this.btnY1axisLocation.Text = "Y1杞村畾浣�";
this.btnY1axisLocation.UseVisualStyleBackColor = true;
@@ -2538,9 +2745,10 @@
//
// btnX1axisLocation
//
- this.btnX1axisLocation.Location = new System.Drawing.Point(4, 111);
+ this.btnX1axisLocation.Location = new System.Drawing.Point(5, 139);
+ this.btnX1axisLocation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnX1axisLocation.Name = "btnX1axisLocation";
- this.btnX1axisLocation.Size = new System.Drawing.Size(80, 40);
+ this.btnX1axisLocation.Size = new System.Drawing.Size(107, 50);
this.btnX1axisLocation.TabIndex = 45;
this.btnX1axisLocation.Text = "X1杞村畾浣�";
this.btnX1axisLocation.UseVisualStyleBackColor = true;
@@ -2549,9 +2757,10 @@
//
// btnY1ToOri
//
- this.btnY1ToOri.Location = new System.Drawing.Point(91, 57);
+ this.btnY1ToOri.Location = new System.Drawing.Point(121, 71);
+ this.btnY1ToOri.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnY1ToOri.Name = "btnY1ToOri";
- this.btnY1ToOri.Size = new System.Drawing.Size(80, 40);
+ this.btnY1ToOri.Size = new System.Drawing.Size(107, 50);
this.btnY1ToOri.TabIndex = 46;
this.btnY1ToOri.Text = "Y1杞村洖鍘熺偣";
this.btnY1ToOri.UseVisualStyleBackColor = true;
@@ -2561,9 +2770,10 @@
//
// btnX1ToOri
//
- this.btnX1ToOri.Location = new System.Drawing.Point(4, 57);
+ this.btnX1ToOri.Location = new System.Drawing.Point(5, 71);
+ this.btnX1ToOri.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnX1ToOri.Name = "btnX1ToOri";
- this.btnX1ToOri.Size = new System.Drawing.Size(80, 40);
+ this.btnX1ToOri.Size = new System.Drawing.Size(107, 50);
this.btnX1ToOri.TabIndex = 47;
this.btnX1ToOri.Text = "X1杞村洖鍘熺偣";
this.btnX1ToOri.UseVisualStyleBackColor = true;
@@ -2573,18 +2783,20 @@
//
// btnXYStop
//
- this.btnXYStop.Location = new System.Drawing.Point(4, 3);
+ this.btnXYStop.Location = new System.Drawing.Point(5, 4);
+ this.btnXYStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnXYStop.Name = "btnXYStop";
- this.btnXYStop.Size = new System.Drawing.Size(80, 40);
+ this.btnXYStop.Size = new System.Drawing.Size(107, 50);
this.btnXYStop.TabIndex = 41;
this.btnXYStop.Text = "鎵嬪姩X/Y瀹氫綅鍋滄\t";
this.btnXYStop.UseVisualStyleBackColor = true;
//
// btnTableAction
//
- this.btnTableAction.Location = new System.Drawing.Point(91, 4);
+ this.btnTableAction.Location = new System.Drawing.Point(121, 5);
+ this.btnTableAction.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnTableAction.Name = "btnTableAction";
- this.btnTableAction.Size = new System.Drawing.Size(80, 40);
+ this.btnTableAction.Size = new System.Drawing.Size(107, 50);
this.btnTableAction.TabIndex = 24;
this.btnTableAction.Text = "杞洏鍔ㄤ綔";
this.btnTableAction.UseVisualStyleBackColor = true;
@@ -2597,11 +2809,11 @@
this.tbSoft.Controls.Add(this.chkSaveHeightOK);
this.tbSoft.Controls.Add(this.chkSaveOKLWImage);
this.tbSoft.Controls.Add(this.btnClearCheck);
- this.tbSoft.Location = new System.Drawing.Point(4, 22);
- this.tbSoft.Margin = new System.Windows.Forms.Padding(2);
+ this.tbSoft.Location = new System.Drawing.Point(4, 25);
+ this.tbSoft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tbSoft.Name = "tbSoft";
- this.tbSoft.Padding = new System.Windows.Forms.Padding(2);
- this.tbSoft.Size = new System.Drawing.Size(817, 473);
+ this.tbSoft.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tbSoft.Size = new System.Drawing.Size(1092, 595);
this.tbSoft.TabIndex = 2;
this.tbSoft.Text = "杞欢";
this.tbSoft.UseVisualStyleBackColor = true;
@@ -2612,9 +2824,11 @@
this.groupBox31.Controls.Add(this.nudCellMinLength);
this.groupBox31.Controls.Add(this.label149);
this.groupBox31.Controls.Add(this.label150);
- this.groupBox31.Location = new System.Drawing.Point(236, 105);
+ this.groupBox31.Location = new System.Drawing.Point(315, 131);
+ this.groupBox31.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox31.Name = "groupBox31";
- this.groupBox31.Size = new System.Drawing.Size(200, 100);
+ this.groupBox31.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox31.Size = new System.Drawing.Size(267, 125);
this.groupBox31.TabIndex = 2;
this.groupBox31.TabStop = false;
this.groupBox31.Text = "鐢垫睜闀垮涓嬮檺";
@@ -2627,9 +2841,10 @@
0,
0,
131072});
- this.nudCellMinWidth.Location = new System.Drawing.Point(49, 60);
+ this.nudCellMinWidth.Location = new System.Drawing.Point(65, 75);
+ this.nudCellMinWidth.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.nudCellMinWidth.Name = "nudCellMinWidth";
- this.nudCellMinWidth.Size = new System.Drawing.Size(120, 21);
+ this.nudCellMinWidth.Size = new System.Drawing.Size(160, 25);
this.nudCellMinWidth.TabIndex = 1;
//
// nudCellMinLength
@@ -2640,26 +2855,29 @@
0,
0,
131072});
- this.nudCellMinLength.Location = new System.Drawing.Point(49, 29);
+ this.nudCellMinLength.Location = new System.Drawing.Point(65, 36);
+ this.nudCellMinLength.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.nudCellMinLength.Name = "nudCellMinLength";
- this.nudCellMinLength.Size = new System.Drawing.Size(120, 21);
+ this.nudCellMinLength.Size = new System.Drawing.Size(160, 25);
this.nudCellMinLength.TabIndex = 1;
//
// label149
//
this.label149.AutoSize = true;
- this.label149.Location = new System.Drawing.Point(13, 65);
+ this.label149.Location = new System.Drawing.Point(17, 81);
+ this.label149.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label149.Name = "label149";
- this.label149.Size = new System.Drawing.Size(17, 12);
+ this.label149.Size = new System.Drawing.Size(22, 15);
this.label149.TabIndex = 0;
this.label149.Text = "瀹�";
//
// label150
//
this.label150.AutoSize = true;
- this.label150.Location = new System.Drawing.Point(13, 31);
+ this.label150.Location = new System.Drawing.Point(17, 39);
+ this.label150.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label150.Name = "label150";
- this.label150.Size = new System.Drawing.Size(17, 12);
+ this.label150.Size = new System.Drawing.Size(22, 15);
this.label150.TabIndex = 0;
this.label150.Text = "闀�";
//
@@ -2669,9 +2887,11 @@
this.groupBox30.Controls.Add(this.nudCellMaxLength);
this.groupBox30.Controls.Add(this.label148);
this.groupBox30.Controls.Add(this.label147);
- this.groupBox30.Location = new System.Drawing.Point(15, 104);
+ this.groupBox30.Location = new System.Drawing.Point(20, 130);
+ this.groupBox30.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox30.Name = "groupBox30";
- this.groupBox30.Size = new System.Drawing.Size(200, 100);
+ this.groupBox30.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox30.Size = new System.Drawing.Size(267, 125);
this.groupBox30.TabIndex = 2;
this.groupBox30.TabStop = false;
this.groupBox30.Text = "鐢垫睜闀垮涓婇檺";
@@ -2684,9 +2904,10 @@
0,
0,
131072});
- this.nudCellMaxWidth.Location = new System.Drawing.Point(49, 60);
+ this.nudCellMaxWidth.Location = new System.Drawing.Point(65, 75);
+ this.nudCellMaxWidth.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.nudCellMaxWidth.Name = "nudCellMaxWidth";
- this.nudCellMaxWidth.Size = new System.Drawing.Size(120, 21);
+ this.nudCellMaxWidth.Size = new System.Drawing.Size(160, 25);
this.nudCellMaxWidth.TabIndex = 1;
//
// nudCellMaxLength
@@ -2697,35 +2918,51 @@
0,
0,
131072});
- this.nudCellMaxLength.Location = new System.Drawing.Point(49, 29);
+ this.nudCellMaxLength.Location = new System.Drawing.Point(65, 36);
+ this.nudCellMaxLength.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.nudCellMaxLength.Name = "nudCellMaxLength";
- this.nudCellMaxLength.Size = new System.Drawing.Size(120, 21);
+ this.nudCellMaxLength.Size = new System.Drawing.Size(160, 25);
this.nudCellMaxLength.TabIndex = 1;
//
// label148
//
this.label148.AutoSize = true;
- this.label148.Location = new System.Drawing.Point(13, 65);
+ this.label148.Location = new System.Drawing.Point(17, 81);
+ this.label148.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label148.Name = "label148";
- this.label148.Size = new System.Drawing.Size(17, 12);
+ this.label148.Size = new System.Drawing.Size(22, 15);
this.label148.TabIndex = 0;
this.label148.Text = "瀹�";
//
// label147
//
this.label147.AutoSize = true;
- this.label147.Location = new System.Drawing.Point(13, 31);
+ this.label147.Location = new System.Drawing.Point(17, 39);
+ this.label147.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label147.Name = "label147";
- this.label147.Size = new System.Drawing.Size(17, 12);
+ this.label147.Size = new System.Drawing.Size(22, 15);
this.label147.TabIndex = 0;
this.label147.Text = "闀�";
+ //
+ // chkSaveHeightOK
+ //
+ this.chkSaveHeightOK.AutoSize = true;
+ this.chkSaveHeightOK.Location = new System.Drawing.Point(229, 81);
+ this.chkSaveHeightOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.chkSaveHeightOK.Name = "chkSaveHeightOK";
+ this.chkSaveHeightOK.Size = new System.Drawing.Size(165, 19);
+ this.chkSaveHeightOK.TabIndex = 1;
+ this.chkSaveHeightOK.Text = "淇濆瓨楂樺害妫�娴婳K鍥剧墖";
+ this.chkSaveHeightOK.UseVisualStyleBackColor = true;
+ this.chkSaveHeightOK.CheckedChanged += new System.EventHandler(this.chkSaveOKLWImage_CheckedChanged);
//
// chkSaveOKLWImage
//
this.chkSaveOKLWImage.AutoSize = true;
- this.chkSaveOKLWImage.Location = new System.Drawing.Point(15, 65);
+ this.chkSaveOKLWImage.Location = new System.Drawing.Point(20, 81);
+ this.chkSaveOKLWImage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chkSaveOKLWImage.Name = "chkSaveOKLWImage";
- this.chkSaveOKLWImage.Size = new System.Drawing.Size(132, 16);
+ this.chkSaveOKLWImage.Size = new System.Drawing.Size(165, 19);
this.chkSaveOKLWImage.TabIndex = 1;
this.chkSaveOKLWImage.Text = "淇濆瓨闀垮妫�娴婳K鍥剧墖";
this.chkSaveOKLWImage.UseVisualStyleBackColor = true;
@@ -2733,10 +2970,10 @@
//
// btnClearCheck
//
- this.btnClearCheck.Location = new System.Drawing.Point(6, 8);
- this.btnClearCheck.Margin = new System.Windows.Forms.Padding(2);
+ this.btnClearCheck.Location = new System.Drawing.Point(8, 10);
+ this.btnClearCheck.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnClearCheck.Name = "btnClearCheck";
- this.btnClearCheck.Size = new System.Drawing.Size(104, 39);
+ this.btnClearCheck.Size = new System.Drawing.Size(139, 49);
this.btnClearCheck.TabIndex = 0;
this.btnClearCheck.Text = "娓呯┖浠婃棩鎶芥";
this.btnClearCheck.UseVisualStyleBackColor = true;
@@ -3462,14 +3699,14 @@
//
this.textBox34.Location = new System.Drawing.Point(45, 20);
this.textBox34.Name = "textBox34";
- this.textBox34.Size = new System.Drawing.Size(81, 21);
+ this.textBox34.Size = new System.Drawing.Size(81, 25);
this.textBox34.TabIndex = 1;
//
// textBox35
//
this.textBox35.Location = new System.Drawing.Point(45, 48);
this.textBox35.Name = "textBox35";
- this.textBox35.Size = new System.Drawing.Size(81, 21);
+ this.textBox35.Size = new System.Drawing.Size(81, 25);
this.textBox35.TabIndex = 1;
//
// label19
@@ -3477,7 +3714,7 @@
this.label19.AutoSize = true;
this.label19.Location = new System.Drawing.Point(6, 50);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(41, 12);
+ this.label19.Size = new System.Drawing.Size(52, 15);
this.label19.TabIndex = 0;
this.label19.Text = "姝ｉ檺锛�";
//
@@ -3485,7 +3722,7 @@
//
this.textBox36.Location = new System.Drawing.Point(45, 19);
this.textBox36.Name = "textBox36";
- this.textBox36.Size = new System.Drawing.Size(81, 21);
+ this.textBox36.Size = new System.Drawing.Size(81, 25);
this.textBox36.TabIndex = 1;
//
// groupBox5
@@ -3506,7 +3743,7 @@
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(6, 23);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(41, 12);
+ this.label22.Size = new System.Drawing.Size(52, 15);
this.label22.TabIndex = 0;
this.label22.Text = "璐熼檺锛�";
//
@@ -3527,7 +3764,7 @@
//
this.textBox37.Location = new System.Drawing.Point(45, 48);
this.textBox37.Name = "textBox37";
- this.textBox37.Size = new System.Drawing.Size(81, 21);
+ this.textBox37.Size = new System.Drawing.Size(81, 25);
this.textBox37.TabIndex = 1;
//
// label23
@@ -3535,7 +3772,7 @@
this.label23.AutoSize = true;
this.label23.Location = new System.Drawing.Point(6, 50);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(41, 12);
+ this.label23.Size = new System.Drawing.Size(52, 15);
this.label23.TabIndex = 0;
this.label23.Text = "姝ｉ檺锛�";
//
@@ -3544,7 +3781,7 @@
this.label25.AutoSize = true;
this.label25.Location = new System.Drawing.Point(6, 22);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(41, 12);
+ this.label25.Size = new System.Drawing.Size(52, 15);
this.label25.TabIndex = 0;
this.label25.Text = "璐熼檺锛�";
//
@@ -3552,7 +3789,7 @@
//
this.textBox38.Location = new System.Drawing.Point(41, 53);
this.textBox38.Name = "textBox38";
- this.textBox38.Size = new System.Drawing.Size(81, 21);
+ this.textBox38.Size = new System.Drawing.Size(81, 25);
this.textBox38.TabIndex = 2;
//
// groupBox10
@@ -3582,7 +3819,7 @@
//
this.textBox39.Location = new System.Drawing.Point(41, 33);
this.textBox39.Name = "textBox39";
- this.textBox39.Size = new System.Drawing.Size(81, 21);
+ this.textBox39.Size = new System.Drawing.Size(81, 25);
this.textBox39.TabIndex = 2;
//
// label26
@@ -3590,7 +3827,7 @@
this.label26.AutoSize = true;
this.label26.Location = new System.Drawing.Point(128, 36);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(17, 12);
+ this.label26.Size = new System.Drawing.Size(23, 15);
this.label26.TabIndex = 0;
this.label26.Text = "mm";
//
@@ -3599,7 +3836,7 @@
this.label27.AutoSize = true;
this.label27.Location = new System.Drawing.Point(6, 36);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(29, 12);
+ this.label27.Size = new System.Drawing.Size(39, 15);
this.label27.TabIndex = 0;
this.label27.Text = "Max:";
//
@@ -3607,7 +3844,7 @@
//
this.textBox40.Location = new System.Drawing.Point(41, 20);
this.textBox40.Name = "textBox40";
- this.textBox40.Size = new System.Drawing.Size(81, 21);
+ this.textBox40.Size = new System.Drawing.Size(81, 25);
this.textBox40.TabIndex = 1;
//
// groupBox16
@@ -3629,14 +3866,14 @@
//
this.textBox41.Location = new System.Drawing.Point(41, 53);
this.textBox41.Name = "textBox41";
- this.textBox41.Size = new System.Drawing.Size(81, 21);
+ this.textBox41.Size = new System.Drawing.Size(81, 25);
this.textBox41.TabIndex = 2;
//
// textBox42
//
this.textBox42.Location = new System.Drawing.Point(41, 20);
this.textBox42.Name = "textBox42";
- this.textBox42.Size = new System.Drawing.Size(81, 21);
+ this.textBox42.Size = new System.Drawing.Size(81, 25);
this.textBox42.TabIndex = 1;
//
// label28
@@ -3644,7 +3881,7 @@
this.label28.AutoSize = true;
this.label28.Location = new System.Drawing.Point(128, 56);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(17, 12);
+ this.label28.Size = new System.Drawing.Size(23, 15);
this.label28.TabIndex = 0;
this.label28.Text = "mm";
//
@@ -3653,7 +3890,7 @@
this.label29.AutoSize = true;
this.label29.Location = new System.Drawing.Point(128, 23);
this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(17, 12);
+ this.label29.Size = new System.Drawing.Size(23, 15);
this.label29.TabIndex = 0;
this.label29.Text = "mm";
//
@@ -3662,7 +3899,7 @@
this.label30.AutoSize = true;
this.label30.Location = new System.Drawing.Point(6, 23);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(29, 12);
+ this.label30.Size = new System.Drawing.Size(39, 15);
this.label30.TabIndex = 0;
this.label30.Text = "Min:";
//
@@ -3671,7 +3908,7 @@
this.label31.AutoSize = true;
this.label31.Location = new System.Drawing.Point(6, 56);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(29, 12);
+ this.label31.Size = new System.Drawing.Size(39, 15);
this.label31.TabIndex = 0;
this.label31.Text = "Max:";
//
@@ -3679,7 +3916,7 @@
//
this.textBox43.Location = new System.Drawing.Point(41, 33);
this.textBox43.Name = "textBox43";
- this.textBox43.Size = new System.Drawing.Size(81, 21);
+ this.textBox43.Size = new System.Drawing.Size(81, 25);
this.textBox43.TabIndex = 2;
//
// label32
@@ -3687,7 +3924,7 @@
this.label32.AutoSize = true;
this.label32.Location = new System.Drawing.Point(128, 36);
this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(17, 12);
+ this.label32.Size = new System.Drawing.Size(23, 15);
this.label32.TabIndex = 0;
this.label32.Text = "mm";
//
@@ -3695,7 +3932,7 @@
//
this.textBox44.Location = new System.Drawing.Point(41, 20);
this.textBox44.Name = "textBox44";
- this.textBox44.Size = new System.Drawing.Size(81, 21);
+ this.textBox44.Size = new System.Drawing.Size(81, 25);
this.textBox44.TabIndex = 1;
//
// label44
@@ -3703,7 +3940,7 @@
this.label44.AutoSize = true;
this.label44.Location = new System.Drawing.Point(128, 56);
this.label44.Name = "label44";
- this.label44.Size = new System.Drawing.Size(17, 12);
+ this.label44.Size = new System.Drawing.Size(23, 15);
this.label44.TabIndex = 0;
this.label44.Text = "mm";
//
@@ -3712,7 +3949,7 @@
this.label45.AutoSize = true;
this.label45.Location = new System.Drawing.Point(6, 56);
this.label45.Name = "label45";
- this.label45.Size = new System.Drawing.Size(29, 12);
+ this.label45.Size = new System.Drawing.Size(39, 15);
this.label45.TabIndex = 0;
this.label45.Text = "Max:";
//
@@ -3721,7 +3958,7 @@
this.label46.AutoSize = true;
this.label46.Location = new System.Drawing.Point(128, 23);
this.label46.Name = "label46";
- this.label46.Size = new System.Drawing.Size(17, 12);
+ this.label46.Size = new System.Drawing.Size(23, 15);
this.label46.TabIndex = 0;
this.label46.Text = "mm";
//
@@ -3730,7 +3967,7 @@
this.label47.AutoSize = true;
this.label47.Location = new System.Drawing.Point(6, 36);
this.label47.Name = "label47";
- this.label47.Size = new System.Drawing.Size(29, 12);
+ this.label47.Size = new System.Drawing.Size(39, 15);
this.label47.TabIndex = 0;
this.label47.Text = "Max:";
//
@@ -3739,7 +3976,7 @@
this.label48.AutoSize = true;
this.label48.Location = new System.Drawing.Point(6, 23);
this.label48.Name = "label48";
- this.label48.Size = new System.Drawing.Size(29, 12);
+ this.label48.Size = new System.Drawing.Size(39, 15);
this.label48.TabIndex = 0;
this.label48.Text = "Min:";
//
@@ -3748,7 +3985,7 @@
this.label51.AutoSize = true;
this.label51.Location = new System.Drawing.Point(128, 56);
this.label51.Name = "label51";
- this.label51.Size = new System.Drawing.Size(17, 12);
+ this.label51.Size = new System.Drawing.Size(23, 15);
this.label51.TabIndex = 0;
this.label51.Text = "mm";
//
@@ -3757,7 +3994,7 @@
this.label52.AutoSize = true;
this.label52.Location = new System.Drawing.Point(128, 23);
this.label52.Name = "label52";
- this.label52.Size = new System.Drawing.Size(17, 12);
+ this.label52.Size = new System.Drawing.Size(23, 15);
this.label52.TabIndex = 0;
this.label52.Text = "mm";
//
@@ -3765,7 +4002,7 @@
//
this.textBox45.Location = new System.Drawing.Point(41, 53);
this.textBox45.Name = "textBox45";
- this.textBox45.Size = new System.Drawing.Size(81, 21);
+ this.textBox45.Size = new System.Drawing.Size(81, 25);
this.textBox45.TabIndex = 2;
//
// groupBox17
@@ -3784,7 +4021,7 @@
//
this.textBox46.Location = new System.Drawing.Point(36, 33);
this.textBox46.Name = "textBox46";
- this.textBox46.Size = new System.Drawing.Size(81, 21);
+ this.textBox46.Size = new System.Drawing.Size(81, 25);
this.textBox46.TabIndex = 2;
//
// label53
@@ -3792,7 +4029,7 @@
this.label53.AutoSize = true;
this.label53.Location = new System.Drawing.Point(123, 36);
this.label53.Name = "label53";
- this.label53.Size = new System.Drawing.Size(17, 12);
+ this.label53.Size = new System.Drawing.Size(23, 15);
this.label53.TabIndex = 0;
this.label53.Text = "mm";
//
@@ -3801,7 +4038,7 @@
this.label54.AutoSize = true;
this.label54.Location = new System.Drawing.Point(1, 36);
this.label54.Name = "label54";
- this.label54.Size = new System.Drawing.Size(29, 12);
+ this.label54.Size = new System.Drawing.Size(39, 15);
this.label54.TabIndex = 0;
this.label54.Text = "Max:";
//
@@ -3809,7 +4046,7 @@
//
this.textBox47.Location = new System.Drawing.Point(41, 20);
this.textBox47.Name = "textBox47";
- this.textBox47.Size = new System.Drawing.Size(81, 21);
+ this.textBox47.Size = new System.Drawing.Size(81, 25);
this.textBox47.TabIndex = 1;
//
// label55
@@ -3817,7 +4054,7 @@
this.label55.AutoSize = true;
this.label55.Location = new System.Drawing.Point(128, 56);
this.label55.Name = "label55";
- this.label55.Size = new System.Drawing.Size(17, 12);
+ this.label55.Size = new System.Drawing.Size(23, 15);
this.label55.TabIndex = 0;
this.label55.Text = "mm";
//
@@ -3840,14 +4077,14 @@
//
this.textBox48.Location = new System.Drawing.Point(41, 53);
this.textBox48.Name = "textBox48";
- this.textBox48.Size = new System.Drawing.Size(81, 21);
+ this.textBox48.Size = new System.Drawing.Size(81, 25);
this.textBox48.TabIndex = 2;
//
// textBox49
//
this.textBox49.Location = new System.Drawing.Point(41, 20);
this.textBox49.Name = "textBox49";
- this.textBox49.Size = new System.Drawing.Size(81, 21);
+ this.textBox49.Size = new System.Drawing.Size(81, 25);
this.textBox49.TabIndex = 1;
//
// label56
@@ -3855,7 +4092,7 @@
this.label56.AutoSize = true;
this.label56.Location = new System.Drawing.Point(128, 56);
this.label56.Name = "label56";
- this.label56.Size = new System.Drawing.Size(17, 12);
+ this.label56.Size = new System.Drawing.Size(23, 15);
this.label56.TabIndex = 0;
this.label56.Text = "mm";
//
@@ -3864,7 +4101,7 @@
this.label57.AutoSize = true;
this.label57.Location = new System.Drawing.Point(128, 23);
this.label57.Name = "label57";
- this.label57.Size = new System.Drawing.Size(17, 12);
+ this.label57.Size = new System.Drawing.Size(23, 15);
this.label57.TabIndex = 0;
this.label57.Text = "mm";
//
@@ -3873,7 +4110,7 @@
this.label58.AutoSize = true;
this.label58.Location = new System.Drawing.Point(6, 23);
this.label58.Name = "label58";
- this.label58.Size = new System.Drawing.Size(29, 12);
+ this.label58.Size = new System.Drawing.Size(39, 15);
this.label58.TabIndex = 0;
this.label58.Text = "Min:";
//
@@ -3882,7 +4119,7 @@
this.label61.AutoSize = true;
this.label61.Location = new System.Drawing.Point(6, 56);
this.label61.Name = "label61";
- this.label61.Size = new System.Drawing.Size(29, 12);
+ this.label61.Size = new System.Drawing.Size(39, 15);
this.label61.TabIndex = 0;
this.label61.Text = "Max:";
//
@@ -3891,7 +4128,7 @@
this.label62.AutoSize = true;
this.label62.Location = new System.Drawing.Point(6, 23);
this.label62.Name = "label62";
- this.label62.Size = new System.Drawing.Size(29, 12);
+ this.label62.Size = new System.Drawing.Size(39, 15);
this.label62.TabIndex = 0;
this.label62.Text = "Min:";
//
@@ -3900,7 +4137,7 @@
this.label67.AutoSize = true;
this.label67.Location = new System.Drawing.Point(6, 56);
this.label67.Name = "label67";
- this.label67.Size = new System.Drawing.Size(29, 12);
+ this.label67.Size = new System.Drawing.Size(39, 15);
this.label67.TabIndex = 0;
this.label67.Text = "Max:";
//
@@ -3909,7 +4146,7 @@
this.label68.AutoSize = true;
this.label68.Location = new System.Drawing.Point(6, 23);
this.label68.Name = "label68";
- this.label68.Size = new System.Drawing.Size(29, 12);
+ this.label68.Size = new System.Drawing.Size(39, 15);
this.label68.TabIndex = 0;
this.label68.Text = "Min:";
//
@@ -3918,7 +4155,7 @@
this.label69.AutoSize = true;
this.label69.Location = new System.Drawing.Point(6, 56);
this.label69.Name = "label69";
- this.label69.Size = new System.Drawing.Size(29, 12);
+ this.label69.Size = new System.Drawing.Size(39, 15);
this.label69.TabIndex = 0;
this.label69.Text = "Max:";
//
@@ -3927,7 +4164,7 @@
this.label70.AutoSize = true;
this.label70.Location = new System.Drawing.Point(128, 23);
this.label70.Name = "label70";
- this.label70.Size = new System.Drawing.Size(17, 12);
+ this.label70.Size = new System.Drawing.Size(23, 15);
this.label70.TabIndex = 0;
this.label70.Text = "mm";
//
@@ -3935,7 +4172,7 @@
//
this.textBox50.Location = new System.Drawing.Point(41, 53);
this.textBox50.Name = "textBox50";
- this.textBox50.Size = new System.Drawing.Size(81, 21);
+ this.textBox50.Size = new System.Drawing.Size(81, 25);
this.textBox50.TabIndex = 2;
//
// groupBox19
@@ -3957,21 +4194,21 @@
//
this.textBox51.Location = new System.Drawing.Point(59, 290);
this.textBox51.Name = "textBox51";
- this.textBox51.Size = new System.Drawing.Size(81, 21);
+ this.textBox51.Size = new System.Drawing.Size(81, 25);
this.textBox51.TabIndex = 1;
//
// textBox52
//
this.textBox52.Location = new System.Drawing.Point(59, 230);
this.textBox52.Name = "textBox52";
- this.textBox52.Size = new System.Drawing.Size(81, 21);
+ this.textBox52.Size = new System.Drawing.Size(81, 25);
this.textBox52.TabIndex = 1;
//
// textBox53
//
this.textBox53.Location = new System.Drawing.Point(59, 107);
this.textBox53.Name = "textBox53";
- this.textBox53.Size = new System.Drawing.Size(81, 21);
+ this.textBox53.Size = new System.Drawing.Size(81, 25);
this.textBox53.TabIndex = 1;
//
// cbxTXT
@@ -3979,7 +4216,7 @@
this.cbxTXT.AutoSize = true;
this.cbxTXT.Location = new System.Drawing.Point(14, 32);
this.cbxTXT.Name = "cbxTXT";
- this.cbxTXT.Size = new System.Drawing.Size(15, 14);
+ this.cbxTXT.Size = new System.Drawing.Size(18, 17);
this.cbxTXT.TabIndex = 5;
this.cbxTXT.UseVisualStyleBackColor = true;
//
@@ -3988,7 +4225,7 @@
this.textBox54.Location = new System.Drawing.Point(141, 66);
this.textBox54.Name = "textBox54";
this.textBox54.ReadOnly = true;
- this.textBox54.Size = new System.Drawing.Size(191, 21);
+ this.textBox54.Size = new System.Drawing.Size(191, 25);
this.textBox54.TabIndex = 1;
//
// label71
@@ -3996,7 +4233,7 @@
this.label71.AutoSize = true;
this.label71.Location = new System.Drawing.Point(-47, 217);
this.label71.Name = "label71";
- this.label71.Size = new System.Drawing.Size(11, 12);
+ this.label71.Size = new System.Drawing.Size(15, 15);
this.label71.TabIndex = 0;
this.label71.Text = "%";
//
@@ -4005,7 +4242,7 @@
this.cbxEXCEL.AutoSize = true;
this.cbxEXCEL.Location = new System.Drawing.Point(14, 69);
this.cbxEXCEL.Name = "cbxEXCEL";
- this.cbxEXCEL.Size = new System.Drawing.Size(15, 14);
+ this.cbxEXCEL.Size = new System.Drawing.Size(18, 17);
this.cbxEXCEL.TabIndex = 5;
this.cbxEXCEL.UseVisualStyleBackColor = true;
//
@@ -4013,7 +4250,7 @@
//
this.textBox55.Location = new System.Drawing.Point(59, 259);
this.textBox55.Name = "textBox55";
- this.textBox55.Size = new System.Drawing.Size(81, 21);
+ this.textBox55.Size = new System.Drawing.Size(81, 25);
this.textBox55.TabIndex = 1;
//
// textBox56
@@ -4021,14 +4258,14 @@
this.textBox56.Location = new System.Drawing.Point(129, 44);
this.textBox56.Name = "textBox56";
this.textBox56.ReadOnly = true;
- this.textBox56.Size = new System.Drawing.Size(191, 21);
+ this.textBox56.Size = new System.Drawing.Size(191, 25);
this.textBox56.TabIndex = 2;
//
// textBox57
//
this.textBox57.Location = new System.Drawing.Point(59, 199);
this.textBox57.Name = "textBox57";
- this.textBox57.Size = new System.Drawing.Size(81, 21);
+ this.textBox57.Size = new System.Drawing.Size(81, 25);
this.textBox57.TabIndex = 1;
//
// btnShangchuan
@@ -4060,7 +4297,7 @@
this.textBox58.Location = new System.Drawing.Point(141, 29);
this.textBox58.Name = "textBox58";
this.textBox58.ReadOnly = true;
- this.textBox58.Size = new System.Drawing.Size(191, 21);
+ this.textBox58.Size = new System.Drawing.Size(191, 25);
this.textBox58.TabIndex = 1;
//
// btnEXCEL
@@ -4085,14 +4322,14 @@
//
this.textBox59.Location = new System.Drawing.Point(59, 76);
this.textBox59.Name = "textBox59";
- this.textBox59.Size = new System.Drawing.Size(81, 21);
+ this.textBox59.Size = new System.Drawing.Size(81, 25);
this.textBox59.TabIndex = 1;
//
// textBox60
//
this.textBox60.Location = new System.Drawing.Point(59, 168);
this.textBox60.Name = "textBox60";
- this.textBox60.Size = new System.Drawing.Size(81, 21);
+ this.textBox60.Size = new System.Drawing.Size(81, 25);
this.textBox60.TabIndex = 1;
//
// cbxIsShangchuan
@@ -4102,7 +4339,7 @@
this.cbxIsShangchuan.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbxIsShangchuan.Location = new System.Drawing.Point(7, 47);
this.cbxIsShangchuan.Name = "cbxIsShangchuan";
- this.cbxIsShangchuan.Size = new System.Drawing.Size(15, 14);
+ this.cbxIsShangchuan.Size = new System.Drawing.Size(18, 17);
this.cbxIsShangchuan.TabIndex = 0;
this.cbxIsShangchuan.UseVisualStyleBackColor = true;
//
@@ -4110,14 +4347,14 @@
//
this.textBox61.Location = new System.Drawing.Point(59, 45);
this.textBox61.Name = "textBox61";
- this.textBox61.Size = new System.Drawing.Size(81, 21);
+ this.textBox61.Size = new System.Drawing.Size(81, 25);
this.textBox61.TabIndex = 1;
//
// textBox62
//
this.textBox62.Location = new System.Drawing.Point(59, 137);
this.textBox62.Name = "textBox62";
- this.textBox62.Size = new System.Drawing.Size(81, 21);
+ this.textBox62.Size = new System.Drawing.Size(81, 25);
this.textBox62.TabIndex = 1;
//
// textBox63
@@ -4125,7 +4362,7 @@
this.textBox63.Location = new System.Drawing.Point(88, 117);
this.textBox63.Name = "textBox63";
this.textBox63.ReadOnly = true;
- this.textBox63.Size = new System.Drawing.Size(81, 21);
+ this.textBox63.Size = new System.Drawing.Size(81, 25);
this.textBox63.TabIndex = 4;
//
// groupBox21
@@ -4154,7 +4391,7 @@
this.textBox64.Location = new System.Drawing.Point(88, 84);
this.textBox64.Name = "textBox64";
this.textBox64.ReadOnly = true;
- this.textBox64.Size = new System.Drawing.Size(81, 21);
+ this.textBox64.Size = new System.Drawing.Size(81, 25);
this.textBox64.TabIndex = 4;
//
// textBox65
@@ -4162,7 +4399,7 @@
this.textBox65.Location = new System.Drawing.Point(88, 51);
this.textBox65.Name = "textBox65";
this.textBox65.ReadOnly = true;
- this.textBox65.Size = new System.Drawing.Size(81, 21);
+ this.textBox65.Size = new System.Drawing.Size(81, 25);
this.textBox65.TabIndex = 4;
//
// textBox66
@@ -4170,7 +4407,7 @@
this.textBox66.Location = new System.Drawing.Point(88, 17);
this.textBox66.Name = "textBox66";
this.textBox66.ReadOnly = true;
- this.textBox66.Size = new System.Drawing.Size(81, 21);
+ this.textBox66.Size = new System.Drawing.Size(81, 25);
this.textBox66.TabIndex = 4;
//
// label74
@@ -4178,7 +4415,7 @@
this.label74.AutoSize = true;
this.label74.Location = new System.Drawing.Point(175, 87);
this.label74.Name = "label74";
- this.label74.Size = new System.Drawing.Size(23, 12);
+ this.label74.Size = new System.Drawing.Size(30, 15);
this.label74.TabIndex = 3;
this.label74.Text = "渭m";
//
@@ -4187,7 +4424,7 @@
this.label72.AutoSize = true;
this.label72.Location = new System.Drawing.Point(175, 54);
this.label72.Name = "label72";
- this.label72.Size = new System.Drawing.Size(23, 12);
+ this.label72.Size = new System.Drawing.Size(30, 15);
this.label72.TabIndex = 3;
this.label72.Text = "渭m";
//
@@ -4196,7 +4433,7 @@
this.label76.AutoSize = true;
this.label76.Location = new System.Drawing.Point(175, 120);
this.label76.Name = "label76";
- this.label76.Size = new System.Drawing.Size(23, 12);
+ this.label76.Size = new System.Drawing.Size(30, 15);
this.label76.TabIndex = 3;
this.label76.Text = "渭m";
//
@@ -4205,7 +4442,7 @@
this.label73.AutoSize = true;
this.label73.Location = new System.Drawing.Point(175, 20);
this.label73.Name = "label73";
- this.label73.Size = new System.Drawing.Size(23, 12);
+ this.label73.Size = new System.Drawing.Size(30, 15);
this.label73.TabIndex = 3;
this.label73.Text = "渭m";
//
@@ -4214,7 +4451,7 @@
this.label75.AutoSize = true;
this.label75.Location = new System.Drawing.Point(6, 87);
this.label75.Name = "label75";
- this.label75.Size = new System.Drawing.Size(65, 12);
+ this.label75.Size = new System.Drawing.Size(83, 15);
this.label75.TabIndex = 2;
this.label75.Text = "宸ョ珯3鐩告満:";
//
@@ -4223,7 +4460,7 @@
this.label77.AutoSize = true;
this.label77.Location = new System.Drawing.Point(6, 54);
this.label77.Name = "label77";
- this.label77.Size = new System.Drawing.Size(71, 12);
+ this.label77.Size = new System.Drawing.Size(90, 15);
this.label77.TabIndex = 2;
this.label77.Text = "杩炴帴鍣ㄧ浉鏈�:";
//
@@ -4232,7 +4469,7 @@
this.label78.AutoSize = true;
this.label78.Location = new System.Drawing.Point(6, 120);
this.label78.Name = "label78";
- this.label78.Size = new System.Drawing.Size(59, 12);
+ this.label78.Size = new System.Drawing.Size(75, 15);
this.label78.TabIndex = 2;
this.label78.Text = "涓嬫枡鐩告満:";
//
@@ -4241,7 +4478,7 @@
this.label79.AutoSize = true;
this.label79.Location = new System.Drawing.Point(6, 20);
this.label79.Name = "label79";
- this.label79.Size = new System.Drawing.Size(59, 12);
+ this.label79.Size = new System.Drawing.Size(75, 15);
this.label79.TabIndex = 2;
this.label79.Text = "涓婃枡鐩告満:";
//
@@ -4249,7 +4486,7 @@
//
this.textBox67.Location = new System.Drawing.Point(59, 14);
this.textBox67.Name = "textBox67";
- this.textBox67.Size = new System.Drawing.Size(81, 21);
+ this.textBox67.Size = new System.Drawing.Size(81, 25);
this.textBox67.TabIndex = 1;
//
// label80
@@ -4257,7 +4494,7 @@
this.label80.AutoSize = true;
this.label80.Location = new System.Drawing.Point(146, 261);
this.label80.Name = "label80";
- this.label80.Size = new System.Drawing.Size(17, 12);
+ this.label80.Size = new System.Drawing.Size(23, 15);
this.label80.TabIndex = 3;
this.label80.Text = "mm";
//
@@ -4266,7 +4503,7 @@
this.label81.AutoSize = true;
this.label81.Location = new System.Drawing.Point(146, 201);
this.label81.Name = "label81";
- this.label81.Size = new System.Drawing.Size(17, 12);
+ this.label81.Size = new System.Drawing.Size(23, 15);
this.label81.TabIndex = 3;
this.label81.Text = "mm";
//
@@ -4275,7 +4512,7 @@
this.label82.AutoSize = true;
this.label82.Location = new System.Drawing.Point(146, 78);
this.label82.Name = "label82";
- this.label82.Size = new System.Drawing.Size(17, 12);
+ this.label82.Size = new System.Drawing.Size(23, 15);
this.label82.TabIndex = 3;
this.label82.Text = "mm";
//
@@ -4284,7 +4521,7 @@
this.label83.AutoSize = true;
this.label83.Location = new System.Drawing.Point(6, 295);
this.label83.Name = "label83";
- this.label83.Size = new System.Drawing.Size(41, 12);
+ this.label83.Size = new System.Drawing.Size(55, 15);
this.label83.TabIndex = 0;
this.label83.Text = "GapRR:";
//
@@ -4305,7 +4542,7 @@
this.label84.AutoSize = true;
this.label84.Location = new System.Drawing.Point(6, 235);
this.label84.Name = "label84";
- this.label84.Size = new System.Drawing.Size(41, 12);
+ this.label84.Size = new System.Drawing.Size(55, 15);
this.label84.TabIndex = 0;
this.label84.Text = "GapRL:";
//
@@ -4314,7 +4551,7 @@
this.label85.AutoSize = true;
this.label85.Location = new System.Drawing.Point(146, 171);
this.label85.Name = "label85";
- this.label85.Size = new System.Drawing.Size(17, 12);
+ this.label85.Size = new System.Drawing.Size(23, 15);
this.label85.TabIndex = 3;
this.label85.Text = "mm";
//
@@ -4323,7 +4560,7 @@
this.label86.AutoSize = true;
this.label86.Location = new System.Drawing.Point(6, 112);
this.label86.Name = "label86";
- this.label86.Size = new System.Drawing.Size(41, 12);
+ this.label86.Size = new System.Drawing.Size(55, 15);
this.label86.TabIndex = 0;
this.label86.Text = "FAI 6:";
//
@@ -4332,7 +4569,7 @@
this.label87.AutoSize = true;
this.label87.Location = new System.Drawing.Point(6, 265);
this.label87.Name = "label87";
- this.label87.Size = new System.Drawing.Size(41, 12);
+ this.label87.Size = new System.Drawing.Size(55, 15);
this.label87.TabIndex = 0;
this.label87.Text = "GapLR:";
//
@@ -4341,7 +4578,7 @@
this.label88.AutoSize = true;
this.label88.Location = new System.Drawing.Point(137, 28);
this.label88.Name = "label88";
- this.label88.Size = new System.Drawing.Size(11, 12);
+ this.label88.Size = new System.Drawing.Size(15, 15);
this.label88.TabIndex = 4;
this.label88.Text = "%";
//
@@ -4361,7 +4598,7 @@
//
this.textBox68.Location = new System.Drawing.Point(80, 25);
this.textBox68.Name = "textBox68";
- this.textBox68.Size = new System.Drawing.Size(51, 21);
+ this.textBox68.Size = new System.Drawing.Size(51, 25);
this.textBox68.TabIndex = 1;
//
// label89
@@ -4369,7 +4606,7 @@
this.label89.AutoSize = true;
this.label89.Location = new System.Drawing.Point(5, 28);
this.label89.Name = "label89";
- this.label89.Size = new System.Drawing.Size(77, 12);
+ this.label89.Size = new System.Drawing.Size(97, 15);
this.label89.TabIndex = 0;
this.label89.Text = "鏈烘鎵嬮�熷害锛�";
//
@@ -4418,7 +4655,7 @@
this.label90.AutoSize = true;
this.label90.Location = new System.Drawing.Point(6, 205);
this.label90.Name = "label90";
- this.label90.Size = new System.Drawing.Size(41, 12);
+ this.label90.Size = new System.Drawing.Size(55, 15);
this.label90.TabIndex = 0;
this.label90.Text = "GapLL:";
//
@@ -4427,7 +4664,7 @@
this.label91.AutoSize = true;
this.label91.Location = new System.Drawing.Point(146, 291);
this.label91.Name = "label91";
- this.label91.Size = new System.Drawing.Size(17, 12);
+ this.label91.Size = new System.Drawing.Size(23, 15);
this.label91.TabIndex = 3;
this.label91.Text = "mm";
//
@@ -4436,7 +4673,7 @@
this.label92.AutoSize = true;
this.label92.Location = new System.Drawing.Point(146, 48);
this.label92.Name = "label92";
- this.label92.Size = new System.Drawing.Size(17, 12);
+ this.label92.Size = new System.Drawing.Size(23, 15);
this.label92.TabIndex = 3;
this.label92.Text = "mm";
//
@@ -4445,7 +4682,7 @@
this.label93.AutoSize = true;
this.label93.Location = new System.Drawing.Point(146, 231);
this.label93.Name = "label93";
- this.label93.Size = new System.Drawing.Size(17, 12);
+ this.label93.Size = new System.Drawing.Size(23, 15);
this.label93.TabIndex = 3;
this.label93.Text = "mm";
//
@@ -4454,7 +4691,7 @@
this.label94.AutoSize = true;
this.label94.Location = new System.Drawing.Point(6, 82);
this.label94.Name = "label94";
- this.label94.Size = new System.Drawing.Size(41, 12);
+ this.label94.Size = new System.Drawing.Size(55, 15);
this.label94.TabIndex = 0;
this.label94.Text = "FAI 5:";
//
@@ -4463,7 +4700,7 @@
this.label95.AutoSize = true;
this.label95.Location = new System.Drawing.Point(6, 175);
this.label95.Name = "label95";
- this.label95.Size = new System.Drawing.Size(47, 12);
+ this.label95.Size = new System.Drawing.Size(63, 15);
this.label95.TabIndex = 0;
this.label95.Text = "FAI 12:";
//
@@ -4472,7 +4709,7 @@
this.label96.AutoSize = true;
this.label96.Location = new System.Drawing.Point(146, 108);
this.label96.Name = "label96";
- this.label96.Size = new System.Drawing.Size(17, 12);
+ this.label96.Size = new System.Drawing.Size(23, 15);
this.label96.TabIndex = 3;
this.label96.Text = "mm";
//
@@ -4481,7 +4718,7 @@
this.label97.AutoSize = true;
this.label97.Location = new System.Drawing.Point(146, 141);
this.label97.Name = "label97";
- this.label97.Size = new System.Drawing.Size(17, 12);
+ this.label97.Size = new System.Drawing.Size(23, 15);
this.label97.TabIndex = 3;
this.label97.Text = "mm";
//
@@ -4490,7 +4727,7 @@
this.label98.AutoSize = true;
this.label98.Location = new System.Drawing.Point(6, 52);
this.label98.Name = "label98";
- this.label98.Size = new System.Drawing.Size(41, 12);
+ this.label98.Size = new System.Drawing.Size(55, 15);
this.label98.TabIndex = 0;
this.label98.Text = "FAI 4:";
//
@@ -4499,7 +4736,7 @@
this.label99.AutoSize = true;
this.label99.Location = new System.Drawing.Point(6, 145);
this.label99.Name = "label99";
- this.label99.Size = new System.Drawing.Size(47, 12);
+ this.label99.Size = new System.Drawing.Size(63, 15);
this.label99.TabIndex = 0;
this.label99.Text = "FAI 10:";
//
@@ -4508,7 +4745,7 @@
this.label100.AutoSize = true;
this.label100.Location = new System.Drawing.Point(146, 18);
this.label100.Name = "label100";
- this.label100.Size = new System.Drawing.Size(17, 12);
+ this.label100.Size = new System.Drawing.Size(23, 15);
this.label100.TabIndex = 3;
this.label100.Text = "mm";
//
@@ -4517,7 +4754,7 @@
this.label101.AutoSize = true;
this.label101.Location = new System.Drawing.Point(6, 22);
this.label101.Name = "label101";
- this.label101.Size = new System.Drawing.Size(41, 12);
+ this.label101.Size = new System.Drawing.Size(55, 15);
this.label101.TabIndex = 0;
this.label101.Text = "FAI 2:";
//
@@ -4556,77 +4793,77 @@
//
this.textBox69.Location = new System.Drawing.Point(246, 68);
this.textBox69.Name = "textBox69";
- this.textBox69.Size = new System.Drawing.Size(81, 21);
+ this.textBox69.Size = new System.Drawing.Size(81, 25);
this.textBox69.TabIndex = 23;
//
// textBox70
//
this.textBox70.Location = new System.Drawing.Point(245, 170);
this.textBox70.Name = "textBox70";
- this.textBox70.Size = new System.Drawing.Size(81, 21);
+ this.textBox70.Size = new System.Drawing.Size(81, 25);
this.textBox70.TabIndex = 24;
//
// textBox71
//
this.textBox71.Location = new System.Drawing.Point(245, 133);
this.textBox71.Name = "textBox71";
- this.textBox71.Size = new System.Drawing.Size(81, 21);
+ this.textBox71.Size = new System.Drawing.Size(81, 25);
this.textBox71.TabIndex = 21;
//
// textBox72
//
this.textBox72.Location = new System.Drawing.Point(81, 133);
this.textBox72.Name = "textBox72";
- this.textBox72.Size = new System.Drawing.Size(81, 21);
+ this.textBox72.Size = new System.Drawing.Size(81, 25);
this.textBox72.TabIndex = 21;
//
// textBox73
//
this.textBox73.Location = new System.Drawing.Point(81, 170);
this.textBox73.Name = "textBox73";
- this.textBox73.Size = new System.Drawing.Size(81, 21);
+ this.textBox73.Size = new System.Drawing.Size(81, 25);
this.textBox73.TabIndex = 22;
//
// textBox74
//
this.textBox74.Location = new System.Drawing.Point(245, 99);
this.textBox74.Name = "textBox74";
- this.textBox74.Size = new System.Drawing.Size(81, 21);
+ this.textBox74.Size = new System.Drawing.Size(81, 25);
this.textBox74.TabIndex = 20;
//
// textBox75
//
this.textBox75.Location = new System.Drawing.Point(81, 99);
this.textBox75.Name = "textBox75";
- this.textBox75.Size = new System.Drawing.Size(81, 21);
+ this.textBox75.Size = new System.Drawing.Size(81, 25);
this.textBox75.TabIndex = 20;
//
// textBox76
//
this.textBox76.Location = new System.Drawing.Point(390, 28);
this.textBox76.Name = "textBox76";
- this.textBox76.Size = new System.Drawing.Size(81, 21);
+ this.textBox76.Size = new System.Drawing.Size(81, 25);
this.textBox76.TabIndex = 27;
//
// textBox77
//
this.textBox77.Location = new System.Drawing.Point(81, 65);
this.textBox77.Name = "textBox77";
- this.textBox77.Size = new System.Drawing.Size(81, 21);
+ this.textBox77.Size = new System.Drawing.Size(81, 25);
this.textBox77.TabIndex = 28;
//
// textBox78
//
this.textBox78.Location = new System.Drawing.Point(244, 28);
this.textBox78.Name = "textBox78";
- this.textBox78.Size = new System.Drawing.Size(81, 21);
+ this.textBox78.Size = new System.Drawing.Size(81, 25);
this.textBox78.TabIndex = 25;
//
// textBox79
//
this.textBox79.Location = new System.Drawing.Point(81, 28);
this.textBox79.Name = "textBox79";
- this.textBox79.Size = new System.Drawing.Size(81, 21);
+ this.textBox79.Size = new System.Drawing.Size(81, 25);
this.textBox79.TabIndex = 26;
//
// label102
@@ -4634,7 +4871,7 @@
this.label102.AutoSize = true;
this.label102.Location = new System.Drawing.Point(170, 71);
this.label102.Name = "label102";
- this.label102.Size = new System.Drawing.Size(83, 12);
+ this.label102.Size = new System.Drawing.Size(105, 15);
this.label102.TabIndex = 5;
this.label102.Text = "Y杞村畾浣嶉�熷害锛�";
//
@@ -4643,7 +4880,7 @@
this.label103.AutoSize = true;
this.label103.Location = new System.Drawing.Point(170, 136);
this.label103.Name = "label103";
- this.label103.Size = new System.Drawing.Size(83, 12);
+ this.label103.Size = new System.Drawing.Size(105, 15);
this.label103.TabIndex = 2;
this.label103.Text = "Y杞存墜鍔ㄩ�熷害锛�";
//
@@ -4652,7 +4889,7 @@
this.label104.AutoSize = true;
this.label104.Location = new System.Drawing.Point(6, 136);
this.label104.Name = "label104";
- this.label104.Size = new System.Drawing.Size(83, 12);
+ this.label104.Size = new System.Drawing.Size(105, 15);
this.label104.TabIndex = 2;
this.label104.Text = "X杞存墜鍔ㄩ�熷害锛�";
//
@@ -4661,7 +4898,7 @@
this.label105.AutoSize = true;
this.label105.Location = new System.Drawing.Point(170, 173);
this.label105.Name = "label105";
- this.label105.Size = new System.Drawing.Size(83, 12);
+ this.label105.Size = new System.Drawing.Size(105, 15);
this.label105.TabIndex = 3;
this.label105.Text = "Y杞寸瓑寰呬綅缃細";
//
@@ -4670,7 +4907,7 @@
this.label106.AutoSize = true;
this.label106.Location = new System.Drawing.Point(170, 102);
this.label106.Name = "label106";
- this.label106.Size = new System.Drawing.Size(83, 12);
+ this.label106.Size = new System.Drawing.Size(105, 15);
this.label106.TabIndex = 6;
this.label106.Text = "Y杞村畾浣嶄綅缃細";
//
@@ -4679,7 +4916,7 @@
this.label107.AutoSize = true;
this.label107.Location = new System.Drawing.Point(6, 102);
this.label107.Name = "label107";
- this.label107.Size = new System.Drawing.Size(83, 12);
+ this.label107.Size = new System.Drawing.Size(105, 15);
this.label107.TabIndex = 6;
this.label107.Text = "X杞村畾浣嶄綅缃細";
//
@@ -4688,7 +4925,7 @@
this.label108.AutoSize = true;
this.label108.Location = new System.Drawing.Point(6, 173);
this.label108.Name = "label108";
- this.label108.Size = new System.Drawing.Size(83, 12);
+ this.label108.Size = new System.Drawing.Size(105, 15);
this.label108.TabIndex = 9;
this.label108.Text = "X杞寸瓑寰呬綅缃細";
//
@@ -4697,7 +4934,7 @@
this.label109.AutoSize = true;
this.label109.Location = new System.Drawing.Point(6, 68);
this.label109.Name = "label109";
- this.label109.Size = new System.Drawing.Size(83, 12);
+ this.label109.Size = new System.Drawing.Size(105, 15);
this.label109.TabIndex = 10;
this.label109.Text = "X杞村畾浣嶉�熷害锛�";
//
@@ -4706,7 +4943,7 @@
this.label110.AutoSize = true;
this.label110.Location = new System.Drawing.Point(332, 31);
this.label110.Name = "label110";
- this.label110.Size = new System.Drawing.Size(65, 12);
+ this.label110.Size = new System.Drawing.Size(82, 15);
this.label110.TabIndex = 7;
this.label110.Text = "涓よ酱閫熷害锛�";
//
@@ -4715,7 +4952,7 @@
this.label111.AutoSize = true;
this.label111.Location = new System.Drawing.Point(170, 31);
this.label111.Name = "label111";
- this.label111.Size = new System.Drawing.Size(65, 12);
+ this.label111.Size = new System.Drawing.Size(82, 15);
this.label111.TabIndex = 8;
this.label111.Text = "涓よ酱鍑忛�燂細";
//
@@ -4724,7 +4961,7 @@
this.label112.AutoSize = true;
this.label112.Location = new System.Drawing.Point(6, 31);
this.label112.Name = "label112";
- this.label112.Size = new System.Drawing.Size(65, 12);
+ this.label112.Size = new System.Drawing.Size(82, 15);
this.label112.TabIndex = 4;
this.label112.Text = "涓よ酱鍔犻�燂細";
//
@@ -4796,23 +5033,13 @@
this.groupBox29.TabStop = false;
this.groupBox29.Text = "FAI 10";
//
- // chkSaveHeightOK
- //
- this.chkSaveHeightOK.AutoSize = true;
- this.chkSaveHeightOK.Location = new System.Drawing.Point(172, 65);
- this.chkSaveHeightOK.Name = "chkSaveHeightOK";
- this.chkSaveHeightOK.Size = new System.Drawing.Size(132, 16);
- this.chkSaveHeightOK.TabIndex = 1;
- this.chkSaveHeightOK.Text = "淇濆瓨楂樺害妫�娴婳K鍥剧墖";
- this.chkSaveHeightOK.UseVisualStyleBackColor = true;
- this.chkSaveHeightOK.CheckedChanged += new System.EventHandler(this.chkSaveOKLWImage_CheckedChanged);
- //
// ConfigForm
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(825, 499);
+ this.ClientSize = new System.Drawing.Size(1100, 624);
this.Controls.Add(this.tabControl1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "ConfigForm";
this.Text = "閰嶇疆";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ConfigForm_FormClosing);
diff --git a/DetectionData.cs b/DetectionData.cs
index 40c0f37..ec0f301 100644
--- a/DetectionData.cs
+++ b/DetectionData.cs
@@ -6,6 +6,8 @@
using System.Text;
using System.Windows.Forms;
using System.Drawing;
+using System.Diagnostics;
+using System.Collections.Generic;
namespace M423project
{
@@ -167,6 +169,41 @@
}
}
}
+
+ public void SaveTrayBarcode(List<int> detectIDList, string carrierCode = null)
+ {
+ //string trayCode = CarrierBarcodeCtrl.GlobalCarrierBarcode;
+
+ if (carrierCode == null)
+ {
+ carrierCode = CarrierBarcodeCtrl.GlobalCarrierBarcode;
+ }
+
+ if (detectIDList.Count == 0)
+ {
+ return;
+ }
+ lock (synObj)
+ {
+ string idList = string.Join(",", detectIDList);
+ try
+ {
+ string sql = $"Update ProductDetectionDetail set CarrierBarcode='{carrierCode}' where AutoID in ({idList})";
+
+ using (SqlCommand cmd = new SqlCommand(sql, connection))
+ {
+ cmd.ExecuteNonQuery();
+ }
+
+ Trace.TraceInformation($"{idList}浜у搧缁戝畾杞藉叿鐮侊細{carrierCode}");
+ }
+ catch (Exception ex)
+ {
+ Trace.TraceError($"{idList}浜у搧缁戝畾杞藉叿鐮侊細{carrierCode}寮傚父锛歿ex.Message}");
+ //throw;
+ }
+ }
+ }
#endregion
#region add by Patrick 2019-04-16
@@ -285,8 +322,14 @@
public void SaveToCsv(ProductMeasureResult pmr)
{
string fileName = @"E:\DailyReport\detectdata" + DateTime.Now.ToString("yyyyMMdd") + ".csv";
- bool IsNewFile = !File.Exists(fileName);
+ CSVDataRecord(pmr, fileName);
+
+ }
+
+ public void CSVDataRecord(ProductMeasureResult pmr, string fileName)
+ {
+ bool IsNewFile = !File.Exists(fileName);
lock (csvLock)
{
using (FileStream myStream = new FileStream(fileName, FileMode.OpenOrCreate))
diff --git a/FormPLCIO.cs b/FormPLCIO.cs
index 0cc7039..cb6a765 100644
--- a/FormPLCIO.cs
+++ b/FormPLCIO.cs
@@ -86,6 +86,17 @@
}
+ private void OPC_OnReadItemValueChanged(OPC.Item item, int itemValue)
+ {
+ var x = (from i in _ioBindlingList
+ where i.OPCName == item.name
+ select i).FirstOrDefault();
+ if (x != default(PLCIO))
+ {
+ x.PLCValue = itemValue == 1;
+ dgvPLCIO.Invalidate();
+ }
+ }
public void OPCEventHandler(object sender, EventTool.ListenEventArgs e)
{
@@ -116,13 +127,14 @@
dgvPLCIO.Rows[i].Cells["PLCValue"].Style.BackColor = _ioList[i].PLCValue ? Color.Green : Color.White;
}
- _opc.listenEventCreater.ListenEvent += this.OPCEventHandler;
+ //_opc.listenEventCreater.ListenEvent += this.OPCEventHandler;
+ _opc.OnReadItemValueChanged += OPC_OnReadItemValueChanged;
}
private void FormPLCIO_FormClosing(object sender, FormClosingEventArgs e)
{
-
- _opc.listenEventCreater.ListenEvent -= this.OPCEventHandler;
+ _opc.OnReadItemValueChanged -= OPC_OnReadItemValueChanged;
+ //_opc.listenEventCreater.ListenEvent -= this.OPCEventHandler;
}
diff --git a/HeightDetection.cs b/HeightDetection.cs
index 2df4a4a..4342ac2 100644
--- a/HeightDetection.cs
+++ b/HeightDetection.cs
@@ -73,6 +73,7 @@
HObject ihImage = null;
HObject hi = new HObject();
+ string tempFileName = "";
try
{
opc.Write(OPCOutputTag.DetectionStart2, false);
@@ -128,7 +129,7 @@
int slotNum = (CommonUtil.mainForm.PlateID + 1) % 5 + 1;
- string tempFileName = slotNum.ToString() + "_" + productNo.Trim().Replace("/", "").Replace("\"", "'") + "_" + DateTime.Now.ToString("HHmmssff") + "_" + detectID.ToString();
+ tempFileName = slotNum.ToString() + "_" + productNo.Trim().Replace("/", "").Replace("\"", "'") + "_" + DateTime.Now.ToString("HHmmssff") + "_" + detectID.ToString();
if (productNo.Trim().Length == CommonUtil.ProductNoLength)
{
string productNoFileName = CommonUtil.ProductNoImageDir + @"\" + productNo + "_" + detectID.ToString();
@@ -197,9 +198,9 @@
if (batteryHeight[0] != 999.999 && batteryHeight[0] != -999.999)
{
double compv = 0.0;
- Type t = opcConfig.standardCompensationZ.GetType();
+ Type t = opcConfig.compensationZ.GetType();
FieldInfo fi = t.GetField(string.Format("station{0}", (CommonUtil.mainForm.PlateID + 1) % 5 + 1));
- compv = (double)fi.GetValue(opcConfig.standardCompensationZ);
+ compv = (double)fi.GetValue(opcConfig.compensationZ);
batteryHeight[0] += compv;
}
@@ -232,7 +233,7 @@
}
else
{
- if (opcConfig.IsSaveHeightOKImage)
+ if (opcConfig.IsSaveHeightOKImage || CommonUtil.DetectionOption == DetectionOption.doStandardBlock)
{
//DateTime dt = DateTime.Now;
@@ -260,6 +261,12 @@
catch (Exception ex)
{
CommonUtil.WriteLog(LogType.Exc, string.Format("妫�娴嬩骇鍝佹潯鐮佸拰鍘氬害杩囩▼涓嚭鐜板紓甯革細{0}", ex.Message));
+
+ if (string.IsNullOrWhiteSpace(tempFileName))
+ {
+ tempFileName = DateTime.Now.ToString("HHmmssfff");
+ }
+ VisionDetect.SaveImageAs(ihImage, $"{CommonUtil.ProductSizeImageDir}_NA\\{tempFileName}");
}
finally
{
diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs
index 4ee8e06..4366d63 100644
--- a/MainForm.Designer.cs
+++ b/MainForm.Designer.cs
@@ -211,19 +211,20 @@
this.panel4.Controls.Add(this.gbHandTest);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel4.Location = new System.Drawing.Point(0, 0);
+ this.panel4.Margin = new System.Windows.Forms.Padding(4);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(485, 385);
+ this.panel4.Size = new System.Drawing.Size(647, 496);
this.panel4.TabIndex = 3;
//
// gbSystemInfo
//
this.gbSystemInfo.Controls.Add(this.tbSystemInfo);
this.gbSystemInfo.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gbSystemInfo.Location = new System.Drawing.Point(0, 633);
- this.gbSystemInfo.Margin = new System.Windows.Forms.Padding(2);
+ this.gbSystemInfo.Location = new System.Drawing.Point(0, 792);
+ this.gbSystemInfo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gbSystemInfo.Name = "gbSystemInfo";
- this.gbSystemInfo.Padding = new System.Windows.Forms.Padding(2);
- this.gbSystemInfo.Size = new System.Drawing.Size(483, 0);
+ this.gbSystemInfo.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gbSystemInfo.Size = new System.Drawing.Size(645, 0);
this.gbSystemInfo.TabIndex = 22;
this.gbSystemInfo.TabStop = false;
this.gbSystemInfo.Text = "绯荤粺淇℃伅杩愯鏃ュ織";
@@ -232,13 +233,13 @@
//
this.tbSystemInfo.AcceptsReturn = true;
this.tbSystemInfo.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tbSystemInfo.Location = new System.Drawing.Point(2, 16);
- this.tbSystemInfo.Margin = new System.Windows.Forms.Padding(2);
+ this.tbSystemInfo.Location = new System.Drawing.Point(3, 20);
+ this.tbSystemInfo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tbSystemInfo.Multiline = true;
this.tbSystemInfo.Name = "tbSystemInfo";
this.tbSystemInfo.ReadOnly = true;
this.tbSystemInfo.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.tbSystemInfo.Size = new System.Drawing.Size(479, 0);
+ this.tbSystemInfo.Size = new System.Drawing.Size(639, 0);
this.tbSystemInfo.TabIndex = 0;
//
// panel6
@@ -246,10 +247,10 @@
this.panel6.Controls.Add(this.groupBox4);
this.panel6.Controls.Add(this.gbxStatistics);
this.panel6.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel6.Location = new System.Drawing.Point(0, 427);
- this.panel6.Margin = new System.Windows.Forms.Padding(2);
+ this.panel6.Location = new System.Drawing.Point(0, 534);
+ this.panel6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(483, 206);
+ this.panel6.Size = new System.Drawing.Size(645, 258);
this.panel6.TabIndex = 20;
//
// groupBox4
@@ -257,8 +258,10 @@
this.groupBox4.Controls.Add(this.dgvNG);
this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox4.Location = new System.Drawing.Point(0, 0);
+ this.groupBox4.Margin = new System.Windows.Forms.Padding(4);
this.groupBox4.Name = "groupBox4";
- this.groupBox4.Size = new System.Drawing.Size(483, 144);
+ this.groupBox4.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox4.Size = new System.Drawing.Size(645, 180);
this.groupBox4.TabIndex = 15;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "妾㈡脯绲愭灉";
@@ -291,12 +294,14 @@
this.colLengthResult,
this.colWidthResult});
this.dgvNG.Dock = System.Windows.Forms.DockStyle.Fill;
- this.dgvNG.Location = new System.Drawing.Point(3, 17);
+ this.dgvNG.Location = new System.Drawing.Point(4, 22);
+ this.dgvNG.Margin = new System.Windows.Forms.Padding(4);
this.dgvNG.Name = "dgvNG";
this.dgvNG.ReadOnly = true;
this.dgvNG.RowHeadersVisible = false;
+ this.dgvNG.RowHeadersWidth = 51;
this.dgvNG.RowTemplate.Height = 20;
- this.dgvNG.Size = new System.Drawing.Size(477, 124);
+ this.dgvNG.Size = new System.Drawing.Size(637, 154);
this.dgvNG.TabIndex = 17;
this.dgvNG.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dgvNG_CellFormatting);
//
@@ -304,6 +309,7 @@
//
this.DetectID.DataPropertyName = "DetectID";
this.DetectID.HeaderText = "搴忓彿";
+ this.DetectID.MinimumWidth = 6;
this.DetectID.Name = "DetectID";
this.DetectID.ReadOnly = true;
this.DetectID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
@@ -316,6 +322,7 @@
dataGridViewCellStyle2.Format = "yy-MM-dd HH:mm:ss";
this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle2;
this.dataGridViewTextBoxColumn11.HeaderText = "鏃堕棿";
+ this.dataGridViewTextBoxColumn11.MinimumWidth = 6;
this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
this.dataGridViewTextBoxColumn11.ReadOnly = true;
this.dataGridViewTextBoxColumn11.Width = 90;
@@ -326,6 +333,7 @@
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.ProductNo.DefaultCellStyle = dataGridViewCellStyle3;
this.ProductNo.HeaderText = "鏉＄爜";
+ this.ProductNo.MinimumWidth = 6;
this.ProductNo.Name = "ProductNo";
this.ProductNo.ReadOnly = true;
this.ProductNo.Width = 150;
@@ -334,6 +342,7 @@
//
this.Column1.DataPropertyName = "PlateID";
this.Column1.HeaderText = "宸ヤ綅";
+ this.Column1.MinimumWidth = 6;
this.Column1.Name = "Column1";
this.Column1.ReadOnly = true;
this.Column1.Width = 55;
@@ -345,6 +354,7 @@
dataGridViewCellStyle4.Format = "0.####";
this.Height.DefaultCellStyle = dataGridViewCellStyle4;
this.Height.HeaderText = "FAI9";
+ this.Height.MinimumWidth = 6;
this.Height.Name = "Height";
this.Height.ReadOnly = true;
this.Height.Width = 60;
@@ -355,8 +365,10 @@
dataGridViewCellStyle5.Format = "0.####";
this.CellHeight.DefaultCellStyle = dataGridViewCellStyle5;
this.CellHeight.HeaderText = "FAI2";
+ this.CellHeight.MinimumWidth = 6;
this.CellHeight.Name = "CellHeight";
this.CellHeight.ReadOnly = true;
+ this.CellHeight.Width = 125;
//
// Length
//
@@ -365,6 +377,7 @@
dataGridViewCellStyle6.Format = "0.####";
this.Length.DefaultCellStyle = dataGridViewCellStyle6;
this.Length.HeaderText = "FAI3";
+ this.Length.MinimumWidth = 6;
this.Length.Name = "Length";
this.Length.ReadOnly = true;
this.Length.Width = 60;
@@ -376,6 +389,7 @@
dataGridViewCellStyle7.Format = "0.####";
this.Width.DefaultCellStyle = dataGridViewCellStyle7;
this.Width.HeaderText = "FAI12";
+ this.Width.MinimumWidth = 6;
this.Width.Name = "Width";
this.Width.ReadOnly = true;
this.Width.Width = 60;
@@ -384,6 +398,7 @@
//
this.ProductResult.DataPropertyName = "ProductResult";
this.ProductResult.HeaderText = "浜у搧鍒ゅ畾";
+ this.ProductResult.MinimumWidth = 6;
this.ProductResult.Name = "ProductResult";
this.ProductResult.ReadOnly = true;
this.ProductResult.Width = 80;
@@ -392,8 +407,10 @@
//
this.colProductNoResult.DataPropertyName = "ProductNoResult";
this.colProductNoResult.HeaderText = "鏉＄爜鍒ゅ畾";
+ this.colProductNoResult.MinimumWidth = 6;
this.colProductNoResult.Name = "colProductNoResult";
this.colProductNoResult.ReadOnly = true;
+ this.colProductNoResult.Width = 125;
//
// Column6
//
@@ -401,6 +418,7 @@
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.Column6.DefaultCellStyle = dataGridViewCellStyle8;
this.Column6.HeaderText = "楂樺害鍒ゅ畾";
+ this.Column6.MinimumWidth = 6;
this.Column6.Name = "Column6";
this.Column6.ReadOnly = true;
this.Column6.Width = 80;
@@ -409,22 +427,28 @@
//
this.colCellHeightResult.DataPropertyName = "CellHeightResult";
this.colCellHeightResult.HeaderText = "渚ц竟楂樺害鍒ゅ畾";
+ this.colCellHeightResult.MinimumWidth = 6;
this.colCellHeightResult.Name = "colCellHeightResult";
this.colCellHeightResult.ReadOnly = true;
+ this.colCellHeightResult.Width = 125;
//
// colLengthResult
//
this.colLengthResult.DataPropertyName = "LengthResult";
this.colLengthResult.HeaderText = "闀垮害鍒ゅ畾";
+ this.colLengthResult.MinimumWidth = 6;
this.colLengthResult.Name = "colLengthResult";
this.colLengthResult.ReadOnly = true;
+ this.colLengthResult.Width = 125;
//
// colWidthResult
//
this.colWidthResult.DataPropertyName = "WidthResult";
this.colWidthResult.HeaderText = "瀹藉害鍒ゅ畾";
+ this.colWidthResult.MinimumWidth = 6;
this.colWidthResult.Name = "colWidthResult";
this.colWidthResult.ReadOnly = true;
+ this.colWidthResult.Width = 125;
//
// gbxStatistics
//
@@ -450,9 +474,11 @@
this.gbxStatistics.Controls.Add(this.lblProductQuantity);
this.gbxStatistics.Controls.Add(this.label3);
this.gbxStatistics.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.gbxStatistics.Location = new System.Drawing.Point(0, 144);
+ this.gbxStatistics.Location = new System.Drawing.Point(0, 180);
+ this.gbxStatistics.Margin = new System.Windows.Forms.Padding(4);
this.gbxStatistics.Name = "gbxStatistics";
- this.gbxStatistics.Size = new System.Drawing.Size(483, 62);
+ this.gbxStatistics.Padding = new System.Windows.Forms.Padding(4);
+ this.gbxStatistics.Size = new System.Drawing.Size(645, 78);
this.gbxStatistics.TabIndex = 22;
this.gbxStatistics.TabStop = false;
this.gbxStatistics.Text = "绲愭灉绲辫▓";
@@ -460,48 +486,45 @@
// lblEmptyQuantity
//
this.lblEmptyQuantity.AutoSize = true;
- this.lblEmptyQuantity.Location = new System.Drawing.Point(757, 20);
- this.lblEmptyQuantity.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lblEmptyQuantity.Location = new System.Drawing.Point(1009, 25);
this.lblEmptyQuantity.Name = "lblEmptyQuantity";
- this.lblEmptyQuantity.Size = new System.Drawing.Size(47, 12);
+ this.lblEmptyQuantity.Size = new System.Drawing.Size(63, 15);
this.lblEmptyQuantity.TabIndex = 20;
this.lblEmptyQuantity.Text = "label37";
//
// label11
//
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(672, 20);
- this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label11.Location = new System.Drawing.Point(896, 25);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(41, 12);
+ this.label11.Size = new System.Drawing.Size(52, 15);
this.label11.TabIndex = 19;
this.label11.Text = "绌虹┐锛�";
//
// lblProductNoFailQuantity
//
this.lblProductNoFailQuantity.AutoSize = true;
- this.lblProductNoFailQuantity.Location = new System.Drawing.Point(757, 42);
- this.lblProductNoFailQuantity.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lblProductNoFailQuantity.Location = new System.Drawing.Point(1009, 52);
this.lblProductNoFailQuantity.Name = "lblProductNoFailQuantity";
- this.lblProductNoFailQuantity.Size = new System.Drawing.Size(47, 12);
+ this.lblProductNoFailQuantity.Size = new System.Drawing.Size(63, 15);
this.lblProductNoFailQuantity.TabIndex = 18;
this.lblProductNoFailQuantity.Text = "label37";
//
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(672, 42);
- this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label7.Location = new System.Drawing.Point(896, 52);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(77, 12);
+ this.label7.Size = new System.Drawing.Size(97, 15);
this.label7.TabIndex = 17;
this.label7.Text = "鏉＄爜閿欒鏁帮細";
//
// btnClearResult
//
- this.btnClearResult.Location = new System.Drawing.Point(817, 35);
+ this.btnClearResult.Location = new System.Drawing.Point(1089, 44);
+ this.btnClearResult.Margin = new System.Windows.Forms.Padding(4);
this.btnClearResult.Name = "btnClearResult";
- this.btnClearResult.Size = new System.Drawing.Size(76, 23);
+ this.btnClearResult.Size = new System.Drawing.Size(101, 29);
this.btnClearResult.TabIndex = 16;
this.btnClearResult.Text = "绲愭灉娓呯┖";
this.btnClearResult.UseVisualStyleBackColor = true;
@@ -510,160 +533,144 @@
// lblSizeFailQuantity
//
this.lblSizeFailQuantity.AutoSize = true;
- this.lblSizeFailQuantity.Location = new System.Drawing.Point(608, 42);
- this.lblSizeFailQuantity.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lblSizeFailQuantity.Location = new System.Drawing.Point(811, 52);
this.lblSizeFailQuantity.Name = "lblSizeFailQuantity";
- this.lblSizeFailQuantity.Size = new System.Drawing.Size(47, 12);
+ this.lblSizeFailQuantity.Size = new System.Drawing.Size(63, 15);
this.lblSizeFailQuantity.TabIndex = 15;
this.lblSizeFailQuantity.Text = "label37";
//
// label31
//
this.label31.AutoSize = true;
- this.label31.Location = new System.Drawing.Point(517, 42);
- this.label31.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label31.Location = new System.Drawing.Point(689, 52);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(77, 12);
+ this.label31.Size = new System.Drawing.Size(97, 15);
this.label31.TabIndex = 14;
this.label31.Text = "灏哄澶辫触鏁帮細";
//
// label39
//
this.label39.AutoSize = true;
- this.label39.Location = new System.Drawing.Point(517, 20);
- this.label39.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label39.Location = new System.Drawing.Point(689, 25);
this.label39.Name = "label39";
- this.label39.Size = new System.Drawing.Size(53, 12);
+ this.label39.Size = new System.Drawing.Size(67, 15);
this.label39.TabIndex = 13;
this.label39.Text = "閫氳繃鐜囷細";
//
// lblPassRate
//
this.lblPassRate.AutoSize = true;
- this.lblPassRate.Location = new System.Drawing.Point(608, 20);
- this.lblPassRate.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lblPassRate.Location = new System.Drawing.Point(811, 25);
this.lblPassRate.Name = "lblPassRate";
- this.lblPassRate.Size = new System.Drawing.Size(47, 12);
+ this.lblPassRate.Size = new System.Drawing.Size(63, 15);
this.lblPassRate.TabIndex = 12;
this.lblPassRate.Text = "label38";
//
// lblSizePassQuantity
//
this.lblSizePassQuantity.AutoSize = true;
- this.lblSizePassQuantity.Location = new System.Drawing.Point(443, 43);
- this.lblSizePassQuantity.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lblSizePassQuantity.Location = new System.Drawing.Point(591, 54);
this.lblSizePassQuantity.Name = "lblSizePassQuantity";
- this.lblSizePassQuantity.Size = new System.Drawing.Size(47, 12);
+ this.lblSizePassQuantity.Size = new System.Drawing.Size(63, 15);
this.lblSizePassQuantity.TabIndex = 11;
this.lblSizePassQuantity.Text = "label37";
//
// label36
//
this.label36.AutoSize = true;
- this.label36.Location = new System.Drawing.Point(352, 43);
- this.label36.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label36.Location = new System.Drawing.Point(469, 54);
this.label36.Name = "label36";
- this.label36.Size = new System.Drawing.Size(77, 12);
+ this.label36.Size = new System.Drawing.Size(97, 15);
this.label36.TabIndex = 10;
this.label36.Text = "灏哄閫氳繃鏁帮細";
//
// lblHeightFailQuantity
//
this.lblHeightFailQuantity.AutoSize = true;
- this.lblHeightFailQuantity.Location = new System.Drawing.Point(283, 42);
- this.lblHeightFailQuantity.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lblHeightFailQuantity.Location = new System.Drawing.Point(377, 52);
this.lblHeightFailQuantity.Name = "lblHeightFailQuantity";
- this.lblHeightFailQuantity.Size = new System.Drawing.Size(47, 12);
+ this.lblHeightFailQuantity.Size = new System.Drawing.Size(63, 15);
this.lblHeightFailQuantity.TabIndex = 9;
this.lblHeightFailQuantity.Text = "label34";
//
// label33
//
this.label33.AutoSize = true;
- this.label33.Location = new System.Drawing.Point(189, 42);
- this.label33.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label33.Location = new System.Drawing.Point(252, 52);
this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(77, 12);
+ this.label33.Size = new System.Drawing.Size(97, 15);
this.label33.TabIndex = 8;
this.label33.Text = "鍘氬害澶辫触鏁帮細";
//
// lblHeightPassQuantity
//
this.lblHeightPassQuantity.AutoSize = true;
- this.lblHeightPassQuantity.Location = new System.Drawing.Point(107, 42);
- this.lblHeightPassQuantity.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lblHeightPassQuantity.Location = new System.Drawing.Point(143, 52);
this.lblHeightPassQuantity.Name = "lblHeightPassQuantity";
- this.lblHeightPassQuantity.Size = new System.Drawing.Size(47, 12);
+ this.lblHeightPassQuantity.Size = new System.Drawing.Size(63, 15);
this.lblHeightPassQuantity.TabIndex = 7;
this.lblHeightPassQuantity.Text = "label31";
//
// label29
//
this.label29.AutoSize = true;
- this.label29.Location = new System.Drawing.Point(9, 42);
- this.label29.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label29.Location = new System.Drawing.Point(12, 52);
this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(77, 12);
+ this.label29.Size = new System.Drawing.Size(97, 15);
this.label29.TabIndex = 6;
this.label29.Text = "鍘氬害閫氳繃鏁帮細";
//
// lblFailQuantity
//
this.lblFailQuantity.AutoSize = true;
- this.lblFailQuantity.Location = new System.Drawing.Point(443, 20);
- this.lblFailQuantity.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lblFailQuantity.Location = new System.Drawing.Point(591, 25);
this.lblFailQuantity.Name = "lblFailQuantity";
- this.lblFailQuantity.Size = new System.Drawing.Size(47, 12);
+ this.lblFailQuantity.Size = new System.Drawing.Size(63, 15);
this.lblFailQuantity.TabIndex = 5;
this.lblFailQuantity.Text = "label29";
//
// label32
//
this.label32.AutoSize = true;
- this.label32.Location = new System.Drawing.Point(352, 20);
- this.label32.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label32.Location = new System.Drawing.Point(469, 25);
this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(65, 12);
+ this.label32.Size = new System.Drawing.Size(82, 15);
this.label32.TabIndex = 4;
this.label32.Text = "澶辫触鏁伴噺锛�";
//
// lblPassQuantity
//
this.lblPassQuantity.AutoSize = true;
- this.lblPassQuantity.Location = new System.Drawing.Point(283, 20);
- this.lblPassQuantity.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lblPassQuantity.Location = new System.Drawing.Point(377, 25);
this.lblPassQuantity.Name = "lblPassQuantity";
- this.lblPassQuantity.Size = new System.Drawing.Size(47, 12);
+ this.lblPassQuantity.Size = new System.Drawing.Size(63, 15);
this.lblPassQuantity.TabIndex = 3;
this.lblPassQuantity.Text = "label31";
//
// label30
//
this.label30.AutoSize = true;
- this.label30.Location = new System.Drawing.Point(189, 20);
- this.label30.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label30.Location = new System.Drawing.Point(252, 25);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(65, 12);
+ this.label30.Size = new System.Drawing.Size(82, 15);
this.label30.TabIndex = 2;
this.label30.Text = "閫氳繃鏁伴噺锛�";
//
// lblProductQuantity
//
this.lblProductQuantity.AutoSize = true;
- this.lblProductQuantity.Location = new System.Drawing.Point(107, 20);
- this.lblProductQuantity.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lblProductQuantity.Location = new System.Drawing.Point(143, 25);
this.lblProductQuantity.Name = "lblProductQuantity";
- this.lblProductQuantity.Size = new System.Drawing.Size(47, 12);
+ this.lblProductQuantity.Size = new System.Drawing.Size(63, 15);
this.lblProductQuantity.TabIndex = 1;
this.lblProductQuantity.Text = "label29";
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(9, 20);
- this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label3.Location = new System.Drawing.Point(12, 25);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(89, 12);
+ this.label3.Size = new System.Drawing.Size(112, 15);
this.label3.TabIndex = 0;
this.label3.Text = "妫�娴嬩骇鍝佹�绘暟锛�";
//
@@ -678,10 +685,11 @@
this.tableLayoutPanel4.Controls.Add(this.hcXyView, 0, 0);
this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Top;
this.tableLayoutPanel4.Location = new System.Drawing.Point(0, 0);
+ this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
this.tableLayoutPanel4.RowCount = 1;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel4.Size = new System.Drawing.Size(483, 427);
+ this.tableLayoutPanel4.Size = new System.Drawing.Size(645, 534);
this.tableLayoutPanel4.TabIndex = 18;
//
// hcBarcode
@@ -690,11 +698,12 @@
this.hcBarcode.BorderColor = System.Drawing.Color.Black;
this.hcBarcode.Dock = System.Windows.Forms.DockStyle.Fill;
this.hcBarcode.ImagePart = new System.Drawing.Rectangle(0, 0, 640, 480);
- this.hcBarcode.Location = new System.Drawing.Point(325, 3);
+ this.hcBarcode.Location = new System.Drawing.Point(434, 4);
+ this.hcBarcode.Margin = new System.Windows.Forms.Padding(4);
this.hcBarcode.Name = "hcBarcode";
- this.hcBarcode.Size = new System.Drawing.Size(155, 421);
+ this.hcBarcode.Size = new System.Drawing.Size(207, 526);
this.hcBarcode.TabIndex = 4;
- this.hcBarcode.WindowSize = new System.Drawing.Size(155, 421);
+ this.hcBarcode.WindowSize = new System.Drawing.Size(207, 526);
//
// hcZView
//
@@ -702,11 +711,12 @@
this.hcZView.BorderColor = System.Drawing.Color.Black;
this.hcZView.Dock = System.Windows.Forms.DockStyle.Fill;
this.hcZView.ImagePart = new System.Drawing.Rectangle(0, 0, 640, 480);
- this.hcZView.Location = new System.Drawing.Point(164, 3);
+ this.hcZView.Location = new System.Drawing.Point(219, 4);
+ this.hcZView.Margin = new System.Windows.Forms.Padding(4);
this.hcZView.Name = "hcZView";
- this.hcZView.Size = new System.Drawing.Size(155, 421);
+ this.hcZView.Size = new System.Drawing.Size(207, 526);
this.hcZView.TabIndex = 1;
- this.hcZView.WindowSize = new System.Drawing.Size(155, 421);
+ this.hcZView.WindowSize = new System.Drawing.Size(207, 526);
//
// hcXyView
//
@@ -715,11 +725,12 @@
this.hcXyView.BorderColor = System.Drawing.Color.Black;
this.hcXyView.Dock = System.Windows.Forms.DockStyle.Fill;
this.hcXyView.ImagePart = new System.Drawing.Rectangle(0, 0, 640, 480);
- this.hcXyView.Location = new System.Drawing.Point(3, 3);
+ this.hcXyView.Location = new System.Drawing.Point(4, 4);
+ this.hcXyView.Margin = new System.Windows.Forms.Padding(4);
this.hcXyView.Name = "hcXyView";
- this.hcXyView.Size = new System.Drawing.Size(155, 421);
+ this.hcXyView.Size = new System.Drawing.Size(207, 526);
this.hcXyView.TabIndex = 3;
- this.hcXyView.WindowSize = new System.Drawing.Size(155, 421);
+ this.hcXyView.WindowSize = new System.Drawing.Size(207, 526);
//
// gbHandTest
//
@@ -728,9 +739,11 @@
this.gbHandTest.Controls.Add(this.btnStation2);
this.gbHandTest.Controls.Add(this.btnTableAction);
this.gbHandTest.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.gbHandTest.Location = new System.Drawing.Point(0, 283);
+ this.gbHandTest.Location = new System.Drawing.Point(0, 369);
+ this.gbHandTest.Margin = new System.Windows.Forms.Padding(4);
this.gbHandTest.Name = "gbHandTest";
- this.gbHandTest.Size = new System.Drawing.Size(483, 100);
+ this.gbHandTest.Padding = new System.Windows.Forms.Padding(4);
+ this.gbHandTest.Size = new System.Drawing.Size(645, 125);
this.gbHandTest.TabIndex = 17;
this.gbHandTest.TabStop = false;
this.gbHandTest.Text = "鎵嬪嫊娓│";
@@ -739,9 +752,10 @@
//
this.cbHandXi.Appearance = System.Windows.Forms.Appearance.Button;
this.cbHandXi.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
- this.cbHandXi.Location = new System.Drawing.Point(6, 21);
+ this.cbHandXi.Location = new System.Drawing.Point(8, 26);
+ this.cbHandXi.Margin = new System.Windows.Forms.Padding(4);
this.cbHandXi.Name = "cbHandXi";
- this.cbHandXi.Size = new System.Drawing.Size(95, 75);
+ this.cbHandXi.Size = new System.Drawing.Size(127, 94);
this.cbHandXi.TabIndex = 76;
this.cbHandXi.Text = "鎵嬪姩鍚�";
this.cbHandXi.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -751,9 +765,10 @@
// btnStation4
//
this.btnStation4.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
- this.btnStation4.Location = new System.Drawing.Point(345, 21);
+ this.btnStation4.Location = new System.Drawing.Point(460, 26);
+ this.btnStation4.Margin = new System.Windows.Forms.Padding(4);
this.btnStation4.Name = "btnStation4";
- this.btnStation4.Size = new System.Drawing.Size(95, 75);
+ this.btnStation4.Size = new System.Drawing.Size(127, 94);
this.btnStation4.TabIndex = 75;
this.btnStation4.Text = " 4# 妫�娴�";
this.btnStation4.UseVisualStyleBackColor = true;
@@ -762,9 +777,10 @@
// btnStation2
//
this.btnStation2.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
- this.btnStation2.Location = new System.Drawing.Point(232, 21);
+ this.btnStation2.Location = new System.Drawing.Point(309, 26);
+ this.btnStation2.Margin = new System.Windows.Forms.Padding(4);
this.btnStation2.Name = "btnStation2";
- this.btnStation2.Size = new System.Drawing.Size(95, 75);
+ this.btnStation2.Size = new System.Drawing.Size(127, 94);
this.btnStation2.TabIndex = 73;
this.btnStation2.Text = " 2# 妫�娴�";
this.btnStation2.UseVisualStyleBackColor = true;
@@ -773,9 +789,10 @@
// btnTableAction
//
this.btnTableAction.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(136)));
- this.btnTableAction.Location = new System.Drawing.Point(119, 21);
+ this.btnTableAction.Location = new System.Drawing.Point(159, 26);
+ this.btnTableAction.Margin = new System.Windows.Forms.Padding(4);
this.btnTableAction.Name = "btnTableAction";
- this.btnTableAction.Size = new System.Drawing.Size(95, 75);
+ this.btnTableAction.Size = new System.Drawing.Size(127, 94);
this.btnTableAction.TabIndex = 74;
this.btnTableAction.Text = "杞洏鍔ㄤ綔";
this.btnTableAction.UseVisualStyleBackColor = true;
@@ -786,9 +803,10 @@
this.panel7.Controls.Add(this.panel4);
this.panel7.Controls.Add(this.panel5);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel7.Location = new System.Drawing.Point(0, 58);
+ this.panel7.Location = new System.Drawing.Point(0, 72);
+ this.panel7.Margin = new System.Windows.Forms.Padding(4);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(856, 385);
+ this.panel7.Size = new System.Drawing.Size(1141, 496);
this.panel7.TabIndex = 5;
//
// panel5
@@ -802,18 +820,21 @@
this.panel5.Controls.Add(this.panel8);
this.panel5.Controls.Add(this.tableLayoutPanel1);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(485, 0);
+ this.panel5.Location = new System.Drawing.Point(647, 0);
+ this.panel5.Margin = new System.Windows.Forms.Padding(4);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(371, 385);
+ this.panel5.Size = new System.Drawing.Size(494, 496);
this.panel5.TabIndex = 92;
//
// groupBox2
//
this.groupBox2.Controls.Add(this.tbPLCMsg);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.groupBox2.Location = new System.Drawing.Point(0, 255);
+ this.groupBox2.Location = new System.Drawing.Point(0, 319);
+ this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(369, 0);
+ this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox2.Size = new System.Drawing.Size(492, 0);
this.groupBox2.TabIndex = 104;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "PLC";
@@ -821,11 +842,12 @@
// tbPLCMsg
//
this.tbPLCMsg.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tbPLCMsg.Location = new System.Drawing.Point(3, 17);
+ this.tbPLCMsg.Location = new System.Drawing.Point(4, 22);
+ this.tbPLCMsg.Margin = new System.Windows.Forms.Padding(4);
this.tbPLCMsg.Multiline = true;
this.tbPLCMsg.Name = "tbPLCMsg";
this.tbPLCMsg.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.tbPLCMsg.Size = new System.Drawing.Size(363, 0);
+ this.tbPLCMsg.Size = new System.Drawing.Size(484, 0);
this.tbPLCMsg.TabIndex = 0;
//
// groupBox1
@@ -835,9 +857,11 @@
this.groupBox1.Controls.Add(this.btnSetupRunMode);
this.groupBox1.Controls.Add(this.btnConfig);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
- this.groupBox1.Location = new System.Drawing.Point(0, 198);
+ this.groupBox1.Location = new System.Drawing.Point(0, 248);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(369, 57);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Size = new System.Drawing.Size(492, 71);
this.groupBox1.TabIndex = 3;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "閰嶇疆瑾挎暣";
@@ -845,9 +869,10 @@
// btnPLCSignal
//
this.btnPLCSignal.Font = new System.Drawing.Font("瀹嬩綋", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btnPLCSignal.Location = new System.Drawing.Point(85, 17);
+ this.btnPLCSignal.Location = new System.Drawing.Point(113, 21);
+ this.btnPLCSignal.Margin = new System.Windows.Forms.Padding(4);
this.btnPLCSignal.Name = "btnPLCSignal";
- this.btnPLCSignal.Size = new System.Drawing.Size(74, 31);
+ this.btnPLCSignal.Size = new System.Drawing.Size(99, 39);
this.btnPLCSignal.TabIndex = 8;
this.btnPLCSignal.Text = "PLC淇¤櫉";
this.btnPLCSignal.UseVisualStyleBackColor = true;
@@ -858,18 +883,21 @@
this.gbDetectionOption.Controls.Add(this.rbStandardBlock);
this.gbDetectionOption.Controls.Add(this.rbProductOption);
this.gbDetectionOption.Font = new System.Drawing.Font("瀹嬩綋", 9F);
- this.gbDetectionOption.Location = new System.Drawing.Point(251, 11);
+ this.gbDetectionOption.Location = new System.Drawing.Point(335, 14);
+ this.gbDetectionOption.Margin = new System.Windows.Forms.Padding(4);
this.gbDetectionOption.Name = "gbDetectionOption";
- this.gbDetectionOption.Size = new System.Drawing.Size(112, 37);
+ this.gbDetectionOption.Padding = new System.Windows.Forms.Padding(4);
+ this.gbDetectionOption.Size = new System.Drawing.Size(149, 46);
this.gbDetectionOption.TabIndex = 7;
this.gbDetectionOption.TabStop = false;
//
// rbStandardBlock
//
this.rbStandardBlock.AutoSize = true;
- this.rbStandardBlock.Location = new System.Drawing.Point(53, 16);
+ this.rbStandardBlock.Location = new System.Drawing.Point(71, 20);
+ this.rbStandardBlock.Margin = new System.Windows.Forms.Padding(4);
this.rbStandardBlock.Name = "rbStandardBlock";
- this.rbStandardBlock.Size = new System.Drawing.Size(59, 16);
+ this.rbStandardBlock.Size = new System.Drawing.Size(73, 19);
this.rbStandardBlock.TabIndex = 1;
this.rbStandardBlock.Text = "妯欐簴濉�";
this.rbStandardBlock.UseVisualStyleBackColor = true;
@@ -879,9 +907,10 @@
//
this.rbProductOption.AutoSize = true;
this.rbProductOption.Checked = true;
- this.rbProductOption.Location = new System.Drawing.Point(5, 16);
+ this.rbProductOption.Location = new System.Drawing.Point(7, 20);
+ this.rbProductOption.Margin = new System.Windows.Forms.Padding(4);
this.rbProductOption.Name = "rbProductOption";
- this.rbProductOption.Size = new System.Drawing.Size(47, 16);
+ this.rbProductOption.Size = new System.Drawing.Size(58, 19);
this.rbProductOption.TabIndex = 0;
this.rbProductOption.TabStop = true;
this.rbProductOption.Text = "鐢㈠搧";
@@ -891,9 +920,10 @@
// btnSetupRunMode
//
this.btnSetupRunMode.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btnSetupRunMode.Location = new System.Drawing.Point(160, 17);
+ this.btnSetupRunMode.Location = new System.Drawing.Point(213, 21);
+ this.btnSetupRunMode.Margin = new System.Windows.Forms.Padding(4);
this.btnSetupRunMode.Name = "btnSetupRunMode";
- this.btnSetupRunMode.Size = new System.Drawing.Size(85, 31);
+ this.btnSetupRunMode.Size = new System.Drawing.Size(113, 39);
this.btnSetupRunMode.TabIndex = 5;
this.btnSetupRunMode.Text = "閬嬭妯″紡";
this.btnSetupRunMode.UseVisualStyleBackColor = true;
@@ -902,9 +932,10 @@
// btnConfig
//
this.btnConfig.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnConfig.Location = new System.Drawing.Point(6, 17);
+ this.btnConfig.Location = new System.Drawing.Point(8, 21);
+ this.btnConfig.Margin = new System.Windows.Forms.Padding(4);
this.btnConfig.Name = "btnConfig";
- this.btnConfig.Size = new System.Drawing.Size(78, 31);
+ this.btnConfig.Size = new System.Drawing.Size(104, 39);
this.btnConfig.TabIndex = 0;
this.btnConfig.Text = "閰嶇疆";
this.btnConfig.UseVisualStyleBackColor = true;
@@ -914,10 +945,10 @@
//
this.panel9.Controls.Add(this.groupBox5);
this.panel9.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel9.Location = new System.Drawing.Point(0, 97);
- this.panel9.Margin = new System.Windows.Forms.Padding(2);
+ this.panel9.Location = new System.Drawing.Point(0, 137);
+ this.panel9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel9.Name = "panel9";
- this.panel9.Size = new System.Drawing.Size(369, 81);
+ this.panel9.Size = new System.Drawing.Size(492, 101);
this.panel9.TabIndex = 103;
//
// groupBox5
@@ -942,8 +973,10 @@
this.groupBox5.Controls.Add(this.label70);
this.groupBox5.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox5.Location = new System.Drawing.Point(0, 0);
+ this.groupBox5.Margin = new System.Windows.Forms.Padding(4);
this.groupBox5.Name = "groupBox5";
- this.groupBox5.Size = new System.Drawing.Size(369, 81);
+ this.groupBox5.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox5.Size = new System.Drawing.Size(492, 101);
this.groupBox5.TabIndex = 17;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "杌镐綅缃俊鎭�";
@@ -951,168 +984,176 @@
// label10
//
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(299, 54);
- this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label10.Location = new System.Drawing.Point(399, 68);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(29, 12);
+ this.label10.Size = new System.Drawing.Size(37, 15);
this.label10.TabIndex = 27;
this.label10.Text = "涓嬫枡";
//
// tbUnloadTime
//
- this.tbUnloadTime.Location = new System.Drawing.Point(329, 50);
+ this.tbUnloadTime.Location = new System.Drawing.Point(439, 62);
+ this.tbUnloadTime.Margin = new System.Windows.Forms.Padding(4);
this.tbUnloadTime.Name = "tbUnloadTime";
this.tbUnloadTime.ReadOnly = true;
- this.tbUnloadTime.Size = new System.Drawing.Size(38, 21);
+ this.tbUnloadTime.Size = new System.Drawing.Size(49, 25);
this.tbUnloadTime.TabIndex = 26;
this.tbUnloadTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label9
//
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(229, 55);
- this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label9.Location = new System.Drawing.Point(305, 69);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(29, 12);
+ this.label9.Size = new System.Drawing.Size(37, 15);
this.label9.TabIndex = 25;
this.label9.Text = "涓婃枡";
//
// tbUploadTime
//
- this.tbUploadTime.Location = new System.Drawing.Point(259, 51);
+ this.tbUploadTime.Location = new System.Drawing.Point(345, 64);
+ this.tbUploadTime.Margin = new System.Windows.Forms.Padding(4);
this.tbUploadTime.Name = "tbUploadTime";
this.tbUploadTime.ReadOnly = true;
- this.tbUploadTime.Size = new System.Drawing.Size(38, 21);
+ this.tbUploadTime.Size = new System.Drawing.Size(49, 25);
this.tbUploadTime.TabIndex = 24;
this.tbUploadTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// tbCT
//
- this.tbCT.Location = new System.Drawing.Point(48, 51);
+ this.tbCT.Location = new System.Drawing.Point(64, 64);
+ this.tbCT.Margin = new System.Windows.Forms.Padding(4);
this.tbCT.Name = "tbCT";
this.tbCT.ReadOnly = true;
- this.tbCT.Size = new System.Drawing.Size(38, 21);
+ this.tbCT.Size = new System.Drawing.Size(49, 25);
this.tbCT.TabIndex = 23;
this.tbCT.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// tbSizeTime
//
- this.tbSizeTime.Location = new System.Drawing.Point(189, 51);
+ this.tbSizeTime.Location = new System.Drawing.Point(252, 64);
+ this.tbSizeTime.Margin = new System.Windows.Forms.Padding(4);
this.tbSizeTime.Name = "tbSizeTime";
this.tbSizeTime.ReadOnly = true;
- this.tbSizeTime.Size = new System.Drawing.Size(38, 21);
+ this.tbSizeTime.Size = new System.Drawing.Size(49, 25);
this.tbSizeTime.TabIndex = 22;
this.tbSizeTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(155, 54);
- this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label8.Location = new System.Drawing.Point(207, 68);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(29, 12);
+ this.label8.Size = new System.Drawing.Size(37, 15);
this.label8.TabIndex = 21;
this.label8.Text = "闀垮";
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(91, 53);
- this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label6.Location = new System.Drawing.Point(121, 66);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(17, 12);
+ this.label6.Size = new System.Drawing.Size(22, 15);
this.label6.TabIndex = 21;
this.label6.Text = "楂�";
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(5, 53);
- this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label2.Location = new System.Drawing.Point(7, 66);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(41, 12);
+ this.label2.Size = new System.Drawing.Size(55, 15);
this.label2.TabIndex = 19;
this.label2.Text = "C/T(s)";
this.label2.DoubleClick += new System.EventHandler(this.label2_DoubleClick);
//
// tbHeightTime
//
- this.tbHeightTime.Location = new System.Drawing.Point(113, 51);
+ this.tbHeightTime.Location = new System.Drawing.Point(151, 64);
+ this.tbHeightTime.Margin = new System.Windows.Forms.Padding(4);
this.tbHeightTime.Name = "tbHeightTime";
this.tbHeightTime.ReadOnly = true;
- this.tbHeightTime.Size = new System.Drawing.Size(38, 21);
+ this.tbHeightTime.Size = new System.Drawing.Size(49, 25);
this.tbHeightTime.TabIndex = 18;
this.tbHeightTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// tbX2axisLoPos
//
- this.tbX2axisLoPos.Location = new System.Drawing.Point(219, 19);
+ this.tbX2axisLoPos.Location = new System.Drawing.Point(292, 24);
+ this.tbX2axisLoPos.Margin = new System.Windows.Forms.Padding(4);
this.tbX2axisLoPos.Name = "tbX2axisLoPos";
this.tbX2axisLoPos.ReadOnly = true;
- this.tbX2axisLoPos.Size = new System.Drawing.Size(58, 21);
+ this.tbX2axisLoPos.Size = new System.Drawing.Size(76, 25);
this.tbX2axisLoPos.TabIndex = 4;
this.tbX2axisLoPos.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// tbX1axisLoPos
//
- this.tbX1axisLoPos.Location = new System.Drawing.Point(34, 19);
+ this.tbX1axisLoPos.Location = new System.Drawing.Point(45, 24);
+ this.tbX1axisLoPos.Margin = new System.Windows.Forms.Padding(4);
this.tbX1axisLoPos.Name = "tbX1axisLoPos";
this.tbX1axisLoPos.ReadOnly = true;
- this.tbX1axisLoPos.Size = new System.Drawing.Size(58, 21);
+ this.tbX1axisLoPos.Size = new System.Drawing.Size(76, 25);
this.tbX1axisLoPos.TabIndex = 4;
this.tbX1axisLoPos.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(190, 23);
+ this.label5.Location = new System.Drawing.Point(253, 29);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(23, 12);
+ this.label5.Size = new System.Drawing.Size(31, 15);
this.label5.TabIndex = 3;
this.label5.Text = "X2:";
//
// tbY2axisLoPos
//
- this.tbY2axisLoPos.Location = new System.Drawing.Point(309, 19);
+ this.tbY2axisLoPos.Location = new System.Drawing.Point(412, 24);
+ this.tbY2axisLoPos.Margin = new System.Windows.Forms.Padding(4);
this.tbY2axisLoPos.Name = "tbY2axisLoPos";
this.tbY2axisLoPos.ReadOnly = true;
- this.tbY2axisLoPos.Size = new System.Drawing.Size(58, 21);
+ this.tbY2axisLoPos.Size = new System.Drawing.Size(76, 25);
this.tbY2axisLoPos.TabIndex = 5;
this.tbY2axisLoPos.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label69
//
this.label69.AutoSize = true;
- this.label69.Location = new System.Drawing.Point(5, 23);
+ this.label69.Location = new System.Drawing.Point(7, 29);
+ this.label69.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label69.Name = "label69";
- this.label69.Size = new System.Drawing.Size(23, 12);
+ this.label69.Size = new System.Drawing.Size(31, 15);
this.label69.TabIndex = 3;
this.label69.Text = "X1:";
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(281, 23);
+ this.label4.Location = new System.Drawing.Point(375, 29);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(23, 12);
+ this.label4.Size = new System.Drawing.Size(31, 15);
this.label4.TabIndex = 2;
this.label4.Text = "Y2:";
//
// tbY1axisLoPos
//
- this.tbY1axisLoPos.Location = new System.Drawing.Point(125, 19);
+ this.tbY1axisLoPos.Location = new System.Drawing.Point(167, 24);
+ this.tbY1axisLoPos.Margin = new System.Windows.Forms.Padding(4);
this.tbY1axisLoPos.Name = "tbY1axisLoPos";
this.tbY1axisLoPos.ReadOnly = true;
- this.tbY1axisLoPos.Size = new System.Drawing.Size(58, 21);
+ this.tbY1axisLoPos.Size = new System.Drawing.Size(76, 25);
this.tbY1axisLoPos.TabIndex = 5;
this.tbY1axisLoPos.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label70
//
this.label70.AutoSize = true;
- this.label70.Location = new System.Drawing.Point(97, 23);
+ this.label70.Location = new System.Drawing.Point(129, 29);
+ this.label70.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label70.Name = "label70";
- this.label70.Size = new System.Drawing.Size(23, 12);
+ this.label70.Size = new System.Drawing.Size(31, 15);
this.label70.TabIndex = 2;
this.label70.Text = "Y1:";
//
@@ -1120,9 +1161,10 @@
//
this.panel2.Controls.Add(this.lbDisplayState);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel2.Location = new System.Drawing.Point(0, 178);
+ this.panel2.Location = new System.Drawing.Point(0, 238);
+ this.panel2.Margin = new System.Windows.Forms.Padding(4);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(369, 52);
+ this.panel2.Size = new System.Drawing.Size(492, 65);
this.panel2.TabIndex = 102;
//
// lbDisplayState
@@ -1131,8 +1173,9 @@
this.lbDisplayState.Dock = System.Windows.Forms.DockStyle.Fill;
this.lbDisplayState.Font = new System.Drawing.Font("瀹嬩綋", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbDisplayState.Location = new System.Drawing.Point(0, 0);
+ this.lbDisplayState.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbDisplayState.Name = "lbDisplayState";
- this.lbDisplayState.Size = new System.Drawing.Size(369, 52);
+ this.lbDisplayState.Size = new System.Drawing.Size(492, 65);
this.lbDisplayState.TabIndex = 6;
this.lbDisplayState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@@ -1144,18 +1187,21 @@
this.groupBox8.Controls.Add(this.groupBox10);
this.groupBox8.Controls.Add(this.groupBox11);
this.groupBox8.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.groupBox8.Location = new System.Drawing.Point(0, 230);
+ this.groupBox8.Location = new System.Drawing.Point(0, 303);
+ this.groupBox8.Margin = new System.Windows.Forms.Padding(4);
this.groupBox8.Name = "groupBox8";
- this.groupBox8.Size = new System.Drawing.Size(369, 153);
+ this.groupBox8.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox8.Size = new System.Drawing.Size(492, 191);
this.groupBox8.TabIndex = 100;
this.groupBox8.TabStop = false;
this.groupBox8.Text = "娓噺闋呭垽鏂锋浠惰ō瀹�";
//
// btnSaveConfig
//
- this.btnSaveConfig.Location = new System.Drawing.Point(313, 19);
+ this.btnSaveConfig.Location = new System.Drawing.Point(417, 24);
+ this.btnSaveConfig.Margin = new System.Windows.Forms.Padding(4);
this.btnSaveConfig.Name = "btnSaveConfig";
- this.btnSaveConfig.Size = new System.Drawing.Size(45, 56);
+ this.btnSaveConfig.Size = new System.Drawing.Size(60, 70);
this.btnSaveConfig.TabIndex = 2;
this.btnSaveConfig.Text = "淇濆瓨";
this.btnSaveConfig.UseVisualStyleBackColor = true;
@@ -1169,62 +1215,70 @@
this.groupBox12.Controls.Add(this.label25);
this.groupBox12.Controls.Add(this.label26);
this.groupBox12.Controls.Add(this.label27);
- this.groupBox12.Location = new System.Drawing.Point(159, 87);
+ this.groupBox12.Location = new System.Drawing.Point(212, 109);
+ this.groupBox12.Margin = new System.Windows.Forms.Padding(4);
this.groupBox12.Name = "groupBox12";
- this.groupBox12.Size = new System.Drawing.Size(150, 64);
+ this.groupBox12.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox12.Size = new System.Drawing.Size(200, 80);
this.groupBox12.TabIndex = 1;
this.groupBox12.TabStop = false;
this.groupBox12.Text = "FAI9";
//
// textBox1
//
- this.textBox1.Location = new System.Drawing.Point(42, 13);
+ this.textBox1.Location = new System.Drawing.Point(56, 16);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(4);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(81, 21);
+ this.textBox1.Size = new System.Drawing.Size(107, 25);
this.textBox1.TabIndex = 2;
this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label23
//
this.label23.AutoSize = true;
- this.label23.Location = new System.Drawing.Point(125, 17);
+ this.label23.Location = new System.Drawing.Point(167, 21);
+ this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(17, 12);
+ this.label23.Size = new System.Drawing.Size(23, 15);
this.label23.TabIndex = 0;
this.label23.Text = "mm";
//
// textBox2
//
- this.textBox2.Location = new System.Drawing.Point(41, 38);
+ this.textBox2.Location = new System.Drawing.Point(55, 48);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(4);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(81, 21);
+ this.textBox2.Size = new System.Drawing.Size(107, 25);
this.textBox2.TabIndex = 2;
this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label25
//
this.label25.AutoSize = true;
- this.label25.Location = new System.Drawing.Point(7, 17);
+ this.label25.Location = new System.Drawing.Point(9, 21);
+ this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(29, 12);
+ this.label25.Size = new System.Drawing.Size(39, 15);
this.label25.TabIndex = 0;
this.label25.Text = "Min:";
//
// label26
//
this.label26.AutoSize = true;
- this.label26.Location = new System.Drawing.Point(124, 41);
+ this.label26.Location = new System.Drawing.Point(165, 51);
+ this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(17, 12);
+ this.label26.Size = new System.Drawing.Size(23, 15);
this.label26.TabIndex = 0;
this.label26.Text = "mm";
//
// label27
//
this.label27.AutoSize = true;
- this.label27.Location = new System.Drawing.Point(6, 41);
+ this.label27.Location = new System.Drawing.Point(8, 51);
+ this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(29, 12);
+ this.label27.Size = new System.Drawing.Size(39, 15);
this.label27.TabIndex = 0;
this.label27.Text = "Max:";
//
@@ -1236,62 +1290,70 @@
this.groupBox9.Controls.Add(this.label126);
this.groupBox9.Controls.Add(this.label21);
this.groupBox9.Controls.Add(this.label24);
- this.groupBox9.Location = new System.Drawing.Point(4, 85);
+ this.groupBox9.Location = new System.Drawing.Point(5, 106);
+ this.groupBox9.Margin = new System.Windows.Forms.Padding(4);
this.groupBox9.Name = "groupBox9";
- this.groupBox9.Size = new System.Drawing.Size(150, 65);
+ this.groupBox9.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox9.Size = new System.Drawing.Size(200, 81);
this.groupBox9.TabIndex = 1;
this.groupBox9.TabStop = false;
this.groupBox9.Text = "FAI2";
//
// textBox16
//
- this.textBox16.Location = new System.Drawing.Point(42, 15);
+ this.textBox16.Location = new System.Drawing.Point(56, 19);
+ this.textBox16.Margin = new System.Windows.Forms.Padding(4);
this.textBox16.Name = "textBox16";
- this.textBox16.Size = new System.Drawing.Size(81, 21);
+ this.textBox16.Size = new System.Drawing.Size(107, 25);
this.textBox16.TabIndex = 2;
this.textBox16.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label127
//
this.label127.AutoSize = true;
- this.label127.Location = new System.Drawing.Point(125, 19);
+ this.label127.Location = new System.Drawing.Point(167, 24);
+ this.label127.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label127.Name = "label127";
- this.label127.Size = new System.Drawing.Size(17, 12);
+ this.label127.Size = new System.Drawing.Size(23, 15);
this.label127.TabIndex = 0;
this.label127.Text = "mm";
//
// textBox11
//
- this.textBox11.Location = new System.Drawing.Point(41, 39);
+ this.textBox11.Location = new System.Drawing.Point(55, 49);
+ this.textBox11.Margin = new System.Windows.Forms.Padding(4);
this.textBox11.Name = "textBox11";
- this.textBox11.Size = new System.Drawing.Size(81, 21);
+ this.textBox11.Size = new System.Drawing.Size(107, 25);
this.textBox11.TabIndex = 2;
this.textBox11.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label126
//
this.label126.AutoSize = true;
- this.label126.Location = new System.Drawing.Point(7, 19);
+ this.label126.Location = new System.Drawing.Point(9, 24);
+ this.label126.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label126.Name = "label126";
- this.label126.Size = new System.Drawing.Size(29, 12);
+ this.label126.Size = new System.Drawing.Size(39, 15);
this.label126.TabIndex = 0;
this.label126.Text = "Min:";
//
// label21
//
this.label21.AutoSize = true;
- this.label21.Location = new System.Drawing.Point(124, 42);
+ this.label21.Location = new System.Drawing.Point(165, 52);
+ this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(17, 12);
+ this.label21.Size = new System.Drawing.Size(23, 15);
this.label21.TabIndex = 0;
this.label21.Text = "mm";
//
// label24
//
this.label24.AutoSize = true;
- this.label24.Location = new System.Drawing.Point(6, 42);
+ this.label24.Location = new System.Drawing.Point(8, 52);
+ this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(29, 12);
+ this.label24.Size = new System.Drawing.Size(39, 15);
this.label24.TabIndex = 0;
this.label24.Text = "Max:";
//
@@ -1303,62 +1365,70 @@
this.groupBox10.Controls.Add(this.label17);
this.groupBox10.Controls.Add(this.label18);
this.groupBox10.Controls.Add(this.label19);
- this.groupBox10.Location = new System.Drawing.Point(4, 15);
+ this.groupBox10.Location = new System.Drawing.Point(5, 19);
+ this.groupBox10.Margin = new System.Windows.Forms.Padding(4);
this.groupBox10.Name = "groupBox10";
- this.groupBox10.Size = new System.Drawing.Size(150, 66);
+ this.groupBox10.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox10.Size = new System.Drawing.Size(200, 82);
this.groupBox10.TabIndex = 1;
this.groupBox10.TabStop = false;
this.groupBox10.Text = "FAI3";
//
// textBox10
//
- this.textBox10.Location = new System.Drawing.Point(41, 15);
+ this.textBox10.Location = new System.Drawing.Point(55, 19);
+ this.textBox10.Margin = new System.Windows.Forms.Padding(4);
this.textBox10.Name = "textBox10";
- this.textBox10.Size = new System.Drawing.Size(81, 21);
+ this.textBox10.Size = new System.Drawing.Size(107, 25);
this.textBox10.TabIndex = 2;
this.textBox10.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label35
//
this.label35.AutoSize = true;
- this.label35.Location = new System.Drawing.Point(124, 19);
+ this.label35.Location = new System.Drawing.Point(165, 24);
+ this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label35.Name = "label35";
- this.label35.Size = new System.Drawing.Size(17, 12);
+ this.label35.Size = new System.Drawing.Size(23, 15);
this.label35.TabIndex = 0;
this.label35.Text = "mm";
//
// textBox7
//
- this.textBox7.Location = new System.Drawing.Point(41, 39);
+ this.textBox7.Location = new System.Drawing.Point(55, 49);
+ this.textBox7.Margin = new System.Windows.Forms.Padding(4);
this.textBox7.Name = "textBox7";
- this.textBox7.Size = new System.Drawing.Size(81, 21);
+ this.textBox7.Size = new System.Drawing.Size(107, 25);
this.textBox7.TabIndex = 2;
this.textBox7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label17
//
this.label17.AutoSize = true;
- this.label17.Location = new System.Drawing.Point(5, 17);
+ this.label17.Location = new System.Drawing.Point(7, 21);
+ this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(29, 12);
+ this.label17.Size = new System.Drawing.Size(39, 15);
this.label17.TabIndex = 0;
this.label17.Text = "Min:";
//
// label18
//
this.label18.AutoSize = true;
- this.label18.Location = new System.Drawing.Point(124, 43);
+ this.label18.Location = new System.Drawing.Point(165, 54);
+ this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(17, 12);
+ this.label18.Size = new System.Drawing.Size(23, 15);
this.label18.TabIndex = 0;
this.label18.Text = "mm";
//
// label19
//
this.label19.AutoSize = true;
- this.label19.Location = new System.Drawing.Point(6, 43);
+ this.label19.Location = new System.Drawing.Point(8, 54);
+ this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(29, 12);
+ this.label19.Size = new System.Drawing.Size(39, 15);
this.label19.TabIndex = 0;
this.label19.Text = "Max:";
//
@@ -1370,62 +1440,70 @@
this.groupBox11.Controls.Add(this.label124);
this.groupBox11.Controls.Add(this.label20);
this.groupBox11.Controls.Add(this.label22);
- this.groupBox11.Location = new System.Drawing.Point(157, 15);
+ this.groupBox11.Location = new System.Drawing.Point(209, 19);
+ this.groupBox11.Margin = new System.Windows.Forms.Padding(4);
this.groupBox11.Name = "groupBox11";
- this.groupBox11.Size = new System.Drawing.Size(150, 66);
+ this.groupBox11.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox11.Size = new System.Drawing.Size(200, 82);
this.groupBox11.TabIndex = 1;
this.groupBox11.TabStop = false;
this.groupBox11.Text = "FAI12";
//
// textBox15
//
- this.textBox15.Location = new System.Drawing.Point(42, 13);
+ this.textBox15.Location = new System.Drawing.Point(56, 16);
+ this.textBox15.Margin = new System.Windows.Forms.Padding(4);
this.textBox15.Name = "textBox15";
- this.textBox15.Size = new System.Drawing.Size(81, 21);
+ this.textBox15.Size = new System.Drawing.Size(107, 25);
this.textBox15.TabIndex = 2;
this.textBox15.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label125
//
this.label125.AutoSize = true;
- this.label125.Location = new System.Drawing.Point(125, 17);
+ this.label125.Location = new System.Drawing.Point(167, 21);
+ this.label125.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label125.Name = "label125";
- this.label125.Size = new System.Drawing.Size(17, 12);
+ this.label125.Size = new System.Drawing.Size(23, 15);
this.label125.TabIndex = 0;
this.label125.Text = "mm";
//
// textBox9
//
- this.textBox9.Location = new System.Drawing.Point(41, 38);
+ this.textBox9.Location = new System.Drawing.Point(55, 48);
+ this.textBox9.Margin = new System.Windows.Forms.Padding(4);
this.textBox9.Name = "textBox9";
- this.textBox9.Size = new System.Drawing.Size(81, 21);
+ this.textBox9.Size = new System.Drawing.Size(107, 25);
this.textBox9.TabIndex = 2;
this.textBox9.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label124
//
this.label124.AutoSize = true;
- this.label124.Location = new System.Drawing.Point(7, 17);
+ this.label124.Location = new System.Drawing.Point(9, 21);
+ this.label124.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label124.Name = "label124";
- this.label124.Size = new System.Drawing.Size(29, 12);
+ this.label124.Size = new System.Drawing.Size(39, 15);
this.label124.TabIndex = 0;
this.label124.Text = "Min:";
//
// label20
//
this.label20.AutoSize = true;
- this.label20.Location = new System.Drawing.Point(124, 41);
+ this.label20.Location = new System.Drawing.Point(165, 51);
+ this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(17, 12);
+ this.label20.Size = new System.Drawing.Size(23, 15);
this.label20.TabIndex = 0;
this.label20.Text = "mm";
//
// label22
//
this.label22.AutoSize = true;
- this.label22.Location = new System.Drawing.Point(6, 41);
+ this.label22.Location = new System.Drawing.Point(8, 51);
+ this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(29, 12);
+ this.label22.Size = new System.Drawing.Size(39, 15);
this.label22.TabIndex = 0;
this.label22.Text = "Max:";
//
@@ -1438,17 +1516,19 @@
this.panel8.Controls.Add(this.btnCreateReport);
this.panel8.Controls.Add(this.btnDetectionResult);
this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel8.Location = new System.Drawing.Point(0, 91);
+ this.panel8.Location = new System.Drawing.Point(0, 114);
+ this.panel8.Margin = new System.Windows.Forms.Padding(4);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(369, 107);
+ this.panel8.Size = new System.Drawing.Size(492, 134);
this.panel8.TabIndex = 2;
//
// btnDownTime
//
this.btnDownTime.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
- this.btnDownTime.Location = new System.Drawing.Point(231, 55);
+ this.btnDownTime.Location = new System.Drawing.Point(308, 69);
+ this.btnDownTime.Margin = new System.Windows.Forms.Padding(4);
this.btnDownTime.Name = "btnDownTime";
- this.btnDownTime.Size = new System.Drawing.Size(67, 45);
+ this.btnDownTime.Size = new System.Drawing.Size(89, 56);
this.btnDownTime.TabIndex = 118;
this.btnDownTime.Text = "瀹曟绲辫▓";
this.btnDownTime.UseVisualStyleBackColor = true;
@@ -1457,9 +1537,10 @@
// btnCheck
//
this.btnCheck.Font = new System.Drawing.Font("瀹嬩綋", 9F);
- this.btnCheck.Location = new System.Drawing.Point(129, 56);
+ this.btnCheck.Location = new System.Drawing.Point(172, 70);
+ this.btnCheck.Margin = new System.Windows.Forms.Padding(4);
this.btnCheck.Name = "btnCheck";
- this.btnCheck.Size = new System.Drawing.Size(97, 45);
+ this.btnCheck.Size = new System.Drawing.Size(129, 56);
this.btnCheck.TabIndex = 117;
this.btnCheck.Text = "鎶芥";
this.btnCheck.UseVisualStyleBackColor = true;
@@ -1468,9 +1549,10 @@
// btnPlcOperation
//
this.btnPlcOperation.Font = new System.Drawing.Font("瀹嬩綋", 9F);
- this.btnPlcOperation.Location = new System.Drawing.Point(129, 5);
+ this.btnPlcOperation.Location = new System.Drawing.Point(172, 6);
+ this.btnPlcOperation.Margin = new System.Windows.Forms.Padding(4);
this.btnPlcOperation.Name = "btnPlcOperation";
- this.btnPlcOperation.Size = new System.Drawing.Size(97, 45);
+ this.btnPlcOperation.Size = new System.Drawing.Size(129, 56);
this.btnPlcOperation.TabIndex = 116;
this.btnPlcOperation.Text = "PLC鎿嶄綔";
this.btnPlcOperation.UseVisualStyleBackColor = true;
@@ -1481,9 +1563,10 @@
this.ckAuto.Anchor = System.Windows.Forms.AnchorStyles.None;
this.ckAuto.Appearance = System.Windows.Forms.Appearance.Button;
this.ckAuto.Font = new System.Drawing.Font("瀹嬩綋", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.ckAuto.Location = new System.Drawing.Point(5, 5);
+ this.ckAuto.Location = new System.Drawing.Point(7, 6);
+ this.ckAuto.Margin = new System.Windows.Forms.Padding(4);
this.ckAuto.Name = "ckAuto";
- this.ckAuto.Size = new System.Drawing.Size(115, 95);
+ this.ckAuto.Size = new System.Drawing.Size(153, 119);
this.ckAuto.TabIndex = 115;
this.ckAuto.Text = "鎵嬭嚜鍕�";
this.ckAuto.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1493,9 +1576,10 @@
// btnCreateReport
//
this.btnCreateReport.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
- this.btnCreateReport.Location = new System.Drawing.Point(301, 56);
+ this.btnCreateReport.Location = new System.Drawing.Point(401, 70);
+ this.btnCreateReport.Margin = new System.Windows.Forms.Padding(4);
this.btnCreateReport.Name = "btnCreateReport";
- this.btnCreateReport.Size = new System.Drawing.Size(63, 45);
+ this.btnCreateReport.Size = new System.Drawing.Size(84, 56);
this.btnCreateReport.TabIndex = 114;
this.btnCreateReport.Text = "鐢熸垚鍫卞憡";
this.btnCreateReport.UseVisualStyleBackColor = true;
@@ -1504,9 +1588,10 @@
// btnDetectionResult
//
this.btnDetectionResult.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
- this.btnDetectionResult.Location = new System.Drawing.Point(231, 5);
+ this.btnDetectionResult.Location = new System.Drawing.Point(308, 6);
+ this.btnDetectionResult.Margin = new System.Windows.Forms.Padding(4);
this.btnDetectionResult.Name = "btnDetectionResult";
- this.btnDetectionResult.Size = new System.Drawing.Size(131, 45);
+ this.btnDetectionResult.Size = new System.Drawing.Size(175, 56);
this.btnDetectionResult.TabIndex = 113;
this.btnDetectionResult.Text = "妾㈡脯绲愭灉";
this.btnDetectionResult.UseVisualStyleBackColor = true;
@@ -1521,21 +1606,22 @@
this.tableLayoutPanel1.Controls.Add(this.panel3, 0, 0);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+ this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 90F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(369, 91);
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 113F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(492, 114);
this.tableLayoutPanel1.TabIndex = 1;
//
// panel3
//
this.panel3.Controls.Add(this.panel10);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel3.Location = new System.Drawing.Point(3, 3);
- this.panel3.Margin = new System.Windows.Forms.Padding(2);
+ this.panel3.Location = new System.Drawing.Point(4, 3);
+ this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(363, 85);
+ this.panel3.Size = new System.Drawing.Size(484, 108);
this.panel3.TabIndex = 0;
//
// panel10
@@ -1543,9 +1629,9 @@
this.panel10.Controls.Add(this.lbOKNG);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel10.Location = new System.Drawing.Point(0, 0);
- this.panel10.Margin = new System.Windows.Forms.Padding(2);
+ this.panel10.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel10.Name = "panel10";
- this.panel10.Size = new System.Drawing.Size(363, 85);
+ this.panel10.Size = new System.Drawing.Size(484, 108);
this.panel10.TabIndex = 0;
//
// lbOKNG
@@ -1555,8 +1641,9 @@
this.lbOKNG.Dock = System.Windows.Forms.DockStyle.Fill;
this.lbOKNG.Font = new System.Drawing.Font("Calibri", 42F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbOKNG.Location = new System.Drawing.Point(0, 0);
+ this.lbOKNG.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbOKNG.Name = "lbOKNG";
- this.lbOKNG.Size = new System.Drawing.Size(363, 85);
+ this.lbOKNG.Size = new System.Drawing.Size(484, 108);
this.lbOKNG.TabIndex = 117;
this.lbOKNG.Text = "OK";
this.lbOKNG.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1574,10 +1661,11 @@
this.toolStripStatusLabel1,
this.tsslWarnMsg,
this.tslWarning});
- this.statusStrip1.Location = new System.Drawing.Point(0, 443);
+ this.statusStrip1.Location = new System.Drawing.Point(0, 568);
this.statusStrip1.Name = "statusStrip1";
+ this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0);
this.statusStrip1.ShowItemToolTips = true;
- this.statusStrip1.Size = new System.Drawing.Size(856, 56);
+ this.statusStrip1.Size = new System.Drawing.Size(1141, 56);
this.statusStrip1.TabIndex = 6;
this.statusStrip1.Text = "statusStrip1";
//
@@ -1585,21 +1673,21 @@
//
this.toolStripStatusLabel1.ForeColor = System.Drawing.Color.Red;
this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
- this.toolStripStatusLabel1.Size = new System.Drawing.Size(96, 51);
+ this.toolStripStatusLabel1.Size = new System.Drawing.Size(121, 50);
this.toolStripStatusLabel1.Text = "鍫辫锛�";
this.toolStripStatusLabel1.Click += new System.EventHandler(this.toolStripStatusLabel1_Click);
//
// tsslWarnMsg
//
this.tsslWarnMsg.Name = "tsslWarnMsg";
- this.tsslWarnMsg.Size = new System.Drawing.Size(0, 51);
+ this.tsslWarnMsg.Size = new System.Drawing.Size(0, 50);
this.tsslWarnMsg.Click += new System.EventHandler(this.tsslWarnMsg_Click);
//
// tslWarning
//
this.tslWarning.AutoSize = false;
this.tslWarning.Name = "tslWarning";
- this.tslWarning.Size = new System.Drawing.Size(500, 51);
+ this.tslWarning.Size = new System.Drawing.Size(500, 50);
//
// panel1
//
@@ -1608,8 +1696,9 @@
this.panel1.Controls.Add(this.lbTime);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(856, 58);
+ this.panel1.Size = new System.Drawing.Size(1141, 72);
this.panel1.TabIndex = 7;
//
// label1
@@ -1618,8 +1707,9 @@
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
this.label1.Font = new System.Drawing.Font("Verdana", 36F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(0, 0);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(856, 58);
+ this.label1.Size = new System.Drawing.Size(1141, 72);
this.label1.TabIndex = 111;
this.label1.Text = "Battery Pack Optical Measurement";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1628,9 +1718,10 @@
//
this.label28.AutoSize = true;
this.label28.BackColor = System.Drawing.SystemColors.AppWorkspace;
- this.label28.Location = new System.Drawing.Point(1083, 85);
+ this.label28.Location = new System.Drawing.Point(1444, 106);
+ this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(185, 12);
+ this.label28.Size = new System.Drawing.Size(232, 15);
this.label28.TabIndex = 2;
this.label28.Text = "寮楀焹鏂伐妤妧琛擄紙铇囧窞锛夋湁闄愬叕鍙�";
//
@@ -1640,22 +1731,24 @@
this.lbTime.AutoSize = true;
this.lbTime.BackColor = System.Drawing.SystemColors.AppWorkspace;
this.lbTime.Font = new System.Drawing.Font("Cambria", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbTime.Location = new System.Drawing.Point(756, 3);
+ this.lbTime.Location = new System.Drawing.Point(1008, 4);
+ this.lbTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbTime.Name = "lbTime";
- this.lbTime.Size = new System.Drawing.Size(0, 25);
+ this.lbTime.Size = new System.Drawing.Size(0, 32);
this.lbTime.TabIndex = 1;
//
// MainForm
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(856, 499);
+ this.ClientSize = new System.Drawing.Size(1141, 624);
this.Controls.Add(this.panel7);
this.Controls.Add(this.panel1);
this.Controls.Add(this.statusStrip1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.KeyPreview = true;
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "MainForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "寮楀焹鏂墜姗熼浕姹犲昂瀵告脯閲忚粺浠�-V1.0";
diff --git a/MainForm.cs b/MainForm.cs
index 3c791e3..81c164a 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -19,6 +19,8 @@
using System.Threading.Tasks;
using System.Configuration;
using System.Globalization;
+using Newtonsoft.Json;
+using System.Reflection;
namespace M423project
{
@@ -85,6 +87,7 @@
private void MainForm_Load(object sender, EventArgs e)
{
+ InitialStandardBlockReportDir();
rm.ReduceMemory();
SetControls();
DisplayMeasureTTL();
@@ -94,6 +97,8 @@
#region add by Patrick 2018-07-13
SetCarrierBarcodeCtrl();
#endregion
+
+
_downTimeNoAction = Convert.ToInt32(ConfigurationManager.AppSettings["DownTimeNoAction"]);
Task.Factory.StartNew(() =>
@@ -190,7 +195,8 @@
if (!opc.CreateGroup())
return;
UpdateOpc();
- opc.listenEventCreater.ListenEvent += OPCEventHandler;
+ //opc.listenEventCreater.ListenEvent += OPCEventHandler;
+ opc.OnReadItemValueChanged += Opc_OnReadItemValueChanged;
InitParams();
imageProcess = new ImageProcess();
if (!imageProcess.OpenCameras())
@@ -351,6 +357,34 @@
}
}
+ string _blockDataReportDir = @"D:\Baisreport";
+ string _blockDataForCustomerDir = @"E:\Baisreport";
+ private void InitialStandardBlockReportDir()
+ {
+ _blockDataReportDir = ConfigurationManager.AppSettings["StandardBlockDataDir"];
+ if (string.IsNullOrWhiteSpace(_blockDataReportDir) || !Path.IsPathRooted(_blockDataReportDir))
+ {
+ _blockDataReportDir = @"D:\Baisreport";
+ }
+
+ if (!Directory.Exists(_blockDataReportDir))
+ {
+ Directory.CreateDirectory(_blockDataReportDir);
+ }
+
+ _blockDataForCustomerDir = ConfigurationManager.AppSettings["StandardBlockDataForCustomer"];
+ if (string.IsNullOrWhiteSpace(_blockDataForCustomerDir) || !Path.IsPathRooted(_blockDataForCustomerDir))
+ {
+ _blockDataForCustomerDir = @"E:\Baisreport";
+ }
+
+ if (!Directory.Exists(_blockDataForCustomerDir))
+ {
+ Directory.CreateDirectory(_blockDataForCustomerDir);
+ }
+ }
+
+
//public void SetDetectionSize(double length, double width, double cellWidth,
// MeasureState lengthMeasureState, MeasureState widthMeasureState, int _plateID, string _imageFile, bool isSpotCheck)
//{
@@ -442,8 +476,71 @@
// }
//}
+
+ //public void SetDetectionSize(double length, double width, double cellWidth,
+ //MeasureState lengthMeasureState, MeasureState widthMeasureState, int _plateID, string _imageFile, bool isSpotCheck)
+ //{
+ // try
+ // {
+ // int detectID = CommonUtil.StepControl.GetDetectSizeStepID();
+ // if (detectID < 0)
+ // {
+ // CommonUtil.WriteLog(LogType.Inf, string.Format("no detectid WHEN set size, stepcontrol:{0}", CommonUtil.StepControl.ToString()));
+ // return;
+ // }
+ // var p = (from x in ProductBindingList
+ // where x.DetectID == detectID
+ // select x
+ // ).FirstOrDefault();
+ // if (p == null)
+ // {
+ // CommonUtil.WriteLog(LogType.Inf, string.Format("no detectid when setsize in ProductBindingList:{0}", detectID));
+ // return;
+ // }
+
+ // p.Length = length;
+ // p.Width = width;
+ // p.PlateID = _plateID;
+ // p.LengthResult = lengthMeasureState.ToString();
+ // p.WidthResult = widthMeasureState.ToString();
+ // p.IsSpotCheck = isSpotCheck;
+
+ // measureResultTTL.ProductQuntity++;
+
+ // if (p.HeightResult == MeasureState.OK.ToString())
+ // measureResultTTL.HeightPassQuntity++;
+
+ // if (p.HeightResult == MeasureState.NG.ToString() && p.LengthResult != MeasureState.NA.ToString())
+ // measureResultTTL.HeightFailQuntity++;
+
+ // if (p.ProductNoResult == MeasureState.NG.ToString() && p.LengthResult != MeasureState.NA.ToString())
+ // {
+ // measureResultTTL.ProductNoFailQuantity++;
+ // }
+
+ // if (lengthMeasureState == MeasureState.OK && widthMeasureState == MeasureState.OK)
+ // measureResultTTL.SizePassQuantity++;
+
+ // if (lengthMeasureState == MeasureState.NG || widthMeasureState == MeasureState.NG)
+ // measureResultTTL.SizeFailQuantity++;
+
+ // //Task.Factory.StartNew(() =>
+ // //{
+ // DisplayResult(length, width, cellWidth, _imageFile, p);
+ // //});
+ // }
+ // catch (Exception)
+ // {
+ // }
+ // finally
+ // {
+ // //opc.Write(OPCOutputTag.DetectionOK4, true);
+ // }
+ //}
+
+ List<ProductMeasureResult> _standardResultList = new List<ProductMeasureResult>();
public void SetDetectionSize(double length, double width, double cellWidth,
-MeasureState lengthMeasureState, MeasureState widthMeasureState, int _plateID, string _imageFile, bool isSpotCheck)
+ MeasureState lengthMeasureState, MeasureState widthMeasureState, int _plateID, string _imageFile, bool isSpotCheck)
{
try
{
@@ -470,32 +567,95 @@
p.WidthResult = widthMeasureState.ToString();
p.IsSpotCheck = isSpotCheck;
- measureResultTTL.ProductQuntity++;
-
- if (p.HeightResult == MeasureState.OK.ToString())
- measureResultTTL.HeightPassQuntity++;
-
- if (p.HeightResult == MeasureState.NG.ToString() && p.LengthResult != MeasureState.NA.ToString())
- measureResultTTL.HeightFailQuntity++;
-
- if (p.ProductNoResult == MeasureState.NG.ToString() && p.LengthResult != MeasureState.NA.ToString())
+ string filePath = Path.Combine(_blockDataForCustomerDir, "Standarddata" + DateTime.Now.ToString("yyyyMMdd") + ".csv");
+ string standardCSVFileName = Path.Combine(_blockDataReportDir, "Standarddata" + DateTime.Now.ToString("yyyyMMdd") + ".csv");
+ if (CommonUtil.DetectionOption == DetectionOption.doStandardBlock)
{
- measureResultTTL.ProductNoFailQuantity++;
+ if (p.measureHeight.HeightResult != MeasureState.NA)
+ {
+ _standardResultList.Add(p);
+
+ //鍏嬮殕鏂扮殑浜у搧缁撴灉瀵硅薄 閬垮厤瀵瑰師鏈変骇鍝佺粨鏋滃璞″仛淇敼鍚庡奖鍝�
+ ProductMeasureResult clone = JsonConvert.DeserializeObject<ProductMeasureResult>(JsonConvert.SerializeObject(p));
+
+ //鍏嬮殕瀵硅薄鐨凜SV鏁版嵁璁板綍
+ detectionData.CSVDataRecord(clone, filePath);
+
+ detectionData.CSVDataRecord(clone, standardCSVFileName);
+
+ }
+
+ if (_standardResultList.Count() == _standardToDoNum)
+ {
+ int plateId = _standardResultList[0].PlateID;
+
+ var stationField = typeof(CompensationZ).GetFields().FirstOrDefault(u => u.Name == "station" + plateId);
+
+ var avgHeight = _standardResultList.Average(u => u.Height);
+ var standardHeightValue = (opcConfig.standardHeightLimit.Min + opcConfig.standardHeightLimit.Max) / 2.0;
+ var curCompensationHeight = stationField.GetValue(opcConfig.compensationZ);
+ var newHeightComp = standardHeightValue - avgHeight + (double)curCompensationHeight;
+ //stationField.SetValue(opcConfig.compensationZ, newHeightComp);
+
+ var avgLenght = _standardResultList.Average(u => u.Length);
+ var standardLenghtValue = (opcConfig.standardLengthLimit.Min + opcConfig.standardLengthLimit.Max) / 2.0;
+ var curCompensationLenght = stationField.GetValue(opcConfig.compensationL);
+ var newLenghtComp = standardLenghtValue - avgLenght + (double)curCompensationLenght;
+
+ var avgWidth = _standardResultList.Average(u => u.Width);
+ var standardWidthValue = (opcConfig.standardWidthLimit.Min + opcConfig.standardWidthLimit.Max) / 2.0;
+ var curCompensationWidth = stationField.GetValue(opcConfig.compensationW);
+ var newWidthComp = standardWidthValue - avgWidth + (double)curCompensationWidth;
+
+ string nameH = "Height";
+ string nameL = "Length";
+ string nameW = "Width";
+ string resultStrH = $"宸ヤ綅 {plateId},妫�娴嬮」 {nameH},鍘熷厛琛ュ伩鍊硷細{curCompensationHeight}锛岃绠楄ˉ鍋垮�硷細{newHeightComp}锛屾爣鍑嗗�硷細{standardHeightValue}锛屽钩鍧囧�硷細{avgHeight}";
+ string resultStrL = $"宸ヤ綅 {plateId},妫�娴嬮」 {nameL},鍘熷厛琛ュ伩鍊硷細{curCompensationLenght}锛岃绠楄ˉ鍋垮�硷細{newLenghtComp}锛屾爣鍑嗗�硷細{standardLenghtValue}锛屽钩鍧囧�硷細{avgLenght}";
+ string resultStrW = $"宸ヤ綅 {plateId},妫�娴嬮」 {nameW},鍘熷厛琛ュ伩鍊硷細{curCompensationWidth}锛岃绠楄ˉ鍋垮�硷細{newWidthComp}锛屾爣鍑嗗�硷細{standardWidthValue}锛屽钩鍧囧�硷細{avgWidth}";
+
+ Trace.TraceWarning(resultStrH);
+ Trace.TraceWarning(resultStrL);
+ Trace.TraceWarning(resultStrW);
+ File.AppendAllText(standardCSVFileName, $"\r\n{resultStrH}\r\n");
+ File.AppendAllText(standardCSVFileName, $"\r\n{resultStrL}\r\n");
+ File.AppendAllText(standardCSVFileName, $"\r\n{resultStrW}\r\n");
+ _standardResultList.Clear();
+
+
+ //鍙嶅皠
+ //List<string> propList = new List<string>() { "Height", "Length", "Width" };
+ //typeof(ProductMeasureResult).GetProperties().Where(u => propList.Contains(u.Name)).ToList().ForEach(u =>
+ //{
+
+
+ // double preValue = 0.0;
+ // double uAvg = 0.0;
+
+ // Type t = opcConfig.standardCompensationZ.GetType();
+ // FieldInfo fi = t.GetField(string.Format("station{0}", (CommonUtil.mainForm.PlateID + 1) % 5 + 1));
+ // preValue = (double)fi.GetValue(opcConfig.standardCompensationZ);
+ // double curCompensation = standardHeightValue - uAvg + preValue;
+
+ // string resultStr = $"宸ヤ綅 {plateId}锛屾娴嬮」 {u.Name}锛屽師鍏堣ˉ鍋垮�硷細{preValue}锛岃绠楄ˉ鍋垮�硷細{curCompensation}锛屾爣鍑嗗�硷細{standardHeightValue}锛屽钩鍧囧�硷細{uAvg}";
+ //Trace.TraceWarning(resultStr);
+
+ //File.AppendAllText(standardCSVFileName, $"\r\n{resultStr}\r\n");
+ //});
+ //_standardResultList.Clear();
+ }
+
}
- if (lengthMeasureState == MeasureState.OK && widthMeasureState == MeasureState.OK)
- measureResultTTL.SizePassQuantity++;
-
- if (lengthMeasureState == MeasureState.NG || widthMeasureState == MeasureState.NG)
- measureResultTTL.SizeFailQuantity++;
-
+ UpdateOEE(p);
//Task.Factory.StartNew(() =>
//{
DisplayResult(length, width, cellWidth, _imageFile, p);
//});
}
- catch (Exception)
+ catch (Exception ex)
{
+ Trace.TraceError($"SetDetectionSize error,ex:{ex}");
}
finally
{
@@ -503,6 +663,28 @@
}
}
+ public void UpdateOEE(ProductMeasureResult result)
+ {
+ measureResultTTL.ProductQuntity++;
+ if (result.HeightResult == MeasureState.OK.ToString())
+ measureResultTTL.HeightPassQuntity++;
+
+ if (result.HeightResult == MeasureState.NG.ToString() && result.LengthResult != MeasureState.NA.ToString())
+ measureResultTTL.HeightFailQuntity++;
+
+ if (result.ProductNoResult == MeasureState.NG.ToString() && result.LengthResult != MeasureState.NA.ToString())
+ {
+ measureResultTTL.ProductNoFailQuantity++;
+ }
+
+ if (result.LengthResult == MeasureState.OK.ToString() && result.WidthResult == MeasureState.OK.ToString())
+ measureResultTTL.SizePassQuantity++;
+
+ if (result.LengthResult == MeasureState.NG.ToString() || result.WidthResult == MeasureState.NG.ToString())
+ measureResultTTL.SizeFailQuantity++;
+
+
+ }
private void DisplayResult(double length, double width, double cellWidth, string _imageFile, ProductMeasureResult p)
{
if (this.InvokeRequired)
@@ -628,16 +810,20 @@
int _continuousNG = 0;
#region PLC 鐩戝惉
- void OPCEventHandler(object sender, EventTool.ListenEventArgs e)
+
+
+
+ void Opc_OnReadItemValueChanged(OPC.Item item, int itemValue)
{
string timeStr = DateTime.Now.ToString("hh:mm:ss fff");
- OPC.Item item = (OPC.Item)e.IData.Data;
+ //OPC.Item item = (OPC.Item)e.IData.Data;
+
//CommonUtil.WriteLog(LogType.Inf, string.Format("鎺ユ敹鍒癙LC淇″彿锛歿0}锛屾椂闂达細{1}", item.name, timeStr));
switch (item.name)
{
case OPCInputTag.TurnDiskReady:
TurnDiskReadyTime = DateTime.Now;
- if ((bool)item.value)
+ if (itemValue == 1)
{
opc.Write(OPCOutputTag.SpotCheck, false);
CommonUtil.StepControl.IncStep();
@@ -741,14 +927,14 @@
}
break;
case OPCInputTag.DetectionStart2:
- if ((bool)item.value)
+ if (itemValue == 1)
{
DetectionProcesser hp = heightDetection.Execute;
IAsyncResult ar = hp.BeginInvoke(null, null);
}
break;
case OPCInputTag.DetectionStart4:
- if ((bool)item.value)
+ if (itemValue == 1)
{
//if (FormCheck._totalQty - FormCheck._finishedQty > 0 && FormCheck._pickCount > 0)
//{
@@ -780,7 +966,7 @@
break;
case OPCInputTag.PLCInitialized:
tbPLCMsg.Text = DateTime.Now.ToString("HH:mm:ss") + ":" + OPCInputTag.PLCInitialized + "," + item.value.ToString() + "\r\n" + tbPLCMsg.Text;
- if ((bool)item.value)
+ if (itemValue == 1)
{
opc.Write(OPCOutputTag.PCInitialized, true);
lbDisplayState.Text = "鍒濆鍖栧畬鎴�";
@@ -805,25 +991,26 @@
// }
// break;
case OPCInputTag.EmergencyStop:
+ if (itemValue == 1)
+ {
+ ProductBindingList.Clear();
+ productTestCollection.Clear();
+ CommonUtil.StepControl.Clear();
+ DisplayMeasureTTL();
- ProductBindingList.Clear();
- productTestCollection.Clear();
- CommonUtil.StepControl.Clear();
- DisplayMeasureTTL();
+ imageProcess.ClearBarcodeImage();
+ //Thread.Sleep(1000);
+ //imageProcess.CloseCameras();
+ //Thread.Sleep(1000);
+ //imageProcess.OpenCameras();
+ CommonUtil.WriteLog(LogType.Inf, "绯荤粺鎬ュ仠");
- imageProcess.ClearBarcodeImage();
- //Thread.Sleep(1000);
- //imageProcess.CloseCameras();
- //Thread.Sleep(1000);
- //imageProcess.OpenCameras();
- CommonUtil.WriteLog(LogType.Inf, "绯荤粺鎬ュ仠");
-
- //鎶芥鍙傛暟鐨勫埛鏂�
- SetCheckInfo();
-
+ //鎶芥鍙傛暟鐨勫埛鏂�
+ SetCheckInfo();
+ }
break;
case OPCInputTag.Alarm:
- int val = int.Parse(item.value.ToString());
+ int val = itemValue;
Task.Factory.StartNew(() =>
{
UpdateAlarm(val);
@@ -851,27 +1038,27 @@
//UpdateAlarm(int.Parse(item.value.ToString()));
//break;
case OPCInputTag.UploadSignalRequire:
- if ((bool)item.value)
+ if (itemValue == 1)
{
UpdateAlarm(101);
}
break;
case OPCInputTag.X1axisLocalPos:
- tbX1axisLoPos.Text = item.value.ToString();
+ tbX1axisLoPos.Text = itemValue.ToString();
break;
case OPCInputTag.Y1axisLocalPos:
- tbY1axisLoPos.Text = item.value.ToString();
+ tbY1axisLoPos.Text = itemValue.ToString();
break;
case OPCInputTag.X2axisLocalPos:
- tbX2axisLoPos.Text = item.value.ToString();
+ tbX2axisLoPos.Text = itemValue.ToString();
break;
case OPCInputTag.Y2axisLocalPos:
- tbY2axisLoPos.Text = item.value.ToString();
+ tbY2axisLoPos.Text = itemValue.ToString();
break;
case OPCInputTag.TestResult:
tbPLCMsg.Text = DateTime.Now.ToString("HH:mm:ss") + ":" + OPCInputTag.TestResult + "," + item.value.ToString() + "\r\n" + tbPLCMsg.Text;
- if ((bool)item.value)
+ if (itemValue == 1)
{
//鍒ゆ柇OKNG
opc.Write(OPCOutputTag.TestResult, false);
@@ -912,7 +1099,7 @@
});
break;
case OPCInputTag.UploadFinished:
- if ((bool)item.value)
+ if (itemValue == 1)
{
TimeSpan tsUpload = DateTime.Now - TurnDiskReadyTime;
tbUploadTime.Text = string.Format("{0:0.00}", tsUpload.TotalMilliseconds / 1000);
@@ -920,7 +1107,7 @@
}
break;
case OPCInputTag.UnloadFinished:
- if ((bool)item.value)
+ if (itemValue == 1)
{
TimeSpan tsUnload = DateTime.Now - TurnDiskReadyTime;
tbUnloadTime.Text = string.Format("{0:0.00}", tsUnload.TotalMilliseconds / 1000);
@@ -930,7 +1117,7 @@
#region add by Patrick 2018-07-12
case OPCInputTag.UnloadBatteryDone: //鐢垫睜涓嬫枡鍒颁綅鏃讹紝缁戝畾杞藉叿鏉＄爜
- if ((bool)item.value)
+ if (itemValue == 1)
{
//opc.Write(OPCInputTag.UnloadBatteryDone, false);
int batteryId = CommonUtil.StepControl.GetUnloadBatteryID();
@@ -942,7 +1129,7 @@
}
break;
case OPCInputTag.UnloadTrayMoveToOP: //褰撲笅鏂欒浇鍏峰洖鍒癘P绔紝娓呯┖杞藉叿鏉＄爜
- if ((bool)item.value)
+ if (itemValue == 1)
{
//opc.Write(OPCInputTag.UnloadTrayMoveToOP, false);
@@ -957,7 +1144,7 @@
}
break;
case OPCInputTag.UnloadTrayReady://褰撲笅鏂欒浇鍏峰氨缁紝涓嶅厑璁歌緭鍏ユ潯鐮�
- if ((bool)item.value)
+ if (itemValue == 1)
{
//opc.Write(OPCInputTag.UnloadTrayReady, false);
allowBarcodeFlag = false;
@@ -967,6 +1154,346 @@
}
}
+
+ //void OPCEventHandler(object sender, EventTool.ListenEventArgs e)
+ //{
+ // string timeStr = DateTime.Now.ToString("hh:mm:ss fff");
+ // OPC.Item item = (OPC.Item)e.IData.Data;
+ // //CommonUtil.WriteLog(LogType.Inf, string.Format("鎺ユ敹鍒癙LC淇″彿锛歿0}锛屾椂闂达細{1}", item.name, timeStr));
+ // switch (item.name)
+ // {
+ // case OPCInputTag.TurnDiskReady:
+ // TurnDiskReadyTime = DateTime.Now;
+ // if ((bool)item.value)
+ // {
+ // opc.Write(OPCOutputTag.SpotCheck, false);
+ // CommonUtil.StepControl.IncStep();
+ // //bool isOk = false;
+
+ // MeasureState pState = MeasureState.NA;
+
+ // int detectID = CommonUtil.StepControl.GetUnloadStepID();
+ // ProductMeasureResult x = null;
+ // if (detectID > 0)
+ // {
+ // x = (from t in productTestCollection
+ // where t.DetectID == detectID
+ // select t
+ // ).FirstOrDefault();
+ // if (x != default(ProductMeasureResult))
+ // {
+ // pState = (MeasureState)Enum.Parse(typeof(MeasureState), x.ProductResult);
+ // if (pState == MeasureState.OK)
+ // //if (x.ProductResult == MeasureState.OK.ToString())
+ // {
+ // if (x.IsSpotCheck)
+ // {
+ // //鍙栨秷鎶芥鏃舵斁鍏G鏂欑洏锛屾洿鏂版暟鎹簱鎶芥鏍囧織
+ // //isOk = false;
+ // //isOk = true;
+ // detectionData.SaveSpotCheck(detectID);
+ // detectionData.SaveTrayBarcode(detectID);
+ // //opc.Write(OPCOutputTag.SpotCheck, true);
+ // }
+ // else
+ // {
+ // //isOk = true;
+ // //opc.Write(OPCOutputTag.SpotCheck, false);
+ // }
+ // }
+ // }
+ // }
+
+ // #region add by Patrick 2019-12-20
+ // switch (pState)
+ // {
+ // case MeasureState.OK:
+ // opc.Write(OPCOutputTag.DetectResult_OK, true);
+ // opc.Write(OPCOutputTag.DetectResult_NG, false);
+
+ // CommonUtil.WriteLog(LogType.Inf, $"{x?.DetectID}|{x?.ProductNo}浜у搧搴旀斁鍏K Tray");
+
+ // _continuousNG = 0;
+ // break;
+ // case MeasureState.NG:
+ // opc.Write(OPCOutputTag.DetectResult_OK, false);
+ // opc.Write(OPCOutputTag.DetectResult_NG, true);
+
+ // CommonUtil.WriteLog(LogType.Inf, $"{x?.DetectID}|{x?.ProductNo}浜у搧搴旀斁鍏G Tray");
+ // CommonUtil.StepControl.RemoveById(detectID);
+
+ // _continuousNG++;
+ // break;
+ // default:
+ // opc.Write(OPCOutputTag.DetectResult_OK, false);
+ // opc.Write(OPCOutputTag.DetectResult_NG, false);
+
+ // CommonUtil.WriteLog(LogType.Inf, $"{x?.DetectID}|{x?.ProductNo}浜у搧搴旀斁鍏A Tray");
+ // CommonUtil.StepControl.RemoveById(detectID);
+
+ // _continuousNG = 0;
+ // break;
+ // }
+ // #endregion
+
+ // //杞洏淇″彿璋冩暣鍒扮粨鏋滀箣鍚庣粰鍑�
+ // opc.Write(OPCOutputTag.TurnDiskReadyConfirm, true);
+
+ // //opc.Write(OPCOutputTag.DetectResult, isOk);
+
+ // //if (!isOk)
+ // //{
+ // // CommonUtil.StepControl.RemoveById(detectID);
+ // //}
+
+ // RemoveDetectedItem(detectID);
+ // CommonUtil.WriteLog(LogType.Inf, string.Format("{0}, {1}", detectID, pState.ToString()));
+
+ // if (unloadTime != DateTime.MaxValue)
+ // {
+ // TimeSpan ts = DateTime.Now - unloadTime;
+ // DisplayCycleTime((int)Math.Round(ts.TotalMilliseconds));
+ // }
+ // unloadTime = DateTime.Now;
+
+ // if (_continuousNG >= _continuousNGThreshold)
+ // {
+ // //鑴氭湰涓缃姤璀︾爜2000琛ㄧず杩炵画NG娆℃暟鍒拌揪璁惧畾鎶ヨ涓婇檺
+ // opc.Write(OPCOutputTag.Alarm, 2000);
+
+ // CommonUtil.WriteLog(LogType.Inf, $"浜у搧杩炵画NG{_continuousNG}娆★紝鎶ヨ鎻愮ず");
+ // _continuousNG = 0;
+ // }
+ // //
+ // }
+ // break;
+ // case OPCInputTag.DetectionStart2:
+ // if ((bool)item.value)
+ // {
+ // DetectionProcesser hp = heightDetection.Execute;
+ // IAsyncResult ar = hp.BeginInvoke(null, null);
+ // }
+ // break;
+ // case OPCInputTag.DetectionStart4:
+ // if ((bool)item.value)
+ // {
+ // //if (FormCheck._totalQty - FormCheck._finishedQty > 0 && FormCheck._pickCount > 0)
+ // //{
+ // // if (FormCheck._lastProductQty + FormCheck._pickCount < measureResultTTL.ProductQuntity + FormCheck._lastBreakProductQty)
+ // // {
+ // // FormCheck._lastProductQty = measureResultTTL.ProductQuntity + FormCheck._lastBreakProductQty;
+ // // }
+ // // if (measureResultTTL.ProductQuntity + FormCheck._lastBreakProductQty == FormCheck._lastProductQty + FormCheck._pickCount)
+ // // {
+ // // string productNo = sizeDetection.GetProductNo(CommonUtil.StepControl.GetDetectSizeStepID());
+ // // if (productNo!="NA" && WeekCompare(productNo))
+ // // {
+ // // sizeDetection.isPick = true;
+ // // FormCheck._lastProductQty = measureResultTTL.ProductQuntity + FormCheck._lastBreakProductQty;
+ // // }
+ // // }
+ // //}
+ // Task.Factory.StartNew(() =>
+ // {
+ // sizeDetection.Execute(measureResultTTL.ProductQuntity);
+ // });
+ // }
+ // break;
+ // case OPCInputTag.Auto:
+ // tbPLCMsg.Text = DateTime.Now.ToString("HH:mm:ss") + ":" + OPCInputTag.Auto + "," + item.value.ToString() + "\r\n" + tbPLCMsg.Text;
+ // ckAuto.Text = (bool)item.value ? "鎵嬪嫊" : "鑷嫊";
+ // ckAuto.Checked = (bool)item.value;
+ // gbHandTest.Enabled = ckAuto.Checked;
+ // break;
+ // case OPCInputTag.PLCInitialized:
+ // tbPLCMsg.Text = DateTime.Now.ToString("HH:mm:ss") + ":" + OPCInputTag.PLCInitialized + "," + item.value.ToString() + "\r\n" + tbPLCMsg.Text;
+ // if ((bool)item.value)
+ // {
+ // opc.Write(OPCOutputTag.PCInitialized, true);
+ // lbDisplayState.Text = "鍒濆鍖栧畬鎴�";
+ // Thread.Sleep(10);
+ // }
+ // break;
+ // //case OPCInputTag.RunStatus:
+ // // switch (item.value.ToString())
+ // // {
+ // // case "1":
+ // // lbDisplayState.Text = "鎬ュ仠";
+ // // break;
+ // // case "2":
+ // // lbDisplayState.Text = "寰╀綅";
+ // // break;
+ // // case "3":
+ // // lbDisplayState.Text = "閬嬭";
+ // // break;
+ // // case "4":
+ // // lbDisplayState.Text = "鍋滄";
+ // // break;
+ // // }
+ // // break;
+ // case OPCInputTag.EmergencyStop:
+
+ // ProductBindingList.Clear();
+ // productTestCollection.Clear();
+ // CommonUtil.StepControl.Clear();
+ // DisplayMeasureTTL();
+
+ // imageProcess.ClearBarcodeImage();
+ // //Thread.Sleep(1000);
+ // //imageProcess.CloseCameras();
+ // //Thread.Sleep(1000);
+ // //imageProcess.OpenCameras();
+ // CommonUtil.WriteLog(LogType.Inf, "绯荤粺鎬ュ仠");
+
+ // //鎶芥鍙傛暟鐨勫埛鏂�
+ // SetCheckInfo();
+
+ // break;
+ // case OPCInputTag.Alarm:
+ // int val = int.Parse(item.value.ToString());
+ // Task.Factory.StartNew(() =>
+ // {
+ // UpdateAlarm(val);
+ // WarningData warningData = new WarningData();
+ // DownTimeData downTimeData = new DownTimeData();
+ // DateTime now = DateTime.Now;
+ // if (val == 0)
+ // {
+ // //鏇存柊鎶ヨ
+ // warningData.UpdateWarning();
+ // //鏇存柊鍥犳姤璀﹀紩璧风殑瀹曟満
+ // downTimeData.UpdateDownTime(new DownTime { EndTime = now, Type = DownTimeType.Warning });
+ // }
+ // else
+ // {
+ // //淇濆瓨鎶ヨ
+ // warningData.SaveWarning(val);
+ // //缁撴潫涓婁竴涓姤璀﹀苟璁板綍涓嬩竴涓姤璀�
+ // downTimeData.UpdateDownTime(new DownTime { EndTime = now, Type = DownTimeType.Warning });
+ // downTimeData.SaveDownTime(new DownTime { BeginTime = now, Type = DownTimeType.Warning });
+ // }
+ // _tempDownTimeList.Add(now);
+ // });
+ // break;
+ // //UpdateAlarm(int.Parse(item.value.ToString()));
+ // //break;
+ // case OPCInputTag.UploadSignalRequire:
+ // if ((bool)item.value)
+ // {
+ // UpdateAlarm(101);
+ // }
+ // break;
+ // case OPCInputTag.X1axisLocalPos:
+ // tbX1axisLoPos.Text = item.value.ToString();
+ // break;
+ // case OPCInputTag.Y1axisLocalPos:
+ // tbY1axisLoPos.Text = item.value.ToString();
+ // break;
+ // case OPCInputTag.X2axisLocalPos:
+ // tbX2axisLoPos.Text = item.value.ToString();
+ // break;
+ // case OPCInputTag.Y2axisLocalPos:
+ // tbY2axisLoPos.Text = item.value.ToString();
+ // break;
+
+ // case OPCInputTag.TestResult:
+ // tbPLCMsg.Text = DateTime.Now.ToString("HH:mm:ss") + ":" + OPCInputTag.TestResult + "," + item.value.ToString() + "\r\n" + tbPLCMsg.Text;
+ // if ((bool)item.value)
+ // {
+ // //鍒ゆ柇OKNG
+ // opc.Write(OPCOutputTag.TestResult, false);
+ // //OK_NG();
+ // }
+ // break;
+ // case OPCInputTag.PPGJceFbPW:
+ // plateID = (int)item.value;
+ // //淇濆瓨鍥犱笂涓嬫枡銆佹枡鐩樻弧鏈綔澶勭悊寮曡捣鐨勫畷鏈�
+ // Task.Factory.StartNew(() =>
+ // {
+ // DateTime now = DateTime.Now;
+ // //鍒ゆ柇褰撳墠鏃犳姤璀﹀苟涓旀椂闂磋秴鍑鸿缃殑鏃堕暱
+ // if (string.IsNullOrEmpty(tsslWarnMsg.Text) && _plateChangeTime != null && (now - _plateChangeTime.Value).TotalSeconds > _downTimeNoAction)
+ // {
+ // DownTimeData downTimeData = new DownTimeData();
+ // //鍒ゆ柇璁剧疆鏃堕暱鍐呮湁鏃犳姤璀�
+ // if (_tempDownTimeList.Count > 0)
+ // {
+ // if ((now - _tempDownTimeList[_tempDownTimeList.Count - 1]).TotalSeconds > _downTimeNoAction)
+ // {
+ // if (_tempDownTimeList[_tempDownTimeList.Count - 1] > _plateChangeTime)
+ // {
+ // downTimeData.SaveDownTime(new DownTime { BeginTime = _tempDownTimeList[_tempDownTimeList.Count - 1], EndTime = now, Type = DownTimeType.NoAction });
+ // }
+ // else
+ // {
+ // downTimeData.SaveDownTime(new DownTime { BeginTime = _plateChangeTime, EndTime = now, Type = DownTimeType.NoAction });
+ // }
+ // }
+ // }
+ // else
+ // {
+ // downTimeData.SaveDownTime(new DownTime { BeginTime = _plateChangeTime, EndTime = now, Type = DownTimeType.NoAction });
+ // }
+ // }
+ // _plateChangeTime = now;
+ // });
+ // break;
+ // case OPCInputTag.UploadFinished:
+ // if ((bool)item.value)
+ // {
+ // TimeSpan tsUpload = DateTime.Now - TurnDiskReadyTime;
+ // tbUploadTime.Text = string.Format("{0:0.00}", tsUpload.TotalMilliseconds / 1000);
+ // tbUploadTime.Invalidate();
+ // }
+ // break;
+ // case OPCInputTag.UnloadFinished:
+ // if ((bool)item.value)
+ // {
+ // TimeSpan tsUnload = DateTime.Now - TurnDiskReadyTime;
+ // tbUnloadTime.Text = string.Format("{0:0.00}", tsUnload.TotalMilliseconds / 1000);
+ // tbUnloadTime.Invalidate();
+ // }
+ // break;
+
+ // #region add by Patrick 2018-07-12
+ // case OPCInputTag.UnloadBatteryDone: //鐢垫睜涓嬫枡鍒颁綅鏃讹紝缁戝畾杞藉叿鏉＄爜
+ // if ((bool)item.value)
+ // {
+ // //opc.Write(OPCInputTag.UnloadBatteryDone, false);
+ // int batteryId = CommonUtil.StepControl.GetUnloadBatteryID();
+
+ // CommonUtil.WriteLog(LogType.Inf, $"鐢垫睜涓嬫枡鍒颁綅,Id:{batteryId}");
+
+ // CommonUtil.StepControl.RemoveById(batteryId);
+ // detectionData.SaveTrayBarcode(batteryId);
+ // }
+ // break;
+ // case OPCInputTag.UnloadTrayMoveToOP: //褰撲笅鏂欒浇鍏峰洖鍒癘P绔紝娓呯┖杞藉叿鏉＄爜
+ // if ((bool)item.value)
+ // {
+ // //opc.Write(OPCInputTag.UnloadTrayMoveToOP, false);
+
+ // allowBarcodeFlag = true;
+ // //CarrierBarcodeCtrl.GlobalCarrierBarcode = string.Empty;
+ // cBarcodeCtrl.CarrierBarcode = string.Empty;
+
+ // Task.Factory.StartNew(() =>
+ // {
+ // detectionDataUpload.UploadData();
+ // });
+ // }
+ // break;
+ // case OPCInputTag.UnloadTrayReady://褰撲笅鏂欒浇鍏峰氨缁紝涓嶅厑璁歌緭鍏ユ潯鐮�
+ // if ((bool)item.value)
+ // {
+ // //opc.Write(OPCInputTag.UnloadTrayReady, false);
+ // allowBarcodeFlag = false;
+ // }
+ // break;
+ // #endregion
+
+ // }
+ //}
#endregion
#region OPC鎿嶄綔
@@ -1036,7 +1563,7 @@
}
}
}
- public void UpdateAlarm(int val)
+ public int UpdateAlarm(int val)
{
string info = "";
int type = 0;
@@ -1068,6 +1595,7 @@
}
tsslWarnMsg.Text = info;
MessageHandler.MessageHandlerInstance.NewMessage(info);
+ return type;
}
#endregion
@@ -1238,6 +1766,7 @@
{
Stop();
}
+ int _standardToDoNum = 0;
private void btnSetupRunMode_Click(object sender, EventArgs e)
{
SystemRunMode rm = new SystemRunMode();
@@ -1253,7 +1782,12 @@
{
rm = form.RunMode;
opc.Write(OPCOutputTag.RunMode, rm.runMode);
- opc.Write(OPCOutputTag.RunTimes, rm.runTimes);
+ opc.Write(OPCOutputTag.RunTimes, rm.runTimes * 5);
+
+ _standardToDoNum = rm.runTimes;
+ _standardResultList.Clear();
+
+ rbStandardBlock.Checked = true;
//閲嶅鎬�
opc.Write(OPCOutputTag.Repeat, rm.Repeat);
diff --git a/OPC.cs b/OPC.cs
index 9b69299..fa64128 100644
--- a/OPC.cs
+++ b/OPC.cs
@@ -22,7 +22,8 @@
private string serverIP;
private GroupProperty groupProperty;
- public ListenEventCreater listenEventCreater;
+ //public ListenEventCreater listenEventCreater;
+ public event Action<Item, int> OnReadItemValueChanged;
public class Item
{
public string name;
@@ -36,6 +37,7 @@
public Dictionary<string, Item> itemReadDict;
public Dictionary<string, Item> itemWriteDict;
+ public Dictionary<int, Item> itemReadHandleDict;
public OPC(opcConfig opcConfig)
{
@@ -92,11 +94,11 @@
SetGroupProperty(opcReadGroup);
SetGroupProperty(opcWriteGroup);
- listenEventCreater = new ListenEventCreater();
+ //listenEventCreater = new ListenEventCreater();
opcReadGroup.DataChange+=new DIOPCGroupEvent_DataChangeEventHandler(opcReadGroup_DataChange);
- SetHandles(opcReadGroup, itemReadDict);
- SetHandles(opcWriteGroup, itemWriteDict);
+ SetHandles(opcReadGroup, itemReadDict, out itemReadHandleDict);
+ SetHandles(opcWriteGroup, itemWriteDict, out _);
CommonUtil.WriteLog(LogType.Inf, "OPC Server 缁勫垪琛ㄥ垱寤哄畬鎴�");
return true;
}
@@ -161,17 +163,31 @@
/// <param name="TimeStamps"></param>
private void opcReadGroup_DataChange(int TransactionID, int NumItems, ref Array ClientHandles, ref Array ItemValues, ref Array Qualities, ref Array TimeStamps)
{
+ //for (int i = 1; i <= NumItems; i++)
+ //{
+ // foreach (Item item in itemReadDict.Values)
+ // {
+ // if (item.clientHandle == Convert.ToInt32(ClientHandles.GetValue(i)))
+ // {
+ // itemReadDict[item.name].value = Convert.ToInt32(ItemValues.GetValue(i));
+ // string state = item.name; // 鏀瑰彉鐨刬tem鐨勫悕绉�
+ // item.value = ItemValues.GetValue(i);
+ // listenEventCreater.ChangeValue(new EventData(item));
+ // }
+ // }
+ //}
+
for (int i = 1; i <= NumItems; i++)
{
- foreach (Item item in itemReadDict.Values)
+ int clientHandle = Convert.ToInt32(ClientHandles.GetValue(i));
+ if (itemReadHandleDict.ContainsKey(clientHandle))
{
- if (item.clientHandle == Convert.ToInt32(ClientHandles.GetValue(i)))
- {
- itemReadDict[item.name].value = Convert.ToInt32(ItemValues.GetValue(i));
- string state = item.name; // 鏀瑰彉鐨刬tem鐨勫悕绉�
- item.value = ItemValues.GetValue(i);
- listenEventCreater.ChangeValue(new EventData(item));
- }
+ var item = itemReadHandleDict[clientHandle];
+ int itemValue = Convert.ToInt32(ItemValues.GetValue(i));
+ item.value = itemValue;
+
+ CommonUtil.WriteLog($"Receive PLC singal锛歂ame:{item.name},value:{itemValue}");
+ OnReadItemValueChanged?.Invoke(item, itemValue);
}
}
}
@@ -182,17 +198,20 @@
/// <param name="opcGroup"></param>
/// <param name="itemDict"></param>
/// <returns></returns>
- private bool SetHandles(OPCGroup opcGroup, Dictionary<string, Item> itemDict)
+ private bool SetHandles(OPCGroup opcGroup, Dictionary<string, Item> itemDict, out Dictionary<int, Item> itemHandleDict)
{
+ itemHandleDict = new Dictionary<int, Item>();
OPCItems opcItems;
OPCItem opcItem;
opcItems = opcGroup.OPCItems;
foreach (var item in itemDict.Values)
{
item.clientHandle = itmHandleClient;
- itmHandleClient++;
opcItem = opcItems.AddItem(item.name, item.clientHandle);
item.serverHandle = opcItem.ServerHandle;
+
+ itemHandleDict[itmHandleClient] = item;
+ itmHandleClient++;
}
return true;
}
diff --git a/OPCConfigStruct.cs b/OPCConfigStruct.cs
index 2c17c53..aee7268 100644
--- a/OPCConfigStruct.cs
+++ b/OPCConfigStruct.cs
@@ -143,6 +143,7 @@
public double calibrateHeight;
public CompensationZ compensationZ;
public CompensationZ compensationW;
+ public CompensationZ compensationL;
public double loadRbtSpeed;
public double unloadRbtSpeed;
@@ -193,17 +194,15 @@
public string textUploadPath;
public string textLine;
public string textStation;
-
- public CompensationZ compensationL;
public InfoMember infoMember;
//鏍囧噯鍧楅厤缃弬鏁�
public LimitRange standardLengthLimit;
public LimitRange standardWidthLimit;
public LimitRange standardHeightLimit;
- public CompensationZ standardCompensationZ;
- public CompensationZ standardCompensationL;
- public CompensationZ standardCompensationW;
+ //public CompensationZ standardCompensationZ;
+ //public CompensationZ standardCompensationL;
+ //public CompensationZ standardCompensationW;
#region add by Patrick
public bool IsSaveSizeOKImage;
diff --git a/SizeDetection.cs b/SizeDetection.cs
index df03200..d883a81 100644
--- a/SizeDetection.cs
+++ b/SizeDetection.cs
@@ -232,6 +232,7 @@
timeStr, CommonUtil.StepControl.ToString()));
HObject hImage = null;
+ string tempFileName = "";
try
{
Thread.Sleep(50);
@@ -242,7 +243,7 @@
{
return;
}
- string tempFileName = GetCurrentProductSN(detectID);
+ tempFileName = GetCurrentProductSN(detectID);
string productNo = GetProductNo(detectID);
int times = 3;
@@ -346,7 +347,7 @@
{
ms = MeasureState.OK;
- if (opcConfig.IsSaveSizeOKImage)
+ if (opcConfig.IsSaveSizeOKImage || CommonUtil.DetectionOption == DetectionOption.doStandardBlock)
{
DateTime dt = DateTime.Now;
@@ -394,13 +395,13 @@
}
else
{
- Type t = opcConfig.standardCompensationL.GetType();
+ Type t = opcConfig.compensationL.GetType();
FieldInfo fi = t.GetField(string.Format("station{0}", CommonUtil.mainForm.PlateID));
- compL = (double)fi.GetValue(opcConfig.standardCompensationL);
+ compL = (double)fi.GetValue(opcConfig.compensationL);
- t = opcConfig.standardCompensationW.GetType();
+ t = opcConfig.compensationW.GetType();
fi = t.GetField(string.Format("station{0}", CommonUtil.mainForm.PlateID));
- compW = (double)fi.GetValue(opcConfig.standardCompensationW);
+ compW = (double)fi.GetValue(opcConfig.compensationW);
btyLength += compL;
btyWidth += compW;
@@ -466,6 +467,7 @@
catch (Exception ex)
{
CommonUtil.WriteLog(LogType.Exc, string.Format("浜у搧灏哄妫�娴嬪嚭鐜板紓甯革細{0}", ex.Message));
+ fileName = VisionDetect.SaveImageAs(hImage, $"{CommonUtil.ProductSizeImageDir}_NA\\{tempFileName}");
}
finally
{
--
Gitblit v1.8.0