Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2

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

@@ -430,8 +430,8 @@
 	<Control name="dev_scmj" text="检测面积：" />
 	<Control name="dev_bgsj" text="报告时间:" />
 	<Control name="dev_fdbs" text="测量放大倍数:" />
-	<Control name="xrlabel_size_iconquestion_class" text="颗粒尺寸分类图" />
-	<Control name="xrlabel_size_iconquestion_subdivision" text="颗粒尺寸二级分类图" />
+	<Control name="xrlabel_size_iconquestion_class" text="颗粒分类图" />
+	<Control name="xrlabel_size_iconquestion_subdivision" text="颗粒二级分类图" />
 	<Control name="xrcellelementarea" text="元素分析表" />
 	<Control name="xrcellelementarea_details" text="Reported average chemical composition (w %), area(μ m^2)" />
 	<Control name="xrcell_element_classify" text="分类" />
@@ -463,7 +463,7 @@
 	<Control name="tcell_notes" text="夹杂物指数=夹杂物面积/扫描面积*比例因子" />
 	<Control name="xrtablecell1" text="备注" />
 	<Control name="dev_ypbh_up" text="样品编号:" />
-	<Control name="xrlabel1" text="颗粒堆叠图" />
+	<Control name="xrlabel1" text="颗粒尺寸堆叠图" />
 	
     </Controls>
  </Form>

OTSIncAReportApp/1-UI/OTSReportExport/RuleGroupSelector.cs

@@ -23,11 +23,22 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport
 		public List<DataTable> List_RuleTable;
 		//private DataTable RuleData = new DataTable();
 		int listIndex = -1;
+
+		DataTable BF_dataTable;
+		List<DataTable> BF_List_RuleTable = new List<DataTable>();
+
 		public RuleGroupSelector(DataTable a_dataTable, List<DataTable> a_List_RuleTable)
         {
             InitializeComponent();
 			dt = a_dataTable.Copy();
 			List_RuleTable = a_List_RuleTable.Copy();
+
+			BF_dataTable = a_dataTable.Copy();
+			for (int i = 0; i < a_List_RuleTable.Count; i++)
+			{
+				DataTable dta = a_List_RuleTable[i].Copy();
+				BF_List_RuleTable.Add(dta);
+			}
 		}
 
 		private void RuleGroupSelector_Load(object sender, EventArgs e)
@@ -106,6 +117,16 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport
 
 		private void button2_Click(object sender, EventArgs e)
 		{
+			dt.Clear();
+			dt = BF_dataTable.Copy();
+			List_RuleTable.Clear();
+			for (int i = 0; i < BF_List_RuleTable.Count; i++)
+			{
+				DataTable table = BF_List_RuleTable[i].Copy();
+				List_RuleTable.Add(table);
+			}
+
+
 			this.Close();
 		}
 

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

@@ -224,10 +224,10 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
                 sqlp = sqlp + " and '" + fieldAndPartic + "' like ('%,'||fieldid||'-'||particleid||',%')";
             }
             DataTable DT = dbHelper.ExecuteDataTable(sqlp, null);
-            for (int i = 0; i < DT.Rows.Count; i++)
-            {
-                DT.Rows[i]["Area"] = Math.Sqrt((double)DT.Rows[i]["Area"] / Math.PI) * 2;
-            }
+            //for (int i = 0; i < DT.Rows.Count; i++)
+            //{
+            //    DT.Rows[i]["Area"] = Math.Sqrt((double)DT.Rows[i]["Area"] / Math.PI) * 2;
+            //}
 
 
             return DT;