remove the in place judgment before moving stage in oxfordwrapper

OTSCPP/OTSImagePro/FieldMgr.cpp

@@ -78,14 +78,9 @@ namespace OTSIMGPROC {
 			{
 				for (int j = 0; j < col; j++)
 				{
-					/*if (i % 2 == 0)
-					{*/
+					
 						arrays[i][j] = col *(row- i) + j+1;
-					/*}
-					else
-					{
-						arrays[i][j] = col * i+(col-  j);
-					}*/
+					
 					
 				}
 			}
@@ -178,9 +173,6 @@ namespace OTSIMGPROC {
 			return FALSE;
 		}
 
-
-		// check member parameters
-		//ASSERT(m_pMeasureArea && m_poImageScanParam && m_poSEMDataMsr);
 		if (!m_pMeasureArea || m_ScanFieldSize==0)
 		{
 			// shouldn't happen
@@ -282,6 +274,12 @@ namespace OTSIMGPROC {
 		return nTotalFields;
 	}
 
+	std::vector<CPoint> CFieldMgr::GetFieldCentrePoints()
+	{
+		 auto m_listFieldCentrePoints = CalculateFieldCentrePoints1();
+		 return m_listFieldCentrePoints; 
+	}
+
 	// field centre points list
 	BOOL CFieldMgr::GetFieldRectByIndex(int a_nIndex, CRect& a_rectField)
 	{
@@ -309,6 +307,12 @@ namespace OTSIMGPROC {
 		return TRUE;
 	}
 
+	int CFieldMgr::GetTotalFields()
+	{
+		auto m_listFieldCentrePoints = CalculateFieldCentrePoints1();
+		return (int)m_listFieldCentrePoints.size();
+	}
+
 	
 
 

OTSCPP/OTSImagePro/FieldMgr.h

@@ -38,10 +38,10 @@ namespace OTSIMGPROC {
 		static long CalculateTotalFields(CDomainPtr a_poMeasureArea, double a_dScanFieldSizeX, CSize a_sizeResolution);
 
 		// field centre points list
-		std::vector<CPoint> GetFieldCentrePoints() { auto m_listFieldCentrePoints = CalculateFieldCentrePoints1(); return m_listFieldCentrePoints; }
+		std::vector<CPoint> GetFieldCentrePoints();
 
 		BOOL GetFieldRectByIndex(int a_nIndex, CRect& a_rctField);
-		int GetTotalFields() { auto m_listFieldCentrePoints = CalculateFieldCentrePoints1(); return (int)m_listFieldCentrePoints.size(); }
+		int GetTotalFields();
 		
 		//overlap
 		int GetOverlap() { return m_Overlap; }

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -454,7 +454,11 @@ namespace OTSModelSharp
 
               
             }
-            Thread.Sleep(hardWareDelay);
+            if (hardWareDelay > 0)
+            {
+                Thread.Sleep(hardWareDelay);
+            }
+           
             return true;
         }
         // Acquire a BSE image

OTSIncAMeasureApp/ServiceCenter/FEIAutoScript/FEIEDSController.cs

@@ -78,6 +78,11 @@ namespace OTSMeasureApp.ServiceCenter
                 {
                     return false;
                 }
+                //Rectangle r = new Rectangle(point.X, point.Y, 0, 0);
+                //if (!ApiClass.GetXRayByRect(r, strResolution, a_nXRayAQTime, AnalyExpCount, a_bElementInfo, ref eleItems, ref spectrumItems))
+                //{
+                //    return false;
+                //}
                 var xray = a_listParticles[i].GetXray();
                 xray.SetXrayData(spectrumItems);
                 a_listParticles[i].SetXray(xray);

OTSIncAMeasureApp/ServiceCenter/OxfordExtender/OxfordSemController.cs

@@ -125,14 +125,14 @@ namespace OTSMeasureApp.ServiceCenter
         {
            var b1= iExtender.MoveStageXY((float)a_dPositionX, (float)a_dPositionY);
             var b2=iExtender.SetStageGotoR((float)rotation);
-            Thread.Sleep(500);
+            //Thread.Sleep(500);
             return b1&b2;
         }
 
         public bool MoveSEMToPoint(double a_dPositionX, double a_dPositionY)
         {
             var b= iExtender.MoveStageXY((float)a_dPositionX, (float)a_dPositionY);
-            Thread.Sleep(500);
+            //Thread.Sleep(500);
             return b;
         }
 

OxfordExtenderWrapper/ExtenderWrapper.cs

@@ -408,10 +408,10 @@ namespace OxfordExtenderWrapper
         }
         public bool MoveStageXY(float x, float y)
         {
-            if ((m_dStageX - x < 0.001) && (m_dStageY - y < 0.001))
-            {
-                return true;
-            }
+            //if ((m_dStageX - x < 0.001) && (m_dStageY - y < 0.001))
+            //{
+            //    return true;
+            //}
             currentCommand.moveStagePrm = new MoveStageParam();
             currentCommand.moveStagePrm.x = x;
             currentCommand.moveStagePrm.y = y;