Merge branch 'ZJX' into dev

OTSIncAMeasureApp/2-OTSMeasureParamManage/OTSMeasureParam.cs

@@ -1307,8 +1307,9 @@ namespace OTSMeasureApp
                 {
                     return false;
                 }
-            GetWorkingSampleSEMData(ref SemMag, ref dDistance);
-                return true;
+            //GetWorkingSampleSEMData(ref SemMag, ref dDistance);
+            GetWorkingSampleSEMData(ref dDistance, ref SemMag);
+            return true;
            
         }
 

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -10,6 +10,7 @@ using System.Collections;
 using OTSDataType;
 using OTSModelSharp;
 using static OTSDataType.otsdataconst;
+using NSOTSController;
 
 namespace OTSMeasureApp
 {
@@ -3911,6 +3912,9 @@ namespace OTSMeasureApp
         public bool SetSEMDATAMParameter(double magnification, double semWorkingDistance)
         {
             #region 获取电镜参数
+            //电镜设置对象
+            //COTSControlFunExport cfun = new COTSControlFunExport();
+
             //获取Field操作类对象
             if (m_SEMDATAFieldManage == null)
             {
@@ -3924,8 +3928,19 @@ namespace OTSMeasureApp
                 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);
+                if (wFlag)
+                {
+                    MessageBox.Show(m_SEMDATAFieldManage.GetSEMMagAndWDParameter().ToString());
+                    
+                }
                 //关闭电镜连接
                 CloseSEM();
                 if (mFlag || wFlag)

OTSSysMgrApp/SemTestForms.cs

@@ -1019,6 +1019,7 @@ namespace OTSSysMgrApp
                 {
                     //配置结果提示
                     ShowMessage(3);
+                    MessageBox.Show(cfun.GetMagnification().ToString());
                 }
                 else
                 {