Merge branch 'OTSRelease3_2' into IntegrationInterface

Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="Bruker" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="Bruker" WeightPercentageToAtomicPercentage="false" />
+  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="OffLine" WeightPercentageToAtomicPercentage="false" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

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

@@ -1782,7 +1782,7 @@
  <Form>
     <Name>SlopFocus</Name>
     <Controls>
-	  <Control name="SlopFocus" text="是否启用" />
+	  <Control name="SlopFocus" text="斜面聚焦" />
       <Control name="cB_enable" text="是否启用" />
 	  <Control name="groupBox1" text="第一点" />
 	  <Control name="label8" text="工作距离" />

OTSIncAReportApp/1-UI/Control_Grids/ResultGrid.cs

@@ -182,7 +182,6 @@ namespace OTSIncAReportGrids
             //判断系统类型是否为夹杂物
             if (resultSysType[0] == "0")
             {
-                //夹杂物标准库设置
                 //0：只使用内置标准库
                 if (result[0] == "0")
                 {
@@ -238,7 +237,7 @@ namespace OTSIncAReportGrids
 
 			keyValues.Add(table["col6"].ToString(), LibraryName);
             keyValues.Add(table["col7"].ToString(), fielddata.GetparticleCount().ToString());
-            keyValues.Add(table["col8"].ToString() + "\x00B2)",Math.Round(filedsArea,2).ToString());
+            keyValues.Add(table["col8"].ToString() + "\x00B2)",Math.Round(filedsArea,1).ToString());
             keyValues.Add(table["col9"].ToString()+ "\x00B2)", String.Format("{0:f2}", particleArea));
             keyValues.Add(table["col10"].ToString(), ratio.ToString());
 

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

@@ -242,8 +242,35 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
 				}
 
 			}
+            return data;
+        }
+
 
+        public DataTable GetParticleAllForBig(string fieldAndPartic)
+        {
+            string sqlp = @"select * from INcAData where";
+            if (fieldAndPartic != "")
+            {
+                sqlp = sqlp + " '" + fieldAndPartic + "' like ('%,'||fieldid||'-'||particleid||',%')";
+            }
+            DataTable DT = dbHelper.ExecuteDataTable(sqlp, null);
+            DT.Columns.Add("ECD", typeof(double));
 
+            for (int i = 0; i < DT.Rows.Count; i++)
+            {
+                DT.Rows[i]["ECD"] = Math.Sqrt((double)DT.Rows[i]["Area"] / Math.PI) * 2;
+            }
+
+            DataTable data = DT.Clone();
+
+            for (int i = 0; i < DT.Rows.Count; i++)
+            {
+                if (Convert.ToInt32(DT.Rows[i]["ParticleId"]) > -1)
+                {
+                    data.Rows.Add(DT.Rows[i].ItemArray);
+                }
+
+            }
             return data;
         }
 
@@ -804,7 +831,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
         {
             string vs = "," + sub.Replace(':', '-') + ",";
 
-            DataTable dataTable = GetParticleAll(vs);
+            DataTable dataTable = GetParticleAllForBig(vs);
             if (dataTable.Rows.Count == 0)
             {
                 return null;