ソースを参照

remove some useless comments

gsp 1 年間 前
コミット
0379cd638e

+ 1 - 12
OTSCPP/OTSControl/Bruker/OTSBrukerImpl.cpp

@@ -498,18 +498,7 @@ namespace OTSController {
 				return CBSEImgPtr();
 			}
 
-			// Get the image config so we can allocate enough memory
-			//DWORD nWidth = 0;
-			//DWORD nHeight = 0;
-			//DWORD nAverage;
-			//BYTE bCh1;
-			//BYTE bCh2;
-			//if (!ImageGetConfiguration(nWidth, nHeight, nAverage, bCh1, bCh2))
-			//{
-			//	// failed to call ImageGetConfiguration method 
-			//	LogErrorTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::AcquireImage: failed to call ImageGetConfiguration method."));
-			//	return CBSEImgPtr();
-			//}
+			
 
 			// SEM info
 			BrukerDll::TRTImageInfoEx imgInfo;

+ 1 - 22
OTSCPP/OTSControl/Bruker/OTSEDSBrucker.cpp

@@ -28,28 +28,7 @@ namespace OTSController {
 	// initialization
 	BOOL COTSEDSBrucker::Init()
 	{
-		// create bruker controller if necessary
-		//if (!m_pBrukerImpl)
-		//{
-		//	// create bruker controller
-		//	m_pBrukerImpl = COTSBrukerImpl::GetInstance();
-		//}
-
-		//// check if bruker controller is alright
-		//ASSERT(m_pBrukerImpl);
-		//if (!m_pBrukerImpl)
-		//{
-		//	LogErrorTrace(__FILE__, __LINE__, _T("COTSEDSBrucker::Init: failed to create bruker controller."));
-		//	return FALSE;
-		//}
-
-		//// initialize bruker controller (as xray controller)
-		//if (!m_pBrukerImpl->Init(CONTROL_TYPE::BRUKER_XRAY))
-		//{
-		//	// failed to initialize bruker controller 
-		//	LogErrorTrace(__FILE__, __LINE__, _T("COTSEDSBrucker::Init: failed to initialize bruker controller."));
-		//	return FALSE;
-		//}
+		
 		if (!m_pBrukerImpl->SetSPU())
 		{
 			return FALSE;

+ 0 - 3
OTSCPP/OTSControl/Bruker/OTSScanBrucker.cpp

@@ -78,9 +78,6 @@ namespace OTSController {
 	BOOL COTSScanBrucker::SetImageSize(long a_nImageSizeX,long a_Height)
 	{
 
-
-		
-
 		// call ImageGetConfiguration to get the existing dimensions, dwell time and enabled channels
 		/*DWORD nWidth = 0;
 		DWORD nHeight = 0;*/

+ 1 - 1
OTSIncAMeasureApp/0-OTSModel/OTSDataType/otsdataconst.cs

@@ -58,7 +58,7 @@ namespace OTSDataType
        public const String FILE_TITLE_SPLIT = ":";
 
        public const String LINE_END = "\r\n";
-       public static int[] DWELLTIME_BRUKER_VALUES = { 1, 1, 4, 8, 16, 32, 64, 128, 256, 512 };
+       public static int[] DWELLTIME_BRUKER_VALUES = { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 };
 
         // IMAGE_RESOLUTION of BRUKER
         public const int RESOLUTION_ID_MIN = 0;