解决遗漏的选择颗粒和全部颗粒（Echart三元相图部分）

OTSIncAReportApp/1-UI/Control_ECharts/EChart_Trianglediagram.cs

@@ -233,8 +233,9 @@ namespace OTSIncAReportApp.Control_ECharts
             }
             double d = Convert.ToDouble(sizestr.Split(',')[sizestr.Split(',').Length - 1]);
             listName.Add(d.ToString() + "~MAX");
+            int sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             //int sel = m_condition.SourceGridData.ConditionItemList[m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE)].comboDownList.IndexOf(m_ReportApp.SourceGridData.ConditionItemList[1].itemVal.ToString());
-            int sel = m_condition.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
+            //int sel = m_condition.m_SourceGridData.GetPropIndexByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
             string filedAndParticl = "";
             if (sel == 1)
             {

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -126,70 +126,44 @@ namespace OTSIncAReportApp
             //测量结果数据源
             List<string> list_source_str = m_rstDataMgr.GetSampleListName();
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE, resultData, OTS_ITEM_TYPES.COMBO, false, "Select Measurement Result", list_source_str[m_rstDataMgr.GetWorkingResult()], list_source_str, m_rstDataMgr.GetWorkingResult());
-            
             //数据源类型，全部 or selected
             List<string> list_sourcetype = new List<string>() { allParticles, selectParticles };
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE, dataSourceType, OTS_ITEM_TYPES.COMBO, false, "data source type", list_sourcetype[(int)DATASOURCE_TYPE.ALL], list_sourcetype, DATASOURCE_TYPE.ALL);
-            
             //测量图类别 分布图 or 排列图
-
             List<string> list1 = new List<string>() { distributionMap, arrangementDiagram };
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE, graphicDisplayMode, OTS_ITEM_TYPES.COMBO, false, "image display mode", list1[0], list1, IMAGE_DISPLAY_TYPE.DISTRIBUTION);
-            
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_TYPE, particleDisplayMode, OTS_ITEM_TYPES.COMBO, false, "distribution image Type", bseOriginal, new List<string>() { bseOriginal, classifiedDisplay, originalSplicing, originalDistribution }, IMAGE_TYPE.BSE);
-            
-
             //粒级表
             List<string> list_partsizelist = m_rstDataMgr.GetPartSizeFileList();//从系统默认的路径中查找出所有的粒级表文件
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE, particleSizeTable, OTS_ITEM_TYPES.COMBO, false, "Particle Table", list_partsizelist[0], list_partsizelist, 0);
-            
-
             //粒级
             List<string> sizeList = new List<string>();
             sizeList = m_rstDataMgr.GetPartSizeList();//获取粒级后额外增加全部，自定义，选项
             sizeList.Insert(0, whole);//全部
             sizeList.Insert(1, custom);//自定义
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS, particleSize, OTS_ITEM_TYPES.COMBO, false, "Grain Size", sizeList[0], sizeList, 0);
-            
-
             //自定义最小
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MIN, minimumParticle, OTS_ITEM_TYPES.DOUBLE, false, "Smallest Particle", "0", new List<string> { }, null);
-            
-
             //自定义最大
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_MAX, maximumParticle, OTS_ITEM_TYPES.DOUBLE, false, "Maximum Particle", "0", new List<string> { }, null);
-            
-
             //排列图显示类别
             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);
-            
-
-           
             //数据表类型
             List<string> list2 = new List<string>() { surveyResults, sampleMeasurementInformation, granularComponent, elementComposition, particleSizeDistribution, averageElementComposition };
             //string[] aa = m_ReportApp.Text.Split('-');
             List<string> listStd = new List<string>() { chineseStandard1, chineseStandard2, americanStandard, germanStandard };
             list2.AddRange(listStd);
             AddGridData(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);
-            
-
             // chart condition items
-           
             List<string> list22 = new List<string>() { commonClassification, granularComponent, elementComposition, particleSizeDistribution, ternaryPhaseDiagram };
             AddGridData(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);
-           
-
             //三元相图模板
             List<string> trio_listname = m_rstDataMgr.GetTriTemplateNameList();
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE, ternaryPhaseDiagram, OTS_ITEM_TYPES.COMBO, false, "Ternary phase diagram", trio_listname.First(), trio_listname, null);
-            
             //颗粒分类ID
-
             //string stdIdcaption = "ClassifyId";
             //ConditionItem stdIdItm = new ConditionItem();
             List<string> stdlistname = m_rstDataMgr.GetSTDIdList();
@@ -202,8 +176,6 @@ namespace OTSIncAReportApp
             //stdIdItm.comboDownList = stdlistname; 
             //m_CurrentConditions.Add(OTS_REPORT_PROP_GRID_ITEMS.STD_ID, stdIdItm);
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.STD_ID, "ClassifyId", OTS_ITEM_TYPES.COMBO, false, "std list", stdlistname[0], stdlistname, null);
-
-
         }
         #region 属性Grid相关方法
         public void ShowsTheDefaultPic()