fix the GB problems

Bin/x64/Debug/Config/ProData/ReportTemplateConfig.xml

@@ -1,18 +1,17 @@
 <XmlConfig>
   <M_SY>
-    <str_tb_ZBT>清洁度分析报告</str_tb_ZBT>
-    <str_tb_FBT>XXX公司</str_tb_FBT>
+    <str_tb_ZBT>Inclusion Analysis </str_tb_ZBT>
+    <str_tb_FBT>马鞍山钢铁股份有限公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>
-    </str_tb_CKBZ>
+    <str_tb_CKBZ>GB/T30834-2014</str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
   </M_SY>
   <M_YMYJ>
-    <str_tb_ymwb>清洁度分析报告</str_tb_ymwb>
+    <str_tb_ymwb>夹杂物分析报告</str_tb_ymwb>
     <str_tb_KHH>Copi0000123012</str_tb_KHH>
     <b_ck_ym>True</b_ck_ym>
-    <str_tb_yjwb>清洁度分析报告</str_tb_yjwb>
+    <str_tb_yjwb>夹杂物分析报告</str_tb_yjwb>
   </M_YMYJ>
   <M_KLFXJG>
     <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
@@ -58,7 +57,7 @@
     <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
-    <str_cb_syxt_mhxssl>3</str_cb_syxt_mhxssl>
+    <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
     <list_lbv_syxt_mblb>
       <MB0>MgO.CaO.Al2O3</MB0>
       <MB1>CaO.S.Al2O3</MB1>

OTSCPP/OTSRptCalculate/DTL/IncADataTable.cpp

@@ -41,6 +41,11 @@ namespace OTSSQLITE
 		AddColumn(std::make_pair(_T("TypeColor"), ColumnType::ID::STRING));
 		AddColumn(std::make_pair(_T("SEMPosX"), ColumnType::ID::INT));
 		AddColumn(std::make_pair(_T("SEMPosY"), ColumnType::ID::INT));
+
+		AddColumn(std::make_pair(_T("GroupId"), ColumnType::ID::INT));
+		AddColumn(std::make_pair(_T("GroupName"), ColumnType::ID::STRING));
+		AddColumn(std::make_pair(_T("GroupColor"), ColumnType::ID::STRING));
+
 		ASSERT(GetColumnCount() == ((int)ColumnID::MAX - (int)ColumnID::MIN) + 1);
 
 		SetTableName(g_sIncAData);

OTSCPP/OTSRptCalculate/DTL/IncADataTable.h

@@ -21,8 +21,7 @@ namespace OTSSQLITE
 			F_AREA = 7,
 			N_POS_X = 8,
 			N_POS_Y = 9,
-			N_INCA_ID = 10,
-			/*N_ELEMENT_NUM = 11,*/
+			N_INCA_ID = 10,		
 			N_SEGMENT_NUM = 11,
 			N_FldPosX = 12,
 			N_FldPosY = 13,
@@ -40,7 +39,11 @@ namespace OTSSQLITE
 			S_COLOR=25,
 			N_SEMPOS_X = 26,
 			N_SEMPOS_Y = 27,
-			MAX = 27
+			N_GRPID = 28,
+			S_GRPNAME = 29,
+			S_GRPCOLOR = 30,
+			MAX = 30
+			
 		};
 
 	

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/OTSSampleReportInfo/OTSSampleReportInfo.cs

@@ -57,7 +57,11 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
         PARTICALE_COMP = 2,
       
         PARTICALE_SIZE_DISTRIBUTION = 3,
-        AVE_ELEMENT_COMP = 4
+        AVE_ELEMENT_COMP = 4,
+        GB_Method1 = 5,
+        GB_Method2 =6,
+        ASTM = 7,
+        DIN = 8
     }
     public enum CALCULATE_CHART_TYPE
     {

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -679,7 +679,95 @@ namespace OTSIncAReportApp
                             m_ReportApp.im_ElementCompositionAvgGrid.Dock = DockStyle.Fill;
                             m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ElementCompositionAvgGrid);
                             m_ReportApp.m_TablesWindow.Activate();
-                            break;                        
+                            break;
+                        case CALCULATE_TABLE_TYPE.GB_Method1:
+                            //国标一
+                            string resultfile = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
+                                + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
+
+                            m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile);
+
+                            OTSCLRINTERFACE.CPropParamClr clr_prop = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
+                            clr_prop.SetDataSourceId(0);//
+                            clr_prop.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
+                            clr_prop.SetCalTableType((int)CALCULATE_TABLE_TYPE.GB_Method1);//国标1                    
+
+                            List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop);//
+
+                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.im_ChineseStandardABCDDS = new ChineseStandardABCDDS(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr);
+
+                            m_ReportApp.im_ChineseStandardABCDDS.Dock = DockStyle.Fill;
+                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ChineseStandardABCDDS);
+                            m_ReportApp.m_TablesWindow.Activate();
+
+
+                            //OpenOTSINcAreportTemplateAPP(m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FilePath+"\\"
+                            //    + m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FileName, "GB1");
+                            break;
+                        case CALCULATE_TABLE_TYPE.GB_Method2:
+                            //国标二
+                            string resultfile2 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
+                                 + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
+
+                            m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile2);
+
+                            OTSCLRINTERFACE.CPropParamClr clr_prop2 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
+                            clr_prop2.SetDataSourceId(0);//
+                            clr_prop2.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
+                            clr_prop2.SetCalTableType((int)CALCULATE_TABLE_TYPE.GB_Method2);//国标2  
+                            List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr2 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop2);//
+
+                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.im_NationalStandardMethodTwo = new NationalStandardMethodTwo(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr2);
+                            m_ReportApp.im_NationalStandardMethodTwo.Dock = DockStyle.Fill;
+                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_NationalStandardMethodTwo);
+                            m_ReportApp.m_TablesWindow.Activate();
+                            //OpenOTSINcAreportTemplateAPP(m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FilePath + "\\"
+                            //    + m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FileName, "GB2");
+                            break;
+                        case CALCULATE_TABLE_TYPE.ASTM:
+                            //美标
+                            string resultfile3 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
+                                + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
+
+                            m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile3);
+
+                            OTSCLRINTERFACE.CPropParamClr clr_prop3 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
+                            clr_prop3.SetDataSourceId(0);//
+                            clr_prop3.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
+                            clr_prop3.SetCalTableType((int)CALCULATE_TABLE_TYPE.ASTM);
+                            List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr3 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop3);
+
+                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.im_ASTMStandardABCDDS = new ASTMStandardABCDDS(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr3);
+                            m_ReportApp.im_ASTMStandardABCDDS.Dock = DockStyle.Fill;
+                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ASTMStandardABCDDS);
+                            m_ReportApp.m_TablesWindow.Activate();
+                            //OpenOTSINcAreportTemplateAPP(m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FilePath + "\\"
+                            //    + m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FileName, "ASTM");
+                            break;
+                        case CALCULATE_TABLE_TYPE.DIN:
+                            //德标
+                            string resultfile4 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
+                               + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
+
+                            m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile4);
+
+                            OTSCLRINTERFACE.CPropParamClr clr_prop4 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
+                            clr_prop4.SetDataSourceId(0);//
+                            clr_prop4.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
+                            clr_prop4.SetCalTableType((int)CALCULATE_TABLE_TYPE.DIN);
+                            List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr4 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop4);
+
+                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.im_DINStandardABCDDS = new DINStandardABCDDS(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr4);
+                            m_ReportApp.im_DINStandardABCDDS.Dock = DockStyle.Fill;
+                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_DINStandardABCDDS);
+                            m_ReportApp.m_TablesWindow.Activate();
+                            //OpenOTSINcAreportTemplateAPP(m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FilePath + "\\"
+                            //    + m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FileName, "DIN");
+                            break;
                     }
 
                     #endregion 第二页选项窗体，分析数据表