|
@@ -43,6 +43,22 @@ namespace MeasureData
|
|
set { this.m_pt = value; }
|
|
set { this.m_pt = value; }
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ //倾斜样品台
|
|
|
|
+ private Boolean m_Title;
|
|
|
|
+ public Boolean Title
|
|
|
|
+ {
|
|
|
|
+ get { return this.m_Title; }
|
|
|
|
+ set { this.m_Title = value; }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ //Z轴移动的范围
|
|
|
|
+ private float m_dZ;
|
|
|
|
+ public float ZDistance
|
|
|
|
+ {
|
|
|
|
+ get { return this.m_dZ; }
|
|
|
|
+ set { this.m_dZ = value; }
|
|
|
|
+ }
|
|
|
|
+
|
|
//FIB使用的ELY文件
|
|
//FIB使用的ELY文件
|
|
private string m_fibTemp;
|
|
private string m_fibTemp;
|
|
public string FIBTemp
|
|
public string FIBTemp
|
|
@@ -163,6 +179,7 @@ namespace MeasureData
|
|
set { this.StigY = value; }
|
|
set { this.StigY = value; }
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
//能谱参数
|
|
//能谱参数
|
|
|
|
|
|
#endregion
|
|
#endregion
|
|
@@ -188,6 +205,8 @@ namespace MeasureData
|
|
this.AutoStigY.TYPE = 3;
|
|
this.AutoStigY.TYPE = 3;
|
|
this.FIBFocus = new FocusParam();
|
|
this.FIBFocus = new FocusParam();
|
|
this.FIBFocus.TYPE = 4;
|
|
this.FIBFocus.TYPE = 4;
|
|
|
|
+ this.Title = false;
|
|
|
|
+ this.ZDistance = 0;
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -199,8 +218,11 @@ namespace MeasureData
|
|
//是否拍照和PT
|
|
//是否拍照和PT
|
|
xBool isPhotograph = new xBool();
|
|
xBool isPhotograph = new xBool();
|
|
xBool ptDepostion = new xBool();
|
|
xBool ptDepostion = new xBool();
|
|
|
|
+ xBool isTilt = new xBool();
|
|
|
|
+ isTilt.AssignValue(this.Title);
|
|
isPhotograph.AssignValue(this.is_Photograph);
|
|
isPhotograph.AssignValue(this.is_Photograph);
|
|
ptDepostion.AssignValue(this.m_pt);
|
|
ptDepostion.AssignValue(this.m_pt);
|
|
|
|
+ sFile.Register("Is_Title", isTilt);
|
|
sFile.Register("Is_Photograph", isPhotograph);
|
|
sFile.Register("Is_Photograph", isPhotograph);
|
|
sFile.Register("PT_Depostion", ptDepostion);
|
|
sFile.Register("PT_Depostion", ptDepostion);
|
|
|
|
|
|
@@ -224,6 +246,9 @@ namespace MeasureData
|
|
xDouble photographMagnification = new xDouble();
|
|
xDouble photographMagnification = new xDouble();
|
|
xDouble photographVoltage = new xDouble();
|
|
xDouble photographVoltage = new xDouble();
|
|
xDouble fibMagnification = new xDouble();
|
|
xDouble fibMagnification = new xDouble();
|
|
|
|
+ xDouble ZDistance = new xDouble();
|
|
|
|
+
|
|
|
|
+ ZDistance.AssignValue(this.ZDistance);
|
|
stretchMagnification.AssignValue(this.stretch_Magnification);
|
|
stretchMagnification.AssignValue(this.stretch_Magnification);
|
|
locationMagnification.AssignValue(this.location_Magnification);
|
|
locationMagnification.AssignValue(this.location_Magnification);
|
|
locationVoltage.AssignValue(this.location_Voltage);
|
|
locationVoltage.AssignValue(this.location_Voltage);
|
|
@@ -236,6 +261,7 @@ namespace MeasureData
|
|
sFile.Register("Photograph_Magnification", photographMagnification);
|
|
sFile.Register("Photograph_Magnification", photographMagnification);
|
|
sFile.Register("Photograph_Voltage", photographVoltage);
|
|
sFile.Register("Photograph_Voltage", photographVoltage);
|
|
sFile.Register("FIB_Magnification", fibMagnification);
|
|
sFile.Register("FIB_Magnification", fibMagnification);
|
|
|
|
+ sFile.Register("ZDistance", ZDistance);
|
|
|
|
|
|
//校正角度
|
|
//校正角度
|
|
xDouble correctionAngle = new xDouble();
|
|
xDouble correctionAngle = new xDouble();
|
|
@@ -266,6 +292,7 @@ namespace MeasureData
|
|
|
|
|
|
this.is_Photograph = isPhotograph.value();
|
|
this.is_Photograph = isPhotograph.value();
|
|
this.m_pt = ptDepostion.value();
|
|
this.m_pt = ptDepostion.value();
|
|
|
|
+ this.Title = isTilt.value();
|
|
|
|
|
|
this.m_ptTemp = ptELYFile.value();
|
|
this.m_ptTemp = ptELYFile.value();
|
|
this.m_fibTemp = fibELYFile.value();
|
|
this.m_fibTemp = fibELYFile.value();
|
|
@@ -282,6 +309,7 @@ namespace MeasureData
|
|
|
|
|
|
this.m_SampleName = sampleType.value();
|
|
this.m_SampleName = sampleType.value();
|
|
this.firm = _firm.value();
|
|
this.firm = _firm.value();
|
|
|
|
+ this.ZDistance = Convert.ToSingle(ZDistance.value());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|