Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

Bin/x64/Debug/Config/ConfigTemplate/BatteryCleannessA/OTSProgMgrParam.pmf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData RunMode="ProfessionalMode" SysType="CleannessA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="Cleanness_F" SteelTechnology="0" UseSysSTD="true" />
-  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" OtherSelection="" ErrodDilateParam="0" OverlapParam="0">
+  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" ParticleSelectionCondition="dmax:1-2,dmin:3-5" ErrodDilateParam="0" OverlapParam="0">
     <Member RegName="BGGray" end="255" start="80" />
     <Member RegName="IncArea" end="100" start="3" />
     <Member RegName="ParticleGray" end="255" start="0" />

Bin/x64/Debug/Config/ConfigTemplate/CleannessA/OTSProgMgrParam.pmf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData RunMode="ProfessionalMode" SysType="CleannessA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="OTSCleanlinessSTD1" SteelTechnology="0" UseSysSTD="true" />
-  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" OtherSelection="" ErrodDilateParam="0" OverlapParam="0">
+  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" ParticleSelectionCondition="dmax:1-2,dmin:3-5" ErrodDilateParam="0" OverlapParam="0">
     <Member RegName="BGGray" end="255" start="80" />
     <Member RegName="IncArea" end="100" start="3" />
     <Member RegName="ParticleGray" end="255" start="0" />

Bin/x64/Debug/Config/ConfigTemplate/IncA/OTSProgMgrParam.pmf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData RunMode="ProfessionalMode" SysType="IncA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="NoSTDDB" SteelTechnology="0" UseSysSTD="true" />
-  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" ErrodDilateParam="0" OtherSelection="" OverlapParam="0">
+  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" ErrodDilateParam="0" ParticleSelectionCondition="dmax:1-2,dmin:3-5" OverlapParam="0">
     <Member RegName="BGGray" end="255" start="80" />
     <Member RegName="IncArea" end="100" start="3" />
     <Member RegName="ParticleGray" end="255" start="0" />

Bin/x64/Debug/Config/SysData/OTSProgMgrParam - 副本.pmf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData RunMode="professional" Modes="professional,Plain" SysType="CleannessA" SysTypes="IncA,CleannessA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="NoSTDDB" StdLibTypeIndex="0" SteelTechnology="0" UseSysSTD="true" />
-  <Member RegName="ImageProcParam" m_autoBGRemoveType="0" m_BGRemoveType="1">
+  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" OverlapParam="0" ParticleSelectionCondition="dmax:1-2,dmin:3-5">
     <Member RegName="BGGray" end="255" start="150" />
     <Member RegName="IncArea" end="100" start="5" />
     <Member RegName="ParticleGray" end="150" start="0" />

Bin/x64/Debug/Resources/XMLData/ResourceForMeasureSourceGrid-ZH.xml

@@ -41,7 +41,7 @@
 			<member itemKey="20025" itemName="" itemText="颗粒灰度最大值" description="输入分析颗粒灰度最大值（0~255），不小于分析颗粒灰度最小值。"/>
 			<member itemKey="20020" itemName="" itemText="等效圆直径最小值（微米）" description="输入分析颗粒面积最小值（微米）。"/>
 			<member itemKey="20021" itemName="" itemText="等效圆直径最大值（微米）" description="输入分析颗粒面积最大值（微米）。"/>
-			<member itemKey="20029" itemName="" itemText="其他选择" description="otherselection"/>	
+			<member itemKey="20029" itemName="" itemText="其他筛选" description="otherselection"/>	
 
         </collection>
 		<collection RegName="ResGrp" grpKey="3" text="x-ray参数" description="">

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSImageProcParam.cs

@@ -23,7 +23,6 @@ namespace OTSDataType
         private OTS_BGREMOVE_TYPE m_BGRemoveType;
         private OTS_AUTOBGREMOVE_TYPE m_autoBGRemoveType;
         int m_OverlapParam;
-        string m_OtherSelection;
 
         private CSpecialGrayRangeParam m_specialGreyRangeParam;
         private string particleSelectCondition = "";
@@ -55,18 +54,10 @@ namespace OTSDataType
         
         }
 
-        public string GetOtherSelection()
-        { 
-            return m_OtherSelection;
-        }
         public void SetParticleSelectCondition(string value)
         {
             particleSelectCondition = value;
         }
-        public void SetOtherSelection(string a_OtherSelection)
-        {
-            m_OtherSelection = a_OtherSelection;
-        }
 
         public CSpecialGrayRangeParam GetSpecialGreyRangeParam()
         {
@@ -102,7 +93,6 @@ namespace OTSDataType
             m_BGRemoveType = OTS_BGREMOVE_TYPE.MANUAL;// OTS_BGREMOVE_TYPE.AUTO;
             m_autoBGRemoveType = OTS_AUTOBGREMOVE_TYPE.MIDDLE;           
             m_OverlapParam = 20;
-            m_OtherSelection = "";
         }
         public CDoubleRange GetIncAreaRange() { return m_oIncArea; }
         public void SetIncAreaRange(CDoubleRange a_oVal) { m_oIncArea = a_oVal; }
@@ -143,7 +133,6 @@ namespace OTSDataType
             m_autoBGRemoveType = a_oSource.m_autoBGRemoveType;
             SetParticleSelectCondition(a_oSource.GetParticleSelectCondition());
             m_OverlapParam = a_oSource.m_OverlapParam;
-            m_OtherSelection = a_oSource.m_OtherSelection;
 
         }
         public bool Equals(COTSImageProcParam a_oSource)
@@ -154,8 +143,7 @@ namespace OTSDataType
                 m_oBGGray == a_oSource.m_oBGGray &&
                 m_oParticleGray == a_oSource.m_oParticleGray &&
                
-                m_OverlapParam == a_oSource.m_OverlapParam&&
-                m_OtherSelection==a_oSource.m_OtherSelection;
+                m_OverlapParam == a_oSource.m_OverlapParam;
 
         }
 
@@ -183,9 +171,6 @@ namespace OTSDataType
             xString xpartselcondition = new xString();
             slo.Register("ParticleSelectionCondition", xpartselcondition);
 
-            xString xOtherSelection = new xString();
-            slo.Register("OtherSelection", xOtherSelection);
-
             if (isStoring)
             {
 
@@ -194,7 +179,6 @@ namespace OTSDataType
                
                 xnOverlapParam.AssignValue(m_OverlapParam);
                 xpartselcondition.AssignValue(GetParticleSelectCondition());
-                xOtherSelection.AssignValue(m_OtherSelection);
                 slo.Serialize(true, classDoc, rootNode);
             }
             else
@@ -205,7 +189,6 @@ namespace OTSDataType
                 m_autoBGRemoveType = (OTS_AUTOBGREMOVE_TYPE)Convert.ToInt32( xnautoBGRemoveType.value().Split(':')[0]);
               
                 m_OverlapParam = Convert.ToInt32(xnOverlapParam.value());
-                m_OtherSelection = xOtherSelection.value();
                 SetParticleSelectCondition(xpartselcondition.value());
             }
         }

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSDisplaySampleGrid.cs

@@ -435,32 +435,42 @@ namespace OTSMeasureApp
                         }
 
                         if (null == m_PropWindow.PropGrid[Row, 2])
-                            {
-                                m_PropWindow.PropGrid[Row, 2] = new SourceGrid.Cells.Cell(SampleVal, typeof(string));
-                                m_PropWindow.PropGrid[Row, 1].View = m_Col_NameMode;
-                                m_PropWindow.PropGrid[Row, 2].View = m_Col_ValMode;
-
+                        {
+                            m_PropWindow.PropGrid[Row, 2] = new SourceGrid.Cells.Cell(SampleVal, typeof(string));
+                            m_PropWindow.PropGrid[Row, 1].View = m_Col_NameMode;
+                            m_PropWindow.PropGrid[Row, 2].View = m_Col_ValMode;
 
+                            if (m_PropWindow.PropGrid[Row, 2].Value == ""|| m_PropWindow.PropGrid[Row, 2].Value ==null)
+                            {
+                                m_PropWindow.PropGrid[Row, 2].Value = "NoFilter";
+                            }
 
-                                if (bReadOnly)          //只读模式
-                                {
-                                    m_PropWindow.PropGrid[Row, 2].Editor = null;
-                                    m_PropWindow.PropGrid[Row, 2].View = M_Col_readonly;// 设置只读
+                            if (bReadOnly)          //只读模式
+                            {
+                                m_PropWindow.PropGrid[Row, 2].Editor = null;
+                                m_PropWindow.PropGrid[Row, 2].View = M_Col_readonly;// 设置只读
 
 
-                                    m_PropWindow.PropGrid[Row, 2].AddController(m_ChangeCellValEvent);
-                                }
-                                else
-                                {
-                                    //设置允许修改值的事件
-                                    m_PropWindow.PropGrid[Row, 2].AddController(m_ChangeCellValEvent);
-                                }
+                                m_PropWindow.PropGrid[Row, 2].AddController(m_ChangeCellValEvent);
+                            }
+                            else
+                            {
+                                //设置允许修改值的事件
+                                m_PropWindow.PropGrid[Row, 2].AddController(m_ChangeCellValEvent);
+                            }
+                        }
+                        else
+                        {
+                            if (m_PropWindow.PropGrid[Row, 2].Value == "")
+                            {
+                                m_PropWindow.PropGrid[Row, 2].Value = "NoFilter";
                             }
                             else
                             {
                                 m_PropWindow.PropGrid[Row, 2].Value = SampleVal;
                             }
-                        
+                        }
+
 
 
                         //将ID绑定到行号上，当在行上Click时，就可以查到对应的样品ID所在的行上的的值

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -313,15 +313,27 @@ namespace OTSMeasureApp
                 else if ((OTS_SAMPLE_PROP_GRID_ITEMS)PropGrid.Rows[m_SampleGrid.m_ClickRow].Tag == OTS_SAMPLE_PROP_GRID_ITEMS.OtherSelection && m_SampleGrid.m_ClickColumn == 2)
                 {
                     otherSelectionForm = new OtherSelectionForm();
-                    otherSelectionForm.OtherSelection = PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value.ToString();
+                    if (PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value.ToString() != "NoFilter")
+                    {
+                        otherSelectionForm.OtherSelection = PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value.ToString();
+                    }
+                    else
+                    {
+                        otherSelectionForm.OtherSelection = "";
+                    }
                     DialogResult result = otherSelectionForm.ShowDialog();
 
                     if (result == DialogResult.OK)
                     {
                         string str = PropGrid[0, 0].Value.ToString();
-
-                        PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value = otherSelectionForm.OtherSelection;
-
+                        if (otherSelectionForm.OtherSelection == "")
+                        {
+                            PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value = "NoFilter";
+                        }
+                        else
+                        {
+                            PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value = otherSelectionForm.OtherSelection;
+                        }
                         PropGrid[0, 0].Value = str;
                         PropGrid.Refresh();
                         PropGrid.Invalidate();

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSSampleVisualPropertyInfo.cs

@@ -650,7 +650,7 @@ namespace OTSMeasureApp
                 case OTS_SAMPLE_PROP_GRID_ITEMS.OtherSelection:
                     {
 
-                        m_poMsrParams.GetImageProcessParam().SetOtherSelection((string)objVal);
+                        m_poMsrParams.GetImageProcessParam().SetParticleSelectCondition((string)objVal);
                     }
                     break;
                 default:
@@ -1992,7 +1992,7 @@ namespace OTSMeasureApp
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.OtherSelection:
                     {
-                        a_strValue = m_poMsrParams.GetImageProcessParam().GetOtherSelection();
+                        a_strValue = m_poMsrParams.GetImageProcessParam().GetParticleSelectCondition();
                     }
                     break;
 
@@ -2026,7 +2026,7 @@ namespace OTSMeasureApp
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.OtherSelection:
                     {
-                        a_strValue = m_poMsrParams.GetImageProcessParam().GetOtherSelection();
+                        a_strValue = m_poMsrParams.GetImageProcessParam().GetParticleSelectCondition();
                     }
                     break;
 

OTSIncAMeasureApp/7-OTSProgMgrInfo/OtherSelection.Designer.cs

@@ -56,14 +56,14 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             this.cB_Dmax.AutoSize = true;
             this.cB_Dmax.Location = new System.Drawing.Point(19, 19);
             this.cB_Dmax.Name = "cB_Dmax";
-            this.cB_Dmax.Size = new System.Drawing.Size(48, 16);
+            this.cB_Dmax.Size = new System.Drawing.Size(72, 16);
             this.cB_Dmax.TabIndex = 0;
-            this.cB_Dmax.Text = "Dmax";
+            this.cB_Dmax.Text = "Dmax(um)";
             this.cB_Dmax.UseVisualStyleBackColor = true;
             // 
             // tB_Dmax_min
             // 
-            this.tB_Dmax_min.Location = new System.Drawing.Point(121, 17);
+            this.tB_Dmax_min.Location = new System.Drawing.Point(133, 17);
             this.tB_Dmax_min.Name = "tB_Dmax_min";
             this.tB_Dmax_min.Size = new System.Drawing.Size(72, 21);
             this.tB_Dmax_min.TabIndex = 3;
@@ -71,7 +71,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             // 
             // tB_Dmax_max
             // 
-            this.tB_Dmax_max.Location = new System.Drawing.Point(236, 17);
+            this.tB_Dmax_max.Location = new System.Drawing.Point(248, 17);
             this.tB_Dmax_max.Name = "tB_Dmax_max";
             this.tB_Dmax_max.Size = new System.Drawing.Size(72, 21);
             this.tB_Dmax_max.TabIndex = 4;
@@ -80,7 +80,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(210, 26);
+            this.label3.Location = new System.Drawing.Point(222, 26);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(11, 12);
             this.label3.TabIndex = 5;
@@ -89,7 +89,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(210, 65);
+            this.label1.Location = new System.Drawing.Point(222, 65);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(11, 12);
             this.label1.TabIndex = 9;
@@ -97,7 +97,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             // 
             // tB_Dmin_max
             // 
-            this.tB_Dmin_max.Location = new System.Drawing.Point(236, 56);
+            this.tB_Dmin_max.Location = new System.Drawing.Point(248, 56);
             this.tB_Dmin_max.Name = "tB_Dmin_max";
             this.tB_Dmin_max.Size = new System.Drawing.Size(72, 21);
             this.tB_Dmin_max.TabIndex = 8;
@@ -105,7 +105,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             // 
             // tB_Dmin_min
             // 
-            this.tB_Dmin_min.Location = new System.Drawing.Point(121, 56);
+            this.tB_Dmin_min.Location = new System.Drawing.Point(133, 56);
             this.tB_Dmin_min.Name = "tB_Dmin_min";
             this.tB_Dmin_min.Size = new System.Drawing.Size(72, 21);
             this.tB_Dmin_min.TabIndex = 7;
@@ -116,15 +116,15 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             this.cB_Dmin.AutoSize = true;
             this.cB_Dmin.Location = new System.Drawing.Point(19, 58);
             this.cB_Dmin.Name = "cB_Dmin";
-            this.cB_Dmin.Size = new System.Drawing.Size(48, 16);
+            this.cB_Dmin.Size = new System.Drawing.Size(72, 16);
             this.cB_Dmin.TabIndex = 6;
-            this.cB_Dmin.Text = "Dmin";
+            this.cB_Dmin.Text = "Dmin(um)";
             this.cB_Dmin.UseVisualStyleBackColor = true;
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(210, 105);
+            this.label2.Location = new System.Drawing.Point(222, 105);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(11, 12);
             this.label2.TabIndex = 13;
@@ -132,7 +132,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             // 
             // tB_Aspect_max
             // 
-            this.tB_Aspect_max.Location = new System.Drawing.Point(236, 96);
+            this.tB_Aspect_max.Location = new System.Drawing.Point(248, 96);
             this.tB_Aspect_max.Name = "tB_Aspect_max";
             this.tB_Aspect_max.Size = new System.Drawing.Size(72, 21);
             this.tB_Aspect_max.TabIndex = 12;
@@ -140,7 +140,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             // 
             // tB_Aspect_min
             // 
-            this.tB_Aspect_min.Location = new System.Drawing.Point(121, 96);
+            this.tB_Aspect_min.Location = new System.Drawing.Point(133, 96);
             this.tB_Aspect_min.Name = "tB_Aspect_min";
             this.tB_Aspect_min.Size = new System.Drawing.Size(72, 21);
             this.tB_Aspect_min.TabIndex = 11;
@@ -151,15 +151,15 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             this.cB_Aspect.AutoSize = true;
             this.cB_Aspect.Location = new System.Drawing.Point(19, 98);
             this.cB_Aspect.Name = "cB_Aspect";
-            this.cB_Aspect.Size = new System.Drawing.Size(60, 16);
+            this.cB_Aspect.Size = new System.Drawing.Size(84, 16);
             this.cB_Aspect.TabIndex = 10;
-            this.cB_Aspect.Text = "Aspect";
+            this.cB_Aspect.Text = "Aspect(um)";
             this.cB_Aspect.UseVisualStyleBackColor = true;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(210, 144);
+            this.label4.Location = new System.Drawing.Point(222, 144);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(11, 12);
             this.label4.TabIndex = 17;
@@ -167,7 +167,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             // 
             // tB_orientation_max
             // 
-            this.tB_orientation_max.Location = new System.Drawing.Point(236, 135);
+            this.tB_orientation_max.Location = new System.Drawing.Point(248, 135);
             this.tB_orientation_max.Name = "tB_orientation_max";
             this.tB_orientation_max.Size = new System.Drawing.Size(72, 21);
             this.tB_orientation_max.TabIndex = 16;
@@ -175,7 +175,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             // 
             // tB_orientation_min
             // 
-            this.tB_orientation_min.Location = new System.Drawing.Point(121, 135);
+            this.tB_orientation_min.Location = new System.Drawing.Point(133, 135);
             this.tB_orientation_min.Name = "tB_orientation_min";
             this.tB_orientation_min.Size = new System.Drawing.Size(72, 21);
             this.tB_orientation_min.TabIndex = 15;
@@ -211,12 +211,12 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             this.panel1.Controls.Add(this.cB_Aspect);
             this.panel1.Location = new System.Drawing.Point(12, 12);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(324, 184);
+            this.panel1.Size = new System.Drawing.Size(335, 176);
             this.panel1.TabIndex = 18;
             // 
             // btn_ok
             // 
-            this.btn_ok.Location = new System.Drawing.Point(180, 202);
+            this.btn_ok.Location = new System.Drawing.Point(190, 198);
             this.btn_ok.Name = "btn_ok";
             this.btn_ok.Size = new System.Drawing.Size(75, 23);
             this.btn_ok.TabIndex = 19;
@@ -226,7 +226,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             // 
             // btn_cancel
             // 
-            this.btn_cancel.Location = new System.Drawing.Point(261, 202);
+            this.btn_cancel.Location = new System.Drawing.Point(271, 198);
             this.btn_cancel.Name = "btn_cancel";
             this.btn_cancel.Size = new System.Drawing.Size(75, 23);
             this.btn_cancel.TabIndex = 20;
@@ -239,7 +239,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.ClientSize = new System.Drawing.Size(351, 233);
+            this.ClientSize = new System.Drawing.Size(358, 229);
             this.Controls.Add(this.btn_cancel);
             this.Controls.Add(this.btn_ok);
             this.Controls.Add(this.panel1);

OTSIncAMeasureApp/7-OTSProgMgrInfo/OtherSelection.cs

@@ -156,6 +156,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo
             {
                 _OtherSelection=_OtherSelection.Substring(0, _OtherSelection.Length - 1);
             }
+            
             return true;
         }
 

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -602,7 +602,14 @@ namespace OTSMeasureApp
             }
             //重叠尺寸
             IDC_EDIT_Overlap.Text = m_cotsimgprocprm.GetOverlapParam().ToString();
-            IDC_EDIT_OTHERSELECTION.Text = m_cotsimgprocprm.GetOtherSelection().ToString();
+            if (m_cotsimgprocprm.GetParticleSelectCondition().ToString() == "")
+            {
+                IDC_EDIT_OTHERSELECTION.Text = "NoFilter";
+            }
+            else
+            {
+                IDC_EDIT_OTHERSELECTION.Text = m_cotsimgprocprm.GetParticleSelectCondition().ToString();
+            }
         }
 
         /// <summary>
@@ -784,8 +791,14 @@ namespace OTSMeasureApp
             //m_cotsimgprocprm.SetErrodDilateParam(Convert.ToInt32(IDC_COMBO_CorrosionExpansionCoefficient.Text));
             //重叠像素
             m_cotsimgprocprm.SetOverlapParam(Convert.ToInt32(IDC_EDIT_Overlap.Text));
-
-            m_cotsimgprocprm.SetOtherSelection(IDC_EDIT_OTHERSELECTION.Text);
+            if (IDC_EDIT_OTHERSELECTION.Text != "NoFilter")
+            {
+                m_cotsimgprocprm.SetParticleSelectCondition(IDC_EDIT_OTHERSELECTION.Text);
+            }
+            else
+            {
+                m_cotsimgprocprm.SetParticleSelectCondition("");
+            }
         }
 
         /// <summary>
@@ -2033,13 +2046,20 @@ namespace OTSMeasureApp
             if (otherSelectionForm == null)
             {
                 otherSelectionForm = new _7_OTSProgMgrInfo.OtherSelectionForm();
-                otherSelectionForm.OtherSelection = m_cotsimgprocprm.GetOtherSelection();
+                otherSelectionForm.OtherSelection = m_cotsimgprocprm.GetParticleSelectCondition();
             }
             DialogResult result = otherSelectionForm.ShowDialog();
             if (result == DialogResult.OK)
             {
-                m_cotsimgprocprm.SetOtherSelection(otherSelectionForm.OtherSelection);
-                IDC_EDIT_OTHERSELECTION.Text = otherSelectionForm.OtherSelection;
+                m_cotsimgprocprm.SetParticleSelectCondition(otherSelectionForm.OtherSelection);
+                if (otherSelectionForm.OtherSelection == "")
+                {
+                    IDC_EDIT_OTHERSELECTION.Text = "NoFilter";
+                }
+                else
+                {
+                    IDC_EDIT_OTHERSELECTION.Text = otherSelectionForm.OtherSelection;
+                }
             }
         }
     }

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.designer.cs

@@ -780,6 +780,7 @@
             this.IDC_EDIT_OTHERSELECTION.Margin = new System.Windows.Forms.Padding(2);
             this.IDC_EDIT_OTHERSELECTION.MaxLength = 10;
             this.IDC_EDIT_OTHERSELECTION.Name = "IDC_EDIT_OTHERSELECTION";
+            this.IDC_EDIT_OTHERSELECTION.ReadOnly = true;
             this.IDC_EDIT_OTHERSELECTION.Size = new System.Drawing.Size(158, 21);
             this.IDC_EDIT_OTHERSELECTION.TabIndex = 843;
             this.IDC_EDIT_OTHERSELECTION.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePage.cs

@@ -1902,6 +1902,7 @@ namespace OTSIncAReportGrids
                 int pictureIdx;
                 Bitmap bp;
                 byte[] bytes;
+                IPicture pict;
                 //插入表内容
                 for (int i_row = 0; i_row < dgV_ParticlesDevidePage.Rows.Count; i_row++)
                 {
@@ -1934,7 +1935,7 @@ namespace OTSIncAReportGrids
                                 anchor = patriarch.CreateAnchor(1, 1, 2, 2, i_cell, i_row + 2, i_cell + 1, i_row + 3);//终止比开始位置大1,会自动缩放到一个单元格内的
 
                                 //第五步，创建图片
-                                IPicture pict = patriarch.CreatePicture(anchor, pictureIdx);
+                                pict = patriarch.CreatePicture(anchor, pictureIdx);
                             }
                         }
                         else