Просмотр исходного кода

根据判断统计流程项数量

wb_han 4 лет назад
Родитель
Сommit
15f4a507b3

+ 2 - 1
HOZProject/FormHOZMain.Designer.cs

@@ -430,10 +430,11 @@
             // 
             // lblStateMessage
             // 
+            this.lblStateMessage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.lblStateMessage.AutoSize = true;
             this.lblStateMessage.Font = new System.Drawing.Font("宋体", 10F);
             this.lblStateMessage.ForeColor = System.Drawing.Color.White;
-            this.lblStateMessage.Location = new System.Drawing.Point(777, 21);
+            this.lblStateMessage.Location = new System.Drawing.Point(757, 21);
             this.lblStateMessage.Name = "lblStateMessage";
             this.lblStateMessage.Size = new System.Drawing.Size(0, 14);
             this.lblStateMessage.TabIndex = 1;

+ 1 - 1
HOZProject/FormHOZMain.cs

@@ -286,8 +286,8 @@ namespace HOZProject
                         m_Ms.key_stop = true;
                         IsClose = true;
                         lblStateMessage.Text = "正在关闭窗体...请等待";
-                        return;
                     }
+                    return;
                 }
             }
             if (MessageBox.Show("是否关闭此窗体?", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)

+ 5 - 2
HOZProject/MeasureMsgDispose/MeasureMsgManage.cs

@@ -18,6 +18,8 @@ namespace HOZProject
             FIB=1,
             PT=2
         }
+
+        #region 线程消息处理,显示内容
         /// <summary>
         /// 线程消息处理,显示内容
         /// </summary>
@@ -70,7 +72,7 @@ namespace HOZProject
         /// </summary>
         /// <param name="formHOZ"></param>
         /// <param name="args"></param>
-        private static void ShowStateMessage(FormHOZMain formHOZ,ThreadStatusEventArgs args)
+        private static void ShowStateMessage(FormHOZMain formHOZ, ThreadStatusEventArgs args)
         {
             //显示状态信息
             if (args.Step_Code == "1-2")
@@ -81,7 +83,8 @@ namespace HOZProject
             {
                 formHOZ.lblStateMessage.Text = "";
             }
-        }
+        } 
+        #endregion
 
         #region 显示切孔流程中拍照信息
         /// <summary>

+ 27 - 1
HOZProject/UserControls/UControl_ParaInfo.cs

@@ -63,13 +63,39 @@ namespace HOZProject
                 //完成状态数量
                 int finishCount = 0;
                 //未完成状态数量
-                int unFinishedCount = TlItem.Length;
+                int unFinishedCount = 0;
                 foreach (TimeLineItem item in TlItem)
                 {
                     if (item.State>0)
                     {
                         finishCount++;
                     }
+                    switch (FormHOZMainObject.m_MeasureType)
+                    {
+                        case (int)MeasureMsgManage.measureType.Photo:
+                            if (item.Type.ToUpper() == "PT" || item.Type.ToUpper() == "FIB")
+                            {
+                                continue;
+                            }
+                            else
+                            {
+                                unFinishedCount++;
+                            }
+                            break;
+                        case (int)MeasureMsgManage.measureType.FIB:
+                            if (item.Type.ToUpper() == "PT")
+                            {
+                                continue;
+                            }
+                            else
+                            {
+                                unFinishedCount++;
+                            }
+                            break;
+                        case (int)MeasureMsgManage.measureType.PT:
+                            unFinishedCount = TlItem.Length;
+                            break;
+                    }
                 }
                 try
                 {