improve gb30834.fix some tiny problem.

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

@@ -818,8 +818,8 @@
 	  <Control name="OriginalSplicing" text="原图拼接" />
 	  <Control name="OriginalDistribution" text="原图颗粒分布" />
 	  <Control name="ParticleSizeTable" text="粒级表" />
-	  <Control name="ChineseStandard1" text="GB方法一(30834)" />
-	  <Control name="ChineseStandard2" text="GB方法二(30834)" />
+	  <Control name="ChineseStandard1" text="GB30834方法一(10561)" />
+	  <Control name="ChineseStandard2" text="GB30834方法二" />
 	  <Control name="AmericanStandard" text="美标" />
 	  <Control name="GermanStandard" text="德标" />
 	  <Control name="CommonClassification" text="颗粒成分分类" />

OTSCPP/OTSData/OTSRect.cpp

@@ -62,6 +62,7 @@ bool OTSDATA::COTSRect::IntersectOtherRect(COTSRect r)
 	CPoint rightBottom = r.GetBottomRight();
 	CPoint rightTop = CPoint(rightBottom.x, leftTop.y);
 	CPoint leftBottom = CPoint(leftTop.x, rightBottom.y);
+
 	if (PointInRect(leftTop))
 	{
 		return true;
@@ -78,6 +79,10 @@ bool OTSDATA::COTSRect::IntersectOtherRect(COTSRect r)
 	{
 		return true;
 	}
+	else if (r.PointInRect(CPoint(m_left, m_top)) || r.PointInRect(CPoint(m_right, m_bottom)))
+	{
+		return true;
+	}
 	else
 	{
 		return false;

OTSCPP/OTSRptCalculate/GBCal/GBFieldData.cpp

@@ -1207,7 +1207,11 @@ namespace OTSGBCalculate
 	}
 	BOOL CGBFieldData::IdentifyPartChemicalType(COTSParticlePtr Particle)
 	{
-
+		if (Particle->GetXrayInfo() == NULL)
+		{
+			Particle->SetChemicalType(GB_CHEMICAL_TYPE::INVALID);
+			return false;
+		}
 		auto chamicalList = Particle->GetXrayInfo()->GetElementQuantifyData();
 
 		double dOWeight = 0;

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -2461,7 +2461,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             
             cPropParamClr.SetDataSourceId(0);//
             cPropParamClr.SetType(1);//table
-            cPropParamClr.SetCalTableType(6);//国标1                    
+            cPropParamClr.SetCalTableType(5);//国标1                    
             List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr = m_otsreport_export.m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(cPropParamClr);
             m_otsreport_export.m_ReportApp.im_ChineseStandardABCDDS = new OTSIncAReportGB.ChineseStandardABCDDS(m_otsreport_export.m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr);
             m_otsreport_export.m_ReportApp.m_TablesWindow.Controls.Clear();
@@ -2479,7 +2479,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             
             cPropParamClr.SetDataSourceId(0);//
             cPropParamClr.SetType(1);//table
-            cPropParamClr.SetCalTableType(7);//国标2  
+            cPropParamClr.SetCalTableType(6);//国标2  
             List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr2 = m_otsreport_export.m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(cPropParamClr);//
             m_otsreport_export.m_ReportApp.m_TablesWindow.Controls.Clear();
             m_otsreport_export.m_ReportApp.im_NationalStandardMethodTwo = new OTSIncAReportGB.NationalStandardMethodTwo(m_otsreport_export.m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr2);