添加用户控件属性

HOZProject/UserControls/UControl_CutHole.cs

@@ -14,6 +14,8 @@ namespace HOZProject
     {
         private string cutHoleName;
         public string CutHoleName { get => cutHoleName; set => cutHoleName = value; }
+        private string cutHoleCode;
+        public string CutHoleCode { get => cutHoleCode; set => cutHoleCode = value; }
         private int cutHoleState;
         public int CutHoleState { get => cutHoleState; set => cutHoleState = value; }
 
@@ -56,7 +58,7 @@ namespace HOZProject
         private void tsShowParaInfo_Click(object sender, EventArgs e)
         {
             ClearProcessControls();
-            //显示切入点参数信息
+            //显示切孔参数信息
             UControl_ParaInfo uControl_ParaInfo = new UControl_ParaInfo(FormHOZMainObject);
             //UCTimeLine uControl_Process = new UCTimeLine();
             FormHOZMainObject.plProcess.Width = uControl_ParaInfo.Width;
@@ -74,6 +76,7 @@ namespace HOZProject
             FormHOZMainObject.plProcess.Controls.Add(uControl_ParaInfo);
             FormHOZMainObject.plProcess.Visible = true;
         }
+        
 
         private void ClearProcessControls()
         {

HOZProject/UserControls/UControl_Init.Designer.cs

@@ -31,19 +31,19 @@
             this.btnClose = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.textBox2 = new System.Windows.Forms.TextBox();
+            this.tbCutHoleFilePath = new System.Windows.Forms.TextBox();
+            this.tbTemplateFilePath = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
-            this.pictureBox2 = new System.Windows.Forms.PictureBox();
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.pbTemplateFile = new System.Windows.Forms.PictureBox();
+            this.pbCutHoleFile = new System.Windows.Forms.PictureBox();
             this.label4 = new System.Windows.Forms.Label();
-            this.textBox3 = new System.Windows.Forms.TextBox();
+            this.tbSampleName = new System.Windows.Forms.TextBox();
             this.checkBox1 = new System.Windows.Forms.CheckBox();
             this.label5 = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbTemplateFile)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbCutHoleFile)).BeginInit();
             this.SuspendLayout();
             // 
             // btnClose
@@ -79,86 +79,90 @@
             this.panel1.Size = new System.Drawing.Size(387, 30);
             this.panel1.TabIndex = 3;
             // 
-            // textBox1
+            // tbCutHoleFilePath
             // 
-            this.textBox1.Font = new System.Drawing.Font("宋体", 20F);
-            this.textBox1.Location = new System.Drawing.Point(16, 51);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(276, 38);
-            this.textBox1.TabIndex = 5;
+            this.tbCutHoleFilePath.Font = new System.Drawing.Font("宋体", 10F);
+            this.tbCutHoleFilePath.Location = new System.Drawing.Point(17, 51);
+            this.tbCutHoleFilePath.Name = "tbCutHoleFilePath";
+            this.tbCutHoleFilePath.ReadOnly = true;
+            this.tbCutHoleFilePath.Size = new System.Drawing.Size(276, 23);
+            this.tbCutHoleFilePath.TabIndex = 5;
+            this.tbCutHoleFilePath.Text = "导入切孔文件";
             // 
-            // textBox2
+            // tbTemplateFilePath
             // 
-            this.textBox2.Font = new System.Drawing.Font("宋体", 20F);
-            this.textBox2.Location = new System.Drawing.Point(15, 146);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(276, 38);
-            this.textBox2.TabIndex = 7;
+            this.tbTemplateFilePath.Font = new System.Drawing.Font("宋体", 10F);
+            this.tbTemplateFilePath.Location = new System.Drawing.Point(17, 122);
+            this.tbTemplateFilePath.Name = "tbTemplateFilePath";
+            this.tbTemplateFilePath.ReadOnly = true;
+            this.tbTemplateFilePath.Size = new System.Drawing.Size(276, 23);
+            this.tbTemplateFilePath.TabIndex = 7;
+            this.tbTemplateFilePath.Text = "导入模板文件";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Font = new System.Drawing.Font("宋体", 20F);
+            this.label2.Font = new System.Drawing.Font("宋体", 10F);
             this.label2.ForeColor = System.Drawing.Color.LightGray;
-            this.label2.Location = new System.Drawing.Point(26, 104);
+            this.label2.Location = new System.Drawing.Point(17, 91);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(242, 27);
+            this.label2.Size = new System.Drawing.Size(126, 14);
             this.label2.TabIndex = 8;
-            this.label2.Text = "成功导入0个切入点";
+            this.label2.Text = "成功导入0个切孔";
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Font = new System.Drawing.Font("宋体", 20F);
+            this.label3.Font = new System.Drawing.Font("宋体", 10F);
             this.label3.ForeColor = System.Drawing.Color.LightGray;
-            this.label3.Location = new System.Drawing.Point(26, 199);
+            this.label3.Location = new System.Drawing.Point(17, 162);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(204, 27);
+            this.label3.Size = new System.Drawing.Size(105, 14);
             this.label3.TabIndex = 9;
             this.label3.Text = "当前模板:XXXXX";
             // 
-            // pictureBox2
+            // pbTemplateFile
             // 
-            this.pictureBox2.BackColor = System.Drawing.Color.LightGray;
-            this.pictureBox2.Location = new System.Drawing.Point(297, 146);
-            this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(77, 39);
-            this.pictureBox2.TabIndex = 6;
-            this.pictureBox2.TabStop = false;
+            this.pbTemplateFile.BackColor = System.Drawing.Color.LightGray;
+            this.pbTemplateFile.Location = new System.Drawing.Point(298, 122);
+            this.pbTemplateFile.Name = "pbTemplateFile";
+            this.pbTemplateFile.Size = new System.Drawing.Size(77, 23);
+            this.pbTemplateFile.TabIndex = 6;
+            this.pbTemplateFile.TabStop = false;
             // 
-            // pictureBox1
+            // pbCutHoleFile
             // 
-            this.pictureBox1.BackColor = System.Drawing.Color.LightGray;
-            this.pictureBox1.Location = new System.Drawing.Point(298, 51);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(77, 39);
-            this.pictureBox1.TabIndex = 4;
-            this.pictureBox1.TabStop = false;
+            this.pbCutHoleFile.BackColor = System.Drawing.Color.LightGray;
+            this.pbCutHoleFile.Location = new System.Drawing.Point(298, 51);
+            this.pbCutHoleFile.Name = "pbCutHoleFile";
+            this.pbCutHoleFile.Size = new System.Drawing.Size(77, 23);
+            this.pbCutHoleFile.TabIndex = 4;
+            this.pbCutHoleFile.TabStop = false;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Font = new System.Drawing.Font("宋体", 20F);
+            this.label4.Font = new System.Drawing.Font("宋体", 10F);
             this.label4.ForeColor = System.Drawing.Color.LightGray;
-            this.label4.Location = new System.Drawing.Point(11, 247);
+            this.label4.Location = new System.Drawing.Point(17, 193);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(93, 27);
+            this.label4.Size = new System.Drawing.Size(49, 14);
             this.label4.TabIndex = 10;
             this.label4.Text = "样品名";
             // 
-            // textBox3
+            // tbSampleName
             // 
-            this.textBox3.Font = new System.Drawing.Font("宋体", 20F);
-            this.textBox3.Location = new System.Drawing.Point(99, 241);
-            this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(276, 38);
-            this.textBox3.TabIndex = 11;
+            this.tbSampleName.Font = new System.Drawing.Font("宋体", 10F);
+            this.tbSampleName.Location = new System.Drawing.Point(69, 189);
+            this.tbSampleName.Name = "tbSampleName";
+            this.tbSampleName.Size = new System.Drawing.Size(224, 23);
+            this.tbSampleName.TabIndex = 11;
             // 
             // checkBox1
             // 
             this.checkBox1.AutoSize = true;
             this.checkBox1.Font = new System.Drawing.Font("宋体", 9F);
-            this.checkBox1.Location = new System.Drawing.Point(16, 299);
+            this.checkBox1.Location = new System.Drawing.Point(17, 224);
             this.checkBox1.Name = "checkBox1";
             this.checkBox1.Size = new System.Drawing.Size(15, 14);
             this.checkBox1.TabIndex = 12;
@@ -167,11 +171,11 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("宋体", 20F);
+            this.label5.Font = new System.Drawing.Font("宋体", 10F);
             this.label5.ForeColor = System.Drawing.Color.LightGray;
-            this.label5.Location = new System.Drawing.Point(37, 293);
+            this.label5.Location = new System.Drawing.Point(32, 224);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(148, 27);
+            this.label5.Size = new System.Drawing.Size(77, 14);
             this.label5.TabIndex = 13;
             this.label5.Text = "是否使用PT";
             // 
@@ -183,21 +187,21 @@
             this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.Controls.Add(this.label5);
             this.Controls.Add(this.checkBox1);
-            this.Controls.Add(this.textBox3);
+            this.Controls.Add(this.tbSampleName);
             this.Controls.Add(this.label4);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.label2);
-            this.Controls.Add(this.textBox2);
-            this.Controls.Add(this.pictureBox2);
-            this.Controls.Add(this.textBox1);
-            this.Controls.Add(this.pictureBox1);
+            this.Controls.Add(this.tbTemplateFilePath);
+            this.Controls.Add(this.pbTemplateFile);
+            this.Controls.Add(this.tbCutHoleFilePath);
+            this.Controls.Add(this.pbCutHoleFile);
             this.Controls.Add(this.panel1);
             this.Name = "UControl_Init";
-            this.Size = new System.Drawing.Size(387, 329);
+            this.Size = new System.Drawing.Size(387, 252);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbTemplateFile)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbCutHoleFile)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -208,14 +212,14 @@
         private System.Windows.Forms.Button btnClose;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.PictureBox pictureBox1;
-        private System.Windows.Forms.TextBox textBox1;
-        private System.Windows.Forms.TextBox textBox2;
-        private System.Windows.Forms.PictureBox pictureBox2;
+        private System.Windows.Forms.PictureBox pbCutHoleFile;
+        private System.Windows.Forms.TextBox tbCutHoleFilePath;
+        private System.Windows.Forms.TextBox tbTemplateFilePath;
+        private System.Windows.Forms.PictureBox pbTemplateFile;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox textBox3;
+        private System.Windows.Forms.TextBox tbSampleName;
         private System.Windows.Forms.CheckBox checkBox1;
         private System.Windows.Forms.Label label5;
     }

HOZProject/UserControls/UControl_Log.Designer.cs

@@ -102,7 +102,7 @@
             // 
             // ColCutHoleName
             // 
-            this.ColCutHoleName.HeaderText = "切入点名称";
+            this.ColCutHoleName.HeaderText = "切孔名称";
             this.ColCutHoleName.Name = "ColCutHoleName";
             this.ColCutHoleName.ReadOnly = true;
             this.ColCutHoleName.Width = 180;

HOZProject/UserControls/UControl_ParaInfo.Designer.cs

@@ -106,7 +106,7 @@
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(77, 14);
             this.label1.TabIndex = 0;
-            this.label1.Text = "切入点名称";
+            this.label1.Text = "切孔名称";
             // 
             // panel1
             //