Browse Source

remove some useless notations.

gsp 3 years ago
parent
commit
fefb86f39b

+ 5 - 10
OTSCPP/OTSClrInterface/ControlClr/OTSControlFunExport.cpp

@@ -488,7 +488,6 @@ namespace OTSCLRINTERFACE
 		m_pEDS->SetQuantification(TRUE);
 
 		bool bRet = m_pEDS->GetXRayByPoints(listXRayPoints, a_nMilliseconds);
-		//bool bRet = m_LpEDSBase->GetXRayByFeaturesFromMultiPoint(listXRayPoints, listFeatures, a_nMilliseconds);
 
 		DWORD* xrd;
 
@@ -533,7 +532,6 @@ namespace OTSCLRINTERFACE
 		m_pEDS->SetQuantification(FALSE);
 
 		bool bRet = m_pEDS->GetXRayByPoints(listXRayPoints, a_nMilliseconds);
-		//bool bRet = m_LpEDSBase->GetXRayByFeaturesFromMultiPoint(listXRayPoints, listFeatures, a_nMilliseconds);
 
 		std::vector<CPosXrayPtr> listXRayPointsTemp;
 		CPosXrayPtr pXRayPointTemp = CPosXrayPtr(new CPosXray());
@@ -587,7 +585,10 @@ namespace OTSCLRINTERFACE
 		CBSEImgPtr pbseImg = nullptr;
 
 		pbseImg = m_pScan->AcquireBSEImage(a_nMatrixIndex, nReads, nDwell);
-
+		if (pbseImg == nullptr)
+		{
+			return bRet;
+		}
 		sz = pbseImg->GetImageSize();
 		height = sz.cx;
 		width = sz.cy;
@@ -606,11 +607,5 @@ namespace OTSCLRINTERFACE
 		//	return 0;
 
 	}
-	//void COTSControlFunExport::InitDevPoint()
-	//{
-	//	
-	//		
-	//	
-	//
-	//}
+
 }

+ 11 - 1
OTSCPP/OTSClrInterface/ControlClr/OTSControlFunExport.h

@@ -365,14 +365,24 @@ namespace OTSCLRINTERFACE
 		bool MoveSEMToPoint(double dPosX, double dPosY, double dRotation)
 		{
 
-			double dRota = dRotation;
+			//double dRota = dRotation;
 			CPoint cPos;
 			cPos.x = (LONG)dPosX;
 			cPos.y = (LONG)dPosY;
 			bool bRev = m_pSem->MoveSEMToPoint(cPos, dRotation);
 			return bRev;
 		}
+		//ÒÆ¶¯µç¾µµ½Ö¸¶¨µÄλÖÃ
+		bool MoveSEMToPoint(double dPosX, double dPosY)
+		{
 
+			double dRotation;
+			CPoint cPos;
+			cPos.x = (LONG)dPosX;
+			cPos.y = (LONG)dPosY;
+			bool bRev = m_pSem->MoveSEMToPoint(cPos, dRotation);
+			return bRev;
+		}
 
 	
 

+ 4 - 49
OTSSysMgrTools/Imagepro.cs

@@ -383,24 +383,13 @@ namespace OTSSysMgrTools
                 {
                     //设置为原始 扫描模式
                     cfun.SetSemScanMode(a_oldMode);
-                    //Scan类结束
-
-                    //初始化电镜参数
-                    //if (!cfun.SetAndStartScan())
-                    //{
-                    //    return 0;
-                    //}
+                   
                    
                 }
                 else
                 {
                     cfun.SetSemScanMode(a_oldMode);
-                    //记录日志
-                    //初始化电镜参数
-                    //if (!cfun.SetAndStartScan())
-                    //{
-                    //    return 0;
-                    //}
+                  
                 }
 
             }
@@ -408,45 +397,11 @@ namespace OTSSysMgrTools
             {
                 throw ex;
             }
-            finally
-            {
-                //cfun.ScanFinishedInstance();
-                //cfun.DisConnectSem();
-                //cfun.FreeDll();
-            }
+           
 
             return GetImgCount;
         }
 
-        /// <summary>
-        /// 将byte数组转换为文件并保存到指定地址
-        /// </summary>
-        /// <param name="buff">byte数组</param>
-        /// <param name="savepath">保存地址</param>
-        //public static void BytesConvertToFile(byte[] buff, string savepath, string fileName)
-        //{
-        //    try
-        //    {
-
-        //        //如果不存在就创建Enclosure文件夹 
-        //        if (Directory.Exists(savepath + @"\Enclosure\") == false)
-        //        {
-        //            Directory.CreateDirectory(savepath + @"\Enclosure\");
-        //        }
-
-        //        if (System.IO.File.Exists(savepath + @"\Enclosure\" + fileName))
-        //        {
-        //            System.IO.File.Delete(savepath + @"\Enclosure\" + fileName);
-        //        }
-        //        Bitmap bitmap=ToGrayBitmap(buff, 1024, 768);
-               
-        //        bitmap.Save(savepath + @"\Enclosure\" + fileName);
-                
-        //    }
-        //    catch (Exception)
-        //    {
-
-        //    }
-        //}
+       
     }
 }