Adjust the order of the list blocks in the C++ section

OTSCPP/OTSRptCalculate/Model/PropParam.cpp

@@ -734,7 +734,6 @@ namespace OTSMODEL {
 		m_nImageDisplayType = IMAGE_DISPLAY_TYPE::GENERAL;
 		m_nImageType = IMAGE_TYPE::BSE;
 		m_nMeasureDataType = MEASURE_DATA_TYPE::ALL_PARTICLE;
-		m_nCalTableType = CALCULATE_TABLE_TYPE::MEASURE_INFO;
 		m_nCalChartType = CALCULATE_CHART_TYPE::COMMON_FIVE;
 		m_nPartType = PARTICLE_TYPE::ALL ;
 		

OTSCPP/OTSRptCalculate/Model/PropParam.h

@@ -55,17 +55,15 @@ namespace OTSMODEL {
 	{
 		INVALID = -1,
 		MIN = 0,
-		MEASURE_INFO = 0,
-		PARTICALE_GENE_INFO = 1,
-		PARTICALE_COMP = 2,
-		PARTICALE_SIZE_DISTRIBUTION = 3,
-		AVE_ELEMENT_COMP =4,
-		GB_Method1 = 5,
-		GB_Method2 = 6,
-		ASTM = 7,
-		DIN = 8,
-		YB6156 = 9,
-		MAX = 9
+		PARTICALE_COMP = 1,
+		PARTICALE_SIZE_DISTRIBUTION = 2,
+		AVE_ELEMENT_COMP =3,
+		GB_Method1 = 4,
+		GB_Method2 = 5,
+		ASTM = 6,
+		DIN = 7,
+		YB6156 = 8,
+		MAX =8
 	}CALCULATE_TABLE_TYPE;
 
 	

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePage.cs

@@ -2,7 +2,6 @@
 using NPOI.SS.UserModel.Charts;
 using NPOI.SS.Util;
 using NPOI.XSSF.UserModel;
-using OTSCLRINTERFACE;
 using OTSCommon.DBOperate;
 using OTSCommon.DBOperate.Model;
 

OTSIncAReportApp/1-UI/GBCalculate/ChineseStandardABCDDS.cs

@@ -38,19 +38,19 @@ namespace OTSIncAReportGB
 
 
         //获取从框架得到的底层计算结果,国标表A
-        List<CGridDataClr> m_list_cgriddataclr_A = null;
+        List<CGridDataClr> m_list_cgriddataclr_A = new List<CGridDataClr>();
 
         //获取从框架得到的底层计算结果,国标表B
-        List<CGridDataClr> m_list_cgriddataclr_B = null;
+        List<CGridDataClr> m_list_cgriddataclr_B = new List<CGridDataClr>();
 
         //获取从框架得到的底层计算结果,国标表C
-        List<CGridDataClr> m_list_cgriddataclr_C = null;
+        List<CGridDataClr> m_list_cgriddataclr_C = new List<CGridDataClr>();
 
         //获取从框架得到的底层计算结果,国标表D
-        List<CGridDataClr> m_list_cgriddataclr_D = null;
+        List<CGridDataClr> m_list_cgriddataclr_D = new List<CGridDataClr>();
 
         //获取从框架得到的底层计算结果,国标表DS
-        List<CGridDataClr> m_list_cgriddataclr_DS = null;
+        List<CGridDataClr> m_list_cgriddataclr_DS = new List<CGridDataClr>();
         //定义整个一组返回List
         List<CGridDataClr> m_list_ALL = null;
 

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -779,7 +779,7 @@ namespace OTSIncAReportApp
                             clr_prop.SetDataSourceList(datasourcelist);
                             clr_prop.SetDataSourceId(index);//
 
-                            clr_prop.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
+                            clr_prop.SetType((int)DisplayPicutureType.AnalyzeSheetandChart);//table
                             clr_prop.SetCalTableType((int)CALCULATE_TABLE_TYPE.GB_Method1);//国标1                    
 
                             List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop);//
@@ -818,7 +818,7 @@ namespace OTSIncAReportApp
                             clr_prop2.SetDataSourceList(datasourcelist2);
                             clr_prop2.SetDataSourceId(index2);//
 
-                            clr_prop2.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
+                            clr_prop2.SetType((int)DisplayPicutureType.AnalyzeSheetandChart);//table
                             clr_prop2.SetCalTableType((int)CALCULATE_TABLE_TYPE.GB_Method2);//国标2  
                             List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr2 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop2);//
 
@@ -854,7 +854,7 @@ namespace OTSIncAReportApp
                             clr_prop3.SetDataSourceList(datasourcelist3);
                             clr_prop3.SetDataSourceId(index3);//
 
-                            clr_prop3.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
+                            clr_prop3.SetType((int)DisplayPicutureType.AnalyzeSheetandChart);//table
                             clr_prop3.SetCalTableType((int)CALCULATE_TABLE_TYPE.ASTM);
                             List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr3 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop3);
 
@@ -889,7 +889,7 @@ namespace OTSIncAReportApp
                             clr_prop4.SetDataSourceList(datasourcelist4);
                             clr_prop4.SetDataSourceId(index4);//
 
-                            clr_prop4.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
+                            clr_prop4.SetType((int)DisplayPicutureType.AnalyzeSheetandChart);//table
                             clr_prop4.SetCalTableType((int)CALCULATE_TABLE_TYPE.DIN);
                             List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr4 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop4);
 
@@ -926,7 +926,7 @@ namespace OTSIncAReportApp
                             clr_prop5.SetDataSourceList(datasourcelist5);
                             clr_prop5.SetDataSourceId(index5);//
 
-                            clr_prop5.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
+                            clr_prop5.SetType((int)DisplayPicutureType.AnalyzeSheetandChart);//table
                             clr_prop5.SetCalTableType((int)CALCULATE_TABLE_TYPE.YB6156);
                             List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr5 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop5);