Merge branch 'dev' of http://192.168.1.123:10080/gaoshipeng/OTS2_0 into dev

OTS/OTSModelSharp/Measure/GetBSEPic/BSEImgFileMgr.cs

@@ -71,7 +71,7 @@ namespace OTSDataType
         const String BSE_IMG_FILE_VERSION = "1.1.1";
 
 
-        public void CBSEImgFileMgr()
+        public  CBSEImageFileMgr()
         {
             // initialization
 

OTS/OTSModelSharp/Measure/GetBSEPic/SmplMeasure.cs

@@ -101,6 +101,9 @@ namespace OTSModelSharp
 
         // X-Ray parameter,this is the initialization parameter
         COTSXRayParam m_pXRayParam;
+
+        //IMeasureHardware aa = new IMeasureHardware();
+        //   ISemController
         public SmplMeasure()
         {
             if (loger == null)
@@ -970,18 +973,18 @@ namespace OTSModelSharp
         }
 
         // hardware control
-      public  COTSSemBase GetSEMControl()//Control中的方法
-      {
-            // SEM controller
-            COTSSemBase pSEMController = null;
+      //public  COTSSemBase GetSEMControl()//Control中的方法
+      //{
+      //      // SEM controller
+      //      COTSSemBase pSEMController = null;
 
            
-            // get SEM controller
-            pSEMController = m_pMsrThread.GetSEMController();
+      //      // get SEM controller
+      //      pSEMController = m_pMsrThread.GetSEMController();
 
-            // return SEM controller
-            return pSEMController;
-      }
+      //      // return SEM controller
+      //      return pSEMController;
+      //}
 
        public COTSScanBase GetScanControl()
         {

OTS/OTSModelSharp/MeasureControl/IMeasureHardware.cs

@@ -38,6 +38,8 @@ namespace OTSIncAMeasureApp.OTSMeasureControl
 
         bool GetSEMDataGnr(out CSEMDataGnr sem );
         bool MoveSEMToPoint(Point poi, double rotation);
+
+        bool  GetSEMControl();
     }
     public interface IScanController
     {