修改报告导出部分的格式，去除颗粒列表部分的Size，并修改为面积（um2）增加dmax和dmin两个字段

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -151,7 +151,7 @@ namespace OTSIncAReportApp
             List<string> list3 = new List<string>() { sortByType, arrangeBySize };
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.IMAGEGRID_DIS_TYPE, arrangementMode, OTS_ITEM_TYPES.COMBO, false, "Measured Data", list3[0], list3, IMAGEGRID_DIS_TYPE.CLASSIFY_TYPE);
             //计算方式
-            AddGridData(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE, dimensionCalculationMethod, OTS_ITEM_TYPES.COMBO, false, "image property calculation method", "DMAX", m_rstDataMgr.GetSizeCalMethodTypeList(), SIZE_CAL_METHOD_TYPE.DMAX);
+            AddGridData(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE, dimensionCalculationMethod, OTS_ITEM_TYPES.COMBO, false, "image property calculation method", "CIRCLE", m_rstDataMgr.GetSizeCalMethodTypeList(), SIZE_CAL_METHOD_TYPE.CIRCLE);
             //数据表类型
             List<string> list2 = new List<string>() { surveyResults, sampleMeasurementInformation, granularComponent, elementComposition, particleSizeDistribution, averageElementComposition };
             //string[] aa = m_ReportApp.Text.Split('-');

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -153,6 +153,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             DT_Largest_frame.Columns.Add("pid");
             DT_Largest_frame.Columns.Add("Size");
             DT_Largest_frame.Columns.Add("Width");
+            DT_Largest_frame.Columns.Add("DMAX");
+            DT_Largest_frame.Columns.Add("DMIN");
             DT_Largest_frame.Columns.Add("Class");
             DT_Largest_frame.Columns.Add("ColName1");
             DT_Largest_frame.Columns.Add("ColName2");
@@ -180,6 +182,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             DT_Largest20.Columns.Add("pid");
             DT_Largest20.Columns.Add("Size");
             DT_Largest20.Columns.Add("Width");
+            DT_Largest20.Columns.Add("DMAX");
+            DT_Largest20.Columns.Add("DMIN");
             DT_Largest20.Columns.Add("Class");
             DT_Largest20.Columns.Add("ColName1");
             DT_Largest20.Columns.Add("ColName2");
@@ -300,6 +304,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     //dr["pid"] = str_fieldid + dt_ParticlesGridDevidePage.Rows[i_row]["particleid"].ToString();
                     dr["Size"] = Convert.ToDouble(dt_ParticlesGridDevidePage.Rows[i_row]["area"]).ToString("#0.00"); //可以需要选择切换，计算方式
                     dr["Width"] = dt_ParticlesGridDevidePage.Rows[i_row]["rectwidth"].ToString();
+                    dr["DMAX"] = Math.Round(Convert.ToDouble(dt_ParticlesGridDevidePage.Rows[i_row]["dmax"]), 2).ToString();
+                    dr["DMIN"] = Math.Round(Convert.ToDouble(dt_ParticlesGridDevidePage.Rows[i_row]["dmin"]), 2).ToString();
                     dr["Class"] = dt_ParticlesGridDevidePage.Rows[i_row]["typename"].ToString();
 
 
@@ -464,6 +470,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     dr["pid"] = str_fieldid + dt_ParticlesGridDevidePage.Rows[i_row]["particleid"].ToString();
                     dr["Size"] = Convert.ToDouble(dt_ParticlesGridDevidePage.Rows[i_row]["area"]).ToString("#0.00");  //可以需要选择切换，计算方式
                     dr["Width"] = dt_ParticlesGridDevidePage.Rows[i_row]["rectwidth"].ToString();
+                    dr["DMAX"] = Math.Round(Convert.ToDouble(dt_ParticlesGridDevidePage.Rows[i_row]["dmax"]),2).ToString();
+                    dr["DMIN"] = Math.Round(Convert.ToDouble(dt_ParticlesGridDevidePage.Rows[i_row]["dmin"]),2).ToString();
                     dr["Class"] = dt_ParticlesGridDevidePage.Rows[i_row]["typename"].ToString();
 
                     dr["fieldid"] = str_fieldid;
@@ -529,6 +537,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             FrameGraphSubTable.Columns.Add("pid");
             FrameGraphSubTable.Columns.Add("Size");
             FrameGraphSubTable.Columns.Add("Width");
+            FrameGraphSubTable.Columns.Add("DMAX");
+            FrameGraphSubTable.Columns.Add("DMIN");
             FrameGraphSubTable.Columns.Add("Class");
             FrameGraphSubTable.Columns.Add("ColName1");
             FrameGraphSubTable.Columns.Add("ColName2");
@@ -608,6 +618,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     dr["pid"] = str_fieldid + dt_ParticlesGridDevidePage.Rows[i_row]["particleid"].ToString();
                     dr["Size"] = Convert.ToDouble(dt_ParticlesGridDevidePage.Rows[i_row]["area"]).ToString("#0.00");  //可以需要选择切换，计算方式
                     dr["Width"] = dt_ParticlesGridDevidePage.Rows[i_row]["rectwidth"].ToString();
+                    dr["DMAX"] = Math.Round(Convert.ToDouble(dt_ParticlesGridDevidePage.Rows[i_row]["dmax"]),2).ToString();
+                    dr["DMIN"] = Math.Round(Convert.ToDouble(dt_ParticlesGridDevidePage.Rows[i_row]["dmin"]),2).ToString();
                     dr["Class"] = dt_ParticlesGridDevidePage.Rows[i_row]["typename"].ToString();
 
                     dr["fieldid"] = str_fieldid;

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -1247,16 +1247,16 @@ namespace OTSIncAReportApp
 
 
                 //创建表 Largest_frame
-                string[] strcolumns_Largest_frame = { "pid", "Size", "Width", "Class", "ColName1", "ColName2", "ColName3", "ColName4", "ColName5", "ColName6",
+                string[] strcolumns_Largest_frame = { "pid", "Size", "Width","DMAX","DMIN", "Class", "ColName1", "ColName2", "ColName3", "ColName4", "ColName5", "ColName6",
                 "ColVal1", "ColVal2", "ColVal3", "ColVal4", "ColVal5", "ColVal6" ,"FieldId","p1"};
-                string[] strcoltypes_Largest_frame = { "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT" ,
+                string[] strcoltypes_Largest_frame = { "TEXT", "TEXT", "TEXT", "TEXT","TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT" ,
             "INT","BLOB"};
                 
 
                 //创建表 Largest20
-                string[] strcolumns_Largest20 = { "pid", "Size", "Width", "Class", "ColName1", "ColName2", "ColName3", "ColName4", "ColName5", "ColName6",
+                string[] strcolumns_Largest20 = { "pid", "Size", "Width","DMAX","DMIN", "Class", "ColName1", "ColName2", "ColName3", "ColName4", "ColName5", "ColName6",
                 "ColVal1", "ColVal2", "ColVal3", "ColVal4", "ColVal5", "ColVal6" ,"p1" ,"p2" ,"p3"};
-                string[] strcoltypes_Largest20 = { "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT" ,
+                string[] strcoltypes_Largest20 = {"TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT", "TEXT" ,
             "BLOB","BLOB","BLOB"};
                 
 
@@ -1347,7 +1347,7 @@ namespace OTSIncAReportApp
                             continue;
                         }
 
-                        string ls_sqlstr = "insert into Largest_frame (pid, Size, Width, Class, ColName1, ColName2, ColName3, ColName4, ColName5, ColName6,ColVal1, ColVal2, ColVal3, ColVal4, ColVal5, ColVal6 ,FieldID,p1) values('"
+                        string ls_sqlstr = "insert into Largest_frame (pid, Size, Width, DMAX,DMIN,Class, ColName1, ColName2, ColName3, ColName4, ColName5, ColName6,ColVal1, ColVal2, ColVal3, ColVal4, ColVal5, ColVal6 ,FieldID,p1) values('"
                             + ls_Largest_frame.Rows[i][0].ToString() + "','"
                             + ls_Largest_frame.Rows[i][1].ToString() + "','"
                             + ls_Largest_frame.Rows[i][2].ToString() + "','"
@@ -1363,10 +1363,12 @@ namespace OTSIncAReportApp
                             + ls_Largest_frame.Rows[i][12].ToString() + "','"
                             + ls_Largest_frame.Rows[i][13].ToString() + "','"
                             + ls_Largest_frame.Rows[i][14].ToString() + "','"
-                            + ls_Largest_frame.Rows[i][15].ToString() + "',"
-                            + ls_Largest_frame.Rows[i][16].ToString() + ",:p1)";
+                            + ls_Largest_frame.Rows[i][15].ToString() + "','"
+                             + ls_Largest_frame.Rows[i][16].ToString() + "','"
+                              + ls_Largest_frame.Rows[i][17].ToString() + "',"
+                            + ls_Largest_frame.Rows[i][18].ToString() + ",:p1)";
 
-                        byte[] byte_p1 = (byte[])ls_Largest_frame.Rows[i][17];
+                        byte[] byte_p1 = (byte[])ls_Largest_frame.Rows[i][19];
 
                         int iresult = sh.ExecuteQuery(ls_sqlstr, "p1", byte_p1, tr);
                     }
@@ -1380,16 +1382,16 @@ namespace OTSIncAReportApp
                     DataTable ls_Largest_frame = list_dt.Where(aa => aa.TableName.Contains("FrameGraphSubTable")).ToList()[0];
                     for (int i = 0; i < ls_Largest_frame.Rows.Count; i++)
                     {
-                        if (ls_Largest_frame.Rows[i][17] == null)
+                        if (ls_Largest_frame.Rows[i][19] == null)
                         {
                             continue;
                         }
-                        if (ls_Largest_frame.Rows[i][17] == DBNull.Value)
+                        if (ls_Largest_frame.Rows[i][19] == DBNull.Value)
                         {
                             continue;
                         }
 
-                        string ls_sqlstr = "insert into FrameGraphSubTable (pid, Size, Width, Class, ColName1, ColName2, ColName3, ColName4, ColName5, ColName6,ColVal1, ColVal2, ColVal3, ColVal4, ColVal5, ColVal6 ,FieldID,p1) values('"
+                        string ls_sqlstr = "insert into FrameGraphSubTable (pid, Size, Width,DMAX,DMIN, Class, ColName1, ColName2, ColName3, ColName4, ColName5, ColName6,ColVal1, ColVal2, ColVal3, ColVal4, ColVal5, ColVal6 ,FieldID,p1) values('"
                             + ls_Largest_frame.Rows[i][0].ToString() + "','"
                             + ls_Largest_frame.Rows[i][1].ToString() + "','"
                             + ls_Largest_frame.Rows[i][2].ToString() + "','"
@@ -1405,10 +1407,12 @@ namespace OTSIncAReportApp
                             + ls_Largest_frame.Rows[i][12].ToString() + "','"
                             + ls_Largest_frame.Rows[i][13].ToString() + "','"
                             + ls_Largest_frame.Rows[i][14].ToString() + "','"
-                            + ls_Largest_frame.Rows[i][15].ToString() + "',"
-                            + ls_Largest_frame.Rows[i][16].ToString() + ",:p1)";
+                            + ls_Largest_frame.Rows[i][15].ToString() + "','"
+                            + ls_Largest_frame.Rows[i][16].ToString() + "','"
+                            + ls_Largest_frame.Rows[i][17].ToString() + "',"
+                            + ls_Largest_frame.Rows[i][18].ToString() + ",:p1)";
 
-                        byte[] byte_p1 = (byte[])ls_Largest_frame.Rows[i][17];
+                        byte[] byte_p1 = (byte[])ls_Largest_frame.Rows[i][19];
 
                         int iresult = sh.ExecuteQuery(ls_sqlstr, "p1", byte_p1, tr);
                     }
@@ -1430,7 +1434,7 @@ namespace OTSIncAReportApp
                             continue;
                         }
 
-                        string ls_sqlstr = "insert into Largest20 (pid, Size, Width, Class, ColName1, ColName2, ColName3, ColName4, ColName5, ColName6,ColVal1, ColVal2, ColVal3, ColVal4, ColVal5, ColVal6 ,p1,p2,p3) values('"
+                        string ls_sqlstr = "insert into Largest20 (pid, Size, Width ,DMAX,DMIN,Class, ColName1, ColName2, ColName3, ColName4, ColName5, ColName6,ColVal1, ColVal2, ColVal3, ColVal4, ColVal5, ColVal6 ,p1,p2,p3) values('"
                             + ls_Largest20.Rows[i][0].ToString() + "','"
                             + ls_Largest20.Rows[i][1].ToString() + "','"
                             + ls_Largest20.Rows[i][2].ToString() + "','"
@@ -1446,11 +1450,13 @@ namespace OTSIncAReportApp
                             + ls_Largest20.Rows[i][12].ToString() + "','"
                             + ls_Largest20.Rows[i][13].ToString() + "','"
                             + ls_Largest20.Rows[i][14].ToString() + "','"
-                            + ls_Largest20.Rows[i][15].ToString() + "',:p1,:p2,:p3)";
+                            + ls_Largest20.Rows[i][15].ToString() + "','"
+                            + ls_Largest20.Rows[i][16].ToString() + "','"
+                            + ls_Largest20.Rows[i][17].ToString() + "',:p1,:p2,:p3)";
 
-                        byte[] byte_p1 = (byte[])ls_Largest20.Rows[i][16];
-                        byte[] byte_p2 = (byte[])ls_Largest20.Rows[i][17];
-                        byte[] byte_p3 = (byte[])ls_Largest20.Rows[i][18];
+                        byte[] byte_p1 = (byte[])ls_Largest20.Rows[i][18];
+                        byte[] byte_p2 = (byte[])ls_Largest20.Rows[i][19];
+                        byte[] byte_p3 = (byte[])ls_Largest20.Rows[i][20];
 
                         int iresult = sh.ExecuteQuery(ls_sqlstr, "p1", byte_p1, "p2", byte_p2, "p3", byte_p3, tr);
                     }