修改 报告程序概况信息

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

@@ -763,13 +763,14 @@
 	  <Control name="col2" text="Start of operation" />
 	  <Control name="col3" text="End of operation" />
 	  <Control name="col4" text="Running time" />
-	  <Control name="col5" text="Total field of view" />
+	  <Control name="col5" text="Total field of view detected" />
 	  <Control name="col6" text="Analysis standard library" />
 	  <Control name="col7" text="Detected features" />
 	  <Control name="col8" text="Field of view area(sq.μ m)" />
 	  <Control name="col9" text="Total area of analyzed features(sq.μm)" />
 	  <Control name="col10" text="Detected characteristic area ratio " />
 	  <Control name="col11" text="Inclusion/scale" />
+	  <Control name="col12" text="Magnification" />
     </Controls>
  </Form>
    <Form>

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

@@ -759,13 +759,14 @@
 	  <Control name="col2" text="运行开始" />
 	  <Control name="col3" text="运行结束" />
 	  <Control name="col4" text="运行时间" />
-	  <Control name="col5" text="视场总数" />
+	  <Control name="col5" text="已检测视场总数" />
 	  <Control name="col6" text="分析标准库" />
 	  <Control name="col7" text="已检测特征" />
 	  <Control name="col8" text="视场面积(sq.μm)" />
 	  <Control name="col9" text="已分析特征总面积 (sq.μm)" />
 	  <Control name="col10" text="已检测的特征面积比" />
 	  <Control name="col11" text="纳入指数/比例因子" />
+	  <Control name="col12" text="放大倍数" />
     </Controls>
  </Form>
   <Form>

OTSIncAReportApp/1-UI/Control_Grids/ResultGrid.cs

@@ -132,8 +132,6 @@ namespace OTSIncAReportGrids
 
             }
             TimeSpan timeSpan = end - star;
-            string all_FiledCount= ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["SEMDataMsr"])["TotalFields"].ToString();
-
             int filedCount = fielddata.GetFiledCount();
             Dictionary<string, object> sampleMembers = ((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"]);
             Dictionary<string, object> semDataMsr = (Dictionary<string, object>)sampleMembers["SEMDataMsr"];
@@ -147,7 +145,9 @@ namespace OTSIncAReportGrids
             int particleArea = fielddata.GetparticleArea();
 
             double ratio = particleArea / filedsArea;
-
+            int ScanFieldSize100 = Convert.ToInt32(((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["SEMDataMsr"])["ScanFieldSize100"].ToString());
+            int ScanFieldSize = Convert.ToInt32(((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["SEMDataMsr"])["ScanFieldSize"].ToString());
+            double Magnification = ScanFieldSize100 * 100 / ScanFieldSize;
             //报告参数文件
             string xmlpath = Application.StartupPath + m_frmReportApp.m_OTSReportMgrParamFile;
             DataSet ds = XMLoperate.GetXmlData(xmlpath, "XMLData");
@@ -165,7 +165,8 @@ namespace OTSIncAReportGrids
             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");
-            keyValues.Add(table["col5"].ToString(), all_FiledCount.ToString());
+            keyValues.Add(table["col5"].ToString(), filedCount.ToString());
+            keyValues.Add(table["col12"].ToString(), Math.Round(Magnification, 2).ToString());
             string LibraryName = "";
             if ("NoSTDDB"== ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString())
             {

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

@@ -106,7 +106,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             //存放查询数据的数据表
             DataTable DT = null;
 
-            string sql = "select FieldId from IncAData group by FieldId";
+            string sql = "select FieldId from Field";
             DT = dbHelper.ExecuteDataTable(sql, null);
             return DT.Rows.Count;