Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into

OTSIncAMeasureApp/0-OTSModel/OTSDataType/CSEMDataMsr.cs

@@ -79,21 +79,7 @@ namespace OTSDataType
 
         public double GetMagnification()
         {
-            //if (m_magnification == 0)
-            //{
-            //    // magnification
-            //    double dMag = 0.0;
-
-            //    // convert scan field size to magnification
-            //    if (m_nScanFieldWidth > 0)
-            //    {
-            //        dMag = (double)m_nScanFieldSize100 * 100.0 / (double)m_nScanFieldWidth;
-            //    }
-            //    m_magnification = dMag;
-            //}
-
-
-        
+ 
             return m_magnification;
         }
        public void SetMagnification(double a_dMag)

OTSIncAMeasureApp/ServiceCenter/SemController.cs

@@ -317,7 +317,7 @@ namespace OTSModelSharp.ServiceInterface
                 }
                 return hw.SetSemWorkingDistance(a_distance);
             }
-            //System.Threading.Thread.Sleep(2000);
+            System.Threading.Thread.Sleep(1000);
         }
 
         public bool GetSemBrightness(ref double a_dBrightness)