|
@@ -3575,7 +3575,7 @@ namespace OTSMeasureApp
|
|
|
CMStrip.Items[(int)MenuIndex.SetSemData].Enabled = true;
|
|
|
|
|
|
}
|
|
|
- m_SEMDATAFieldManage.CloseSEM();
|
|
|
+
|
|
|
|
|
|
}
|
|
|
|
|
@@ -3905,8 +3905,7 @@ namespace OTSMeasureApp
|
|
|
public bool SetSEMDATAMParameter(double magnification, double semWorkingDistance)
|
|
|
{
|
|
|
#region 获取电镜参数
|
|
|
- //电镜设置对象
|
|
|
- //COTSControlFunExport cfun = new COTSControlFunExport();
|
|
|
+
|
|
|
|
|
|
//获取Field操作类对象
|
|
|
if (m_SEMDATAFieldManage == null)
|
|
@@ -3920,17 +3919,10 @@ namespace OTSMeasureApp
|
|
|
List<double> semParameters = m_SEMDATAFieldManage.GetSEMMagAndWDParameter();
|
|
|
bool mFlag = false;
|
|
|
bool wFlag = false;
|
|
|
- //放大倍数
|
|
|
- //mFlag = cfun.SetSemMagnification(magnification);
|
|
|
- //wFlag = cfun.SetSemWorkingDistance(semWorkingDistance);
|
|
|
- //if (wFlag)
|
|
|
- //{
|
|
|
- // MessageBox.Show(cfun.GetMagnification().ToString());
|
|
|
- //}
|
|
|
+
|
|
|
mFlag = m_SEMDATAFieldManage.SetSEMMagnificationParameter(magnification);
|
|
|
wFlag = m_SEMDATAFieldManage.SetSEMWorkingDistanceParameter(semWorkingDistance);
|
|
|
- //关闭电镜连接
|
|
|
- m_SEMDATAFieldManage.CloseSEM();
|
|
|
+
|
|
|
|
|
|
if (mFlag || wFlag)
|
|
|
{
|
|
@@ -3957,8 +3949,7 @@ namespace OTSMeasureApp
|
|
|
//放大倍数
|
|
|
magnification = semParameters[0];
|
|
|
WorkingDistance = semParameters[1];
|
|
|
- //关闭电镜连接
|
|
|
- m_SEMDATAFieldManage.CloseSEM();
|
|
|
+
|
|
|
|
|
|
return true;
|
|
|
}
|
|
@@ -4038,8 +4029,7 @@ namespace OTSMeasureApp
|
|
|
#region 驱动SEM到当前位置
|
|
|
public bool SetSEMCurrentLocation()
|
|
|
{
|
|
|
- //try
|
|
|
- //{
|
|
|
+
|
|
|
bool bret=false;
|
|
|
//获取Field操作类对象
|
|
|
if (m_SEMDATAFieldManage == null)
|
|
@@ -4051,18 +4041,12 @@ namespace OTSMeasureApp
|
|
|
{
|
|
|
bret = m_SEMDATAFieldManage.SetSEMCurrentLocation(m_MouseDownLocation, m_RectangleGDIObjects, m_OTSSampleStageData, IsWidth, Width, Height);
|
|
|
|
|
|
- m_SEMDATAFieldManage.CloseSEM();
|
|
|
+
|
|
|
}
|
|
|
|
|
|
return bret;
|
|
|
|
|
|
- //}
|
|
|
- //catch (Exception ex)
|
|
|
- //{
|
|
|
- // //string message = table["message3"].ToString();
|
|
|
- // log.Error("OTSSamplespaceWindow_" + message + ":" + ex.ToString() + "");
|
|
|
- // //return false;
|
|
|
- //}
|
|
|
+
|
|
|
}
|
|
|
#endregion
|
|
|
|
|
@@ -4082,8 +4066,7 @@ namespace OTSMeasureApp
|
|
|
{
|
|
|
bret = (m_SEMDATAFieldManage.DriveSEMToLocation(m_MouseDownLocation, m_RectangleGDIObjects, m_SingleGDIObjects, m_OTSSampleStageData, IsWidth, Width, Height));
|
|
|
|
|
|
- //关闭电镜连接
|
|
|
- m_SEMDATAFieldManage.CloseSEM();
|
|
|
+
|
|
|
|
|
|
|
|
|
}
|
|
@@ -4114,7 +4097,7 @@ namespace OTSMeasureApp
|
|
|
{
|
|
|
bret = m_SEMDATAFieldManage.GetSemLocation(ref SemLocation);
|
|
|
|
|
|
- m_SEMDATAFieldManage.CloseSEM();
|
|
|
+
|
|
|
|
|
|
}
|
|
|
return bret;
|
|
@@ -4191,28 +4174,7 @@ namespace OTSMeasureApp
|
|
|
}
|
|
|
#endregion
|
|
|
|
|
|
- #region 关闭电镜连接
|
|
|
- public bool CloseSEM()
|
|
|
- {
|
|
|
- if (m_SEMDATAFieldManage == null)
|
|
|
- {
|
|
|
- m_SEMDATAFieldManage = new SEMDATAFieldManage(m_MeasureAppForm.m_ProjParam);
|
|
|
- }
|
|
|
- //关闭电镜连接
|
|
|
- bool result = m_SEMDATAFieldManage.CloseSEM();
|
|
|
- return result;
|
|
|
- }
|
|
|
- public bool CloseSEM(SEMDATAFieldManage m_SEMDATAFieldManage)
|
|
|
- {
|
|
|
- bool result = false;
|
|
|
- if (m_SEMDATAFieldManage != null)
|
|
|
- {
|
|
|
- //关闭电镜连接
|
|
|
- result = m_SEMDATAFieldManage.CloseSEM();
|
|
|
- }
|
|
|
- return result;
|
|
|
- }
|
|
|
- #endregion
|
|
|
+
|
|
|
|
|
|
#region 显示标尺
|
|
|
/// <summary>
|