优化 夹杂物指数

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

@@ -286,7 +286,7 @@
 	  <Control name="groupBox9" text="纳入指数计算" />
 	  <Control name="label22" text="比例因子" />
 	  <Control name="label1" text="显示元素" />
-	  <Control name="groupBox2" text="显示信息设置" />
+	  <Control name="groupBox2" text="特征/夹杂物指数系数" />
 	  <Control name="cb_EquivalentCircleDiameter" text="等效圆直径um" />
 	  <Control name="cb_FerretDiameter" text="费雷特直径um" />
 	  <Control name="cb_DiameterRatio" text="长短直径比" />
@@ -792,7 +792,7 @@
 	  <Control name="col7" text="已检测特征" />
 	  <Control name="col8" text="视场面积(μm" />
 	  <Control name="col9" text="已分析特征总面积 (μm" />
-	  <Control name="col10" text="已检测的特征面积比" />
+	  <Control name="col10" text="特征/夹杂物指数" />
 	  <Control name="col11" text="纳入指数/比例因子" />
 	  <Control name="col12" text="放大倍数" />
     </Controls>

OTSIncAReportApp/1-UI/Control_Grids/ResultGrid.cs

@@ -139,7 +139,6 @@ namespace OTSIncAReportGrids
             double filedsArea = Math.Round(high * wide * pixelSize* pixelSize*  filedCount, 2);
             int particleArea = fielddata.GetparticleArea();
 
-            double ratio = Math.Round(particleArea / filedsArea*1000,3);
             //float ScanFieldSize100 = resfile.GetScanFieldSizeX100();
             //float ScanFieldSize = resfile.GetScanFieldSizeX();
 
@@ -161,6 +160,8 @@ namespace OTSIncAReportGrids
                 }
             }
 
+            double ratio = Math.Round(particleArea / filedsArea*double.Parse(sizestr),3);
+
             keyValues.Add(table["col2"].ToString(), star.ToString("yyyy-MM-dd HH:mm:ss"));
             keyValues.Add(table["col3"].ToString(), end.ToString("yyyy-MM-dd HH:mm:ss"));
             keyValues.Add(table["col4"].ToString(), Math.Round(timeSpan.TotalMinutes, 2).ToString() + "mins");
@@ -183,7 +184,7 @@ namespace OTSIncAReportGrids
             keyValues.Add(table["col9"].ToString()+ "\x00B2)", particleArea.ToString());
             keyValues.Add(table["col10"].ToString(), ratio.ToString());
 
-            keyValues.Add(table["col11"].ToString(), sizestr);
+            //keyValues.Add(table["col11"].ToString(), sizestr);
 
             return keyValues;
         }

OTSIncAReportApp/1-UI/OTSMgrInfo/frmReportSysConfig.cs

@@ -214,6 +214,11 @@ namespace OTSIncAReprotCharts
         //保存报告文件
         private void btn_ybcsbc_Click(object sender, EventArgs e)
         {
+            double blyz = 0;
+            if (!double.TryParse(tb_blyz.Text.ToString(),out blyz))
+            {
+                MessageBox.Show("please check params!");
+            }
             //参数设置保存功能粒级文件
             strParSizeFile = tb_PartiSizeFileFolder.Text;
 

OTSIncAReportApp/3-ServiceCenter/DataOperation/DataAccess/XMLoperate.cs

@@ -303,17 +303,17 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             try
             {
                 XmlDocument xmlDoc = new XmlDocument();
-
                 xmlDoc.Load(FilePath);    //加载Xml文件  
 
-                XmlNodeList nodeList = xmlDoc.GetElementsByTagName(TagName);
+                XmlNodeList nodeList = xmlDoc.GetElementsByTagName("Member");
 
                 foreach (XmlNode node in nodeList)
                 {
                     XmlElement ele = (XmlElement)node;
-
-                    ele.SetAttribute(Name, Value);
-
+                    if (ele.GetAttribute("RegName") == TagName)
+                    {
+                        ele.SetAttribute(Name, Value);
+                    }
 
                 }
                 xmlDoc.Save(FilePath);