Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP

OTSCPP/OTSControl/Bruker/OTSBrukerImpl.cpp

@@ -96,7 +96,7 @@ namespace OTSController {
 		
 			if (QueryServers() && OpenClient())
 			{
-
+				LogTrace(__FILE__, __LINE__, "open bruker client success!");
 				if (!m_psRTSpectrumBuffer)
 				{
 					m_psRTSpectrumBuffer.reset(new char[(int)BRUKER_PARAM::RT_SPECTRUM_BUFFER_SIZE]);

OTSCPP/OTSControl/COTSHardwareMgr.cpp

@@ -122,7 +122,7 @@ namespace OTSController {
 					return nullptr;
 				}
 			}
-			LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetEDSControllerPtr) szSemName = %s,  szEdsName = %s", szSemName, szEdsName);
+			//LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetEDSControllerPtr) szSemName = %s,  szEdsName = %s", szSemName, szEdsName);
 
 			iDevID = this->GetEDSControllerID(szEdsName);
 			switch (iDevID)
@@ -181,7 +181,7 @@ namespace OTSController {
 				}
 			}
 
-			LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetScanControllerPtr) szSemName = %s,  szEdsName = %s", szSemName, szEdsName);
+			//LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetScanControllerPtr) szSemName = %s,  szEdsName = %s", szSemName, szEdsName);
 
 			iDevID = this->GetEDSControllerID(szEdsName);
 

OTSIncAMeasureApp/0-OTSModel/Measure/BSEPicData/COTSFieldData.cs

@@ -193,7 +193,7 @@ namespace OTSModelSharp
                 m_listAnalysisParticles.Add(pParticle);
                
             }
-            log.Info("Normal Particles (>"+ dAreaLow .ToString("f2") + "): "+ "<" + dAreaHigh.ToString("f2") + "): " + m_listAnalysisParticles.Count);
+            log.Info("Normal Particles (>"+ oAreaRange.GetStart().ToString("f2") + "): "+ "<" + oAreaRange.GetEnd().ToString("f2") + "): " + m_listAnalysisParticles.Count);
            
 
             List<COTSParticleClr> xrayParts = new List<COTSParticleClr>();
@@ -218,17 +218,17 @@ namespace OTSModelSharp
             {
              
          
-                // get xray position
+              
                 System.Drawing.Point poi = (System.Drawing.Point)pPart.GetXRayPos();
-                // create a x-ray 
+             
                 CPosXrayClr pPosXray = new CPosXrayClr();
-                // set x-ray position
+               
                 pPosXray.SetPosition(poi);
-                // set particle tag id
+              
                 pPosXray.SetPartTagId(pPart.GetTagId());
-                //pPosXray.SetIndex(nXrayIndex++);
+              
                 pPosXray.SetIndex(pPart.GetAnalysisId());
-                // set field id
+                
                 pPosXray.SetScanFieldId(pPart.GetFieldId());
            
                 pPart.SetXray(pPosXray);