修改流程中的状态

HOZProject/FormHOZMain.Designer.cs

@@ -30,14 +30,16 @@
         {
             this.plMain = new System.Windows.Forms.Panel();
             this.plFill = new System.Windows.Forms.Panel();
-            this.comboBox1 = new System.Windows.Forms.ComboBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.textBox1 = new System.Windows.Forms.TextBox();
             this.button1 = new System.Windows.Forms.Button();
+            this.comboBox1 = new System.Windows.Forms.ComboBox();
             this.textBox2 = new System.Windows.Forms.TextBox();
-            this.textBox1 = new System.Windows.Forms.TextBox();
             this.plPrarInfo = new System.Windows.Forms.Panel();
             this.listmsg = new System.Windows.Forms.ListBox();
             this.pbImage = new System.Windows.Forms.PictureBox();
             this.plSEM = new System.Windows.Forms.Panel();
+            this.lblFlowContent = new System.Windows.Forms.Label();
             this.plLeft = new System.Windows.Forms.Panel();
             this.label1 = new System.Windows.Forms.Label();
             this.plLeftContent = new System.Windows.Forms.Panel();
@@ -54,10 +56,9 @@
             this.pbSave = new System.Windows.Forms.PictureBox();
             this.pbOpen = new System.Windows.Forms.PictureBox();
             this.pbNew = new System.Windows.Forms.PictureBox();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.lblFlowContent = new System.Windows.Forms.Label();
             this.plMain.SuspendLayout();
             this.plFill.SuspendLayout();
+            this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pbImage)).BeginInit();
             this.plSEM.SuspendLayout();
             this.plLeft.SuspendLayout();
@@ -74,7 +75,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.pbSave)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbOpen)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbNew)).BeginInit();
-            this.groupBox1.SuspendLayout();
             this.SuspendLayout();
             // 
             // plMain
@@ -107,17 +107,29 @@
             this.plFill.Size = new System.Drawing.Size(894, 658);
             this.plFill.TabIndex = 5;
             // 
-            // comboBox1
+            // groupBox1
             // 
-            this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Items.AddRange(new object[] {
-            "0",
-            "1",
-            "2"});
-            this.comboBox1.Location = new System.Drawing.Point(6, 74);
-            this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(100, 20);
-            this.comboBox1.TabIndex = 25;
+            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.Controls.Add(this.textBox1);
+            this.groupBox1.Controls.Add(this.button1);
+            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(694, 2);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(200, 100);
+            this.groupBox1.TabIndex = 26;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "测试设置状态";
+            this.groupBox1.Visible = false;
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(6, 20);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(100, 21);
+            this.textBox1.TabIndex = 21;
+            this.textBox1.Text = "切孔名称";
             // 
             // button1
             // 
@@ -130,6 +142,18 @@
             this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
+            // comboBox1
+            // 
+            this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.Items.AddRange(new object[] {
+            "0",
+            "1",
+            "2"});
+            this.comboBox1.Location = new System.Drawing.Point(6, 74);
+            this.comboBox1.Name = "comboBox1";
+            this.comboBox1.Size = new System.Drawing.Size(100, 20);
+            this.comboBox1.TabIndex = 25;
+            // 
             // textBox2
             // 
             this.textBox2.Location = new System.Drawing.Point(6, 47);
@@ -138,14 +162,6 @@
             this.textBox2.TabIndex = 22;
             this.textBox2.Text = "编号";
             // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(6, 20);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(100, 21);
-            this.textBox1.TabIndex = 21;
-            this.textBox1.Text = "切孔名称";
-            // 
             // plPrarInfo
             // 
             this.plPrarInfo.BackColor = System.Drawing.Color.White;
@@ -185,6 +201,17 @@
             this.plSEM.Size = new System.Drawing.Size(894, 90);
             this.plSEM.TabIndex = 19;
             // 
+            // lblFlowContent
+            // 
+            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(23, 38);
+            this.lblFlowContent.Name = "lblFlowContent";
+            this.lblFlowContent.Size = new System.Drawing.Size(28, 14);
+            this.lblFlowContent.TabIndex = 0;
+            this.lblFlowContent.Text = "---";
+            // 
             // plLeft
             // 
             this.plLeft.BackColor = System.Drawing.Color.Black;
@@ -393,32 +420,6 @@
             this.pbNew.Visible = false;
             this.pbNew.Click += new System.EventHandler(this.pbNew_Click);
             // 
-            // groupBox1
-            // 
-            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupBox1.Controls.Add(this.textBox1);
-            this.groupBox1.Controls.Add(this.button1);
-            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(694, 2);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(200, 100);
-            this.groupBox1.TabIndex = 26;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "测试设置状态";
-            // 
-            // lblFlowContent
-            // 
-            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(23, 38);
-            this.lblFlowContent.Name = "lblFlowContent";
-            this.lblFlowContent.Size = new System.Drawing.Size(28, 14);
-            this.lblFlowContent.TabIndex = 0;
-            this.lblFlowContent.Text = "---";
-            // 
             // FormHOZMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -435,6 +436,8 @@
             this.Load += new System.EventHandler(this.FormHOZMain_Load);
             this.plMain.ResumeLayout(false);
             this.plFill.ResumeLayout(false);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pbImage)).EndInit();
             this.plSEM.ResumeLayout(false);
             this.plSEM.PerformLayout();
@@ -453,8 +456,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.pbSave)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbOpen)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbNew)).EndInit();
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
             this.ResumeLayout(false);
 
         }

HOZProject/MeasureMsgDispose/MeasureMsgManage.cs

@@ -27,11 +27,10 @@ namespace HOZProject
                     formHOZ.pbImage.Image = Image.FromStream(fileStream);
                     fileStream.Close();
                     fileStream.Dispose();
-                    //formHOZ.pbImage.Image = new Bitmap(args.Picture_Information.Picture_FullPath);
                     //流程内容
                     string semParaContent = "电压:"+args.Picture_Information.Work_Voltage;
-                    semParaContent = "  放大倍数：" + args.Picture_Information.Magnification;
-                    semParaContent = "  工作距离:" + args.Picture_Information.Work_Distance;
+                    semParaContent += "  放大倍数：" + args.Picture_Information.Magnification;
+                    semParaContent += "  工作距离:" + args.Picture_Information.Work_Distance;
                     formHOZ.lblFlowContent.Text = semParaContent;
                     break;
                 default:
@@ -71,7 +70,7 @@ namespace HOZProject
                             {
                                 if (tlItem.Code == args.Step_Code)
                                 {
-                                    //tlItem.State = Convert.ToInt32(args.State);
+                                    tlItem.State = Convert.ToInt32(args.State);
                                     break;
                                 }
                             }

HOZProject/UserControls/UCTimeLine.cs

@@ -249,14 +249,13 @@ namespace HOZProject
                     {
                         switch (item.State)
                         {
+                                //出错
                             case 0:
                                 lineColor = Color.Red;
                                 break;
+                                //完成
                             case 1:
-                                lineColor = Color.Yellow;
-                                break;
-                            case 2:
-                                lineColor = Color.White;
+                                lineColor = Color.GreenYellow;
                                 break;
                             default:
                                 lineColor = TextColors.Light;

HOZProject/UserControls/UControl_ParaInfo.cs

@@ -143,7 +143,7 @@ namespace HOZProject
                 TimeLineItem tlItem = new TimeLineItem();
                 tlItem.Details = nodeList[i].Attributes["Details"].Value;
                 tlItem.Code = nodeList[i].Attributes["Code"].Value;
-                tlItem.State = 0;
+                tlItem.State = -1;
                 tlItem.Title = nodeList[i].Attributes["Title"].Value;
                 tlItem.IsData = Convert.ToBoolean(nodeList[i].Attributes["IsData"].Value);
                 timeLineItem[i] = tlItem;