Forráskód Böngészése

修改初始化窗口

HaoShuang 4 éve
szülő
commit
e4cf69c5e7

+ 86 - 86
HOZProject/FormHOZMain.Designer.cs

@@ -87,10 +87,10 @@
             this.plMain.Controls.Add(this.plFill);
             this.plMain.Controls.Add(this.plLeft);
             this.plMain.Controls.Add(this.plTop);
-            this.plMain.Location = new System.Drawing.Point(16, 15);
-            this.plMain.Margin = new System.Windows.Forms.Padding(4);
+            this.plMain.Location = new System.Drawing.Point(18, 18);
+            this.plMain.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.plMain.Name = "plMain";
-            this.plMain.Size = new System.Drawing.Size(1333, 895);
+            this.plMain.Size = new System.Drawing.Size(1500, 1074);
             this.plMain.TabIndex = 1;
             // 
             // plFill
@@ -104,10 +104,10 @@
             this.plFill.Controls.Add(this.listmsg);
             this.plFill.Controls.Add(this.pbImage);
             this.plFill.Controls.Add(this.plSEM);
-            this.plFill.Location = new System.Drawing.Point(141, 108);
-            this.plFill.Margin = new System.Windows.Forms.Padding(4);
+            this.plFill.Location = new System.Drawing.Point(159, 130);
+            this.plFill.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.plFill.Name = "plFill";
-            this.plFill.Size = new System.Drawing.Size(1192, 788);
+            this.plFill.Size = new System.Drawing.Size(1341, 946);
             this.plFill.TabIndex = 5;
             // 
             // groupBox1
@@ -118,11 +118,11 @@
             this.groupBox1.Controls.Add(this.comboBox1);
             this.groupBox1.Controls.Add(this.textBox2);
             this.groupBox1.ForeColor = System.Drawing.Color.White;
-            this.groupBox1.Location = new System.Drawing.Point(925, 2);
-            this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox1.Location = new System.Drawing.Point(1041, 2);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox1.Size = new System.Drawing.Size(267, 125);
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.groupBox1.Size = new System.Drawing.Size(300, 150);
             this.groupBox1.TabIndex = 26;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "测试设置状态";
@@ -130,20 +130,20 @@
             // 
             // textBox1
             // 
-            this.textBox1.Location = new System.Drawing.Point(8, 25);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.textBox1.Location = new System.Drawing.Point(9, 30);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(132, 25);
+            this.textBox1.Size = new System.Drawing.Size(148, 28);
             this.textBox1.TabIndex = 21;
             this.textBox1.Text = "分析点名称";
             // 
             // button1
             // 
             this.button1.ForeColor = System.Drawing.Color.Black;
-            this.button1.Location = new System.Drawing.Point(159, 25);
-            this.button1.Margin = new System.Windows.Forms.Padding(4);
+            this.button1.Location = new System.Drawing.Point(179, 30);
+            this.button1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(100, 92);
+            this.button1.Size = new System.Drawing.Size(112, 110);
             this.button1.TabIndex = 24;
             this.button1.Text = "测试";
             this.button1.UseVisualStyleBackColor = true;
@@ -155,18 +155,18 @@
             this.comboBox1.Items.AddRange(new object[] {
             "True",
             "False"});
-            this.comboBox1.Location = new System.Drawing.Point(8, 92);
-            this.comboBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.comboBox1.Location = new System.Drawing.Point(9, 110);
+            this.comboBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(132, 23);
+            this.comboBox1.Size = new System.Drawing.Size(148, 26);
             this.comboBox1.TabIndex = 25;
             // 
             // textBox2
             // 
-            this.textBox2.Location = new System.Drawing.Point(8, 59);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(4);
+            this.textBox2.Location = new System.Drawing.Point(9, 71);
+            this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(132, 25);
+            this.textBox2.Size = new System.Drawing.Size(148, 28);
             this.textBox2.TabIndex = 22;
             this.textBox2.Text = "编号";
             // 
@@ -174,9 +174,9 @@
             // 
             this.plPrarInfo.BackColor = System.Drawing.Color.White;
             this.plPrarInfo.Location = new System.Drawing.Point(0, 0);
-            this.plPrarInfo.Margin = new System.Windows.Forms.Padding(4);
+            this.plPrarInfo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.plPrarInfo.Name = "plPrarInfo";
-            this.plPrarInfo.Size = new System.Drawing.Size(291, 125);
+            this.plPrarInfo.Size = new System.Drawing.Size(327, 150);
             this.plPrarInfo.TabIndex = 2;
             this.plPrarInfo.Visible = false;
             // 
@@ -184,11 +184,11 @@
             // 
             this.listmsg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.listmsg.FormattingEnabled = true;
-            this.listmsg.ItemHeight = 15;
-            this.listmsg.Location = new System.Drawing.Point(556, 2);
+            this.listmsg.ItemHeight = 18;
+            this.listmsg.Location = new System.Drawing.Point(626, 2);
             this.listmsg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.listmsg.Name = "listmsg";
-            this.listmsg.Size = new System.Drawing.Size(635, 244);
+            this.listmsg.Size = new System.Drawing.Size(714, 292);
             this.listmsg.TabIndex = 18;
             this.listmsg.Visible = false;
             // 
@@ -196,9 +196,9 @@
             // 
             this.pbImage.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pbImage.Location = new System.Drawing.Point(0, 0);
-            this.pbImage.Margin = new System.Windows.Forms.Padding(4);
+            this.pbImage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pbImage.Name = "pbImage";
-            this.pbImage.Size = new System.Drawing.Size(1192, 718);
+            this.pbImage.Size = new System.Drawing.Size(1341, 862);
             this.pbImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.pbImage.TabIndex = 20;
             this.pbImage.TabStop = false;
@@ -209,10 +209,10 @@
             this.plSEM.Controls.Add(this.lblStateMessage);
             this.plSEM.Controls.Add(this.lblFlowContent);
             this.plSEM.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.plSEM.Location = new System.Drawing.Point(0, 718);
-            this.plSEM.Margin = new System.Windows.Forms.Padding(4);
+            this.plSEM.Location = new System.Drawing.Point(0, 862);
+            this.plSEM.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.plSEM.Name = "plSEM";
-            this.plSEM.Size = new System.Drawing.Size(1192, 70);
+            this.plSEM.Size = new System.Drawing.Size(1341, 84);
             this.plSEM.TabIndex = 19;
             // 
             // lblStateMessage
@@ -221,10 +221,10 @@
             this.lblStateMessage.BackColor = System.Drawing.Color.Black;
             this.lblStateMessage.Font = new System.Drawing.Font("宋体", 10F);
             this.lblStateMessage.ForeColor = System.Drawing.Color.White;
-            this.lblStateMessage.Location = new System.Drawing.Point(874, 19);
+            this.lblStateMessage.Location = new System.Drawing.Point(983, 23);
             this.lblStateMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblStateMessage.Name = "lblStateMessage";
-            this.lblStateMessage.Size = new System.Drawing.Size(309, 30);
+            this.lblStateMessage.Size = new System.Drawing.Size(348, 36);
             this.lblStateMessage.TabIndex = 1;
             this.lblStateMessage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
@@ -233,10 +233,10 @@
             this.lblFlowContent.AutoSize = true;
             this.lblFlowContent.Font = new System.Drawing.Font("宋体", 10F);
             this.lblFlowContent.ForeColor = System.Drawing.Color.White;
-            this.lblFlowContent.Location = new System.Drawing.Point(33, 26);
+            this.lblFlowContent.Location = new System.Drawing.Point(37, 31);
             this.lblFlowContent.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblFlowContent.Name = "lblFlowContent";
-            this.lblFlowContent.Size = new System.Drawing.Size(0, 17);
+            this.lblFlowContent.Size = new System.Drawing.Size(0, 20);
             this.lblFlowContent.TabIndex = 0;
             // 
             // plLeft
@@ -245,10 +245,10 @@
             this.plLeft.Controls.Add(this.label1);
             this.plLeft.Controls.Add(this.plLeftContent);
             this.plLeft.Dock = System.Windows.Forms.DockStyle.Left;
-            this.plLeft.Location = new System.Drawing.Point(0, 100);
-            this.plLeft.Margin = new System.Windows.Forms.Padding(4);
+            this.plLeft.Location = new System.Drawing.Point(0, 120);
+            this.plLeft.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.plLeft.Name = "plLeft";
-            this.plLeft.Size = new System.Drawing.Size(133, 795);
+            this.plLeft.Size = new System.Drawing.Size(150, 954);
             this.plLeft.TabIndex = 4;
             // 
             // label1
@@ -257,10 +257,10 @@
             this.label1.BackColor = System.Drawing.Color.Transparent;
             this.label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.Color.Gainsboro;
-            this.label1.Location = new System.Drawing.Point(24, 4);
+            this.label1.Location = new System.Drawing.Point(27, 5);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(87, 15);
+            this.label1.Size = new System.Drawing.Size(103, 18);
             this.label1.TabIndex = 1;
             this.label1.Text = "分析点列表";
             // 
@@ -270,10 +270,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.plLeftContent.AutoScroll = true;
-            this.plLeftContent.Location = new System.Drawing.Point(7, 24);
-            this.plLeftContent.Margin = new System.Windows.Forms.Padding(4);
+            this.plLeftContent.Location = new System.Drawing.Point(8, 29);
+            this.plLeftContent.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.plLeftContent.Name = "plLeftContent";
-            this.plLeftContent.Size = new System.Drawing.Size(120, 771);
+            this.plLeftContent.Size = new System.Drawing.Size(135, 925);
             this.plLeftContent.TabIndex = 0;
             // 
             // plTop
@@ -293,9 +293,9 @@
             this.plTop.Controls.Add(this.pbNew);
             this.plTop.Dock = System.Windows.Forms.DockStyle.Top;
             this.plTop.Location = new System.Drawing.Point(0, 0);
-            this.plTop.Margin = new System.Windows.Forms.Padding(4);
+            this.plTop.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.plTop.Name = "plTop";
-            this.plTop.Size = new System.Drawing.Size(1333, 100);
+            this.plTop.Size = new System.Drawing.Size(1500, 120);
             this.plTop.TabIndex = 3;
             // 
             // pbStop
@@ -304,10 +304,10 @@
             this.pbStop.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbStop.Cursor = System.Windows.Forms.Cursors.Hand;
             this.pbStop.Enabled = false;
-            this.pbStop.Location = new System.Drawing.Point(596, 5);
-            this.pbStop.Margin = new System.Windows.Forms.Padding(4);
+            this.pbStop.Location = new System.Drawing.Point(670, 6);
+            this.pbStop.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pbStop.Name = "pbStop";
-            this.pbStop.Size = new System.Drawing.Size(91, 89);
+            this.pbStop.Size = new System.Drawing.Size(102, 107);
             this.pbStop.TabIndex = 8;
             this.pbStop.TabStop = false;
             this.pbStop.Click += new System.EventHandler(this.pbStop_Click);
@@ -319,10 +319,10 @@
             this.pbPause.BackgroundImage = global::HOZProject.Properties.Resources.Pause;
             this.pbPause.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbPause.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbPause.Location = new System.Drawing.Point(695, 5);
-            this.pbPause.Margin = new System.Windows.Forms.Padding(4);
+            this.pbPause.Location = new System.Drawing.Point(782, 6);
+            this.pbPause.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pbPause.Name = "pbPause";
-            this.pbPause.Size = new System.Drawing.Size(91, 89);
+            this.pbPause.Size = new System.Drawing.Size(102, 107);
             this.pbPause.TabIndex = 8;
             this.pbPause.TabStop = false;
             this.pbPause.Visible = false;
@@ -332,10 +332,10 @@
             this.pbStart.BackgroundImage = global::HOZProject.Properties.Resources.Start;
             this.pbStart.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbStart.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbStart.Location = new System.Drawing.Point(497, 5);
-            this.pbStart.Margin = new System.Windows.Forms.Padding(4);
+            this.pbStart.Location = new System.Drawing.Point(559, 6);
+            this.pbStart.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pbStart.Name = "pbStart";
-            this.pbStart.Size = new System.Drawing.Size(91, 89);
+            this.pbStart.Size = new System.Drawing.Size(102, 107);
             this.pbStart.TabIndex = 8;
             this.pbStart.TabStop = false;
             this.pbStart.Click += new System.EventHandler(this.pbStart_Click);
@@ -348,10 +348,10 @@
             this.pbMax.BackgroundImage = global::HOZProject.Properties.Resources.Max_Gray;
             this.pbMax.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbMax.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbMax.Location = new System.Drawing.Point(1247, 0);
-            this.pbMax.Margin = new System.Windows.Forms.Padding(4);
+            this.pbMax.Location = new System.Drawing.Point(1403, 0);
+            this.pbMax.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pbMax.Name = "pbMax";
-            this.pbMax.Size = new System.Drawing.Size(37, 39);
+            this.pbMax.Size = new System.Drawing.Size(42, 47);
             this.pbMax.TabIndex = 7;
             this.pbMax.TabStop = false;
             this.pbMax.Click += new System.EventHandler(this.pbMax_Click);
@@ -364,10 +364,10 @@
             this.pbMin.BackgroundImage = global::HOZProject.Properties.Resources.Min_Gray;
             this.pbMin.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbMin.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbMin.Location = new System.Drawing.Point(1201, 0);
-            this.pbMin.Margin = new System.Windows.Forms.Padding(4);
+            this.pbMin.Location = new System.Drawing.Point(1351, 0);
+            this.pbMin.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pbMin.Name = "pbMin";
-            this.pbMin.Size = new System.Drawing.Size(37, 39);
+            this.pbMin.Size = new System.Drawing.Size(42, 47);
             this.pbMin.TabIndex = 7;
             this.pbMin.TabStop = false;
             this.pbMin.Click += new System.EventHandler(this.pbMin_Click);
@@ -380,10 +380,10 @@
             this.pbClose.BackgroundImage = global::HOZProject.Properties.Resources.exit_Gray;
             this.pbClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbClose.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbClose.Location = new System.Drawing.Point(1292, 0);
-            this.pbClose.Margin = new System.Windows.Forms.Padding(4);
+            this.pbClose.Location = new System.Drawing.Point(1454, 0);
+            this.pbClose.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pbClose.Name = "pbClose";
-            this.pbClose.Size = new System.Drawing.Size(37, 39);
+            this.pbClose.Size = new System.Drawing.Size(42, 47);
             this.pbClose.TabIndex = 7;
             this.pbClose.TabStop = false;
             this.pbClose.Click += new System.EventHandler(this.pbClose_Click);
@@ -395,10 +395,10 @@
             this.pbImportTemplateFile.BackgroundImage = global::HOZProject.Properties.Resources.ImportConfigFile;
             this.pbImportTemplateFile.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbImportTemplateFile.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbImportTemplateFile.Location = new System.Drawing.Point(299, 5);
-            this.pbImportTemplateFile.Margin = new System.Windows.Forms.Padding(4);
+            this.pbImportTemplateFile.Location = new System.Drawing.Point(336, 6);
+            this.pbImportTemplateFile.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pbImportTemplateFile.Name = "pbImportTemplateFile";
-            this.pbImportTemplateFile.Size = new System.Drawing.Size(91, 89);
+            this.pbImportTemplateFile.Size = new System.Drawing.Size(102, 107);
             this.pbImportTemplateFile.TabIndex = 6;
             this.pbImportTemplateFile.TabStop = false;
             this.pbImportTemplateFile.Click += new System.EventHandler(this.pbImportTemplateFile_Click);
@@ -408,10 +408,10 @@
             this.pbLog.BackgroundImage = global::HOZProject.Properties.Resources.Log;
             this.pbLog.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbLog.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbLog.Location = new System.Drawing.Point(396, 5);
-            this.pbLog.Margin = new System.Windows.Forms.Padding(4);
+            this.pbLog.Location = new System.Drawing.Point(446, 6);
+            this.pbLog.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pbLog.Name = "pbLog";
-            this.pbLog.Size = new System.Drawing.Size(91, 89);
+            this.pbLog.Size = new System.Drawing.Size(102, 107);
             this.pbLog.TabIndex = 6;
             this.pbLog.TabStop = false;
             this.pbLog.Click += new System.EventHandler(this.pbLog_Click);
@@ -421,10 +421,10 @@
             this.pbInit.BackgroundImage = global::HOZProject.Properties.Resources.init;
             this.pbInit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbInit.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbInit.Location = new System.Drawing.Point(201, 5);
-            this.pbInit.Margin = new System.Windows.Forms.Padding(4);
+            this.pbInit.Location = new System.Drawing.Point(226, 6);
+            this.pbInit.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pbInit.Name = "pbInit";
-            this.pbInit.Size = new System.Drawing.Size(91, 89);
+            this.pbInit.Size = new System.Drawing.Size(102, 107);
             this.pbInit.TabIndex = 5;
             this.pbInit.TabStop = false;
             this.pbInit.Click += new System.EventHandler(this.pbInit_Click);
@@ -434,10 +434,10 @@
             this.pbSave.BackgroundImage = global::HOZProject.Properties.Resources.save;
             this.pbSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbSave.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbSave.Location = new System.Drawing.Point(104, 5);
-            this.pbSave.Margin = new System.Windows.Forms.Padding(4);
+            this.pbSave.Location = new System.Drawing.Point(117, 6);
+            this.pbSave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pbSave.Name = "pbSave";
-            this.pbSave.Size = new System.Drawing.Size(91, 89);
+            this.pbSave.Size = new System.Drawing.Size(102, 107);
             this.pbSave.TabIndex = 4;
             this.pbSave.TabStop = false;
             this.pbSave.Click += new System.EventHandler(this.pbSave_Click);
@@ -447,10 +447,10 @@
             this.pbOpen.BackgroundImage = global::HOZProject.Properties.Resources.open;
             this.pbOpen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbOpen.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbOpen.Location = new System.Drawing.Point(7, 5);
-            this.pbOpen.Margin = new System.Windows.Forms.Padding(4);
+            this.pbOpen.Location = new System.Drawing.Point(8, 6);
+            this.pbOpen.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pbOpen.Name = "pbOpen";
-            this.pbOpen.Size = new System.Drawing.Size(91, 89);
+            this.pbOpen.Size = new System.Drawing.Size(102, 107);
             this.pbOpen.TabIndex = 3;
             this.pbOpen.TabStop = false;
             this.pbOpen.Click += new System.EventHandler(this.pbOpen_Click);
@@ -460,10 +460,10 @@
             this.pbNew.BackgroundImage = global::HOZProject.Properties.Resources.New;
             this.pbNew.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbNew.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbNew.Location = new System.Drawing.Point(7, 5);
-            this.pbNew.Margin = new System.Windows.Forms.Padding(4);
+            this.pbNew.Location = new System.Drawing.Point(8, 6);
+            this.pbNew.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pbNew.Name = "pbNew";
-            this.pbNew.Size = new System.Drawing.Size(91, 89);
+            this.pbNew.Size = new System.Drawing.Size(102, 107);
             this.pbNew.TabIndex = 3;
             this.pbNew.TabStop = false;
             this.pbNew.Visible = false;
@@ -471,15 +471,15 @@
             // 
             // FormHOZMain
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.WindowFrame;
-            this.ClientSize = new System.Drawing.Size(1365, 925);
+            this.ClientSize = new System.Drawing.Size(1536, 1110);
             this.ControlBox = false;
             this.Controls.Add(this.plMain);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
-            this.MinimumSize = new System.Drawing.Size(1365, 925);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.MinimumSize = new System.Drawing.Size(1536, 1018);
             this.Name = "FormHOZMain";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "FormHOZMain";

+ 36 - 30
HOZProject/UserControls/UControl_Init.Designer.cs

@@ -95,7 +95,7 @@
             this.label1.ForeColor = System.Drawing.Color.LightGray;
             this.label1.Location = new System.Drawing.Point(15, 9);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(93, 17);
+            this.label1.Size = new System.Drawing.Size(109, 20);
             this.label1.TabIndex = 0;
             this.label1.Text = "初始化设置";
             // 
@@ -132,7 +132,7 @@
             this.tbCutHoleFilePath.Location = new System.Drawing.Point(129, 49);
             this.tbCutHoleFilePath.Name = "tbCutHoleFilePath";
             this.tbCutHoleFilePath.ReadOnly = true;
-            this.tbCutHoleFilePath.Size = new System.Drawing.Size(347, 27);
+            this.tbCutHoleFilePath.Size = new System.Drawing.Size(347, 30);
             this.tbCutHoleFilePath.TabIndex = 5;
             // 
             // txtWPTF
@@ -141,7 +141,7 @@
             this.txtWPTF.Location = new System.Drawing.Point(129, 100);
             this.txtWPTF.Name = "txtWPTF";
             this.txtWPTF.ReadOnly = true;
-            this.txtWPTF.Size = new System.Drawing.Size(346, 27);
+            this.txtWPTF.Size = new System.Drawing.Size(346, 30);
             this.txtWPTF.TabIndex = 7;
             // 
             // lblCutHoleCount
@@ -151,7 +151,7 @@
             this.lblCutHoleCount.ForeColor = System.Drawing.Color.LightGray;
             this.lblCutHoleCount.Location = new System.Drawing.Point(127, 79);
             this.lblCutHoleCount.Name = "lblCutHoleCount";
-            this.lblCutHoleCount.Size = new System.Drawing.Size(153, 17);
+            this.lblCutHoleCount.Size = new System.Drawing.Size(179, 20);
             this.lblCutHoleCount.TabIndex = 8;
             this.lblCutHoleCount.Text = "成功导入0个分析点";
             // 
@@ -163,7 +163,7 @@
             this.chkManul.Location = new System.Drawing.Point(365, 182);
             this.chkManul.Margin = new System.Windows.Forms.Padding(2);
             this.chkManul.Name = "chkManul";
-            this.chkManul.Size = new System.Drawing.Size(98, 21);
+            this.chkManul.Size = new System.Drawing.Size(115, 24);
             this.chkManul.TabIndex = 15;
             this.chkManul.Text = "手动对焦";
             this.chkManul.UseVisualStyleBackColor = true;
@@ -177,7 +177,7 @@
             this.label6.Location = new System.Drawing.Point(13, 54);
             this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(93, 17);
+            this.label6.Size = new System.Drawing.Size(109, 20);
             this.label6.TabIndex = 17;
             this.label6.Text = "导入分析点";
             // 
@@ -195,8 +195,9 @@
             this.cbbWPZD.Location = new System.Drawing.Point(129, 258);
             this.cbbWPZD.Margin = new System.Windows.Forms.Padding(2);
             this.cbbWPZD.Name = "cbbWPZD";
-            this.cbbWPZD.Size = new System.Drawing.Size(132, 25);
+            this.cbbWPZD.Size = new System.Drawing.Size(132, 28);
             this.cbbWPZD.TabIndex = 99;
+            this.cbbWPZD.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.cbbWPZD_KeyPress);
             // 
             // cbbWPZF
             // 
@@ -211,8 +212,9 @@
             this.cbbWPZF.Location = new System.Drawing.Point(439, 258);
             this.cbbWPZF.Margin = new System.Windows.Forms.Padding(2);
             this.cbbWPZF.Name = "cbbWPZF";
-            this.cbbWPZF.Size = new System.Drawing.Size(132, 25);
+            this.cbbWPZF.Size = new System.Drawing.Size(132, 28);
             this.cbbWPZF.TabIndex = 98;
+            this.cbbWPZF.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.cbbWPZF_KeyPress);
             // 
             // cbbWQGD
             // 
@@ -228,8 +230,9 @@
             this.cbbWQGD.Location = new System.Drawing.Point(129, 301);
             this.cbbWQGD.Margin = new System.Windows.Forms.Padding(2);
             this.cbbWQGD.Name = "cbbWQGD";
-            this.cbbWQGD.Size = new System.Drawing.Size(132, 25);
+            this.cbbWQGD.Size = new System.Drawing.Size(132, 28);
             this.cbbWQGD.TabIndex = 97;
+            this.cbbWQGD.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.cbbWQGD_KeyPress);
             // 
             // cbbWQGF
             // 
@@ -244,8 +247,9 @@
             this.cbbWQGF.Location = new System.Drawing.Point(439, 301);
             this.cbbWQGF.Margin = new System.Windows.Forms.Padding(2);
             this.cbbWQGF.Name = "cbbWQGF";
-            this.cbbWQGF.Size = new System.Drawing.Size(132, 25);
+            this.cbbWQGF.Size = new System.Drawing.Size(132, 28);
             this.cbbWQGF.TabIndex = 96;
+            this.cbbWQGF.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.cbbWQGF_KeyPress);
             // 
             // cbbWLZ
             // 
@@ -260,8 +264,9 @@
             this.cbbWLZ.Location = new System.Drawing.Point(439, 344);
             this.cbbWLZ.Margin = new System.Windows.Forms.Padding(2);
             this.cbbWLZ.Name = "cbbWLZ";
-            this.cbbWLZ.Size = new System.Drawing.Size(132, 25);
+            this.cbbWLZ.Size = new System.Drawing.Size(132, 28);
             this.cbbWLZ.TabIndex = 95;
+            this.cbbWLZ.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.cbbWLZ_KeyPress);
             // 
             // cbbWXZ
             // 
@@ -275,7 +280,7 @@
             this.cbbWXZ.Location = new System.Drawing.Point(129, 344);
             this.cbbWXZ.Margin = new System.Windows.Forms.Padding(2);
             this.cbbWXZ.Name = "cbbWXZ";
-            this.cbbWXZ.Size = new System.Drawing.Size(132, 25);
+            this.cbbWXZ.Size = new System.Drawing.Size(132, 28);
             this.cbbWXZ.TabIndex = 94;
             // 
             // cbbWCS
@@ -286,7 +291,7 @@
             this.cbbWCS.Location = new System.Drawing.Point(438, 215);
             this.cbbWCS.Margin = new System.Windows.Forms.Padding(2);
             this.cbbWCS.Name = "cbbWCS";
-            this.cbbWCS.Size = new System.Drawing.Size(132, 25);
+            this.cbbWCS.Size = new System.Drawing.Size(132, 28);
             this.cbbWCS.TabIndex = 93;
             // 
             // cbbWYP
@@ -297,7 +302,7 @@
             this.cbbWYP.Location = new System.Drawing.Point(129, 215);
             this.cbbWYP.Margin = new System.Windows.Forms.Padding(2);
             this.cbbWYP.Name = "cbbWYP";
-            this.cbbWYP.Size = new System.Drawing.Size(132, 25);
+            this.cbbWYP.Size = new System.Drawing.Size(132, 28);
             this.cbbWYP.TabIndex = 92;
             // 
             // label58
@@ -308,7 +313,7 @@
             this.label58.Location = new System.Drawing.Point(13, 347);
             this.label58.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label58.Name = "label58";
-            this.label58.Size = new System.Drawing.Size(76, 17);
+            this.label58.Size = new System.Drawing.Size(89, 20);
             this.label58.TabIndex = 91;
             this.label58.Text = "校正角度";
             // 
@@ -320,7 +325,7 @@
             this.label50.Location = new System.Drawing.Point(13, 261);
             this.label50.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label50.Name = "label50";
-            this.label50.Size = new System.Drawing.Size(94, 17);
+            this.label50.Size = new System.Drawing.Size(109, 20);
             this.label50.TabIndex = 90;
             this.label50.Text = "拍照电压/V";
             // 
@@ -332,7 +337,7 @@
             this.label54.Location = new System.Drawing.Point(299, 262);
             this.label54.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label54.Name = "label54";
-            this.label54.Size = new System.Drawing.Size(110, 17);
+            this.label54.Size = new System.Drawing.Size(129, 20);
             this.label54.TabIndex = 89;
             this.label54.Text = "拍照放大倍数";
             // 
@@ -344,7 +349,7 @@
             this.label46.Location = new System.Drawing.Point(13, 304);
             this.label46.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label46.Name = "label46";
-            this.label46.Size = new System.Drawing.Size(94, 17);
+            this.label46.Size = new System.Drawing.Size(109, 20);
             this.label46.TabIndex = 88;
             this.label46.Text = "定位电压/V";
             // 
@@ -356,7 +361,7 @@
             this.label42.Location = new System.Drawing.Point(299, 305);
             this.label42.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label42.Name = "label42";
-            this.label42.Size = new System.Drawing.Size(110, 17);
+            this.label42.Size = new System.Drawing.Size(129, 20);
             this.label42.TabIndex = 87;
             this.label42.Text = "定位放大倍数";
             // 
@@ -368,7 +373,7 @@
             this.label38.Location = new System.Drawing.Point(299, 348);
             this.label38.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label38.Name = "label38";
-            this.label38.Size = new System.Drawing.Size(144, 17);
+            this.label38.Size = new System.Drawing.Size(169, 20);
             this.label38.TabIndex = 86;
             this.label38.Text = "拉直操作放大倍数";
             // 
@@ -380,7 +385,7 @@
             this.chkWIsP.Location = new System.Drawing.Point(129, 182);
             this.chkWIsP.Margin = new System.Windows.Forms.Padding(2);
             this.chkWIsP.Name = "chkWIsP";
-            this.chkWIsP.Size = new System.Drawing.Size(81, 21);
+            this.chkWIsP.Size = new System.Drawing.Size(95, 24);
             this.chkWIsP.TabIndex = 85;
             this.chkWIsP.Text = "仅拍照";
             this.chkWIsP.UseVisualStyleBackColor = true;
@@ -394,7 +399,7 @@
             this.label48.Location = new System.Drawing.Point(13, 218);
             this.label48.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label48.Name = "label48";
-            this.label48.Size = new System.Drawing.Size(76, 17);
+            this.label48.Size = new System.Drawing.Size(89, 20);
             this.label48.TabIndex = 81;
             this.label48.Text = "样品类型";
             // 
@@ -406,7 +411,7 @@
             this.label56.Location = new System.Drawing.Point(299, 219);
             this.label56.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label56.Name = "label56";
-            this.label56.Size = new System.Drawing.Size(42, 17);
+            this.label56.Size = new System.Drawing.Size(49, 20);
             this.label56.TabIndex = 80;
             this.label56.Text = "厂商";
             // 
@@ -418,7 +423,7 @@
             this.label59.Location = new System.Drawing.Point(13, 147);
             this.label59.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label59.Name = "label59";
-            this.label59.Size = new System.Drawing.Size(103, 17);
+            this.label59.Size = new System.Drawing.Size(119, 20);
             this.label59.TabIndex = 79;
             this.label59.Text = "FIB文件名称";
             // 
@@ -430,7 +435,7 @@
             this.label61.Location = new System.Drawing.Point(13, 105);
             this.label61.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label61.Name = "label61";
-            this.label61.Size = new System.Drawing.Size(94, 17);
+            this.label61.Size = new System.Drawing.Size(109, 20);
             this.label61.TabIndex = 78;
             this.label61.Text = "PT文件名称";
             // 
@@ -442,7 +447,7 @@
             this.chkWPT.Location = new System.Drawing.Point(246, 182);
             this.chkWPT.Margin = new System.Windows.Forms.Padding(2);
             this.chkWPT.Name = "chkWPT";
-            this.chkWPT.Size = new System.Drawing.Size(82, 21);
+            this.chkWPT.Size = new System.Drawing.Size(95, 24);
             this.chkWPT.TabIndex = 77;
             this.chkWPT.Text = "使用PT";
             this.chkWPT.UseVisualStyleBackColor = true;
@@ -467,7 +472,7 @@
             this.txtWFIBF.Location = new System.Drawing.Point(129, 142);
             this.txtWFIBF.Name = "txtWFIBF";
             this.txtWFIBF.ReadOnly = true;
-            this.txtWFIBF.Size = new System.Drawing.Size(346, 27);
+            this.txtWFIBF.Size = new System.Drawing.Size(346, 30);
             this.txtWFIBF.TabIndex = 103;
             // 
             // pbDelWLZ
@@ -639,8 +644,9 @@
             this.cbbWFIB.Location = new System.Drawing.Point(130, 390);
             this.cbbWFIB.Margin = new System.Windows.Forms.Padding(2);
             this.cbbWFIB.Name = "cbbWFIB";
-            this.cbbWFIB.Size = new System.Drawing.Size(132, 25);
+            this.cbbWFIB.Size = new System.Drawing.Size(132, 28);
             this.cbbWFIB.TabIndex = 114;
+            this.cbbWFIB.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.cbbWFIB_KeyPress);
             // 
             // label2
             // 
@@ -650,13 +656,13 @@
             this.label2.Location = new System.Drawing.Point(13, 393);
             this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(103, 17);
+            this.label2.Size = new System.Drawing.Size(119, 20);
             this.label2.TabIndex = 113;
             this.label2.Text = "FIB放大倍数";
             // 
             // UControl_Init
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 17F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
             this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

+ 86 - 1
HOZProject/UserControls/UControl_Init.cs

@@ -775,6 +775,8 @@ namespace HOZProject
                 pbFIBTemplateFile.Visible = false;
                 label58.Visible = false;
                 cbbWXZ.Visible = false;
+                label2.Visible = false;
+                cbbWFIB.Visible = false;
                 FormHOZMainObject.m_MeasureType = (int)MeasureMsgManage.measureType.Photo;
             }
             else
@@ -788,6 +790,8 @@ namespace HOZProject
                 pbFIBTemplateFile.Visible = true;
                 label58.Visible = true;
                 cbbWXZ.Visible = true;
+                label2.Visible = true;
+                cbbWFIB.Visible = true;
                 if (!chkWPT.Checked)
                 {
                     FormHOZMainObject.m_MeasureType = (int)MeasureMsgManage.measureType.FIB;
@@ -900,7 +904,88 @@ namespace HOZProject
         private void pbClose_MouseLeave(object sender, EventArgs e)
         {
             pbClose.BackgroundImage = global::HOZProject.Properties.Resources.exit_Gray;
-        } 
+        }
+        #endregion
+
+        #region 输入限制只能是数字
+        private void ComboBox_KeyPress(string text, object sender, KeyPressEventArgs e)
+        {
+
+            //允许输入数字、小数点、删除键和负号  
+            if ((e.KeyChar < 48 || e.KeyChar > 57) && e.KeyChar != 8 && e.KeyChar != (char)('.') && e.KeyChar != (char)('-'))
+            {
+                MessageBox.Show("请输入正确的数字");
+                text = "";
+                e.Handled = true;
+            }
+            if (e.KeyChar == (char)('-'))
+            {
+                if (text != "")
+                {
+                    MessageBox.Show("请输入正确的数字");
+                    text = "";
+                    e.Handled = true;
+                }
+            }
+            //小数点只能输入一次  
+            if (e.KeyChar == (char)('.') && ((ComboBox)sender).Text.IndexOf('.') != -1)
+            {
+                MessageBox.Show("请输入正确的数字");
+                text = "";
+                e.Handled = true;
+            }
+            //第一位不能为小数点  
+            if (e.KeyChar == (char)('.') && ((ComboBox)sender).Text == "")
+            {
+                MessageBox.Show("请输入正确的数字");
+                text = "";
+                e.Handled = true;
+            }
+            //第一位是0,第二位必须为小数点  
+            if (e.KeyChar != (char)('.') && ((ComboBox)sender).Text == "0")
+            {
+                MessageBox.Show("请输入正确的数字");
+                text = "";
+                e.Handled = true;
+            }
+            //第一位是负号,第二位不能为小数点  
+            if (((ComboBox)sender).Text == "-" && e.KeyChar == (char)('.'))
+            {
+                MessageBox.Show("请输入正确的数字");
+                text = "";
+                e.Handled = true;
+            }
+        }
+
+        private void cbbWPZD_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            ComboBox_KeyPress(cbbWPZD.Text, sender, e);
+        }
+
+        private void cbbWPZF_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            ComboBox_KeyPress(cbbWPZF.Text, sender, e);
+        }
+
+        private void cbbWQGD_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            ComboBox_KeyPress(cbbWQGD.Text, sender, e);
+        }
+
+        private void cbbWQGF_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            ComboBox_KeyPress(cbbWQGF.Text, sender, e);
+        }
+
+        private void cbbWLZ_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            ComboBox_KeyPress(cbbWLZ.Text, sender, e);
+        }
+
+        private void cbbWFIB_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            ComboBox_KeyPress(cbbWFIB.Text, sender, e);
+        }
         #endregion
     }
 }