处理合并后的冲突

OTSIncAMeasureApp/0-OTSModel/Measure/2-OTSCleanliness/SmplMeasureCleanliness.cs

@@ -31,6 +31,8 @@ namespace OTSModelSharp
             nNewFieldId = m_pSampleRstFile.GetIdForANewField();
             //first step:remove background of the bse image and compound all the finded particles.
             curFldData = new CFieldDataClean( a_BSEImg,m_Sample.CalculatePixelSize());
+            CFieldDataClean curFldDataCln =( CFieldDataClean) curFldData;
+          
             curFldData.SetId(nNewFieldId);
             curFldData.SetPosition(fldCenter);
             GetOriginalParticles();
@@ -49,15 +51,12 @@ namespace OTSModelSharp
 
             //special treatment.
             //ParticleSpecialTreatment();
-<<<<<<< HEAD
-            loger.Info("Begin to Calculate the image property of every particle!");
-            var analysisparts = curFldData.ListAnalysisParticles;
-            curFldData.CalParticleImageProp(analysisparts);//calculate particle image property such as feret diameter, DMAX etc.
-=======
+
+
             log.Info("Begin to Calculate the image property of every particle!");
-            var analysisparts = curFldDataMgr.ListBigParticles;
-            curFldDataMgr.CalParticleImageProp(analysisparts);//calculate particle image property such as feret diameter, DMAX etc.
->>>>>>> b3e4b445b84559debf2b0aa83ff8b79e2ec8a891
+            var analysisparts = curFldDataCln.ListBigParticles;
+            curFldData.CalParticleImageProp(analysisparts);//calculate particle image property such as feret diameter, DMAX etc.
+
 
             ClassifyParticles(curFldData.ListAnalysisParticles);
 

OTSIncAReportApp/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -1391,12 +1391,9 @@ namespace OTSIncAReportGraph.Controls
                 //第二步，移动到指定位置,先读取再设置
                 if (m_OTSIncAReportFun.m_SEMConnectionState == true)
                 {
-<<<<<<< HEAD
-                    m_OTSIncAReportFun.MoveSemToPointXY_ForDrawDistrbutionImageAndBSE(sem_point.X, sem_point.Y);
-                   // bool MoveFlag= m_OTSIncAReportGridsFun.m_cfun.SetSemPositionXY(sem_point.X, sem_point.Y, 0);
-=======
+
                     m_OTSIncAReportFun.MoveSemToPointXY(sem_point.X, sem_point.Y);
->>>>>>> b3e4b445b84559debf2b0aa83ff8b79e2ec8a891
+
                 }
 
                 Thread.Sleep(500);

OTSIncAReportApp/Control_Grids/OTSIncAReportGridsFuncation/OTSIncAReportGridsFun.cs

@@ -32,7 +32,7 @@ namespace OTSIncAReportGrids.OTSIncAReportGridsFuncation
         Hashtable table;
 
         OTSIncAReportApp.frmReportApp m_frmReportApp = null;
-        COTSControlFunExport m_cfun = null;
+       public COTSControlFunExport m_cfun = null;
 
         #endregion