Bladeren bron

remove the condition judge when GetMagnification.

gsp 2 jaren geleden
bovenliggende
commit
79e57c27fc

+ 2 - 2
Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="Oxford" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="Oxford" />
+  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="OffLine" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit2.2.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

+ 14 - 14
OTSIncAMeasureApp/0-OTSModel/OTSDataType/CSEMDataMsr.cs

@@ -79,21 +79,21 @@ 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;
-            }
-           
+            //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 magnification
+        
             return m_magnification;
         }
        public void SetMagnification(double a_dMag)