optimize the redundant border measurement algorithm

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSField.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.Reflection;
 using System.Xml;
 
 namespace OTSDataType
@@ -483,10 +484,10 @@ namespace OTSDataType
                         p1.GetOTSRect(ref p1left, ref p1top, ref p1right, ref p1bottom);
                         COTSRect p1rec = new COTSRect(p1left, p1top, p1right, p1bottom);
                         PointF p1Center = p1rec.GetCenterPoint();
-                        if (Math.Abs(pcenter.X - p1Center.X) < 2 * overlap && Math.Abs(pcenter.Y - p1Center.Y) < 2 * overlap)
+                        if (Math.Abs(pcenter.X - p1Center.X) < 1 * overlap && Math.Abs(pcenter.Y - p1Center.Y) < 1 * overlap)
                         {
-                            var sim = p.CalculateSimilarity(p1);
-                            if (sim > 0.95)
+                            double sim = 0;
+                            if (judgeParticlesAreDuplicate(p, pcenter, p1, p1Center, out sim))
                             {
                                 log.Warn("remove left side duplicate particle,similarity:" + sim.ToString("F3"));
                                 log.Warn("P1:" + p.GetImgPortraitString());
@@ -526,10 +527,10 @@ namespace OTSDataType
                         p1.GetOTSRect(ref p1left, ref p1top, ref p1right, ref p1bottom);
                         COTSRect p1rec = new COTSRect(p1left, p1top, p1right, p1bottom);
                         PointF p1Center = p1rec.GetCenterPoint();
-                        if (Math.Abs(pcenter.X - p1Center.X) < 2 * overlap && Math.Abs(pcenter.Y - p1Center.Y) < 2 * overlap)
+                        if (Math.Abs(pcenter.X - p1Center.X) < 1 * overlap && Math.Abs(pcenter.Y - p1Center.Y) < 1 * overlap)
                         {
-                            var sim = p.CalculateSimilarity(p1);
-                            if (sim > 0.95)
+                            double sim = 0;
+                            if (judgeParticlesAreDuplicate(p, pcenter, p1, p1Center, out sim))
                             {
                                 log.Warn("remove upside duplicate particle,similarity:" + sim.ToString("F3"));
                                 log.Warn("P1:" + p.GetImgPortraitString());
@@ -579,10 +580,10 @@ namespace OTSDataType
                         p1.GetOTSRect(ref p1left, ref p1top, ref p1right, ref p1bottom);
                         COTSRect p1rec = new COTSRect(p1left, p1top, p1right, p1bottom);
                         PointF p1Center = p1rec.GetCenterPoint();
-                        if (Math.Abs(pcenter.X - p1Center.X) < 2 * overlap && Math.Abs(pcenter.Y - p1Center.Y) < 2 * overlap)
+                        if (Math.Abs(pcenter.X - p1Center.X) < 1 * overlap && Math.Abs(pcenter.Y - p1Center.Y) < 1 * overlap)
                         {
-                            var sim = p.CalculateSimilarity(p1);
-                            if (sim > 0.95)
+                            double sim = 0; 
+                            if (judgeParticlesAreDuplicate(p, pcenter, p1, p1Center, out sim))
                             {
                                 log.Warn("remove right side duplicate particle,similarity:" + sim.ToString("F3"));
                                 log.Warn("P1:" + p.GetImgPortraitString());
@@ -621,16 +622,16 @@ namespace OTSDataType
                         PointF p1Center = p1rec.GetCenterPoint();
                         if (Math.Abs(pcenter.X - p1Center.X) < 1 * overlap && Math.Abs(pcenter.Y - p1Center.Y) < 1 * overlap)
                         {
-                            var sim = p.CalculateSimilarity(p1);
-                            if (sim > 0.90)
+                            double sim = 0;
+                            if(judgeParticlesAreDuplicate(p, pcenter, p1, p1Center,out sim))
                             {
                                 log.Warn("remove down side duplicate particle,similarity:" + sim.ToString("F3"));
                                 log.Warn("P1:" + p.GetImgPortraitString());
                                 log.Warn("P2:" + p1.GetImgPortraitString());
                                 duplicateparts.Add(p);
-
                                 break;
                             }
+                           
                         }
 
                     }
@@ -696,6 +697,23 @@ namespace OTSDataType
             this.SetListAnalysisParticles(finalparts);
             log.Info("removing duplicate particles result:" + finalparts.Count);
         }
+        private bool judgeParticlesAreDuplicate( COTSParticleClr p,PointF pCenter,COTSParticleClr p1,PointF p1Center,out double sim)
+        {
+             sim = p.CalculateSimilarity(p1);
+            double d = Math.Sqrt(Math.Pow(pCenter.X - p1Center.X, 2) + Math.Pow(pCenter.Y - p1Center.Y, 2));
+            double d1 = p.GetFeretDiameter() / 2;
+            double d2 = p1.GetFeretDiameter() / 2;
+            if (d <= (d1 + d2) && sim > 0.90)
+            {
+
+                return true;
+            }
+            else if (d > (d1 + d2) && sim > 0.97)
+            {
+                return true;
+            }
+            return false;
+        }
         private List<COTSParticleClr> GetSideParticlesByOverlap(SORTING_DIRECTION direction, int overlap)
         {
             List<COTSParticleClr> sideparts = new List<COTSParticleClr>();

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -2640,16 +2640,32 @@ namespace OTSIncAReportGraph.Controls
                 foreach (var otherP in a_field.List_DParticle)
                 {
                     var partPos = otherP.OTSRect.GetCenterPoint();
-                    if ((Math.Abs(partPos.X - selpartPos.X) < (float)overlap * 2) && (Math.Abs(partPos.Y - selpartPos.Y) < 2 * (float)overlap))
+                    if ((Math.Abs(partPos.X - selpartPos.X) < (float)overlap * 1) && (Math.Abs(partPos.Y - selpartPos.Y) < 1 * (float)overlap))
                     {
 
                         var otherpartclrObj = GetParticleclrObjFromParticleData(otherP);
-
+                        var selpartclrObj = GetParticleclrObjFromParticleData(selpart);
+                        double d = Math.Sqrt(Math.Pow(selpartPos.X - partPos.X, 2) + Math.Pow(selpartPos.Y - partPos.Y, 2));
+                        double d1 = otherpartclrObj.GetFeretDiameter() / 2;
+                        double d2 = selpartclrObj.GetFeretDiameter() / 2;
                         var sim = selpartclrobj.CalculateSimilarity(otherpartclrObj);
-                        if (sim > 0.95)
+                        bool issimilar = false;
+                        if (d <= (d1 + d2) && sim > 0.90)
+                        {
+
+                            issimilar= true;
+                            otherP.IsSelect = true;
+                        }
+                        else if (d > (d1 + d2) && sim > 0.97)
                         {
+                            issimilar =  true;
                             otherP.IsSelect = true;
                         }
+                       
+                        //if (sim > 0.97)
+                        //{
+                        //    otherP.IsSelect = true;
+                        //}
                     }
                 }
             }