去除分析数据表中没有用到的选择颗粒选项

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -385,13 +385,25 @@ namespace OTSIncAReportApp
                 sampleData = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE];
                 list.Add(sampleData);
 
-               var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
-                list.Add(sampleData1);
 
                 //数据表类型
-
                 var sampleData3 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE];
                 list.Add(sampleData3);
+                if ((int)sampleData3.itemVal==(int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO)
+                {
+                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
+                    list.Add(sampleData1);
+                }
+                if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.AVE_ELEMENT_COMP)
+                {
+                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
+                    list.Add(sampleData1);
+                }
+                if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.ELEMENT_COMP)
+                {
+                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
+                    list.Add(sampleData1);
+                }
                 if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_SIZE_DISTRIBUTION )
                 {
                     //粒级表
@@ -400,19 +412,20 @@ namespace OTSIncAReportApp
                     list.Add(sampleData_partsizefile);
 
                     //尺寸计算方法
-
-
                     var sampleData5 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE];
                     list.Add(sampleData5);
+
+                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
+                    list.Add(sampleData1);
                 }
                 if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_COMP)
                 {
                     //尺寸计算方法
-
-
                     var sampleData5 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE];
                     list.Add(sampleData5);
 
+                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
+                    list.Add(sampleData1);
                 }