优化报告程序grid表部分的代码

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" standalone="yes"?>
 <Language>
-  <DefaultLanguage>EN</DefaultLanguage>
+  <DefaultLanguage>ZH</DefaultLanguage>
 </Language>

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -62,190 +62,115 @@ namespace OTSIncAReportApp
             #endregion
         }
         #endregion
+
+        private ConditionItem SetGeidData(OTS_REPORT_PROP_GRID_ITEMS ID,string name, OTS_ITEM_TYPES ValType,bool ReadOnly,string DescriptionInfo,object DisplayVal,List<string> DownList,object itemVal)
+        {
+            ConditionItem sampleData = new ConditionItem();
+            sampleData.iItemId = ID;
+            sampleData.sSCaptionName = name;
+            sampleData.iItemValType = ValType;
+            sampleData.bReadOnly = ReadOnly;
+            sampleData.sDescriptionInfo = DescriptionInfo;
+            sampleData.itemDisplayVal = DisplayVal;
+            sampleData.comboDownList = DownList;
+            if(itemVal!=null)
+                sampleData.itemVal = itemVal;
+            return sampleData;
+        }
         public void SetDefaultConditionValue()
         {
             m_CurrentConditions.Clear();
             //image condition items.
+            #region 从xml文档中读取的数据信息
+            string ResultData = resTable["sscaptionname1"].ToString();//测量结果数据
+            string GraphicDisplayMode = resTable["sscaptionname3"].ToString();//测量图显示方式
+            string DistributionMap = resTable["sscaptionname14"].ToString();//颗粒分布图
+            string ArrangementDiagram = resTable["sscaptionname15"].ToString();//颗粒排列图
+            string ParticleDisplayMode = resTable["sscaptionname2"].ToString();//颗粒显示方式
+            string ParticleClassDiagram = resTable["sscaptionname13"].ToString();//颗粒分类图
+            string whole = resTable["sscaptionname16"].ToString();//全部
+            string AnalyticalParticle = resTable["sscaptionname17"].ToString();//分析颗粒
+            string custom = resTable["sscaptionname18"].ToString();//自定义
+            string ParticleSize = resTable["sscaptionname5"].ToString();//粒级
+            string MinimumParticle = resTable["sscaptionname6"].ToString();//最小颗粒
+            string MaximumParticle = resTable["sscaptionname7"].ToString();//最大颗粒
+            string ArrangementMode = resTable["sscaptionname22"].ToString();//排列方式
+            string SortByType = resTable["sscaptionname20"].ToString();//按类型排列
+            string ArrangeBySize = resTable["sscaptionname21"].ToString();//按尺寸排列
+            string DimensionCalculationMethod = resTable["sscaptionname8"].ToString();//尺寸计算法
+            string DataTableType = resTable["sscaptionname10"].ToString();//数据表类型
+            string SurveyResults = resTable["sscaptionname25"].ToString();//测量结果概况
+            string SampleMeasurementInformation = resTable["sscaptionname26"].ToString(); //样品测量信息
+            string granularComponent= resTable["sscaptionname27"].ToString();//颗粒成分
+            string ElementComposition= resTable["sscaptionname28"].ToString();//元素成分
+            string ParticleSizeDistribution= resTable["sscaptionname29"].ToString();//颗粒尺寸分布
+            string AverageElementComposition= resTable["sscaptionname30"].ToString();//平均元素成分
+            string TernaryPhaseDiagram= resTable["sscaptionname12"].ToString();//三元相图
+            #endregion
+
+
             //测量结果数据源
             List<string> list_source_str = m_DataMgr.GetSampleListName();
-            string sSCaptionName1 = resTable["sscaptionname1"].ToString();
-            ConditionItem sampleData = new ConditionItem();
-            sampleData.iItemId = OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE;
-            sampleData.sSCaptionName = sSCaptionName1;
-            sampleData.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData.bReadOnly = false;
-            sampleData.sDescriptionInfo = "Select Measurement Result";
-            sampleData.itemDisplayVal = list_source_str[m_DataMgr.WorkingResult];
-            sampleData.comboDownList = list_source_str;
-            sampleData.itemVal = m_DataMgr.WorkingResult;
+            ConditionItem sampleData = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE, ResultData, OTS_ITEM_TYPES.COMBO, false, "Select Measurement Result", list_source_str[m_DataMgr.WorkingResult], list_source_str, m_DataMgr.WorkingResult);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE,sampleData);
 
             //测量图类别 分布图 or 排列图
             List<string> list_datasourcetypelist = m_DataMgr.GetDataSourceTypeList();
-            string sSCaptionName3 = resTable["sscaptionname3"].ToString();
-            string sscaptionname14 = resTable["sscaptionname14"].ToString();
-            string sscaptionname15 = resTable["sscaptionname15"].ToString();
-            List<string> list1 = new List<string>() { sscaptionname14, sscaptionname15 };
-            ConditionItem sampleData2 = new ConditionItem();
-            sampleData2.iItemId = OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE;
-            sampleData2.sSCaptionName = sSCaptionName3;
-            sampleData2.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData2.bReadOnly = false;
-            sampleData2.sDescriptionInfo = "image display mode";
-            sampleData2.itemDisplayVal = list1[0];
-            sampleData2.itemVal = IMAGE_DISPLAY_TYPE.DISTRIBUTION;
-            sampleData2.comboDownList = list1;
+            List<string> list1 = new List<string>() { DistributionMap, ArrangementDiagram };
+            ConditionItem sampleData2 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE, GraphicDisplayMode, OTS_ITEM_TYPES.COMBO,false, "image display mode", list1[0], list1, IMAGE_DISPLAY_TYPE.DISTRIBUTION);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE,sampleData2);
-
-
-            string sSCaptionName2 = resTable["sscaptionname2"].ToString();
-            string sSCaptionName13 = resTable["sscaptionname13"].ToString();
-            ConditionItem sampleData1 = new ConditionItem();
-            sampleData1.iItemId = OTS_REPORT_PROP_GRID_ITEMS.IMAGE_TYPE;
-            sampleData1.sSCaptionName = sSCaptionName2;//测量图类型
-            sampleData1.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData1.bReadOnly = false;
-            sampleData1.sDescriptionInfo = "distribution image Type";
-            sampleData1.itemDisplayVal = "BSE原图";
-            sampleData1.itemVal = IMAGE_TYPE.BSE;
-            sampleData1.comboDownList = new List<string>() { "BSE原图", "分类显示", "Original", "原图颗粒分布" };//bse,颗粒分类图
+            ConditionItem sampleData1 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_TYPE, ParticleDisplayMode, OTS_ITEM_TYPES.COMBO, false, "distribution image Type", "BSE原图", new List<string>() { "BSE原图", "分类显示", "原图拼接", "原图颗粒分布" }, IMAGE_TYPE.BSE);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_TYPE,sampleData1);
 
-
-
-
             //粒级表
-            string sSCaptionName_partsizefile = "粒级表";
             List<string> list_partsizelist = m_DataMgr.GetPartSizeFileList();//从系统默认的路径中查找出所有的粒级表文件
-            ConditionItem sampleData_partsizefile = new ConditionItem();
-            sampleData_partsizefile.iItemId = OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE;
-            sampleData_partsizefile.sSCaptionName = sSCaptionName_partsizefile;
-            sampleData_partsizefile.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData_partsizefile.bReadOnly = false;
-            sampleData_partsizefile.sDescriptionInfo = "Particle Table";
-            sampleData_partsizefile.itemDisplayVal = list_partsizelist[0];
-            sampleData_partsizefile.itemVal = 0;
-            sampleData_partsizefile.comboDownList = list_partsizelist;
+            ConditionItem sampleData_partsizefile = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE, "粒级表", OTS_ITEM_TYPES.COMBO, false, "Particle Table", list_partsizelist[0], list_partsizelist, 0);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE,sampleData_partsizefile);
 
             //粒级
-            string sscaptionname16 = resTable["sscaptionname16"].ToString();
-            string sscaptionname17 = resTable["sscaptionname17"].ToString();
-            string sscaptionname18 = resTable["sscaptionname18"].ToString();
-            ConditionItem sampleData4 = new ConditionItem();
             List<string> sizeList = new List<string>();
             sizeList = m_DataMgr.GetPartSizeList();//获取粒级后额外增加全部，自定义，选项
-            sizeList.Insert(0, sscaptionname16);//全部
-            sizeList.Insert(1, sscaptionname18);//自定义
-
-            string sSCaptionName5 = resTable["sscaptionname5"].ToString();
-            sampleData4.iItemId = OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS;
-            sampleData4.sSCaptionName = sSCaptionName5;
-            sampleData4.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData4.bReadOnly = false;
-            sampleData4.sDescriptionInfo = "Grain Size";
-            sampleData4.itemDisplayVal = sscaptionname16;
-            sampleData4.comboDownList = sizeList;
-            sampleData4.itemVal = 0;
+            sizeList.Insert(0, whole);//全部
+            sizeList.Insert(1, custom);//自定义
+            ConditionItem sampleData4 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS, ParticleSize, OTS_ITEM_TYPES.COMBO, false, "Grain Size", sizeList[0], sizeList, 0);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS,sampleData4);
 
             //自定义最小
-            string sSCaptionName6 = resTable["sscaptionname6"].ToString();
-            ConditionItem sampleData41 = new ConditionItem();
-            sampleData41.iItemId = OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MIN;
-            sampleData41.sSCaptionName = sSCaptionName6;
-            sampleData41.iItemValType = OTS_ITEM_TYPES.DOUBLE;
-            sampleData41.bReadOnly = false;
-            sampleData41.sDescriptionInfo = "Smallest Particle";
-            sampleData41.itemDisplayVal = "0";
+            ConditionItem sampleData41 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MIN, MinimumParticle, OTS_ITEM_TYPES.DOUBLE, false, "Smallest Particle", "0", new List<string> { }, null);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MIN,sampleData41);
 
             //自定义最大
-            string sSCaptionName7 = resTable["sscaptionname7"].ToString();
-            ConditionItem sampleData42 = new ConditionItem();
-            sampleData42.iItemId = OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MAX;
-            sampleData42.sSCaptionName = sSCaptionName7;
-            sampleData42.iItemValType = OTS_ITEM_TYPES.DOUBLE;
-            sampleData42.bReadOnly = false;
-            sampleData42.sDescriptionInfo = "Maximum Particle";
-            sampleData42.itemDisplayVal = "0";
+            ConditionItem sampleData42 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MAX, MaximumParticle, OTS_ITEM_TYPES.DOUBLE, false, "Maximum Particle", "0", new List<string> { }, null);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MAX,sampleData42);
 
             //排列图显示类别
-            string sSCaptionName22 = resTable["sscaptionname22"].ToString();
-            //string sSCaptionName19 = resTable["sscaptionname19"].ToString();
-            string sSCaptionName20 = resTable["sscaptionname20"].ToString();
-            string sSCaptionName21 = resTable["sscaptionname21"].ToString();
-            List<string> list3 = new List<string>() { sSCaptionName20, sSCaptionName21 };
-            ConditionItem sampleData6 = new ConditionItem();
-            sampleData6.iItemId = OTS_REPORT_PROP_GRID_ITEMS.IMAGEGRID_DIS_TYPE;
-            sampleData6.sSCaptionName = sSCaptionName22;
-            sampleData6.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData6.bReadOnly = false;
-            sampleData6.sDescriptionInfo = "Measured Data";
-            sampleData6.itemDisplayVal = list3[0];
-            sampleData6.itemVal = IMAGEGRID_DIS_TYPE.CLASSIFY_TYPE;
-            sampleData6.comboDownList = list3;
+            List<string> list3 = new List<string>() { SortByType, ArrangeBySize };
+            ConditionItem sampleData6 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.IMAGEGRID_DIS_TYPE, ArrangementMode, OTS_ITEM_TYPES.COMBO, false, "Measured Data", list3[0], list3, IMAGEGRID_DIS_TYPE.CLASSIFY_TYPE);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.IMAGEGRID_DIS_TYPE,sampleData6);
 
             //计算方式
-            string sSCaptionName8 = resTable["sscaptionname8"].ToString();
-            ConditionItem sampleData5 = new ConditionItem();
-            sampleData5.iItemId = OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE;
-            sampleData5.sSCaptionName = sSCaptionName8;
-            sampleData5.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData5.bReadOnly = false;
-            sampleData5.sDescriptionInfo = "image property calculation method";
-            sampleData5.itemDisplayVal = "DMAX";
-            sampleData5.itemVal = SIZECALMETHOM.DMAX;
-            sampleData5.comboDownList = m_DataMgr.GetSizeCalMethodTypeList();
+            ConditionItem sampleData5 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE, DimensionCalculationMethod, OTS_ITEM_TYPES.COMBO, false, "image property calculation method", m_DataMgr.GetSizeCalMethodTypeList()[0], m_DataMgr.GetSizeCalMethodTypeList(), SIZECALMETHOM.DMAX);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE,sampleData5);
 
-
             // grid condition items
             //数据表类型
             string sSCaptionName10 = resTable["sscaptionname10"].ToString();
-            List<string> list2 = new List<string>() { resTable["sscaptionname25"].ToString(), resTable["sscaptionname26"].ToString(), resTable["sscaptionname27"].ToString(), resTable["sscaptionname28"].ToString(), resTable["sscaptionname29"].ToString(), resTable["sscaptionname30"].ToString() };
+            List<string> list2 = new List<string>() { SurveyResults, SampleMeasurementInformation, granularComponent, ElementComposition, ParticleSizeDistribution, AverageElementComposition };
             string[] aa = m_ReportApp.Text.Split('-');
             List<string> listStd = new List<string>() { "国标一", "国标二", "美标", "德标" };
             list2.AddRange(listStd);
-            ConditionItem sampleData3 = new ConditionItem();
-            sampleData3.iItemId = OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE;
-            sampleData3.sSCaptionName = sSCaptionName10;
-            sampleData3.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData3.bReadOnly = false;
-            sampleData3.sDescriptionInfo = "Data table type";
-            sampleData3.itemDisplayVal = list2[0];
-            sampleData3.itemVal = CALCULATE_TABLE_TYPE.MEASURE_INFO;
-            sampleData3.comboDownList = list2;
+            ConditionItem sampleData3 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE, DataTableType, OTS_ITEM_TYPES.COMBO, false, "Data table type", list2[0], list2, CALCULATE_TABLE_TYPE.MEASURE_INFO);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE,sampleData3);
 
-
             // chart condition items
            
-            List<string> list22 = new List<string>() { "常用夹杂物分类", resTable["sscaptionname27"].ToString(), resTable["sscaptionname28"].ToString(), resTable["sscaptionname29"].ToString(), resTable["sscaptionname12"].ToString() };
-            ConditionItem sampleData22 = new ConditionItem();
-            sampleData22.iItemId = OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE;
-            sampleData22.sSCaptionName = sSCaptionName10;
-            sampleData22.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData22.bReadOnly = false;
-            sampleData22.sDescriptionInfo = "Data graph type";
-            sampleData22.itemDisplayVal = list22[0];
-            sampleData22.itemVal = CALCULATE_CHART_TYPE.COMMON_FIVE;
-            sampleData22.comboDownList = list22;
+            List<string> list22 = new List<string>() { "常用夹杂物分类", granularComponent, ElementComposition, ParticleSizeDistribution, TernaryPhaseDiagram };
+            ConditionItem sampleData22 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, DataTableType, OTS_ITEM_TYPES.COMBO, false, "Data graph type", list22[0], list22, CALCULATE_CHART_TYPE.COMMON_FIVE);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, sampleData22);
 
             //三元相图模板
-            string sSCaptionName12 = resTable["sscaptionname12"].ToString();
-            ConditionItem sampleData15 = new ConditionItem();
             List<string> trio_listname = m_DataMgr.GetTriTemplateNameList();
-            sampleData15.iItemId = OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE;
-            sampleData15.sSCaptionName = sSCaptionName12;
-            sampleData15.iItemValType = OTS_ITEM_TYPES.COMBO;
-            sampleData15.bReadOnly = false;
-            sampleData15.sDescriptionInfo = "Ternary phase diagram";
-            sampleData15.itemDisplayVal = trio_listname.First();
-            sampleData15.comboDownList = trio_listname;
+            ConditionItem sampleData15 = SetGeidData(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE, TernaryPhaseDiagram, OTS_ITEM_TYPES.COMBO, false, "Ternary phase diagram", trio_listname.First(), trio_listname, null);
             m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE,sampleData15);
 
 
@@ -418,8 +343,6 @@ namespace OTSIncAReportApp
                         var sampleData_partsizefile = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE];
                         list.Add(sampleData_partsizefile);
 
-             
-
 
 
                         //尺寸计算方式
@@ -428,12 +351,6 @@ namespace OTSIncAReportApp
                         list.Add(sampleData5);
                     }
                 }
-                
-               
-
-
-
-
               
             }
             else if (tbindex == DisplayPicutureType.AnalyzeDataTable)//Grid表格页