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

OTSCPP/OTSClassifyEngine/InclutionEngine/STDFileMgr.cpp

@@ -2,7 +2,6 @@
 #include "STDFileMgr.h"
 
 #include "OTSFileSys.h"
-//#include "OTSHelper.h"
 
 namespace OTSClassifyEngine {
 
@@ -274,24 +273,7 @@ namespace OTSClassifyEngine {
 				return FALSE;
 			}
 
-			//get element list
-
-			/*long nElementSize = pInfo->GetElementRange();
-
-			if (nElementSize == 0)
-			{
-				m_listSTDItem.push_back(pItem);
-				continue;
-			}*/
-
-			/*CElementRangeList listElementRange;
-			if (!GetElementRange(a_STDId, nElementSize, listElementRange))
-			{
-				LogErrorTrace(__FILE__, __LINE__, _T("GetXrayList: get x-ray data failed."));
-				return FALSE;
-			}
-
-			pItem->SetElementRangeList(listElementRange);*/
+	
 			
 			m_listSTDItem.push_back(pItem);
 		}
@@ -312,21 +294,7 @@ namespace OTSClassifyEngine {
 
 		return TRUE;
 	}
-	/*BOOL CSTDFileMgr::GetElementRange(const long a_nSTDId, const long a_nElementSize, CElementRangeList& a_listElementRange)
-	{
-		auto ElementRangeDB = GetElementRangeDB();
-		if (!ElementRangeDB)
-		{
-			LogErrorTrace(__FILE__, __LINE__, _T("Failed to open element range table"));
-			ASSERT(FALSE);
-			return FALSE;
-		}
-
-		a_listElementRange.clear();
-		a_listElementRange = ElementRangeDB->GetElementRangeListById(a_nSTDId, a_nElementSize);
 
-		return TRUE;
-	}*/
 	BOOL CSTDFileMgr::GetSTDData(const long a_nSTDId, CSTDItemPtr a_pSTDItem)
 	{
 		ASSERT(a_pSTDItem);
@@ -363,21 +331,7 @@ namespace OTSClassifyEngine {
 
 		return m_pSTDDataDB;
 	}
-	/*CElementRangeDBPtr CSTDFileMgr::GetElementRangeDB()
-	{
-		if (!m_pElementRangeDB)
-		{
-			auto datastorePtr = GetDatastore();
-			if (datastorePtr)
-			{
-				m_pElementRangeDB = std::make_shared<CElementRangeDB>(datastorePtr);
-			}
-		}
-
-		ASSERT(m_pElementRangeDB);
 
-		return m_pElementRangeDB;
-	}*/
 	
 	// cleanup 
 	void CSTDFileMgr::Cleanup()

OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -443,11 +443,11 @@ namespace OTSMeasureApp
                 // try to find matched hole
                 //bool IsChanged = false;
                 //int holeIndex = -1;
-                for (int itr = 0; itr < listHoles.Count; itr++)
+                for (int i = 0; i < listHoles.Count; i++)
                 {
-                    if (listHoles[itr].GetName() == a_strHoleName)
+                    if (listHoles[i].GetName() == a_strHoleName)
                     {
-                        cReHole = listHoles[itr];
+                        cReHole = listHoles[i];
                         return cReHole;
                         //listHoles.RemoveAt(itr);
                         //IsChanged = true;

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -233,7 +233,7 @@ namespace OTSMeasureApp
 
                     //添加样品
                     m_MeasureAppForm.AddNewSampleMeasure(m_SampleHoleSelectName);
-                    ReadSEMDataFromSEM();
+                   
                     break;
                 case "DeleteStage":
                     //删除样品
@@ -255,7 +255,7 @@ namespace OTSMeasureApp
                 case "ReadSEMData":
                     m_MeasureAppForm.SetRunType(MSR_RUN_TYPE.RUNMEASURE);
                   
-                    ReadSEMDataFromSEM();
+                    ReadSEMDataAndSetToCurrentSample();
                     PrepareMeasureField(GetWorkingVisualSample(), MSR_RUN_TYPE.RUNMEASURE);
                   
                     break;
@@ -825,6 +825,9 @@ namespace OTSMeasureApp
                 control_Ruler2.Location = rulerLocation;
                 this.Controls.Add(control_Ruler2);
                 log = NLog.LogManager.GetCurrentClassLogger();
+
+
+              
            
         }
         public static void SetShowCMStrip(ContextMenuType IsSelectType, ContextMenuStrip cmStrip, bool IsTrue)
@@ -2501,7 +2504,7 @@ namespace OTSMeasureApp
 
 
         #region 获取帧图信息
-        public void ReadSEMDataFromSEM()
+        public void ReadSEMDataAndSetToCurrentSample()
         {
           
            

OTSIncAMeasureApp/App.config

@@ -10,8 +10,8 @@
   </startup>
   <connectionStrings>
     <add name="XMLFilePath" connectionString="Resources/XMLData/SystemData.XML"/>
-    <add name="LogAppPath" connectionString="C:\\Log\\OTSSysMgrApp"/>
-    <add name="LogPath" connectionString="C:\\Log\\OTSSysMgrApp_OTSControl"/>
+    <add name="LogAppPath" connectionString="Log\\Nlog"/>
+    <add name="LogPath" connectionString="Log\\Nlog"/>
     <add name="XMLFileName" connectionString="Config/ProData/HardwareConfig.xml"/>
   </connectionStrings>
   <nlog>

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -711,6 +711,7 @@ namespace OTSMeasureApp
             //给SampleWindow 发送样品信息
            
             m_SamplepaceWindow.AddSampleArea(SMInfo.SMeasurePara);
+             m_SamplepaceWindow.ReadSEMDataAndSetToCurrentSample();
             //给PropWindow 发送工作样品属性信息
             m_SPropertyWindows.DisplaySampleMeasureInfo(SMInfo);
             //给SoluWindow 发送样品显示信息

OTSIncAMeasureApp/ServiceCenter/SemController.cs

@@ -232,7 +232,7 @@ namespace OTSModelSharp.ServiceInterface
                 {
                     return false;
                 }
-                NLog.LogManager.GetCurrentClassLogger().Warn("Set WorkingDistance:" + a_distance.ToString("F2"));
+               
                 return hw.GetSemWorkingDistance(ref a_distance);
             }
         }