Browse Source

1.资源文件优化
2.分布图排列图去除lowcount

cxs 1 year ago
parent
commit
2d1366fac5

+ 1 - 1
Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -916,7 +916,7 @@
    <Name>Control_DrawDistrbutionSortImage</Name>
     <Controls>
       <Control name="ToolStripMenuItem_selected" text="选择颗粒" />
-      <Control name="ToolStripMenuItem_delete" text="除颗粒" />
+      <Control name="ToolStripMenuItem_delete" text="除颗粒" />
 	  <Control name="另存选择颗粒ToolStripMenuItem" text="另存为" />
 	  <Control name="ToolStripMenuItem_movesempoint" text="移动SEM到当前位置" />
 	  <Control name="toolStripMenuItem_copyimage" text="复制图像" />

+ 19 - 1
OTSIncAReportApp/2-CommonFunction/CommonClass/DisplayField.cs

@@ -27,6 +27,24 @@ namespace OTSIncAReportGraph
         PointF m_dragingpoint;//鼠标拖动的位置
        public COTSRect myOTSRect = new COTSRect();
         private Bitmap m_originalImage;
+        public enum RemoveParticleType
+        {
+            INVALID = -1,
+            MIN = 0,
+            UNCLASSIFY = 0,
+            NOT_USE2 = 1,
+            AVE_GRAY_NOT_INRANRE = 2,
+            SEARCH_X_RAY = 3,
+            LOW_COUNT = 4,
+            NO_INTEREST_ELEMENTS = 5,
+            NO_ANALYSIS_X_RAY = 6,
+            ISNOT_INCLUTION = 7,
+            NOT_USE = 8,
+            NOT_IDENTIFIED = 9,
+            IDENTIFIED = 10,//当为可识别类型时(10),可以被进一步识别为用户类型(1000以上),系统预定义类型(10000以上),所以最终颗粒类型不会为10,最终的组号可能为7,9(非夹杂物和未识别)或其他预定义的组,ID号则为识别出的ID号
+            MAX = 10,
+        }
+
         const int INVALIDPARTICLE= -1;
         /// <summary>
         /// 构造函数
@@ -62,7 +80,7 @@ namespace OTSIncAReportGraph
             foreach (Particle particle in list_particle)
             {
                 //分布图排列图无效颗粒不显示
-                if (particle.TypeId == INVALIDPARTICLE)
+                if (particle.TypeId == (int)RemoveParticleType.INVALID|| particle.TypeId == (int)RemoveParticleType.LOW_COUNT)
                 {
                     continue;
                 }