CIRCLE修改为ECD在报告表达上

OTSIncAReportApp/1-UI/Control_ECharts/EChart_ParticlesComposition.cs

@@ -870,7 +870,7 @@ namespace OTSIncAReportApp.Control_ECharts
                 case "DMIN":
                     po = "DMIN";
                     break;
-                case "CIRCLE":
+                case "ECD":
                     po = "Area";
                     break;
                 case "FERET":
@@ -963,7 +963,7 @@ namespace OTSIncAReportApp.Control_ECharts
                 case "DMIN":
                     po = "DMIN";
                     break;
-                case "CIRCLE":
+                case "ECD":
                     po = "Area";
                     break;
                 case "FERET":
@@ -1327,7 +1327,7 @@ namespace OTSIncAReportApp.Control_ECharts
                                 case "DMIN":
                                     po = "DMIN";
                                     break;
-                                case "CIRCLE":
+                                case "ECD":
                                     po = "Area";
                                     break;
                                 case "FERET":

OTSIncAReportApp/1-UI/Control_ECharts/EChart_Trianglediagram.cs

@@ -333,7 +333,7 @@ namespace OTSIncAReportApp.Control_ECharts
                 case "DMIN":
                     po = "DMIN";
                     break;
-                case "CIRCLE":
+                case "ECD":
                     po = "Area";
                     break;
                 case "FERET":

OTSIncAReportApp/1-UI/Control_Grids/CompositionDistributionGrid.cs

@@ -99,7 +99,7 @@ namespace OTSIncAReportGrids
                     //创建Grid的列最大直径
                     gridView.Columns.Add("max", str7);
                     break;
-                case "CIRCLE":
+                case "ECD":
                     po = "Area";
                     //创建Grid的列平均直径
                     gridView.Columns.Add("av", str3);
@@ -172,7 +172,7 @@ namespace OTSIncAReportGrids
                                     max = kv.Value[i].DMIN;
                                 }
                                 break;
-                            case "CIRCLE":
+                            case "ECD":
                                 avg += kv.Value[i].Area;
                                 if (kv.Value[i].Area > max)
                                 {
@@ -235,7 +235,7 @@ namespace OTSIncAReportGrids
                     }
                     else if (gridView.Columns[k].Name.ToLower() == "av" || gridView.Columns[k].Name.ToLower() == "max")
                     {
-                        if (con == "CIRCLE")
+                        if (con == "ECD")
                         {
                             double Area = Convert.ToDouble(dt.Rows[i][gridView.Columns[k].Name]);
                             gridView.Rows[add_rowindex].Cells[k].Value = Math.Round(Math.Sqrt(Area / Math.PI)* 2,2);
@@ -293,7 +293,7 @@ namespace OTSIncAReportGrids
                     }
                     else if (gridView.Columns[k].Name.ToLower() == "av" || gridView.Columns[k].Name.ToLower() == "max")
                     {
-                        if (con == "CIRCLE")
+                        if (con == "ECD")
                         {
                             double Area = Convert.ToDouble(dt.Rows[i][gridView.Columns[k].Name]);
                             gridView.Rows[add_rowindex].Cells[k].Value = Math.Round(Math.Sqrt(Area / Math.PI) * 2, 2);

OTSIncAReportApp/1-UI/Control_Grids/ParticlesSizeGrid.cs

@@ -210,7 +210,7 @@ namespace OTSIncAReportGrids
                 case "DMIN":
                     po = "DMIN";
                     break;
-                case "CIRCLE":
+                case "ECD":
                     po = "Area";
                     break;
                 case "FERET":

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -154,7 +154,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", "CIRCLE", m_rstDataMgr.GetSizeCalMethodTypeList(), SIZE_CAL_METHOD_TYPE.CIRCLE);
+            AddGridData(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE, dimensionCalculationMethod, OTS_ITEM_TYPES.COMBO, false, "image property calculation method", "ECD", m_rstDataMgr.GetSizeCalMethodTypeList(), SIZE_CAL_METHOD_TYPE.CIRCLE);
             //数据表类型
             List<string> list2 = new List<string>() { surveyResults, sampleMeasurementInformation, granularComponent, particleSizeDistribution, averageElementComposition };
             ResultFile resultinfo = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResultId()];

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -285,7 +285,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 case "DMIN":
                     po = "DMIN";
                     break;
-                case "CIRCLE":
+                case "ECD":
                     po = "Area";
                     break;
                 case "FERET":
@@ -2299,7 +2299,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 case "DMIN":
                     po = "DMIN";
                     break;
-                case "CIRCLE":
+                case "ECD":
                     po = "Area";
                     break;
                 case "FERET":

OTSIncAReportApp/2-CommonFunction/OTSDataMgrFunction/ResultDataMgr.cs

@@ -330,7 +330,7 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
         /// <returns></returns>
         public List<string> GetSizeCalMethodTypeList()
         {
-            List<string> ret_list = new List<string>() { "DMAX", "DMIN", "FERET", "CIRCLE" };
+            List<string> ret_list = new List<string>() { "DMAX", "DMIN", "FERET", "ECD" };
             return ret_list;
         }
         public List<string> ParticleRange()