Browse Source

添加图标文件

wb_han 5 years ago
parent
commit
1194919615

+ 13 - 0
HOZProject/FormHOZMain.Designer.cs

@@ -46,6 +46,7 @@
             this.pbSave = new System.Windows.Forms.PictureBox();
             this.pbNew = new System.Windows.Forms.PictureBox();
             this.pbOpen = new System.Windows.Forms.PictureBox();
+            this.listmsg = new System.Windows.Forms.ListBox();
             this.plMain.SuspendLayout();
             this.plFill.SuspendLayout();
             this.plLeft.SuspendLayout();
@@ -84,6 +85,7 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.plFill.BackColor = System.Drawing.Color.Black;
             this.plFill.Controls.Add(this.plProcess);
+            this.plFill.Controls.Add(this.listmsg);
             this.plFill.Location = new System.Drawing.Point(106, 86);
             this.plFill.Name = "plFill";
             this.plFill.Size = new System.Drawing.Size(894, 658);
@@ -287,6 +289,16 @@
             this.pbOpen.TabStop = false;
             this.pbOpen.Click += new System.EventHandler(this.pbOpen_Click);
             // 
+            // listmsg
+            // 
+            this.listmsg.FormattingEnabled = true;
+            this.listmsg.ItemHeight = 12;
+            this.listmsg.Location = new System.Drawing.Point(0, 1);
+            this.listmsg.Margin = new System.Windows.Forms.Padding(2);
+            this.listmsg.Name = "listmsg";
+            this.listmsg.Size = new System.Drawing.Size(524, 484);
+            this.listmsg.TabIndex = 18;
+            // 
             // FormHOZMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -340,5 +352,6 @@
         private System.Windows.Forms.PictureBox pbStart;
         private System.Windows.Forms.PictureBox pbStop;
         private System.Windows.Forms.PictureBox pbPause;
+        private System.Windows.Forms.ListBox listmsg;
     }
 }

+ 3 - 1
HOZProject/FormHOZMain.cs

@@ -61,7 +61,7 @@ namespace HOZProject
             //主界面显示内容
             this.BeginInvoke((Action)delegate
             {
-                //this.listmsg.Items.Add(e.Time.ToString() + e.State);
+                this.listmsg.Items.Add(e.Time.ToString() + e.State);
             });
         }
 
@@ -86,6 +86,8 @@ namespace HOZProject
 
         public void CreateCutHoleList(int cutHoleCount)
         {
+            //清空左侧Panel中的切孔控件
+            plLeftContent.Controls.Clear();
             for (int i = 0; i < cutHoleCount; i++)
             {
                 UControl_CutHole ucCutHole = new UControl_CutHole(this);

BIN
HOZProject/Resources/New.png


BIN
HOZProject/Resources/Pause.png


BIN
HOZProject/Resources/Start.png


BIN
HOZProject/Resources/Stop.png


+ 22 - 22
HOZProject/UserControls/UControl_Init.Designer.cs

@@ -38,12 +38,12 @@
             this.label4 = new System.Windows.Forms.Label();
             this.tBSampleName = new System.Windows.Forms.TextBox();
             this.cBIsPT = new System.Windows.Forms.CheckBox();
-            this.pbTemplateFile = new System.Windows.Forms.PictureBox();
-            this.pbCutHoleFile = new System.Windows.Forms.PictureBox();
             this.btnSave = new System.Windows.Forms.Button();
             this.cBIsManul = new System.Windows.Forms.CheckBox();
             this.label5 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
+            this.pbTemplateFile = new System.Windows.Forms.PictureBox();
+            this.pbCutHoleFile = new System.Windows.Forms.PictureBox();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pbTemplateFile)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbCutHoleFile)).BeginInit();
@@ -153,26 +153,6 @@
             this.cBIsPT.Text = "是否使用PT";
             this.cBIsPT.UseVisualStyleBackColor = true;
             // 
-            // pbTemplateFile
-            // 
-            this.pbTemplateFile.BackColor = System.Drawing.Color.LightGray;
-            this.pbTemplateFile.Location = new System.Drawing.Point(297, 92);
-            this.pbTemplateFile.Name = "pbTemplateFile";
-            this.pbTemplateFile.Size = new System.Drawing.Size(77, 23);
-            this.pbTemplateFile.TabIndex = 6;
-            this.pbTemplateFile.TabStop = false;
-            this.pbTemplateFile.Click += new System.EventHandler(this.pbTemplateFile_Click);
-            // 
-            // pbCutHoleFile
-            // 
-            this.pbCutHoleFile.BackColor = System.Drawing.Color.LightGray;
-            this.pbCutHoleFile.Location = new System.Drawing.Point(298, 45);
-            this.pbCutHoleFile.Name = "pbCutHoleFile";
-            this.pbCutHoleFile.Size = new System.Drawing.Size(77, 23);
-            this.pbCutHoleFile.TabIndex = 4;
-            this.pbCutHoleFile.TabStop = false;
-            this.pbCutHoleFile.Click += new System.EventHandler(this.pbCutHoleFile_Click);
-            // 
             // btnSave
             // 
             this.btnSave.Location = new System.Drawing.Point(297, 187);
@@ -220,6 +200,26 @@
             this.label6.TabIndex = 17;
             this.label6.Text = "导入切孔";
             // 
+            // pbTemplateFile
+            // 
+            this.pbTemplateFile.BackColor = System.Drawing.Color.LightGray;
+            this.pbTemplateFile.Location = new System.Drawing.Point(297, 92);
+            this.pbTemplateFile.Name = "pbTemplateFile";
+            this.pbTemplateFile.Size = new System.Drawing.Size(77, 23);
+            this.pbTemplateFile.TabIndex = 6;
+            this.pbTemplateFile.TabStop = false;
+            this.pbTemplateFile.Click += new System.EventHandler(this.pbTemplateFile_Click);
+            // 
+            // pbCutHoleFile
+            // 
+            this.pbCutHoleFile.BackColor = System.Drawing.Color.LightGray;
+            this.pbCutHoleFile.Location = new System.Drawing.Point(298, 45);
+            this.pbCutHoleFile.Name = "pbCutHoleFile";
+            this.pbCutHoleFile.Size = new System.Drawing.Size(77, 23);
+            this.pbCutHoleFile.TabIndex = 4;
+            this.pbCutHoleFile.TabStop = false;
+            this.pbCutHoleFile.Click += new System.EventHandler(this.pbCutHoleFile_Click);
+            // 
             // UControl_Init
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);