gsp 1 год назад
Родитель
Сommit
44003cc53d

+ 5 - 3
OTSCPP/OTSClrInterface/CommonClr/OTSFieldDataClr.cpp

@@ -2,6 +2,7 @@
 #include "OTSFieldDataClr.h"
 
 namespace OTSCLRINTERFACE {
+	using namespace System::Drawing;
 	
 	COTSFieldDataClr::COTSFieldDataClr()													// constructor
 	{
@@ -47,10 +48,11 @@ namespace OTSCLRINTERFACE {
 		 return gcnew System::Drawing::Point(mFieldData->get()->GetPosition().x, mFieldData->get()->GetPosition().y); 
 	}
 
-	void COTSFieldDataClr::SetPosition(System::Drawing::Point^ a_poiPos)
+	void COTSFieldDataClr::SetPosition(int x, int y)
 	{
-		{ auto p1 = CPoint(a_poiPos->X, a_poiPos->Y); 
-		mFieldData->get()->SetPosition(p1); }
+		
+		auto p1 = CPoint(x, y); 
+		mFieldData->get()->SetPosition(p1); 
 	}
 
 	COTSParticleListClr ^ COTSFieldDataClr::GetParticleList()

+ 2 - 2
OTSCPP/OTSClrInterface/CommonClr/OTSFieldDataClr.h

@@ -4,7 +4,7 @@
 
 namespace OTSCLRINTERFACE {
 
-	using namespace System;
+	using namespace System::Drawing;
 	using namespace OTSDATA;
 
 	public ref class COTSFieldDataClr :	public Object
@@ -25,7 +25,7 @@ namespace OTSCLRINTERFACE {
 
 		// position (from field center manager) 
 		System::Drawing::Point^ GetPosition();
-		void SetPosition(System::Drawing::Point^ a_poiPos);
+		void SetPosition(int x,int y);
 
 		// field file folder
 		String^ GetFieldFileFolder() { return gcnew String(mFieldData->get()->GetFieldFileFolder() ); }

+ 7 - 9
OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -137,9 +137,7 @@ namespace OTSModelSharp
         {
 
 
-            // get SEM controller 
-            //var pSEMController = m_SemHardwareMgr;
-
+           
             // get scan controller
             var pScanController = m_ScanHardwareMgr;
 
@@ -163,16 +161,16 @@ namespace OTSModelSharp
             switch (nDwellTime)
             {
                 case OTS_IMAGE_SCANSPEED_OPTIONS.low:
-                    nBrukerDwellTimeId = 3;
+                    nBrukerDwellTimeId = 2;
                     break;
                 case OTS_IMAGE_SCANSPEED_OPTIONS.meddium:
-                    nBrukerDwellTimeId = 4;
+                    nBrukerDwellTimeId = 3;
                     break;
                 case OTS_IMAGE_SCANSPEED_OPTIONS.high:
-                    nBrukerDwellTimeId = 5;
+                    nBrukerDwellTimeId = 4;
                     break;
                 default:
-                    nBrukerDwellTimeId = 3;
+                    nBrukerDwellTimeId = 2;
                     break;
 
             }
@@ -586,8 +584,8 @@ namespace OTSModelSharp
              
                                                             
                 var pSEMDataGnr = new CSEMDataGnr();
-               // log.Info("Get Kv, Brightness and Contrast!");
-               //GetSEMDataGnrFromHw(ref pSEMDataGnr);
+                log.Info("Get Kv, Brightness and Contrast!");
+                GetSEMDataGnrFromHw(ref pSEMDataGnr);
 
 
                 m_pSampleRstFile.SetSEMGnr(pSEMDataGnr);

+ 1 - 1
OTSIncAMeasureApp/ServiceCenter/CImageHandler.cs

@@ -574,7 +574,7 @@ namespace OTSModelSharp.ServiceCenter
                 COTSFieldDataClr fldclr = new COTSFieldDataClr();
                 PointF p1 = f.GetOTSPosition();
                 Point p2 = new Point((int)p1.X, (int)p1.Y);
-                fldclr.SetPosition(p2);
+                fldclr.SetPosition((int)p1.X,(int)p1.Y);
                 fldclr.SetImageWidth(f.Width);
                 fldclr.SetImageHeight(f.Height);
                 var parts = f.GetListAnalysisParticles();