Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into zty

Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="OffLine" />
+  <Member RegName="SemControllerName" Value="FEI" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="FEI" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit2.2.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -108,15 +108,7 @@ namespace OTSModelSharp
 
            
             var pSEMCtrl = m_pMsrThread.GetSEMController();
-         
-            //if (!pSEMCtrl.IsConnected())
-            //{
-            //    if (!pSEMCtrl.Connect())
-            //    {
-            //        log.Error("SetSEMDataMrs: can't connect SEM.");
-            //        return false;
-            //    }
-            //}
+   
           
             pSEMCtrl.SetMagnification(dMag);
             pSEMCtrl.SetWorkingDistance(dWorkDis);
@@ -171,15 +163,6 @@ namespace OTSModelSharp
             Size sizePixelImage = RESOLUTION_VALUE[nResulotionId];
 
 
-            // get SEM controller
-            //if (!pSEMController.IsConnected())
-            //{
-            //    if (!pSEMController.Connect())
-            //    {
-            //        log.Error("SetBSEParam: can't connect SEM.");
-            //        return false;
-            //    }
-            //}
 
             // get dwell time 
             OTS_IMAGE_SCANSPEED_OPTIONS nDwellTime = pImgScanParam.GetScanImageSpeed();
@@ -465,15 +448,8 @@ namespace OTSModelSharp
                 return false;
             }
 
+            log.Info("Begin to move SEM stage to OTScoord:" + a_poi.X + "," + a_poi.Y);
 
-            //if (!pSEMController.IsConnected())
-            //{
-            //    if (!pSEMController.Connect())
-            //    {
-            //        log.Error("MoveSEMToPoint: can't connect SEM.");
-            //        return false;
-            //    }
-            //}
             log.Info("Begin to move SEM stage to " + a_SEMpt.X + "," + a_SEMpt.Y);
            
             // move SEM to the position (rotation 0)

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/CreateRectangle.cs

@@ -581,11 +581,11 @@ namespace OTSMeasureApp
             get { return lineStartPoint; }
             set { lineStartPoint = value; }
         }
-        public  PointF SEMCenterPoint
-        {
-            get { return semCenterPoint; }
-            set { semCenterPoint = value; }
-        }
+        //public  PointF SEMCenterPoint
+        //{
+        //    get { return semCenterPoint; }
+        //    set { semCenterPoint = value; }
+        //}
         public  int OTSX
         {
             get { return otsX; }
@@ -1017,7 +1017,7 @@ namespace OTSMeasureApp
             BSEImageWitdh = m_RegionF.Width;
             BSEImageHeight = m_RegionF.Height;
             BSEImageLocation = m_RegionF.Location;
-            SEMCenterPoint = m_RegionF.Location;
+            //SEMCenterPoint = m_RegionF.Location;
 
             var scalePs = new List<PointF>();
             foreach (var p in m_PolygonPoints)
@@ -1065,7 +1065,7 @@ namespace OTSMeasureApp
             BSEImageWitdh = m_RegionF.Width;
             BSEImageHeight = m_RegionF.Height;
             BSEImageLocation = m_RegionF.Location;
-            SEMCenterPoint = m_RegionF.Location;
+            //SEMCenterPoint = m_RegionF.Location;
             LineStartPoint = m_RegionF.Location;
 
             m_DraggingPoint = new Point((int)location.X,(int)location.Y);
@@ -1117,7 +1117,7 @@ namespace OTSMeasureApp
             BSEImageWitdh = m_RegionF.Width;
             BSEImageHeight = m_RegionF.Height;
             BSEImageLocation = m_RegionF.Location;
-            SEMCenterPoint = m_RegionF.Location;
+            //SEMCenterPoint = m_RegionF.Location;
             LineStartPoint = m_RegionF.Location;
 
             

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -1430,9 +1430,13 @@ namespace OTSMeasureApp
                         //样品
                         MouseDownFunction(GetAllVisualSampleGDIObject(), e);
 
+                        if (GetWorkingVisualSample() != null)
+                        {
+                            //样品台中BSE图片
+                            MouseDownFunction(GetWorkingVisualSample().m_ImageGDIObjects, e);
 
-                        //样品台中BSE图片
-                        MouseDownFunction(GetWorkingVisualSample().m_ImageGDIObjects, e);
+                        }
+                       
 
                         MouseDownFunction(m_AllHoleImageGDIObjects, e);
 
@@ -2810,7 +2814,7 @@ namespace OTSMeasureApp
                 {
                    
                     PointF OTSLocation = m_MeasureAppForm.m_ProjParam.ConverSEMToOTSCoord(new PointF((int)Math.Round(SemLocation[(int)XYIndex.X], 0), (int)Math.Round(SemLocation[(int)XYIndex.Y], 0)));
-                   
+                    NLog.LogManager.GetCurrentClassLogger().Warn(OTSLocation.ToString());
            
                     var sam = GetWorkingVisualSample();
                     var MeasureItem = sam.GetMeasureGDIObject();