fix the issue of cleanness calculation of inclusion

OTSCPP/OTSClrInterface/ReportCalculateClr/ReportMgrClr.cpp

@@ -307,6 +307,7 @@ namespace OTSCLRINTERFACE {
 		tbl->Columns->Add("fieldX");
 		tbl->Columns->Add("fieldY");
 		tbl->Columns->Add("grade");
+		tbl->Columns->Add("gradeDetail");
 		tbl->Columns->Add("topGrade");
 		for (auto f : flds)
 		{
@@ -316,6 +317,8 @@ namespace OTSCLRINTERFACE {
 		
 			String^ tmpMStr =gcnew String(f->GetGBGradeString().c_str());
 			r["grade"] = tmpMStr;
+			tmpMStr = gcnew String(f->GetGBGradeDetail().c_str());
+			r["gradeDetail"] = tmpMStr;
 			tbl->Rows->Add(r);
 			int tp = (int)f->GetGBTopGrade();
 			r["topGrade"] = tp;

OTSCPP/OTSRptCalculate/GBCal/GBFieldData.cpp

@@ -289,7 +289,11 @@ namespace OTSGBCalculate
 			{
 				continue;
 			}
-			if (pParticle->GetType() == OTS_PARTICLE_TYPE::ISNOT_INCLUTION)//here we take all the particles except Invalid.
+			if (pParticle->GetClassifyName() == _T("FeO"))//here we take all the particles except Invalid.
+			{
+				continue;
+			}
+			if (pParticle->GetClassifyName() == _T("SiC"))//here we take all the particles except Invalid.
 			{
 				continue;
 			}
@@ -542,10 +546,15 @@ namespace OTSGBCalculate
 			{
 				continue;
 			}
-			if (pParticle->GetType() == OTS_PARTICLE_TYPE::ISNOT_INCLUTION)//here we take all the particles except Invalid.
+			if (pParticle->GetClassifyName() == _T("FeO"))//here we take all the particles except Invalid.
+			{
+				continue;
+			}
+			if (pParticle->GetClassifyName() == _T("SiC"))//here we take all the particles except Invalid.
 			{
 				continue;
 			}
+
 			//check the denominator is zero or not
 			auto w = pParticle->GetDMin();
 
@@ -720,10 +729,15 @@ namespace OTSGBCalculate
 			{
 				continue;
 			}
-			if (pParticle->GetType() == OTS_PARTICLE_TYPE::ISNOT_INCLUTION)//here we take all the particles except Invalid.
+			if (pParticle->GetClassifyName() == _T("FeO"))//here we take all the particles except Invalid.
+			{
+				continue;
+			}
+			if (pParticle->GetClassifyName() == _T("SiC"))//here we take all the particles except Invalid.
 			{
 				continue;
 			}
+
 			auto w = pParticle->GetDMin();
 
 			if (w == 0)
@@ -1393,16 +1407,45 @@ namespace OTSGBCalculate
 	std::string CGBFieldData::GetGBGradeString()
 	{
 		std::string grdStr;
-		CString Astring = _T("A:") + GetGradeString(m_pALevel->GetThinGrade())+_T("(")+DoubleToCString(m_pALevel->GetThinLength())+_T(")") + _T(" ") +
+		CString Astring = _T("A:") + GetGradeString(m_pALevel->GetThinGrade()) + _T(" ") +
+			GetGradeString(m_pALevel->GetWideGrade()) +  _T(" ") +
+			GetGradeString(m_pALevel->GetSuperGrade()) + _T(" ");
+		CString Bstring = _T("B:") + GetGradeString(m_pBLevel->GetThinGrade())  + _T(" ") +
+			GetGradeString(m_pBLevel->GetWideGrade()) +  _T(" ") +
+			GetGradeString(m_pBLevel->GetSuperGrade()) + _T(" ");
+		CString Cstring = _T("C:") + GetGradeString(m_pCLevel->GetThinGrade())  + _T(" ") +
+			GetGradeString(m_pCLevel->GetWideGrade()) + _T(" ") +
+			GetGradeString(m_pCLevel->GetSuperGrade()) +  _T(" ");
+		CString Dstring = _T("D:") + GetGradeString(m_pDLevel->GetThinGrade())+_T(" ") +
+			GetGradeString(m_pDLevel->GetWideGrade()) +_T(" ") +
+			GetGradeString(m_pDLevel->GetSuperGrade()) +_T(" ");
+		if (calcuType == GB_METHODE_TYPE::METHODE_2)
+		{
+			CString DSulstring = _T("DSulfide:") + GetGradeString(GetDSulfideLevel()->GetThinGrade()) + _T(" ") +
+				GetGradeString(GetDSulfideLevel()->GetWideGrade()) + _T(" ") +
+				GetGradeString(GetDSulfideLevel()->GetSuperGrade());
+			grdStr= std::string((Astring + Bstring + Cstring + Dstring + DSulstring).GetBuffer());
+		}
+		else
+		{
+			grdStr= std::string((Astring + Bstring + Cstring + Dstring ).GetBuffer());
+		}
+		
+		return grdStr;
+	}
+	std::string CGBFieldData::GetGBGradeDetail()
+	{
+		std::string grdStr;
+		CString Astring = _T("A:") + GetGradeString(m_pALevel->GetThinGrade()) + _T("(") + DoubleToCString(m_pALevel->GetThinLength()) + _T(")") + _T(" ") +
 			GetGradeString(m_pALevel->GetWideGrade()) + _T("(") + DoubleToCString(m_pALevel->GetWideLength()) + _T(")") + _T(" ") +
 			GetGradeString(m_pALevel->GetSuperGrade()) + _T("(") + DoubleToCString(m_pALevel->GetSuperLength()) + _T(")") + _T(" ");
 		CString Bstring = _T("B:") + GetGradeString(m_pBLevel->GetThinGrade()) + _T("(") + DoubleToCString(m_pBLevel->GetThinLength()) + _T(")") + _T(" ") +
 			GetGradeString(m_pBLevel->GetWideGrade()) + _T("(") + DoubleToCString(m_pBLevel->GetWideLength()) + _T(")") + _T(" ") +
-			GetGradeString(m_pBLevel->GetSuperGrade()) + _T("(")  + DoubleToCString(m_pBLevel->GetSuperLength()) + _T(")") + _T(" ");
-		CString Cstring = _T("C:") + GetGradeString(m_pCLevel->GetThinGrade()) + _T("(")+ DoubleToCString(m_pCLevel->GetThinLength()) + _T(")") + _T(" ") +
+			GetGradeString(m_pBLevel->GetSuperGrade()) + _T("(") + DoubleToCString(m_pBLevel->GetSuperLength()) + _T(")") + _T(" ");
+		CString Cstring = _T("C:") + GetGradeString(m_pCLevel->GetThinGrade()) + _T("(") + DoubleToCString(m_pCLevel->GetThinLength()) + _T(")") + _T(" ") +
 			GetGradeString(m_pCLevel->GetWideGrade()) + _T("(") + DoubleToCString(m_pCLevel->GetWideLength()) + _T(")") + _T(" ") +
 			GetGradeString(m_pCLevel->GetSuperGrade()) + _T("(") + DoubleToCString(m_pCLevel->GetSuperLength()) + _T(")") + _T(" ");
-		CString Dstring = _T("D:") + GetGradeString(m_pDLevel->GetThinGrade())+_T("(") + DoubleToCString(m_pDLevel->GetThinLength()) + _T(")") + _T(" ") +
+		CString Dstring = _T("D:") + GetGradeString(m_pDLevel->GetThinGrade()) + _T("(") + DoubleToCString(m_pDLevel->GetThinLength()) + _T(")") + _T(" ") +
 			GetGradeString(m_pDLevel->GetWideGrade()) + _T("(") + DoubleToCString(m_pDLevel->GetWideLength()) + _T(")") + _T(" ") +
 			GetGradeString(m_pDLevel->GetSuperGrade()) + _T("(") + DoubleToCString(m_pDLevel->GetSuperLength()) + _T(")") + _T(" ");
 		if (calcuType == GB_METHODE_TYPE::METHODE_2)
@@ -1410,13 +1453,13 @@ namespace OTSGBCalculate
 			CString DSulstring = _T("DSulfide:") + GetGradeString(GetDSulfideLevel()->GetThinGrade()) + _T(" ") +
 				GetGradeString(GetDSulfideLevel()->GetWideGrade()) + _T(" ") +
 				GetGradeString(GetDSulfideLevel()->GetSuperGrade());
-			grdStr= std::string((Astring + Bstring + Cstring + Dstring + DSulstring).GetBuffer());
+			grdStr = std::string((Astring + Bstring + Cstring + Dstring + DSulstring).GetBuffer());
 		}
 		else
 		{
-			grdStr= std::string((Astring + Bstring + Cstring + Dstring ).GetBuffer());
+			grdStr = std::string((Astring + Bstring + Cstring + Dstring).GetBuffer());
 		}
-		
+
 		return grdStr;
 	}
 	GB_GRADE_TYPE CGBFieldData::GetGBTopGrade()

OTSCPP/OTSRptCalculate/GBCal/GBFieldData.h

@@ -94,6 +94,8 @@ namespace OTSGBCalculate
 
 		std::string GetGBGradeString();
 
+		std::string GetGBGradeDetail();
+
 		GB_GRADE_TYPE GetGBTopGrade();
 	protected:
 

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -762,7 +762,7 @@ namespace OTSModelSharp
 
                     }
 
-                    m_SemHardwareMgr.SetScanExternal(false);
+                    //m_SemHardwareMgr.SetScanExternal(false);
 
 
 

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -2175,7 +2175,7 @@ namespace OTSIncAReportGraph.Controls
                         }
 
 
-                        string grade = r["grade"].ToString();
+                        string grade = r["gradeDetail"].ToString();
                         df.gradeString = grade;
                         m_CurGBFields.Add(df);
                     }