remove some useless code.

OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/StageParam.cs

@@ -5,7 +5,7 @@ using System.IO;
 using System.Windows.Forms;
 using System.Xml;
 using OTSDataType;
-//using OTSModelSharp.Measure.GetStageInfo;
+
 using static OTSDataType.otsdataconst;
 
 namespace OTSModelSharp
@@ -474,7 +474,7 @@ namespace OTSModelSharp
             // get stage text body
             String strStageTextBody = GetStageTextBody(pStage);
             File.WriteAllText(a_strFilePathName,strStageTextBody);
-            //File.Delete(a_strFilePathName);
+          
             NewText.Dispose();
 
             // ok, return TRUE

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSXRayParam.cs

@@ -35,8 +35,7 @@ namespace OTSDataType
 
         const int DEFAULE_FASTXRAYTIME = 100;
         private OTS_X_RAY_SCAN_MODE m_nScanMode;
-        //private OTS_IMAGE_SCANSPEED_OPTIONS m_nSearchSpeed;
-        private int m_nXRaySearchCount;
+
         private OTS_IMAGE_SCANSPEED_OPTIONS m_nAnalySpeed;
         private int m_nAnalyExpCount;
         private int m_nMidSearchAQTime;
@@ -49,8 +48,7 @@ namespace OTSDataType
         void Init()
         {
             m_nScanMode = DEFAULE_XRAY_SCAN_MODE;
-            //m_nSearchSpeed = DEFAULE_SEARCH_XRAY_SPEED;
-            //m_nXRaySearchCount = DEFAULE_XRAY_LOW_COUNT;
+    
             m_nAnalySpeed = DEFAULE_ANALYSIS_XRAY_SPEED;
             m_nAnalyExpCount = DEFAULE_XRAY_EXP_COUNT;
             m_nMidSearchAQTime = DEFAULE_XRAY_SEARCH_MID_TIME;
@@ -68,8 +66,7 @@ namespace OTSDataType
 
             // copy data over
             m_nScanMode = a_oSource.m_nScanMode;
-            //m_nSearchSpeed = a_oSource.m_nSearchSpeed;
-            //m_nXRaySearchCount = a_oSource.m_nXRaySearchCount;
+
             m_nAnalySpeed = a_oSource.m_nAnalySpeed;
             m_nAnalyExpCount = a_oSource.m_nAnalyExpCount;
             m_nMidSearchAQTime = a_oSource.m_nMidSearchAQTime;
@@ -89,8 +86,7 @@ namespace OTSDataType
         {
             // return test result
             return m_nScanMode == a_oSource.m_nScanMode &&
-                //m_nSearchSpeed == a_oSource.m_nSearchSpeed &&
-                //m_nXRaySearchCount == a_oSource.m_nXRaySearchCount &&
+   
                 m_nAnalySpeed == a_oSource.m_nAnalySpeed &&
                 m_nAnalyExpCount == a_oSource.m_nAnalyExpCount &&
                 m_nMidSearchAQTime == a_oSource.m_nMidSearchAQTime &&
@@ -107,12 +103,7 @@ namespace OTSDataType
         public OTS_X_RAY_SCAN_MODE GetScanMode() { return m_nScanMode; }
         public void SetScanMode(OTS_X_RAY_SCAN_MODE a_nVal) { m_nScanMode = a_nVal; }
 
-        //public OTS_IMAGE_SCANSPEED_OPTIONS GetSearchSpeed() { return m_nSearchSpeed; }
-        //public void SetSearchSpeed(OTS_IMAGE_SCANSPEED_OPTIONS a_nVal) { m_nSearchSpeed = a_nVal; }
 
-        // low count
-        //public int GetXRaySearchCount() { return m_nXRaySearchCount; }
-        //public void SetXRaySearchCount(int a_nVal) { m_nXRaySearchCount = a_nVal; }
 
         public OTS_IMAGE_SCANSPEED_OPTIONS GetAnalySpeed() { return m_nAnalySpeed; }
         public void SetAnalySpeed(OTS_IMAGE_SCANSPEED_OPTIONS a_nVal) { m_nAnalySpeed = a_nVal; }
@@ -122,9 +113,7 @@ namespace OTSDataType
 
         public int GetMidSearchAQTime() { return m_nMidSearchAQTime; }
         public void SetMidSearchAQTime(int a_nMidSearchAQTime) { m_nMidSearchAQTime = a_nMidSearchAQTime; }
-        public int GetLowSearchAQTime() { return m_nMidSearchAQTime * 3 / 4; }
-
-        public int GetHighSearchAQTime() { return m_nMidSearchAQTime * 5 / 4; }
+    
 
 
         public int GetMidAnalyAQTime() { return m_nMidAnalyAQTime; }
@@ -173,11 +162,9 @@ namespace OTSDataType
         public override void Serialize(bool isStoring, XmlDocument classDoc, XmlNode rootNode)
         {
             xString xnScanMode = new xString();
-            //xInt xnSearchSpeed = new xInt();
-            //xInt xnXRaySearchCount = new xInt();
-            //xInt xnAnalySpeed = new xInt();
+    
             xInt xnAnalyExpCount = new xInt();
-            //xInt xnMidSearchAQTime = new xInt();
+        
             xInt xnMidAnalyAQTime = new xInt();
             xInt xnUsingXray = new xInt();
 
@@ -185,11 +172,9 @@ namespace OTSDataType
             Slo slo = new Slo();
 
             slo.Register("ScanMode", xnScanMode);
-            //slo.Register("SearchSpeed", xnSearchSpeed);
-            //slo.Register("XRaySearchCount", xnXRaySearchCount);
-            //slo.Register("AnalySpeed", xnAnalySpeed);
+    
             slo.Register("AnalyExpCount", xnAnalyExpCount);
-            //slo.Register("MidSearchAQTime", xnMidSearchAQTime);
+   
             slo.Register("MidAnalyAQTime", xnMidAnalyAQTime);
 
             slo.Register("UsingXray", xnUsingXray);
@@ -200,11 +185,9 @@ namespace OTSDataType
             if (isStoring)
             {
                 xnScanMode.AssignValue(m_nScanMode.ToString());
-                //xnSearchSpeed.AssignValue((int)m_nSearchSpeed);
-                //xnXRaySearchCount.AssignValue(m_nXRaySearchCount);
-                //xnMidAnalyAQTime.AssignValue((int)m_nAnalySpeed);
+    
                 xnAnalyExpCount.AssignValue(m_nAnalyExpCount);
-                //xnMidSearchAQTime.AssignValue(m_nMidSearchAQTime);
+            
                 xnMidAnalyAQTime.AssignValue(m_nMidAnalyAQTime);
             
                 xnUsingXray.AssignValue(m_nUsingXray);
@@ -214,11 +197,9 @@ namespace OTSDataType
             {
                 slo.Serialize(false, classDoc, rootNode);
                 m_nScanMode = (OTS_X_RAY_SCAN_MODE)Enum.Parse(typeof(OTS_X_RAY_SCAN_MODE),xnScanMode.value());
-                //m_nSearchSpeed = (OTS_IMAGE_SCANSPEED_OPTIONS)xnSearchSpeed.value();
-                //m_nAnalySpeed = (OTS_IMAGE_SCANSPEED_OPTIONS)xnAnalySpeed.value();
-                //m_nXRaySearchCount = xnXRaySearchCount.value();
+         
                 m_nAnalyExpCount = xnAnalyExpCount.value();
-                //m_nMidSearchAQTime = xnMidSearchAQTime.value();
+             
                 m_nMidAnalyAQTime = xnMidAnalyAQTime.value();
 
                 m_nUsingXray = xnUsingXray.value();

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSBSEImageFun.cs

@@ -186,14 +186,7 @@ namespace OTSMeasureApp
 
                     cfun.SetSemScanMode(a_oldMode);
 
-                    //Scan类结束
-
-                    //初始化电镜参数
-
-                    //if (!cfun.SetAndStartScan())
-                    //{
-                    //    return 0;
-                    //}
+        
 
                 }
                 else
@@ -202,11 +195,7 @@ namespace OTSMeasureApp
                     string strErrorInfo = "(OTSBSEImageFun.GetScanImage) cfun.AcquireBSEImage = 0  Failed";
                     log.Error(strErrorInfo);
 
-                    //初始化电镜参数                  
-                    //if (!cfun.SetAndStartScan())
-                    //{
-                    //    return 0;
-                    //}
+               
 
                 }
             }
@@ -218,12 +207,7 @@ namespace OTSMeasureApp
                 log.Error(strErrorInfo);
 
             }
-            //finally
-            //{
-            //    //cfun.ScanFinishedInstance();
-            //    cfun.DisconnectSem();
-            //    //cfun.FreeHardware();
-            //}
+      
 
             return GetImgCount;
         }