Kaynağa Gözat

添加XML文档

wb_han 5 yıl önce
ebeveyn
işleme
cbded36fcc

+ 9 - 0
HOZProject/FormHOZMain.cs

@@ -11,6 +11,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using static MeasureThread.ThreadStatusEventArgs;
 
 namespace HOZProject
 {
@@ -80,6 +81,14 @@ namespace HOZProject
             //主界面显示内容
             this.BeginInvoke((Action)delegate
             {
+                //流程编号
+                int eCode = e.Step_Code;
+                //流程开始时间
+                DateTime eTime = e.Time;
+                //图片对象
+                PictureInformation ePictureInformation = e.Picture_Information;
+                //当前状态
+                string eState = e.State;
                 this.listmsg.Items.Add(e.Time.ToString() +"_"+ e.State);
                 ShowLogInfo();
             });

+ 2 - 2
HOZProject/FormUnitControl.cs

@@ -1307,7 +1307,7 @@ namespace HOZProject
             double offsetx = 0;
             double offsety = 0;
             int state = 0;
-            wr.Img_Cut_Position("D:/aaaa.jpg", out offsetx, out offsety, out state);
+            //wr.Img_Cut_Position("D:/aaaa.jpg", out offsetx, out offsety, out state);
             lbllocationx.Text = offsetx.ToString("0.0");
             lbllocationy.Text = offsety.ToString("0.0");
             lblstate2.Text = state.ToString();
@@ -1356,7 +1356,7 @@ namespace HOZProject
             double degree = 0;
             int direction = 0;
             int state = 0;
-            wr.Img_Center_Position_OffsetAngle_Direction("D:/aaaa.jpg", out offsetx, out offsety, out degree, out direction, out state);
+            //wr.Img_Center_Position_OffsetAngle_Direction("D:/aaaa.jpg", out offsetx, out offsety, out degree, out direction, out state);
             lblcenterx.Text = offsetx.ToString("0.0");
             lblcentery.Text = offsety.ToString("0.0");
             lbldegree2.Text = degree.ToString();

+ 141 - 0
HOZProject/MeasureXML/MeasureStructXml.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MeasureList>
+  <MeasureFlow Code="1" Name="拍照">
+    <Step Index="0" Name="" Code="1-0" IsData="False" Title="移动至切割位置" Tooltip="自动定位切割位置"></Step>
+    <Step Index="1" Name="" Code="1-1" IsData="False" Title="设置放大倍数" Tooltip="控制SEM放大倍数"></Step>
+    <Step Index="2" Name="" Code="1-2" IsData="True" Title="自动对焦" Tooltip="控制SEM自动对焦、亮度、对比度"></Step>
+    <Step Index="3" Name="" Code="1-3" IsData="True" Title="拍照" Tooltip="控制SEM对分析位置拍照"></Step>
+    <Step Index="4" Name="" Code="1-4" IsData="False" Title="保存照片" Tooltip="保存照片"></Step>
+    <Step Index="5" Name="" Code="1-5" IsData="False" Title="保存信息" Tooltip="保存切孔位置坐标,保存客户返回值信息"></Step>
+
+    <Step Index="6" Name="" Code="1-6" IsData="False" Title="移动至切割位置" Tooltip="自动定位切割位置"></Step>
+    <Step Index="7" Name="" Code="1-7" IsData="False" Title="设置放大倍数" Tooltip="控制SEM放大倍数"></Step>
+    <Step Index="8" Name="" Code="1-8" IsData="True" Title="自动对焦" Tooltip="控制SEM自动对焦、亮度、对比度"></Step>
+    <Step Index="9" Name="" Code="1-9" IsData="True" Title="拍照" Tooltip="控制SEM拍照"></Step>
+    <Step Index="10" Name="" Code="1-10" IsData="True" Title="获取偏移信息" Tooltip="显示照片,获取偏移坐标,以及偏移角度"></Step>
+    <Step Index="11" Name="" Code="1-11" IsData="False" Title="移动至切孔位置" Tooltip="根据坐标控制SEM移动到切孔位置,居中"></Step>
+    <Step Index="12" Name="" Code="1-12" IsData="False" Title="验证移动准确性" Tooltip="获取当前SEM中心位置坐标,与客户返回坐标对比,验证是否移动正确"></Step>
+
+    <Step Index="13" Name="" Code="1-13" IsData="False" Title="设置放大倍数" Tooltip="控制SEM放大倍数"></Step>
+    <Step Index="14" Name="" Code="1-14" IsData="True" Title="自动对焦" Tooltip="控制SEM自动对焦、亮度、对比度"></Step>
+    <Step Index="15" Name="" Code="1-15" IsData="False" Title="角度补偿" Tooltip="设置SEM角度补偿"></Step>
+    <Step Index="16" Name="" Code="1-16" IsData="True" Title="拍照" Tooltip="控制SEM对分析位置拍照"></Step>
+    <Step Index="17" Name="" Code="1-17" IsData="False" Title="保存照片" Tooltip="设置图片名称、保存图片"></Step>
+    <Step Index="18" Name="" Code="1-18" IsData="True" Title="获取偏移坐标" Tooltip="将照片传给客户,获取偏移坐标"></Step>
+    <Step Index="19" Name="" Code="1-19" IsData="False" Title="移动至分析位置" Tooltip="根据坐标控制SEM移动到分析位置"></Step>
+    <Step Index="20" Name="" Code="1-20" IsData="False" Title="验证移动准确性" Tooltip="验证移动准确性:获取当前SEM中心位置坐标,与客户返回坐标对比,验证是否移动正确"></Step>
+    
+    <Step Index="21" Name="" Code="1-21" IsData="False" Title="平行校正" Tooltip="控制SEM平行校正,并记录校正前初始值"></Step>
+    <Step Index="22" Name="" Code="1-22" IsData="False" Title="设置放大倍数" Tooltip="控制SEM放大到指定参数大小范围"></Step>
+    <Step Index="23" Name="" Code="1-23" IsData="True" Title="自动对焦" Tooltip="控制SEM自动对焦、消像散、亮度、对比度"></Step>
+    <Step Index="24" Name="" Code="1-24" IsData="True" Title="拍照" Tooltip="控制SEM对分析位置拍照"></Step>
+    <Step Index="25" Name="" Code="1-25" IsData="False" Title="保存照片" Tooltip="设置图片名称、保存图片"></Step>
+    <Step Index="26" Name="" Code="1-26" IsData="False" Title="取消电子束校正并初始化" Tooltip="控制SEM取消电子束校正,回到初始值"></Step>
+    <Step Index="27" Name="" Code="1-27" IsData="False" Title="自动能谱分析" Tooltip="确定能谱位置、控制牛津打能谱、能谱分析-面扫+线扫"></Step>
+    <Step Index="28" Name="" Code="1-28" IsData="False" Title="初始化" Tooltip="多切孔进行初始化操作"></Step>
+  </MeasureFlow>
+  <MeasureFlow Code="2" Name="切割">
+      <Step Index="0" Name="" Code="2-0" IsData="False" Title="移动至切割位置" Tooltip="自动定位切割位置"></Step>
+      <Step Index="1" Name="" Code="2-1" IsData="False" Title="设置放大倍数" Tooltip="控制SEM放大倍数"></Step>
+      <Step Index="2" Name="" Code="2-2" IsData="True" Title="自动对焦" Tooltip="控制SEM自动对焦、亮度、对比度"></Step>
+      <Step Index="3" Name="" Code="2-3" IsData="False" Title="角度补偿" Tooltip="设置SEM进行角度补偿"></Step>
+      <Step Index="4" Name="" Code="2-4" IsData="True" Title="拍照" Tooltip="控制SEM对分析位置拍照"></Step>
+      <Step Index="5" Name="" Code="2-5" IsData="False" Title="保存照片" Tooltip="保存照片"></Step>
+      <Step Index="6" Name="" Code="2-6" IsData="False" Title="FIB拍照参数" Tooltip="设置FIB拍照参数-扫描时间、束流等"></Step>
+      <Step Index="7" Name="" Code="2-7" IsData="False" Title="FIB设置参数" Tooltip="控制FIB自动亮度、对比度"></Step>
+      <Step Index="8" Name="" Code="2-8" IsData="False" Title="FIB拍照" Tooltip=""></Step>
+      <Step Index="9" Name="" Code="2-9" IsData="False" Title="保存照片" Tooltip="保存照片"></Step>
+      <Step Index="10" Name="" Code="2-10" IsData="True" Title="显示照片" Tooltip="将照片传给客户,返回梯形位置坐标,及样品类型参数"></Step>
+      <Step Index="11" Name="" Code="2-11" IsData="False" Title="FIB调整到中心位置" Tooltip="根据梯形坐标控制FIB调整到中心位置"></Step>
+      <Step Index="12" Name="" Code="2-12" IsData="False" Title="验证移动准确性" Tooltip="验证移动准确性:获取当前FIB中心位置坐标,与客户返回坐标对比,验证是否移动正确"></Step>
+      <Step Index="13" Name="" Code="2-13" IsData="False" Title="保存信息" Tooltip="保存切孔位置坐标,保存客户返回值信息"></Step>  
+    
+      <Step Index="14" Name="" Code="2-14" IsData="True" Title="设置FIB参数" Tooltip="根据参数设置FIB扫描时间(使图清晰),设置梯形上下边及深度、设置束流等"></Step>
+      <Step Index="15" Name="" Code="2-15" IsData="False" Title="FIB进行切割" Tooltip="控制FIB进行切割"></Step>
+      <Step Index="16" Name="" Code="2-16" IsData="False" Title="设置FIB放大倍数" Tooltip="控制SEM放大倍数"></Step>
+      <Step Index="17" Name="" Code="2-17" IsData="False" Title="保存照片" Tooltip="保存照片"></Step>
+      <Step Index="18" Name="" Code="2-18" IsData="False" Title="验证移动准确性" Tooltip="验证移动准确性:获取当前FIB中心位置坐标,与客户返回坐标对比"></Step><Step Index="13" Name="" Code="2-13" Title="设置放大倍数" Tooltip="控制SEM放大倍数"></Step>
+      <Step Index="19" Name="" Code="2-19" IsData="False" Title="设置FIB解冻" Tooltip="设置FIB解冻:先读取状态,如果冻结状态则进行解冻"></Step>
+
+      <Step Index="20" Name="" Code="2-20" IsData="False" Title="设置放大倍数" Tooltip="控制SEM放大倍数"></Step>
+      <Step Index="21" Name="" Code="2-21" IsData="True" Title="自动对焦" Tooltip="控制SEM自动对焦、亮度、对比度"></Step>
+      <Step Index="22" Name="" Code="2-22" IsData="True" Title="拍照" Tooltip="控制SEM对分析位置拍照"></Step>
+      <Step Index="23" Name="" Code="2-23" IsData="True" Title="显示照片" Tooltip="获取偏移坐标,以及偏移角度"></Step>
+      <Step Index="24" Name="" Code="2-24" IsData="False" Title="移动到切孔位置" Tooltip="根据坐标控制SEM移动到切孔位置,居中"></Step>
+      <Step Index="25" Name="" Code="2-25" IsData="False" Title="验证移动准确性" Tooltip="验证移动准确性:获取当前SEM中心位置坐标,与客户返回坐标对比,验证是否移动正确"></Step>
+
+      <Step Index="26" Name="" Code="2-26" IsData="False" Title="设置放大倍数" Tooltip="控制SEM放大到指定参数大小范围"></Step>
+      <Step Index="27" Name="" Code="2-27" IsData="True" Title="自动对焦" Tooltip="控制SEM自动对焦、消像散、亮度、对比度"></Step>
+      <Step Index="28" Name="" Code="2-28" IsData="False" Title="角度补偿" Tooltip="设置SEM角度补偿"></Step>
+      <Step Index="29" Name="" Code="2-29" IsData="True" Title="保存照片" Tooltip="设置图片名称、保存图片"></Step>
+      <Step Index="30" Name="" Code="2-30" IsData="True" Title="显示照片" Tooltip="获取偏移坐标"></Step>
+      <Step Index="31" Name="" Code="2-31" IsData="False" Title="移动到分析位置" Tooltip="根据坐标控制SEM移动到分析位置"></Step>
+      <Step Index="32" Name="" Code="2-32" IsData="False" Title="验证移动准确性" Tooltip="验证移动准确性:获取当前SEM中心位置坐标,与客户返回坐标对比,验证是否移动正确"></Step>
+      
+      <Step Index="33" Name="" Code="2-33" IsData="False" Title="平行校正" Tooltip="控制SEM平行校正,并记录校正前初始值"></Step>
+      <Step Index="34" Name="" Code="2-34" IsData="False" Title="设置放大倍数" Tooltip="控制SEM放大到指定参数大小范围"></Step>
+      <Step Index="35" Name="" Code="2-35" IsData="True" Title="自动对焦" Tooltip="控制SEM自动对焦、消像散、亮度、对比度"></Step>
+      <Step Index="36" Name="" Code="2-36" IsData="True" Title="拍照" Tooltip="控制SEM对分析位置拍照"></Step>
+      <Step Index="37" Name="" Code="2-37" IsData="False" Title="保存照片" Tooltip="设置图片名称、保存图片"></Step>
+      <Step Index="38" Name="" Code="2-38" IsData="False" Title="取消电子束校正并初始化" Tooltip="控制SEM取消电子束校正,回到初始值"></Step>
+
+      <Step Index="39" Name="" Code="2-39" IsData="False" Title="传入参数" Tooltip="获取SEM Pixel Size 给客户传入参数"></Step>
+      <Step Index="40" Name="" Code="2-40" IsData="True" Title="显示照片" Tooltip="将照片传给客户,客户进行层高分析"></Step>
+      <Step Index="41" Name="" Code="2-41" IsData="False" Title="自动能谱分析" Tooltip="确定能谱位置、控制牛津打能谱、能谱分析-面扫+线扫"></Step>
+      <Step Index="42" Name="" Code="2-42" IsData="False" Title="初始化" Tooltip="多切孔进行初始化操作"></Step>
+  </MeasureFlow>
+  <MeasureFlow Code="3" Name="PT+切割">
+      <Step Index="0" Name="" Code="3-0" IsData="False" Title="PT沉积" Tooltip="自动根据样品类型参数确定是否需要PT沉积"></Step>
+      <Step Index="1" Name="" Code="3-1" IsData="False" Title="移动至切割位置" Tooltip="自动定位切割位置"></Step>
+      <Step Index="2" Name="" Code="3-2" IsData="False" Title="设置放大倍数" Tooltip="控制SEM放大倍数"></Step>
+      <Step Index="3" Name="" Code="3-3" IsData="True" Title="自动对焦" Tooltip="控制SEM自动对焦、亮度、对比度"></Step>
+      <Step Index="4" Name="" Code="3-4" IsData="False" Title="角度补偿" Tooltip="设置SEM进行角度补偿"></Step>
+      <Step Index="5" Name="" Code="3-5" IsData="True" Title="拍照" Tooltip="控制SEM对分析位置拍照"></Step>
+      <Step Index="6" Name="" Code="3-6" IsData="False" Title="保存照片" Tooltip="保存照片"></Step>
+      <Step Index="7" Name="" Code="3-7" IsData="False" Title="FIB拍照参数" Tooltip="设置FIB拍照参数-扫描时间、束流等"></Step>
+      <Step Index="8" Name="" Code="3-8" IsData="False" Title="FIB设置参数" Tooltip="控制FIB自动亮度、对比度"></Step>
+      <Step Index="9" Name="" Code="3-9" IsData="False" Title="FIB拍照" Tooltip=""></Step>
+      <Step Index="10" Name="" Code="3-10" IsData="False" Title="保存照片" Tooltip="保存照片"></Step>
+      <Step Index="11" Name="" Code="3-11" IsData="True" Title="显示照片" Tooltip="将照片传给客户,返回梯形位置坐标,及样品类型参数"></Step>
+      <Step Index="12" Name="" Code="3-12" IsData="False" Title="PT沉积" Tooltip="自动根据样品类型参数确定是否需要PT沉积"></Step>
+      <Step Index="13" Name="" Code="3-13" IsData="False" Title="FIB调整到中心位置" Tooltip="根据梯形坐标控制FIB调整到中心位置"></Step>
+      <Step Index="14" Name="" Code="3-14" IsData="False" Title="验证移动准确性" Tooltip="验证移动准确性:获取当前FIB中心位置坐标,与客户返回坐标对比,验证是否移动正确"></Step>
+      <Step Index="15" Name="" Code="3-15" IsData="False" Title="保存信息" Tooltip="保存切孔位置坐标,保存客户返回值信息"></Step>
+
+      <Step Index="16" Name="" Code="3-16" IsData="True" Title="设置FIB参数" Tooltip="根据参数设置FIB扫描时间(使图清晰),设置梯形上下边及深度、设置束流等"></Step>
+      <Step Index="17" Name="" Code="3-17" IsData="False" Title="FIB进行切割" Tooltip="控制FIB进行切割"></Step>
+      <Step Index="18" Name="" Code="3-18" IsData="False" Title="设置FIB放大倍数" Tooltip="控制SEM放大倍数"></Step>
+      <Step Index="19" Name="" Code="3-19" IsData="False" Title="保存照片" Tooltip="保存照片"></Step>
+      <Step Index="20" Name="" Code="3-20" IsData="False" Title="验证移动准确性" Tooltip="验证移动准确性:获取当前FIB中心位置坐标,与客户返回坐标对比"></Step>
+      <Step Index="21" Name="" Code="3-21" Title="设置放大倍数" Tooltip="控制SEM放大倍数"></Step>
+      <Step Index="22" Name="" Code="3-22" IsData="False" Title="设置FIB解冻" Tooltip="设置FIB解冻:先读取状态,如果冻结状态则进行解冻"></Step>
+      <Step Index="23" Name="" Code="3-23" IsData="False" Title="拔出PT针" Tooltip="根据样品类型决定是否撤出PT针"></Step>
+
+      <Step Index="24" Name="" Code="3-24" IsData="False" Title="设置放大倍数" Tooltip="控制SEM放大倍数"></Step>
+      <Step Index="25" Name="" Code="3-25" IsData="True" Title="自动对焦" Tooltip="控制SEM自动对焦、亮度、对比度"></Step>
+      <Step Index="26" Name="" Code="3-26" IsData="True" Title="拍照" Tooltip="控制SEM对分析位置拍照"></Step>
+      <Step Index="27" Name="" Code="3-27" IsData="True" Title="显示照片" Tooltip="获取偏移坐标,以及偏移角度"></Step>
+      <Step Index="28" Name="" Code="3-28" IsData="False" Title="移动到切孔位置" Tooltip="根据坐标控制SEM移动到切孔位置,居中"></Step>
+      <Step Index="29" Name="" Code="3-29" IsData="False" Title="验证移动准确性" Tooltip="验证移动准确性:获取当前SEM中心位置坐标,与客户返回坐标对比,验证是否移动正确"></Step>
+
+      <Step Index="30" Name="" Code="3-30" IsData="False" Title="设置放大倍数" Tooltip="控制SEM放大到指定参数大小范围"></Step>
+      <Step Index="31" Name="" Code="3-31" IsData="True" Title="自动对焦" Tooltip="控制SEM自动对焦、消像散、亮度、对比度"></Step>
+      <Step Index="32" Name="" Code="3-32" IsData="False" Title="角度补偿" Tooltip="设置SEM角度补偿"></Step>
+      <Step Index="33" Name="" Code="3-33" IsData="True" Title="保存照片" Tooltip="设置图片名称、保存图片"></Step>
+      <Step Index="34" Name="" Code="3-34" IsData="True" Title="显示照片" Tooltip="获取偏移坐标"></Step>
+      <Step Index="35" Name="" Code="3-35" IsData="False" Title="移动到分析位置" Tooltip="根据坐标控制SEM移动到分析位置"></Step>
+      <Step Index="36" Name="" Code="3-36" IsData="False" Title="验证移动准确性" Tooltip="验证移动准确性:获取当前SEM中心位置坐标,与客户返回坐标对比,验证是否移动正确"></Step>
+
+      <Step Index="37" Name="" Code="3-37" IsData="False" Title="平行校正" Tooltip="控制SEM平行校正,并记录校正前初始值"></Step>
+      <Step Index="38" Name="" Code="3-38" IsData="False" Title="设置放大倍数" Tooltip="控制SEM放大到指定参数大小范围"></Step>
+      <Step Index="39" Name="" Code="3-39" IsData="True" Title="自动对焦" Tooltip="控制SEM自动对焦、消像散、亮度、对比度"></Step>
+      <Step Index="40" Name="" Code="3-40" IsData="True" Title="拍照" Tooltip="控制SEM对分析位置拍照"></Step>
+      <Step Index="41" Name="" Code="3-41" IsData="False" Title="保存照片" Tooltip="设置图片名称、保存图片"></Step>
+      <Step Index="42" Name="" Code="3-42" IsData="False" Title="取消电子束校正并初始化" Tooltip="控制SEM取消电子束校正,回到初始值"></Step>
+
+      <Step Index="43" Name="" Code="3-43" IsData="False" Title="传入参数" Tooltip="获取SEM Pixel Size 给客户传入参数"></Step>
+      <Step Index="44" Name="" Code="3-44" IsData="True" Title="显示照片" Tooltip="将照片传给客户,客户进行层高分析"></Step>
+      <Step Index="45" Name="" Code="3-45" IsData="False" Title="自动能谱分析" Tooltip="确定能谱位置、控制牛津打能谱、能谱分析-面扫+线扫"></Step>
+      <Step Index="46" Name="" Code="3-46" IsData="False" Title="初始化" Tooltip="多切孔进行初始化操作"></Step>
+    </MeasureFlow>
+</MeasureList>

+ 5 - 0
HOZProject/UnitControl.csproj

@@ -276,5 +276,10 @@
   <ItemGroup>
     <None Include="Resources\Max_Gray.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="MeasureXML\MeasureStructXml.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

+ 0 - 13
HOZProject/UserControls/UCTimeLine.designer.cs

@@ -28,24 +28,13 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.button1 = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(580, 12);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(75, 23);
-            this.button1.TabIndex = 0;
-            this.button1.Text = "button1";
-            this.button1.UseVisualStyleBackColor = true;
-            // 
             // UCTimeLine
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.AutoScroll = true;
             this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.Controls.Add(this.button1);
             this.Name = "UCTimeLine";
             this.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0);
             this.Size = new System.Drawing.Size(671, 375);
@@ -54,7 +43,5 @@
         }
 
         #endregion
-
-        private System.Windows.Forms.Button button1;
     }
 }

+ 2 - 2
HOZProject/UserControls/UControl_CutHole.cs

@@ -61,7 +61,7 @@ namespace HOZProject
             ClearProcessControls();
             //显示切孔参数信息
             UControl_ParaInfo uControl_ParaInfo = new UControl_ParaInfo(FormHOZMainObject);
-            //UCTimeLine uControl_Process = new UCTimeLine();
+            //UCTimeLine uControl_ParaInfo = new UCTimeLine();
             FormHOZMainObject.plProcess.Width = uControl_ParaInfo.Width;
             FormHOZMainObject.plProcess.Height = uControl_ParaInfo.Height;
             //if ((this.Location.Y + uControl_ParaInfo.Height) > FormHOZMainObject.Height)
@@ -90,7 +90,7 @@ namespace HOZProject
             }
 
             uControl_ParaInfo.Dock = DockStyle.Fill;
-            uControl_ParaInfo.ShowParaInfo();
+            //uControl_ParaInfo.ShowParaInfo();
             FormHOZMainObject.plProcess.Location = uControl_ParaInfo.Location;
             FormHOZMainObject.plProcess.Controls.Add(uControl_ParaInfo);
             FormHOZMainObject.plProcess.Visible = true;

+ 56 - 90
HOZProject/UserControls/UControl_ParaInfo.Designer.cs

@@ -29,18 +29,6 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.ListViewItem listViewItem6 = new System.Windows.Forms.ListViewItem(new string[] {
-            "aaa",
-            "aaa",
-            "Time"}, 0, System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))));
-            System.Windows.Forms.ListViewItem listViewItem7 = new System.Windows.Forms.ListViewItem(new string[] {
-            "bbb"}, 1, System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))));
-            System.Windows.Forms.ListViewItem listViewItem8 = new System.Windows.Forms.ListViewItem(new string[] {
-            "ccc"}, 2, System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))));
-            System.Windows.Forms.ListViewItem listViewItem9 = new System.Windows.Forms.ListViewItem(new string[] {
-            "ddd"}, 3, System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))));
-            System.Windows.Forms.ListViewItem listViewItem10 = new System.Windows.Forms.ListViewItem(new string[] {
-            "eee"}, 4, System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))));
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UControl_ParaInfo));
             this.lblLocation = new System.Windows.Forms.Label();
             this.lblStartTime = new System.Windows.Forms.Label();
@@ -49,6 +37,7 @@
             this.CkIsSwitch = new System.Windows.Forms.CheckBox();
             this.lblCutHoleName = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.pbClose = new System.Windows.Forms.PictureBox();
             this.lblX = new System.Windows.Forms.Label();
             this.lblShowStartTime = new System.Windows.Forms.Label();
             this.lblShowEndTime = new System.Windows.Forms.Label();
@@ -64,23 +53,19 @@
             this.label5 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.listView1 = new System.Windows.Forms.ListView();
-            this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.plMeasureFlow = new System.Windows.Forms.Panel();
+            this.lvMeasureFlow = new System.Windows.Forms.ListView();
             this.imageList1 = new System.Windows.Forms.ImageList(this.components);
             this.panel3 = new System.Windows.Forms.Panel();
             this.label1 = new System.Windows.Forms.Label();
             this.progressBar1 = new System.Windows.Forms.ProgressBar();
             this.panel4 = new System.Windows.Forms.Panel();
             this.label8 = new System.Windows.Forms.Label();
-            this.pbClose = new System.Windows.Forms.PictureBox();
             this.panel1.SuspendLayout();
-            this.panel2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pbClose)).BeginInit();
+            this.plMeasureFlow.SuspendLayout();
             this.panel3.SuspendLayout();
             this.panel4.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pbClose)).BeginInit();
             this.SuspendLayout();
             // 
             // lblLocation
@@ -159,6 +144,19 @@
             this.panel1.Size = new System.Drawing.Size(345, 30);
             this.panel1.TabIndex = 2;
             // 
+            // pbClose
+            // 
+            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.Dock = System.Windows.Forms.DockStyle.Right;
+            this.pbClose.Location = new System.Drawing.Point(313, 0);
+            this.pbClose.Name = "pbClose";
+            this.pbClose.Size = new System.Drawing.Size(32, 30);
+            this.pbClose.TabIndex = 108;
+            this.pbClose.TabStop = false;
+            this.pbClose.Click += new System.EventHandler(this.btnClose_Click);
+            // 
             // lblX
             // 
             this.lblX.AutoSize = true;
@@ -318,55 +316,39 @@
             this.label7.TabIndex = 9;
             this.label7.Text = "X:";
             // 
-            // panel2
-            // 
-            this.panel2.Controls.Add(this.listView1);
-            this.panel2.Controls.Add(this.panel3);
-            this.panel2.Controls.Add(this.panel4);
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel2.Location = new System.Drawing.Point(0, 183);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(345, 459);
-            this.panel2.TabIndex = 15;
-            // 
-            // listView1
-            // 
-            this.listView1.Activation = System.Windows.Forms.ItemActivation.OneClick;
-            this.listView1.AllowColumnReorder = true;
-            this.listView1.AllowDrop = true;
-            this.listView1.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.listView1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.columnHeader1,
-            this.columnHeader2,
-            this.columnHeader3});
-            this.listView1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.listView1.ForeColor = System.Drawing.Color.LightGray;
-            this.listView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
-            this.listView1.HotTracking = true;
-            this.listView1.HoverSelection = true;
-            listViewItem6.StateImageIndex = 0;
-            listViewItem7.StateImageIndex = 0;
-            listViewItem8.StateImageIndex = 0;
-            listViewItem9.StateImageIndex = 0;
-            listViewItem10.StateImageIndex = 0;
-            this.listView1.Items.AddRange(new System.Windows.Forms.ListViewItem[] {
-            listViewItem6,
-            listViewItem7,
-            listViewItem8,
-            listViewItem9,
-            listViewItem10});
-            this.listView1.LabelWrap = false;
-            this.listView1.Location = new System.Drawing.Point(0, 30);
-            this.listView1.MultiSelect = false;
-            this.listView1.Name = "listView1";
-            this.listView1.ShowGroups = false;
-            this.listView1.Size = new System.Drawing.Size(345, 383);
-            this.listView1.SmallImageList = this.imageList1;
-            this.listView1.TabIndex = 7;
-            this.listView1.TabStop = false;
-            this.listView1.UseCompatibleStateImageBehavior = false;
-            this.listView1.View = System.Windows.Forms.View.List;
+            // plMeasureFlow
+            // 
+            this.plMeasureFlow.Controls.Add(this.lvMeasureFlow);
+            this.plMeasureFlow.Controls.Add(this.panel3);
+            this.plMeasureFlow.Controls.Add(this.panel4);
+            this.plMeasureFlow.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.plMeasureFlow.Location = new System.Drawing.Point(0, 183);
+            this.plMeasureFlow.Name = "plMeasureFlow";
+            this.plMeasureFlow.Size = new System.Drawing.Size(345, 459);
+            this.plMeasureFlow.TabIndex = 15;
+            // 
+            // lvMeasureFlow
+            // 
+            this.lvMeasureFlow.Activation = System.Windows.Forms.ItemActivation.OneClick;
+            this.lvMeasureFlow.AllowColumnReorder = true;
+            this.lvMeasureFlow.AllowDrop = true;
+            this.lvMeasureFlow.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.lvMeasureFlow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.lvMeasureFlow.ForeColor = System.Drawing.Color.LightGray;
+            this.lvMeasureFlow.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+            this.lvMeasureFlow.HotTracking = true;
+            this.lvMeasureFlow.HoverSelection = true;
+            this.lvMeasureFlow.LabelWrap = false;
+            this.lvMeasureFlow.Location = new System.Drawing.Point(1, 276);
+            this.lvMeasureFlow.MultiSelect = false;
+            this.lvMeasureFlow.Name = "lvMeasureFlow";
+            this.lvMeasureFlow.ShowGroups = false;
+            this.lvMeasureFlow.Size = new System.Drawing.Size(345, 68);
+            this.lvMeasureFlow.SmallImageList = this.imageList1;
+            this.lvMeasureFlow.TabIndex = 7;
+            this.lvMeasureFlow.TabStop = false;
+            this.lvMeasureFlow.UseCompatibleStateImageBehavior = false;
+            this.lvMeasureFlow.View = System.Windows.Forms.View.List;
             // 
             // imageList1
             // 
@@ -430,26 +412,13 @@
             this.label8.TabIndex = 3;
             this.label8.Text = "XXXX";
             // 
-            // pbClose
-            // 
-            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.Dock = System.Windows.Forms.DockStyle.Right;
-            this.pbClose.Location = new System.Drawing.Point(313, 0);
-            this.pbClose.Name = "pbClose";
-            this.pbClose.Size = new System.Drawing.Size(32, 30);
-            this.pbClose.TabIndex = 108;
-            this.pbClose.TabStop = false;
-            this.pbClose.Click += new System.EventHandler(this.btnClose_Click);
-            // 
             // UControl_ParaInfo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
             this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.plMeasureFlow);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.label4);
@@ -474,12 +443,12 @@
             this.Size = new System.Drawing.Size(345, 642);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            this.panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pbClose)).EndInit();
+            this.plMeasureFlow.ResumeLayout(false);
             this.panel3.ResumeLayout(false);
             this.panel3.PerformLayout();
             this.panel4.ResumeLayout(false);
             this.panel4.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pbClose)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -508,11 +477,8 @@
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Panel panel2;
-        private System.Windows.Forms.ListView listView1;
-        private System.Windows.Forms.ColumnHeader columnHeader1;
-        private System.Windows.Forms.ColumnHeader columnHeader2;
-        private System.Windows.Forms.ColumnHeader columnHeader3;
+        private System.Windows.Forms.Panel plMeasureFlow;
+        private System.Windows.Forms.ListView lvMeasureFlow;
         private System.Windows.Forms.ImageList imageList1;
         private System.Windows.Forms.Panel panel3;
         private System.Windows.Forms.Label label1;

+ 16 - 0
HOZProject/UserControls/UControl_ParaInfo.cs

@@ -66,6 +66,13 @@ namespace HOZProject
             }
         }
 
+        public void ShowUCTimeLine()
+        {
+            UCTimeLine uControl_ParaInfo = new UCTimeLine();
+            uControl_ParaInfo.Dock = DockStyle.Fill;
+            plMeasureFlow.Controls.Add(uControl_ParaInfo);
+        }
+
         /// <summary>
         /// 显示切孔参数信息
         /// </summary>
@@ -85,5 +92,14 @@ namespace HOZProject
             lblCutHoleName.Text = CutHoleName;
             CkIsSwitch.Checked = IsSwitch;
         }
+
+        /// <summary>
+        /// 绑定流程信息
+        /// </summary>
+        /// <param name="flowCode"></param>
+        private void ShowMeasureFlow(string flowCode)
+        {
+
+        }
     }
 }

+ 1 - 1
HOZProject/UserControls/UControl_ParaInfo.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS
-        GAAAAk1TRnQBSQFMAgEBBQEAATgBAAE4AQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        GAAAAk1TRnQBSQFMAgEBBQEAAUABAAFAAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABgAMAAUADAAEBAQABCAYAASAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA