highlight the GB particle of every single GB field according to the GB level.

OTS.sln

@@ -79,9 +79,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxfordExtenderWrapper", "Ox
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		CleannessRelease|Any CPU = CleannessRelease|Any CPU
-		CleannessRelease|x64 = CleannessRelease|x64
-		CleannessRelease|x86 = CleannessRelease|x86
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
@@ -96,12 +93,6 @@ Global
 		Release_oxford61|x86 = Release_oxford61|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Any CPU
-		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.CleannessRelease|Any CPU.Build.0 = CleannessRelease|Any CPU
-		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Any CPU
-		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.CleannessRelease|x86.Build.0 = CleannessRelease|Any CPU
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Debug|Any CPU.Build.0 = Debug|x64
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Debug|x64.ActiveCfg = Debug|x64
@@ -126,12 +117,6 @@ Global
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Any CPU
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release_oxford61|x86.Build.0 = Release_oxford61|Any CPU
-		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Any CPU
-		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.CleannessRelease|Any CPU.Build.0 = CleannessRelease|Any CPU
-		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.CleannessRelease|x86.ActiveCfg = CleannessRelease|x86
-		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.CleannessRelease|x86.Build.0 = CleannessRelease|x86
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Debug|x64.ActiveCfg = Debug|x64
@@ -156,11 +141,6 @@ Global
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release_oxford61|x86.ActiveCfg = Release_oxford61|x86
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release_oxford61|x86.Build.0 = Release_oxford61|x86
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Win32
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Win32
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.CleannessRelease|x86.Build.0 = CleannessRelease|Win32
 		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Debug|x64.ActiveCfg = Debug|x64
 		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Debug|x64.Build.0 = Debug|x64
@@ -181,11 +161,6 @@ Global
 		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Win32
 		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford61|x86.Build.0 = Release_oxford61|Win32
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Win32
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Win32
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.CleannessRelease|x86.Build.0 = CleannessRelease|Win32
 		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Debug|x64.ActiveCfg = Debug|x64
 		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Debug|x64.Build.0 = Debug|x64
@@ -206,11 +181,6 @@ Global
 		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Win32
 		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford61|x86.Build.0 = Release_oxford61|Win32
-		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Win32
-		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Win32
-		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.CleannessRelease|x86.Build.0 = CleannessRelease|Win32
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Debug|x64.ActiveCfg = Debug|x64
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Debug|x64.Build.0 = Debug|x64
@@ -231,11 +201,6 @@ Global
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Win32
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release_oxford61|x86.Build.0 = Release_oxford61|Win32
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Win32
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Win32
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.CleannessRelease|x86.Build.0 = CleannessRelease|Win32
 		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Debug|x64.ActiveCfg = Debug|x64
 		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Debug|x64.Build.0 = Debug|x64
@@ -256,11 +221,6 @@ Global
 		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Win32
 		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford61|x86.Build.0 = Release_oxford61|Win32
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Win32
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Win32
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.CleannessRelease|x86.Build.0 = CleannessRelease|Win32
 		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Debug|x64.ActiveCfg = Debug|x64
 		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Debug|x64.Build.0 = Debug|x64
@@ -281,11 +241,6 @@ Global
 		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Win32
 		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford61|x86.Build.0 = Release_oxford61|Win32
-		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Win32
-		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Win32
-		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.CleannessRelease|x86.Build.0 = CleannessRelease|Win32
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Debug|x64.ActiveCfg = Debug|x64
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Debug|x64.Build.0 = Debug|x64
@@ -307,11 +262,6 @@ Global
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Win32
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release_oxford61|x86.Build.0 = Release_oxford61|Win32
-		{490A8592-7B13-4536-B475-028E73007FAE}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Win32
-		{490A8592-7B13-4536-B475-028E73007FAE}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{490A8592-7B13-4536-B475-028E73007FAE}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{490A8592-7B13-4536-B475-028E73007FAE}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Win32
-		{490A8592-7B13-4536-B475-028E73007FAE}.CleannessRelease|x86.Build.0 = CleannessRelease|Win32
 		{490A8592-7B13-4536-B475-028E73007FAE}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{490A8592-7B13-4536-B475-028E73007FAE}.Debug|x64.ActiveCfg = Debug|x64
 		{490A8592-7B13-4536-B475-028E73007FAE}.Debug|x64.Build.0 = Debug|x64
@@ -332,11 +282,6 @@ Global
 		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Win32
 		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford61|x86.Build.0 = Release_oxford61|Win32
-		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Win32
-		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Win32
-		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.CleannessRelease|x86.Build.0 = CleannessRelease|Win32
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Debug|x64.ActiveCfg = Debug|x64
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Debug|x64.Build.0 = Debug|x64
@@ -357,11 +302,6 @@ Global
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Win32
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release_oxford61|x86.Build.0 = Release_oxford61|Win32
-		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Win32
-		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Win32
-		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.CleannessRelease|x86.Build.0 = CleannessRelease|Win32
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Debug|x64.ActiveCfg = Debug|x64
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Debug|x64.Build.0 = Debug|x64
@@ -382,12 +322,6 @@ Global
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Win32
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release_oxford61|x86.Build.0 = Release_oxford61|Win32
-		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Any CPU
-		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.CleannessRelease|Any CPU.Build.0 = CleannessRelease|Any CPU
-		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Any CPU
-		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.CleannessRelease|x86.Build.0 = CleannessRelease|Any CPU
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Debug|x64.ActiveCfg = Debug|x64
@@ -412,12 +346,6 @@ Global
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Any CPU
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release_oxford61|x86.Build.0 = Release_oxford61|Any CPU
-		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Any CPU
-		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.CleannessRelease|Any CPU.Build.0 = CleannessRelease|Any CPU
-		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Any CPU
-		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.CleannessRelease|x86.Build.0 = CleannessRelease|Any CPU
 		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Debug|x64.ActiveCfg = Debug|x64
@@ -442,12 +370,6 @@ Global
 		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Any CPU
 		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Release_oxford61|x86.Build.0 = Release_oxford61|Any CPU
-		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Any CPU
-		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.CleannessRelease|Any CPU.Build.0 = CleannessRelease|Any CPU
-		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Any CPU
-		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.CleannessRelease|x86.Build.0 = CleannessRelease|Any CPU
 		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Debug|x64.ActiveCfg = Debug|x64
@@ -472,12 +394,6 @@ Global
 		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Any CPU
 		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Release_oxford61|x86.Build.0 = Release_oxford61|Any CPU
-		{474772DC-334A-4E87-BB46-3ABD913AA44A}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Any CPU
-		{474772DC-334A-4E87-BB46-3ABD913AA44A}.CleannessRelease|Any CPU.Build.0 = CleannessRelease|Any CPU
-		{474772DC-334A-4E87-BB46-3ABD913AA44A}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{474772DC-334A-4E87-BB46-3ABD913AA44A}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{474772DC-334A-4E87-BB46-3ABD913AA44A}.CleannessRelease|x86.ActiveCfg = CleannessRelease|x86
-		{474772DC-334A-4E87-BB46-3ABD913AA44A}.CleannessRelease|x86.Build.0 = CleannessRelease|x86
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Debug|x64.ActiveCfg = Debug|x64
@@ -502,12 +418,6 @@ Global
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release_oxford61|x86.ActiveCfg = Release_oxford61|x86
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release_oxford61|x86.Build.0 = Release_oxford61|x86
-		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Any CPU
-		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.CleannessRelease|Any CPU.Build.0 = CleannessRelease|Any CPU
-		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Any CPU
-		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.CleannessRelease|x86.Build.0 = CleannessRelease|Any CPU
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Debug|x64.ActiveCfg = Debug|x64
@@ -532,12 +442,6 @@ Global
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Any CPU
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Release_oxford61|x86.Build.0 = Release_oxford61|Any CPU
-		{3B7695AA-8231-45AC-B493-84390A945D02}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Any CPU
-		{3B7695AA-8231-45AC-B493-84390A945D02}.CleannessRelease|Any CPU.Build.0 = CleannessRelease|Any CPU
-		{3B7695AA-8231-45AC-B493-84390A945D02}.CleannessRelease|x64.ActiveCfg = CleannessRelease|x64
-		{3B7695AA-8231-45AC-B493-84390A945D02}.CleannessRelease|x64.Build.0 = CleannessRelease|x64
-		{3B7695AA-8231-45AC-B493-84390A945D02}.CleannessRelease|x86.ActiveCfg = CleannessRelease|Any CPU
-		{3B7695AA-8231-45AC-B493-84390A945D02}.CleannessRelease|x86.Build.0 = CleannessRelease|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Debug|x64.ActiveCfg = Debug|x64
@@ -562,12 +466,6 @@ Global
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release_oxford61|x86.Build.0 = Release_oxford61|Any CPU
-		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.CleannessRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.CleannessRelease|Any CPU.Build.0 = Release|Any CPU
-		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.CleannessRelease|x64.ActiveCfg = Release|Any CPU
-		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.CleannessRelease|x64.Build.0 = Release|Any CPU
-		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.CleannessRelease|x86.ActiveCfg = Release|Any CPU
-		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.CleannessRelease|x86.Build.0 = Release|Any CPU
 		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Debug|x64.ActiveCfg = Debug|x64
@@ -592,12 +490,6 @@ Global
 		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release_oxford61|x64.Build.0 = Release_oxford61|x64
 		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release_oxford61|x86.ActiveCfg = Release_oxford61|Any CPU
 		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release_oxford61|x86.Build.0 = Release_oxford61|Any CPU
-		{B2683648-C829-40E7-A479-AC90B1B80286}.CleannessRelease|Any CPU.ActiveCfg = Debug|x64
-		{B2683648-C829-40E7-A479-AC90B1B80286}.CleannessRelease|Any CPU.Build.0 = Debug|x64
-		{B2683648-C829-40E7-A479-AC90B1B80286}.CleannessRelease|x64.ActiveCfg = Release|Any CPU
-		{B2683648-C829-40E7-A479-AC90B1B80286}.CleannessRelease|x64.Build.0 = Release|Any CPU
-		{B2683648-C829-40E7-A479-AC90B1B80286}.CleannessRelease|x86.ActiveCfg = Release|Any CPU
-		{B2683648-C829-40E7-A479-AC90B1B80286}.CleannessRelease|x86.Build.0 = Release|Any CPU
 		{B2683648-C829-40E7-A479-AC90B1B80286}.Debug|Any CPU.ActiveCfg = Release|Any CPU
 		{B2683648-C829-40E7-A479-AC90B1B80286}.Debug|x64.ActiveCfg = Debug|x64
 		{B2683648-C829-40E7-A479-AC90B1B80286}.Debug|x64.Build.0 = Debug|x64

OTSCPP/OTSClrInterface/ReportCalculateClr/ReportMgrClr.cpp

@@ -285,12 +285,7 @@ namespace OTSCLRINTERFACE {
 
 		CReportMgrPtr pReportMgr = GetCReportMgrPtr();
 
-		ASSERT(pReportMgr);
-		if (!pReportMgr)
-		{
-			LogErrorTrace(__FILE__, __LINE__, _T("GridDataTransfer: failed to create pointer."));
-			return nullptr;
-		}
+		
 
 		CGridDatasList listGridData = pReportMgr->GridDataTransfer(thePropParam->GetPropParamPtr());
 		CGridDataListClr^ listGridDataClr = gcnew CGridDataListClr();
@@ -328,6 +323,130 @@ namespace OTSCLRINTERFACE {
 
 		return tbl;
 	}
+	DataTable^ CReportMgrClr::GetAllParticlesOfOneGBField(CPropParamClr^ thePropParam,float fieldx,float fieldy)
+	{
+		DataTable^ tbl = gcnew DataTable();
+		CReportMgrPtr pReportMgr = GetCReportMgrPtr();
+		auto flds = pReportMgr->GetAllGBFields(thePropParam->GetPropParamPtr());
+		tbl->Columns->Add("fieldId");
+		tbl->Columns->Add("particleId");
+		tbl->Columns->Add("gbClassify");
+	
+		for (auto f : flds)
+		{
+			auto fldx = f->GetPosition().x;
+			auto fldy = f->GetPosition().y;
+			if (fldx == fieldx && fldy == fieldy)
+			{
+				//------------A
+				for (auto p : f->listAThinParticles)
+				{
+					auto r = tbl->NewRow();
+					r["fieldId"] = p->GetFieldId();
+					r["particleId"] = p->GetParticleId();
+					r["gbClassify"] = "A";
+					tbl->Rows->Add(r);
+				}
+				for (auto p : f->listAWideParticles)
+				{
+					auto r = tbl->NewRow();
+					r["fieldId"] = p->GetFieldId();
+					r["particleId"] = p->GetParticleId();
+					r["gbClassify"] = "A";
+					tbl->Rows->Add(r);
+				}
+				for (auto p : f->listASuperParticles)
+				{
+					auto r = tbl->NewRow();
+					r["fieldId"] = p->GetFieldId();
+					r["particleId"] = p->GetParticleId();
+					r["gbClassify"] = "A";
+					tbl->Rows->Add(r);
+				}
+				//--------------B
+				for (auto p : f->listBThinParticles)
+				{
+					auto r = tbl->NewRow();
+					r["fieldId"] = p->GetFieldId();
+					r["particleId"] = p->GetParticleId();
+					r["gbClassify"] = "B";
+					tbl->Rows->Add(r);
+				}
+				for (auto p : f->listBWideParticles)
+				{
+					auto r = tbl->NewRow();
+					r["fieldId"] = p->GetFieldId();
+					r["particleId"] = p->GetParticleId();
+					r["gbClassify"] = "B";
+					tbl->Rows->Add(r);
+				}
+				for (auto p : f->listBSuperParticles)
+				{
+					auto r = tbl->NewRow();
+					r["fieldId"] = p->GetFieldId();
+					r["particleId"] = p->GetParticleId();
+					r["gbClassify"] = "B";
+					tbl->Rows->Add(r);
+				}
+				//--------------C
+				for (auto p : f->listCThinParticles)
+				{
+					auto r = tbl->NewRow();
+					r["fieldId"] = p->GetFieldId();
+					r["particleId"] = p->GetParticleId();
+					r["gbClassify"] = "C";
+					tbl->Rows->Add(r);
+				}
+				for (auto p : f->listCWideParticles)
+				{
+					auto r = tbl->NewRow();
+					r["fieldId"] = p->GetFieldId();
+					r["particleId"] = p->GetParticleId();
+					r["gbClassify"] = "C";
+					tbl->Rows->Add(r);
+				}
+				for (auto p : f->listCSuperParticles)
+				{
+					auto r = tbl->NewRow();
+					r["fieldId"] = p->GetFieldId();
+					r["particleId"] = p->GetParticleId();
+					r["gbClassify"] = "C";
+					tbl->Rows->Add(r);
+				}
+				//--------------D
+				for (auto p : f->listDThinParticles)
+				{
+					auto r = tbl->NewRow();
+					r["fieldId"] = p->GetFieldId();
+					r["particleId"] = p->GetParticleId();
+					r["gbClassify"] = "D";
+					tbl->Rows->Add(r);
+				}
+				for (auto p : f->listDWideParticles)
+				{
+					auto r = tbl->NewRow();
+					r["fieldId"] = p->GetFieldId();
+					r["particleId"] = p->GetParticleId();
+					r["gbClassify"] = "D";
+					tbl->Rows->Add(r);
+				}
+				for (auto p : f->listDSuperParticles)
+				{
+					auto r = tbl->NewRow();
+					r["fieldId"] = p->GetFieldId();
+					r["particleId"] = p->GetParticleId();
+					r["gbClassify"] = "D";
+					tbl->Rows->Add(r);
+				}
+
+				
+
+			}
+			
+		}
+
+		return tbl;
+	}
 	DataTable^ CReportMgrClr::GetGBDSParticles(CPropParamClr^ thePropParam)
 	{
 		DataTable^ tbl = gcnew DataTable();

OTSCPP/OTSClrInterface/ReportCalculateClr/ReportMgrClr.h

@@ -60,6 +60,8 @@ namespace OTSCLRINTERFACE {
 	
 		DataTable^ GetAllGBFields(CPropParamClr^ thePropParam);
 
+		DataTable^ GetAllParticlesOfOneGBField(CPropParamClr^ thePropParam,float fieldx, float fieldy);
+
 		DataTable^ GetGBDSParticles(CPropParamClr^ thePropParam);
 
 		bool IsHaveMultiDataSource();

OTSCPP/OTSRptCalculate/GBCal/CGBCalculate.cpp

@@ -205,38 +205,42 @@ namespace OTSGBCalculate
 	}
 	CGBFieldList CGBCalculate::GetAllGBFields(CALCULATE_TABLE_TYPE tableType)
 	{
-		CPropParamPtr currentProp = m_rptMgrPtr->GetPropertyParamForGrid();
-		std::vector<CString> listDataSource = currentProp->GetDataSourceList();
-		int nSelectedDataSourceIndex = currentProp->GetDataSourceId();
-		CString sDataSourceNames = listDataSource[nSelectedDataSourceIndex];
+			CGBFieldList listGBFields;
+		
+			CPropParamPtr currentProp = m_rptMgrPtr->GetPropertyParamForGrid();
+			std::vector<CString> listDataSource = currentProp->GetDataSourceList();
+			int nSelectedDataSourceIndex = currentProp->GetDataSourceId();
+			CString sDataSourceNames = listDataSource[nSelectedDataSourceIndex];
 
-		std::vector<CString> listSelectedDataSource = COTSHelper::SplitString(sDataSourceNames, _T("+"));
-		CGBFieldList fields;
-		if (listSelectedDataSource.size() > 1) return fields;
+			std::vector<CString> listSelectedDataSource = COTSHelper::SplitString(sDataSourceNames, _T("+"));
+			CGBFieldList fields;
+			if (listSelectedDataSource.size() > 1) return fields;
 
 
-		CSmplMsrResultFileMgrPtr rstFileMgrPrt = m_rptMgrPtr->GetASmplMsrResultMgrByFileName(listSelectedDataSource[0]);
+			CSmplMsrResultFileMgrPtr rstFileMgrPrt = m_rptMgrPtr->GetASmplMsrResultMgrByFileName(listSelectedDataSource[0]);
 
-		GB_METHODE_TYPE t;
-		switch (tableType)
-		{
-		case CALCULATE_TABLE_TYPE::GB_Method1:
-			t = GB_METHODE_TYPE::METHODE_1;
-			break;
-		case CALCULATE_TABLE_TYPE::GB_Method2:
-			t = GB_METHODE_TYPE::METHODE_2;
-			break;
-		case CALCULATE_TABLE_TYPE::ASTM:
-			t = GB_METHODE_TYPE::ASTM;
-			break;
-		default:
-			t = GB_METHODE_TYPE::METHODE_1;
-			break;
-		}
+			GB_METHODE_TYPE t;
+			switch (tableType)
+			{
+			case CALCULATE_TABLE_TYPE::GB_Method1:
+				t = GB_METHODE_TYPE::METHODE_1;
+				break;
+			case CALCULATE_TABLE_TYPE::GB_Method2:
+				t = GB_METHODE_TYPE::METHODE_2;
+				break;
+			case CALCULATE_TABLE_TYPE::ASTM:
+				t = GB_METHODE_TYPE::ASTM;
+				break;
+			default:
+				t = GB_METHODE_TYPE::METHODE_1;
+				break;
+			}
 
-		CGBFieldList listGBFields = CalGBFields(rstFileMgrPrt,t);
+			 listGBFields = CalGBFields(rstFileMgrPrt, t);
 
-		CategoryGBInclutions(listGBFields, tableType);
+			CategoryGBInclutions(listGBFields, tableType);
+		
+		
 
 		return listGBFields;
 	
@@ -390,15 +394,15 @@ namespace OTSGBCalculate
 					pColumn->SetName(strName);
 					pRow = CGridRowPtr(new CGridRow());
 					pRow->SetDataType(REPORT_GRID_DATA_TYPE::STRING);
-					pRow->SetStringValue("Thin"); //MultiLang::GetInstance().GetCStringByKey(GBStr2)
+					pRow->SetStringValue("Thin"); 
 					listRows.push_back(pRow);
 					pRow = CGridRowPtr(new CGridRow());
 					pRow->SetDataType(REPORT_GRID_DATA_TYPE::STRING);
-					pRow->SetStringValue("Thick"); //MultiLang::GetInstance().GetCStringByKey(GBStr3)
+					pRow->SetStringValue("Thick"); 
 					listRows.push_back(pRow);
 					pRow = CGridRowPtr(new CGridRow());
 					pRow->SetDataType(REPORT_GRID_DATA_TYPE::STRING);
-					pRow->SetStringValue("OverSize"); //MultiLang::GetInstance().GetCStringByKey(GBStr4)
+					pRow->SetStringValue("OverSize"); 
 					listRows.push_back(pRow);
 					pColumn->SetGridRowsList(listRows);
 
@@ -407,7 +411,7 @@ namespace OTSGBCalculate
 				case 1:
 					pColumn = CGridColumnPtr(new CGridColumn());
 
-					strName = "Width/um"; //MultiLang::GetInstance().GetCStringByKey(GBStr5);
+					strName = "Width/um"; 
 					pColumn->SetName(strName);
 
 					if (GridType == "A")

OTSCPP/OTSRptCalculate/GBCal/GBFieldData.cpp

@@ -430,7 +430,7 @@ namespace OTSGBCalculate
 						}
 						double dd = 0, ds = 0;
 						ds = abs(ptParticleCenter.x - ptBParticleCenter.x);
-						if (ds < 15 )//认为两个颗粒在一条竖直线上,但不在一起
+						if (ds < 10 )//认为两个颗粒在一条竖直线上,但不在一起
 						{
 							if (Bottom > TopB)//current particle is on the above
 							{

OTSCPP/OTSRptCalculate/Model/ReportMgr.cpp

@@ -259,14 +259,16 @@ namespace OTSMODEL {
 	
 	CGBFieldList CReportMgr::GetAllGBFields(CPropParamPtr thePropParam)
 	{
+		static	CGBFieldList listGBFields;
+		if (listGBFields.size() == 0)
+		{
+			CGBCalculate GBCal(this);
 
-		CGBCalculate GBCal(this);
-
-
-		CALCULATE_TABLE_TYPE nCalTableType = thePropParam->GetCalTableType();
-		auto flds = GBCal.GetAllGBFields(nCalTableType);
 
-		return flds;
+			CALCULATE_TABLE_TYPE nCalTableType = thePropParam->GetCalTableType();
+			 listGBFields = GBCal.GetAllGBFields(nCalTableType);
+		}
+		return listGBFields;
 	}
 	
 

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

@@ -37,6 +37,7 @@
             this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.查询DS类颗粒ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.显示当前帧国标分类ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripMenuItem();
@@ -49,6 +50,11 @@
             this.ToolStripMenuItem_movesempoint = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem_DeleteParticles = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem_Segmentation = new System.Windows.Forms.ToolStripMenuItem();
+            this.aToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.bToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.cToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.dToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.全部ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.CMenuStrip.SuspendLayout();
             this.contextMenuStrip_Particle.SuspendLayout();
             this.SuspendLayout();
@@ -64,7 +70,7 @@
             this.toolStripMenuItem_combin,
             this.toolStripMenuItem_combinClass});
             this.CMenuStrip.Name = "contextMenuStrip1";
-            this.CMenuStrip.Size = new System.Drawing.Size(185, 136);
+            this.CMenuStrip.Size = new System.Drawing.Size(185, 158);
             // 
             // ToolStripMenuItem_ParticleSplicing
             // 
@@ -102,15 +108,16 @@
             // 
             this.toolStripMenuItem2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripMenuItem1,
-            this.查询DS类颗粒ToolStripMenuItem});
+            this.查询DS类颗粒ToolStripMenuItem,
+            this.显示当前帧国标分类ToolStripMenuItem});
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(112, 22);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 22);
             this.toolStripMenuItem2.Text = "方法一";
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(160, 22);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(184, 22);
             this.toolStripMenuItem1.Tag = "All1";
             this.toolStripMenuItem1.Text = "显示所有国标帧";
             this.toolStripMenuItem1.Click += new System.EventHandler(this.显示国标信息ToolStripMenuItem_Click);
@@ -118,18 +125,31 @@
             // 查询DS类颗粒ToolStripMenuItem
             // 
             this.查询DS类颗粒ToolStripMenuItem.Name = "查询DS类颗粒ToolStripMenuItem";
-            this.查询DS类颗粒ToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.查询DS类颗粒ToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
             this.查询DS类颗粒ToolStripMenuItem.Tag = "DS1";
             this.查询DS类颗粒ToolStripMenuItem.Text = "查询DS类颗粒";
             this.查询DS类颗粒ToolStripMenuItem.Click += new System.EventHandler(this.显示国标信息ToolStripMenuItem_Click);
             // 
+            // 显示当前帧国标分类ToolStripMenuItem
+            // 
+            this.显示当前帧国标分类ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.aToolStripMenuItem,
+            this.bToolStripMenuItem,
+            this.cToolStripMenuItem,
+            this.dToolStripMenuItem,
+            this.全部ToolStripMenuItem});
+            this.显示当前帧国标分类ToolStripMenuItem.Name = "显示当前帧国标分类ToolStripMenuItem";
+            this.显示当前帧国标分类ToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+            this.显示当前帧国标分类ToolStripMenuItem.Text = "高亮当前帧国标分类";
+            this.显示当前帧国标分类ToolStripMenuItem.Click += new System.EventHandler(this.显示当前帧国标分类ToolStripMenuItem_Click);
+            // 
             // toolStripMenuItem3
             // 
             this.toolStripMenuItem3.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripMenuItem4,
             this.toolStripMenuItem10});
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(112, 22);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(180, 22);
             this.toolStripMenuItem3.Text = "方法二";
             // 
             // toolStripMenuItem4
@@ -153,7 +173,7 @@
             this.aSTMToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.显示所有帧ToolStripMenuItem});
             this.aSTMToolStripMenuItem.Name = "aSTMToolStripMenuItem";
-            this.aSTMToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+            this.aSTMToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.aSTMToolStripMenuItem.Tag = "";
             this.aSTMToolStripMenuItem.Text = "ASTM";
             // 
@@ -168,7 +188,7 @@
             // 清除ToolStripMenuItem
             // 
             this.清除ToolStripMenuItem.Name = "清除ToolStripMenuItem";
-            this.清除ToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+            this.清除ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.清除ToolStripMenuItem.Text = "清除";
             this.清除ToolStripMenuItem.Click += new System.EventHandler(this.清除ToolStripMenuItem_Click);
             // 
@@ -219,6 +239,41 @@
             this.toolStripMenuItem_Segmentation.Text = "分割颗粒";
             this.toolStripMenuItem_Segmentation.Click += new System.EventHandler(this.toolStripMenuItem_Segmentation_Click);
             // 
+            // aToolStripMenuItem
+            // 
+            this.aToolStripMenuItem.Name = "aToolStripMenuItem";
+            this.aToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.aToolStripMenuItem.Text = "A";
+            this.aToolStripMenuItem.Click += new System.EventHandler(this.aToolStripMenuItem_Click);
+            // 
+            // bToolStripMenuItem
+            // 
+            this.bToolStripMenuItem.Name = "bToolStripMenuItem";
+            this.bToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.bToolStripMenuItem.Text = "B";
+            this.bToolStripMenuItem.Click += new System.EventHandler(this.bToolStripMenuItem_Click);
+            // 
+            // cToolStripMenuItem
+            // 
+            this.cToolStripMenuItem.Name = "cToolStripMenuItem";
+            this.cToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.cToolStripMenuItem.Text = "C";
+            this.cToolStripMenuItem.Click += new System.EventHandler(this.cToolStripMenuItem_Click);
+            // 
+            // dToolStripMenuItem
+            // 
+            this.dToolStripMenuItem.Name = "dToolStripMenuItem";
+            this.dToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.dToolStripMenuItem.Text = "D";
+            this.dToolStripMenuItem.Click += new System.EventHandler(this.dToolStripMenuItem_Click);
+            // 
+            // 全部ToolStripMenuItem
+            // 
+            this.全部ToolStripMenuItem.Name = "全部ToolStripMenuItem";
+            this.全部ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.全部ToolStripMenuItem.Text = "全部";
+            this.全部ToolStripMenuItem.Click += new System.EventHandler(this.全部ToolStripMenuItem_Click);
+            // 
             // Control_DrawDistrbutionImageAndBSE
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -256,5 +311,11 @@
         protected System.Windows.Forms.ContextMenuStrip CMenuStrip;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_combinClass;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_combin;
+        private System.Windows.Forms.ToolStripMenuItem 显示当前帧国标分类ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem aToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem bToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem cToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem dToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 全部ToolStripMenuItem;
     }
 }

OTSIncAReportApp/1-UI/Control_Graph/OTSIncAReportGraphFuncation/OTSImageDisHelp.cs

@@ -171,15 +171,6 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
 
      
 
-            //Dictionary<string, object> sampleMembers = ((Dictionary<string, object>)((Dictionary<string, object>)resultFile.ResultInfo["Sample"])["Members"]);
-            //Dictionary<string, object> SEMDataMsr = (Dictionary<string, object>)sampleMembers["SEMDataMsr"];
-
-            //Dictionary<string, object> msrParams = (Dictionary<string, object>)sampleMembers["MsrParams"];
-
-            //Dictionary<string, object> imgParam = (Dictionary<string, object>)msrParams["Members"];
-            //Dictionary<string, object> scanParam = (Dictionary<string, object>)imgParam["ImageScanParam"];
-            //string resolution = scanParam["ImageResolution"].ToString();
-
 
             int width = resultFile.GetImageWidth();
             int height = resultFile.GetImageHeight();
@@ -206,14 +197,7 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
 
 
 
-            //Dictionary<string, object> sampleMembers = ((Dictionary<string, object>)((Dictionary<string, object>)resultFile.ResultInfo["Sample"])["Members"]);
-            ////Dictionary<string, object> SEMDataMsr = (Dictionary<string, object>)sampleMembers["SEMDataMsr"];
-
-            //Dictionary<string, object> msrParams= (Dictionary<string, object>)sampleMembers["MsrParams"];
-
-            //Dictionary<string, object> imgParam = (Dictionary<string, object>)msrParams["Members"];
-            //Dictionary<string, object> scanParam = (Dictionary<string, object>)imgParam["ImageScanParam"];
-            //string resolution = scanParam["ImageResolution"].ToString();
+          
             int width = resultFile.GetImageWidth();
             int height = resultFile.GetImageHeight();
             s.Width = width;
@@ -523,6 +507,19 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
                 return false;
             }
         }
+        public bool WhetherInRange(DisplayField field, PointF WhetherPoint)
+        {
+            var rect = field.GetShowRect();
+            if ((rect.Left < WhetherPoint.X && WhetherPoint.X < rect.Right) && (rect.Top < WhetherPoint.Y && WhetherPoint.Y < rect.Bottom))
+            {
+  
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
 
 
         #region 颗粒分割功能方法

OTSIncAReportApp/2-CommonFunction/CommonClass/DisplayField.cs

@@ -79,11 +79,12 @@ namespace OTSIncAReportGraph
             m_list_dparticle = in_list_dparticle;
         }
 
-        public DisplayField(int fldwidth, int fldheight, Point screenPos)
+        public DisplayField(int fldwidth, int fldheight,Point OTSPos, Point screenPos)
         {
             m_id = System.Guid.NewGuid();
             var ltPoint = new Point(screenPos.X - fldwidth / 2, screenPos.Y - fldheight / 2);
             SetShow_Rect(new Rectangle(ltPoint, new Size(fldwidth, fldheight)));
+            m_ots_point = OTSPos;
         }
 
         public void Zoom(float zoomDelta , PointF refPoint)