|
|
@@ -47,17 +47,18 @@ namespace MeasureThread
|
|
|
}
|
|
|
private DateTime m_time;
|
|
|
|
|
|
- //步骤编码
|
|
|
- public int Step_Code
|
|
|
+ //步骤编码与MeasureStructXml.xml文件中的step中的code码一致
|
|
|
+ public string Step_Code
|
|
|
{
|
|
|
get { return step_Code; }
|
|
|
set { step_Code = value; }
|
|
|
}
|
|
|
- private int step_Code;
|
|
|
+ private string step_Code;
|
|
|
|
|
|
//图片信息
|
|
|
public class PictureInformation
|
|
|
{
|
|
|
+ //使用XML中的IsData，不用改字段
|
|
|
public Boolean Is_Picture
|
|
|
{
|
|
|
get { return is_Picture; }
|
|
|
@@ -93,6 +94,7 @@ namespace MeasureThread
|
|
|
}
|
|
|
private double work_Distance;
|
|
|
|
|
|
+ //SEM/FIB
|
|
|
public String Work_Status
|
|
|
{
|
|
|
get { return work_Status; }
|
|
|
@@ -111,6 +113,7 @@ namespace MeasureThread
|
|
|
//图像信息
|
|
|
public class ImageInformation
|
|
|
{
|
|
|
+ //8个名
|
|
|
public int Method_Name
|
|
|
{
|
|
|
get { return method_Name; }
|
|
|
@@ -321,10 +324,7 @@ namespace MeasureThread
|
|
|
picture_Information = new PictureInformation();
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+ //切孔状态
|
|
|
public class CutHolesStatusEventArgs
|
|
|
{
|
|
|
public string State
|
|
|
@@ -413,7 +413,7 @@ namespace MeasureThread
|
|
|
set { this.m_ThreadStatus = value; }
|
|
|
}
|
|
|
|
|
|
- //测量参数
|
|
|
+ //测量参数，不使用，使用文件中的参数
|
|
|
private MeasureParam m_MsParam;
|
|
|
public MeasureParam MeasParam
|
|
|
{
|
HaoShuang