Explorar o código

move ReadSEMDataAndSetToCurrentSample to AddNewSampleMeasure procedure.

gsp %!s(int64=2) %!d(string=hai) anos
pai
achega
dfb3dd2a17

+ 3 - 3
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;

+ 6 - 3
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()
         {
           
            

+ 1 - 0
OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

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