optimize GB result.

OTSCPP/OTSRptCalculate/GBCal/CGBGradeData.h

@@ -56,7 +56,7 @@ namespace OTSGBCalculate
 
 				ALevel_w[(int)levelw].AddFld(GBFld);
 
-				ALevel_s[(int)levelw].AddFld(GBFld);
+				ALevel_s[(int)levels].AddFld(GBFld);
 
 				//update the B class grid data
 				levelt = GBFld->GetBLevel()->GetThinGrade();
@@ -68,7 +68,7 @@ namespace OTSGBCalculate
 
 				BLevel_w[(int)levelw].AddFld(GBFld);
 
-				BLevel_s[(int)levelw].AddFld(GBFld);
+				BLevel_s[(int)levels].AddFld(GBFld);
 
 				//update the C class grid data
 
@@ -81,7 +81,7 @@ namespace OTSGBCalculate
 
 				CLevel_w[(int)levelw].AddFld(GBFld);
 
-				CLevel_s[(int)levelw].AddFld(GBFld);
+				CLevel_s[(int)levels].AddFld(GBFld);
 				//update the D class grid data
 				levelt = GBFld->GetDLevel()->GetThinGrade();
 				levelw = GBFld->GetDLevel()->GetWideGrade();
@@ -91,7 +91,7 @@ namespace OTSGBCalculate
 
 				DLevel_w[(int)levelw].AddFld(GBFld);
 
-				DLevel_s[(int)levelw].AddFld(GBFld);
+				DLevel_s[(int)levels].AddFld(GBFld);
 
 
 
@@ -104,7 +104,7 @@ namespace OTSGBCalculate
 
 				DSulfideLevel_w[(int)levelw].AddFld(GBFld);
 
-				DSulfideLevel_s[(int)levelw].AddFld(GBFld);
+				DSulfideLevel_s[(int)levels].AddFld(GBFld);
 
 
 			}

OTSCPP/OTSRptCalculate/GBCal/GBFieldData.cpp

@@ -1130,7 +1130,7 @@ namespace OTSGBCalculate
 		{
 			return GB_WIDTH_TYPE::INVALID;//СÓÚ2um²»¿¼ÂÇ
 		}
-		else if (dWidth >= dMin && dWidth < dMax)
+		else if (dWidth >= dMin && dWidth <= dMax)
 		{
 			return GB_WIDTH_TYPE::THIN;
 		}
@@ -1154,7 +1154,7 @@ namespace OTSGBCalculate
 			dMax = 13;
 			break;
 		}
-		if (dWidth >= dMin && dWidth < dMax)
+		if (dWidth > dMin && dWidth <= dMax)
 		{
 			return GB_WIDTH_TYPE::WIDE;
 		}
@@ -1173,7 +1173,7 @@ namespace OTSGBCalculate
 			dMin = 13;
 			break;
 		}
-		if (dWidth >= dMin)
+		if (dWidth > dMin)
 		{
 			return GB_WIDTH_TYPE::SUPER;
 		}