处理样品孔拍摄后帧图数误算的bug

OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureDisplayResult.cs

@@ -532,7 +532,8 @@ namespace OTSMeasureApp
                                 {
                                     string inprocessEndTime = SMsrData.STMThreadStu.csMsrEndTime;
                                     SetMeasureResultInfo(SMsrData);
-                                    MeasureResultMsrData = SMsrData;
+
+
                                     m_bgWorker.ReportProgress((int)ProgressState.MeasureCheckReport, SMsrData);
                                     //激活跳转至报告程序按钮
                                     m_MeasureApp.rbPReport.Enabled = true;
@@ -729,11 +730,13 @@ namespace OTSMeasureApp
             double m_SEMDMagni = OTSSamplespaceWindow.m_SEMDMagni;
             double m_PropIWDistance = OTSSamplespaceWindow.m_PropIWDistance;
             double m_PropDMagni = OTSSamplespaceWindow.m_PropDMagni;
+            //m_MeasureApp.m_ProjParam.
             if (m_PropIWDistance != 0 && m_PropDMagni != 0)
             {
                 m_MeasureApp.m_ProjParam.SetWorkingSampleSEMData(m_PropIWDistance, m_PropDMagni);
             }
             m_MeasureApp.m_SamplepaceWindow.SetSEMDATAMParameter(m_SEMDMagni,m_SEMIWDistance);
+            m_MeasureApp.m_ProjParam.SetFliedsCount(OTSSamplespaceWindow.m_TotalFieldsCount);
         }
         #endregion
 

OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -1199,7 +1199,10 @@ namespace OTSMeasureApp
             {
             }
         }
-
+        public void SetFliedsCount(int FliedsCount)
+        {
+            m_ResultData.GetWorkingSample().GetSEMDataMsr().SetTotalFields(FliedsCount);
+        }
         //获取电镜参数
         //int iScanFieldSize: Field扫描参数
         //int iWDistance： 电镜工作距离
@@ -1210,6 +1213,12 @@ namespace OTSMeasureApp
             dMagni = m_ResultData.GetWorkingSample().GetSEMDataMsr().GetMagnification();
         }
 
+        public int GetTotalFieldsCount()
+        {
+            int icount = m_ResultData.GetWorkingSample().GetSEMDataMsr().GetTotalFields();
+            return icount;
+        }
+
         //获取工作样品的测量区域
         //int iShape :测量区域形状
         //Rectangle Srect: 测量区域大小
@@ -1402,7 +1411,7 @@ namespace OTSMeasureApp
                 smlgrp.sTitle = sTitle;
                 for (int j = 0; j < SDataArr.Count; j++)
                 {
-                    var SDataObj = SDataArr[j];
+                      var SDataObj = SDataArr[j];
                     SamplePropertyData SData = new SamplePropertyData();
                     int smplid = (int)SDataObj.GetSmplItemId();
                     SData.iSampleId = (OTS_SAMPLE_PROP_GRID_ITEMS)smplid;

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -102,7 +102,8 @@ namespace OTSMeasureApp
         public static double m_SEMDMagni = 0;
         public static double m_PropIWDistance = 0;
         public static double m_PropDMagni = 0;
-
+        
+        public static int m_TotalFieldsCount = 0;
         #region 鼠标滚动所需参数
         public static float m_ScaleNum = 1;
         public static float m_GlobalZoomNum = 1;//记录每次比例缩放后的总体比例系数。
@@ -3201,6 +3202,7 @@ namespace OTSMeasureApp
                     //记录当前放大倍数 在停止拍摄图片后设置回原放大倍数
                     m_MeasureAppForm.m_ProjParam.GetWorkingSampleSEMData(ref m_PropIWDistance, ref m_PropDMagni);
                     GetSEMDATAMParameter(ref m_SEMDMagni, ref m_SEMIWDistance);
+                    m_TotalFieldsCount = m_MeasureAppForm.m_ProjParam.GetTotalFieldsCount();
                     GetBSEPictures();
                     break;
                 case "DeleteBSEPicture":
@@ -4029,8 +4031,6 @@ namespace OTSMeasureApp
          
                 mFlag = m_SEMDATAFieldManage.SetSEMMagnificationParameter(magnification);
                 wFlag = m_SEMDATAFieldManage.SetSEMWorkingDistanceParameter(semWorkingDistance);
-          
-               
                 if (mFlag || wFlag)
                 {
                     return true;
@@ -4057,7 +4057,6 @@ namespace OTSMeasureApp
                 //放大倍数
                 magnification = semParameters[0];
                 WorkingDistance = semParameters[1];
-
                 //m_SEMDATAFieldManage.CloseSEM();
                 return true;
             }