change the feature mode xray collection to cycle process mode.

OTSCPP/OTSControl/Bruker/OTSEDSBrucker.cpp

@@ -237,7 +237,7 @@ namespace OTSController {
 			LogErrorTrace(__FILE__, __LINE__, _T("COTSEDSBrucker::GetXRayByPoints: invalid m_pBrukerImpl."));
 			return FALSE;
 		}
-		std::vector<CPosXrayPtr> listXRayPointsTemp;
+		
 
 		// turn SEM to external
 		if (!m_pBrukerImpl->SetSEMExternalOn())
@@ -247,7 +247,7 @@ namespace OTSController {
 			return FALSE;
 		}
 
-
+		std::vector<CPosXrayPtr> listXRayPointsTemp;
 		for (int i = 0; i < (int)a_vXRayPoints.size(); i++)
 		{
 			listXRayPointsTemp.push_back( a_vXRayPoints[i]);
@@ -290,13 +290,31 @@ namespace OTSController {
 			LogTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::GetXRayByPoints: failed to call SetSEMExternalOn method."));
 			return FALSE;
 		}
-		// collect x-Ray points (area scan)
-		if (!m_pBrukerImpl->GetXRayByFeatures(a_listXRayPoints, a_listFeatures, a_nXRayAQTime))
+
+		std::vector<CPosXrayPtr> listXRayPointsTemp;
+		std::vector<BrukerFeature> listFeatureTemp;
+		for (int i = 0; i < (int)a_listXRayPoints.size(); i++)
 		{
-			// failed to call bruker controller CollectXRayPointsByFeatures method.
-			LogErrorTrace(__FILE__, __LINE__, _T("COTSEDSBrucker::CollectXRayPointsByFeatures: failed to call bruker controller CollectXRayPointsByFeatures method."));
-			return FALSE;
+			listXRayPointsTemp.push_back(a_listXRayPoints[i]);
+			listFeatureTemp.push_back(a_listFeatures[i]);
+
+			// collect x-Ray points (area scan)
+			if (!m_pBrukerImpl->GetXRayByFeatures(listXRayPointsTemp, listFeatureTemp, a_nXRayAQTime))
+			{
+				// failed to call bruker controller CollectXRayPointsByFeatures method.
+				LogErrorTrace(__FILE__, __LINE__, _T("COTSEDSBrucker::CollectXRayPointsByFeatures: failed to call bruker controller CollectXRayPointsByFeatures method."));
+			
+			}
+
+			
+			listXRayPointsTemp.clear();
+			listFeatureTemp.clear();
+
 		}
+
+
+
+		
 		if (!m_pBrukerImpl->SetSEMExternalOff())
 		{
 			// failed to call SetSEMExternalOn method

OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -533,15 +533,7 @@ namespace OTSModelSharp
 
                     return;
                 }
-                // get SEM external controll on
-                //if (!SetSEMExteralOn())
-                //{
-                //    log.Error("DoMeasure: fail to set SEM external.");
-                //    pStatus.SetStatus(OTS_MSR_SAMPLE_STATUS.FAILED);                  
-                //    pStatus.ComputeTime(OTS_MSR_TIME_TYPE.STOPPED);
-
-                //    return;
-                //}
+      
                 // set the BSE scan param
                 if (!SetBSEParam())
                 {
@@ -821,16 +813,7 @@ namespace OTSModelSharp
                     return;
                 }
 
-                // get SEM external controll on
-                //if (!SetSEMExteralOn())
-                //{
-                //    log.Error("DoMeasure: fail to set SEM external.");
-                //    pStatus.SetStatus(OTS_MSR_SAMPLE_STATUS.FAILED);
-                //    // record end time
-                //    pStatus.ComputeTime(OTS_MSR_TIME_TYPE.STOPPED);
-
-                //    return;
-                //}
+     
                 // set the BSE scan param
                 if (!SetHoleBSEParam())
                 {

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSDisplaySampleGrid.cs

@@ -556,7 +556,6 @@ namespace OTSMeasureApp
                         {
                             m_PropWindow.PropGrid[Row, 1].Value = sCaptionName;
                         }
-                   //     m_PropWindow.PropGrid[Row, 1] = new SourceGrid.Cells.Cell(sCaptionName);
                         if(null == m_PropWindow.PropGrid[Row, 2])
                         {
                             m_PropWindow.PropGrid[Row, 2] = new SourceGrid.Cells.Cell(SampleVal, typeof(int));