change some resource strings

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -1066,7 +1066,7 @@
 	  <Control name="groupBox9" text="标准库选择" />
 	  <Control name="label43" text="背景处理方式" />
 	  <Control name="label44" text="是否使用X-ray" />
-	  <Control name="label50" text="图像重叠像素(0=不启用)" />
+	  <Control name="label50" text="图像重叠尺寸(0=不启用)" />
 	  <Control name="btnok" text="确  定" />
 	  <Control name="btncancel" text="取  消" />
 	  <Control name="button1" text="特殊灰度颗粒识别设置" />

Bin/x64/Debug/Version.txt

@@ -4,6 +4,7 @@ update history
 增加边界重叠测量并自动去重功能
 可更加个性化设置报告模板（可精确到具体的分类）
 增加部分删除测量结果数据，然后重新测量功能。
+增加颗粒多条件组合筛选功能
 支持牛津6.1 sp1
 优化支持Coxem电镜
 -----OTS 3.0版本 2023-12

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/RingGdiDataInput.cs

@@ -1,13 +1,7 @@
 using OTSCommon;
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
 using System.Windows.Forms;
 
 namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/VisualStage.cs

@@ -842,28 +842,8 @@ namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
 
             return allobj;
         }
-        public List<CRectangleGDIObject> GetAllGDIObjectWithoutHoleNameStr()
-        {
-            var allobj = new List<CRectangleGDIObject>();
-            foreach (CRectangleGDIObject item in m_StageEdgeGDIObjects)
-            {
-                allobj.Add(item);
-            }
-
-            foreach (CRectangleGDIObject item in m_SampleHoleGDIObjects)
-            {
-                allobj.Add(item);
-            }
-            foreach (CRectangleGDIObject item in m_SpecimenGDIObjects)
-            {
-                allobj.Add(item);
-            }
        
 
-
-            return allobj;
-        }
-
         public  PointF GetCenterPoint(RectangleF rect)
         {
             //声明
@@ -873,29 +853,7 @@ namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
             centerPoint.Y = rect.Y + rect.Height / 2;
             return centerPoint;
         }
-        public  SampleHolePara GetSampleHoleInfo(CRectangleGDIObject item)
-        {
-            SampleHolePara sampleHolePara = new SampleHolePara();
-         
-       
-            //设置测量区域
-            sampleHolePara.SampleHoleRect = item.GetZoomedRegion;
-            //设置测量区域位置与尺寸
-            float left = PixelConvertToMicron(item.GetZoomedRegionF().X);
-            float Top = PixelConvertToMicron(item.GetZoomedRegionF().Y);          
-            float Width = PixelConvertToMicron(item.GetZoomedRegionF().Width);
-            float Height = PixelConvertToMicron(item.GetZoomedRegionF().Height);
-
-            PointF startPoint = new PointF(left, Top);
-            SizeF sampleHoleSize = new SizeF(Width, Height);
-            sampleHolePara.SampleHoleRect = new Rectangle(new Point((int)startPoint.X, (int)startPoint.Y), new Size((int)sampleHoleSize.Width, (int)sampleHoleSize.Height));
-            //设置样品孔名称
-            sampleHolePara.sHoleName = item.NameOrHoleName;
-            //设置测量区域形状
-            sampleHolePara.iShape = item.Shape;
-           
-            return sampleHolePara;
-        }
+        
 
 
     }

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -11,8 +11,7 @@ using OTSModelSharp;
 using OTSModelSharp.ResourceManage;
 using static OTSDataType.otsdataconst;
 using System.Diagnostics;
-using OTSModelSharp.ServiceCenter;
-//using OTSMeasureApp._0_OTSModel.Measure.ParamData;
+
 using OTSCLRINTERFACE;
 using System.IO;
 using System.Management;