edit the first edition of gbcalculate code.

OTS.sln

@@ -19,26 +19,28 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OTSSysMgrTools", "OTSSysMgr
 		{490A8592-7B13-4536-B475-028E73007FAE} = {490A8592-7B13-4536-B475-028E73007FAE}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTSControl", "OTSCPP\OTSControl\OTSControl.vcxproj", "{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OTSPartA_STDEditor", "OTSPartA_STDEditor\OTSPartA_STDEditor.csproj", "{52B47C78-BF08-4670-AB88-FDC972B4D7B4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTSData", "OTSCPP\OTSData\OTSData.vcxproj", "{CEA06DD1-5CD7-4B7D-A807-785718C3A854}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OTSIncAReportApp", "OTSIncAReportApp\OTSIncAReportApp.csproj", "{A3059BB1-9315-49DB-9680-FE16FAB1499D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTSImagePro", "OTSCPP\OTSImagePro\OTSImagePro.vcxproj", "{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OTSIncAReportTemplate", "OTSIncAReportTemplate\OTSIncAReportTemplate.csproj", "{BA8F9918-E809-4957-99D3-B2CD823BB236}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTSClassifyEngine", "OTSCPP\OTSClassifyEngine\OTSClassifyEngine.vcxproj", "{DAA6170E-5984-46DC-A8BA-DE696299DCA6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OTSCPP", "OTSCPP", "{58614F3D-F080-4BAF-80E9-F2035806D205}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTSClrInterface", "OTSCPP\OTSClrInterface\OTSClrInterface.vcxproj", "{490A8592-7B13-4536-B475-028E73007FAE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTSData", "OTSCPP\OTSData\OTSData.vcxproj", "{CEA06DD1-5CD7-4B7D-A807-785718C3A854}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OTSPartA_STDEditor", "OTSPartA_STDEditor\OTSPartA_STDEditor.csproj", "{52B47C78-BF08-4670-AB88-FDC972B4D7B4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTSControl", "OTSCPP\OTSControl\OTSControl.vcxproj", "{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OTSIncAReportApp", "OTSIncAReportApp\OTSIncAReportApp.csproj", "{A3059BB1-9315-49DB-9680-FE16FAB1499D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTSSQLiteDll", "OTSCPP\OTSSQLiteDll\OTSSQLiteDll.vcxproj", "{201A7F92-48AE-4BCC-B75E-988E3AAC117C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OTSIncAReportTemplate", "OTSIncAReportTemplate\OTSIncAReportTemplate.csproj", "{BA8F9918-E809-4957-99D3-B2CD823BB236}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTSImagePro", "OTSCPP\OTSImagePro\OTSImagePro.vcxproj", "{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTSSQLiteDll", "OTSCPP\OTSSQLiteDll\OTSSQLiteDll.vcxproj", "{201A7F92-48AE-4BCC-B75E-988E3AAC117C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTSClassifyEngine", "OTSCPP\OTSClassifyEngine\OTSClassifyEngine.vcxproj", "{DAA6170E-5984-46DC-A8BA-DE696299DCA6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTSRptCalculate", "OTSCPP\OTSRptCalculate\OTSRptCalculate.vcxproj", "{11A59D12-007A-40D9-9D74-D8F079BD9F86}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTSClrInterface", "OTSCPP\OTSClrInterface\OTSClrInterface.vcxproj", "{490A8592-7B13-4536-B475-028E73007FAE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -105,91 +107,6 @@ Global
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release|x64.ActiveCfg = Release|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release|x64.Build.0 = Release|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release|x86.ActiveCfg = Release|Any CPU
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Debug|x64.ActiveCfg = Debug|x64
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Debug|x64.Build.0 = Debug|x64
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Debug|x86.ActiveCfg = Debug|Win32
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Debug|x86.Build.0 = Debug|Win32
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|x64
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford50|Any CPU.Build.0 = Release_oxford50|x64
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford50|x86.ActiveCfg = Release_oxford50|Win32
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford50|x86.Build.0 = Release_oxford50|Win32
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release|Any CPU.ActiveCfg = Release|x64
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release|Any CPU.Build.0 = Release|x64
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release|x64.ActiveCfg = Release|x64
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release|x64.Build.0 = Release|x64
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release|x86.ActiveCfg = Release|Win32
-		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release|x86.Build.0 = Release|Win32
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Debug|x64.ActiveCfg = Debug|x64
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Debug|x64.Build.0 = Debug|x64
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Debug|x86.ActiveCfg = Debug|Win32
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Debug|x86.Build.0 = Debug|Win32
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|x64
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford50|Any CPU.Build.0 = Release_oxford50|x64
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford50|x86.ActiveCfg = Release_oxford50|Win32
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford50|x86.Build.0 = Release_oxford50|Win32
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release|Any CPU.ActiveCfg = Release|x64
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release|Any CPU.Build.0 = Release|x64
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release|x64.ActiveCfg = Release|x64
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release|x64.Build.0 = Release|x64
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release|x86.ActiveCfg = Release|Win32
-		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release|x86.Build.0 = Release|Win32
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Debug|x64.ActiveCfg = Debug|x64
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Debug|x64.Build.0 = Debug|x64
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Debug|x86.ActiveCfg = Debug|Win32
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Debug|x86.Build.0 = Debug|Win32
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|x64
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford50|Any CPU.Build.0 = Release_oxford50|x64
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford50|x86.ActiveCfg = Release_oxford50|Win32
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford50|x86.Build.0 = Release_oxford50|Win32
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release|Any CPU.ActiveCfg = Release|x64
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release|Any CPU.Build.0 = Release|x64
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release|x64.ActiveCfg = Release|x64
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release|x64.Build.0 = Release|x64
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release|x86.ActiveCfg = Release|Win32
-		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release|x86.Build.0 = Release|Win32
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Debug|x64.ActiveCfg = Debug|x64
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Debug|x64.Build.0 = Debug|x64
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Debug|x86.ActiveCfg = Debug|Win32
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Debug|x86.Build.0 = Debug|Win32
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|x64
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford50|Any CPU.Build.0 = Release_oxford50|x64
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford50|x86.ActiveCfg = Release_oxford50|Win32
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford50|x86.Build.0 = Release_oxford50|Win32
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release|Any CPU.ActiveCfg = Release|x64
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release|Any CPU.Build.0 = Release|x64
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release|x64.ActiveCfg = Release|x64
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release|x64.Build.0 = Release|x64
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release|x86.ActiveCfg = Release|Win32
-		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release|x86.Build.0 = Release|Win32
-		{490A8592-7B13-4536-B475-028E73007FAE}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{490A8592-7B13-4536-B475-028E73007FAE}.Debug|x64.ActiveCfg = Debug|x64
-		{490A8592-7B13-4536-B475-028E73007FAE}.Debug|x64.Build.0 = Debug|x64
-		{490A8592-7B13-4536-B475-028E73007FAE}.Debug|x86.ActiveCfg = Debug|Win32
-		{490A8592-7B13-4536-B475-028E73007FAE}.Debug|x86.Build.0 = Debug|Win32
-		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|x64
-		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford50|Any CPU.Build.0 = Release_oxford50|x64
-		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
-		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
-		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford50|x86.ActiveCfg = Release_oxford50|Win32
-		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford50|x86.Build.0 = Release_oxford50|Win32
-		{490A8592-7B13-4536-B475-028E73007FAE}.Release|Any CPU.ActiveCfg = Release|x64
-		{490A8592-7B13-4536-B475-028E73007FAE}.Release|Any CPU.Build.0 = Release|x64
-		{490A8592-7B13-4536-B475-028E73007FAE}.Release|x64.ActiveCfg = Release|x64
-		{490A8592-7B13-4536-B475-028E73007FAE}.Release|x64.Build.0 = Release|x64
-		{490A8592-7B13-4536-B475-028E73007FAE}.Release|x86.ActiveCfg = Release|Win32
-		{490A8592-7B13-4536-B475-028E73007FAE}.Release|x86.Build.0 = Release|Win32
 		{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
@@ -244,30 +161,88 @@ Global
 		{BA8F9918-E809-4957-99D3-B2CD823BB236}.Release|x64.Build.0 = Release|x64
 		{BA8F9918-E809-4957-99D3-B2CD823BB236}.Release|x86.ActiveCfg = Release|Any CPU
 		{BA8F9918-E809-4957-99D3-B2CD823BB236}.Release|x86.Build.0 = Release|Any CPU
+		{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
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Debug|x86.ActiveCfg = Debug|Win32
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Debug|x86.Build.0 = Debug|Win32
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Win32
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford50|x86.ActiveCfg = Release_oxford50|Win32
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford50|x86.Build.0 = Release_oxford50|Win32
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release|Any CPU.ActiveCfg = Release|Win32
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release|x64.ActiveCfg = Release|x64
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release|x64.Build.0 = Release|x64
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release|x86.ActiveCfg = Release|Win32
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release|x86.Build.0 = Release|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
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Debug|x86.ActiveCfg = Debug|Win32
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Debug|x86.Build.0 = Debug|Win32
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Win32
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford50|x86.ActiveCfg = Release_oxford50|Win32
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford50|x86.Build.0 = Release_oxford50|Win32
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release|Any CPU.ActiveCfg = Release|Win32
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release|x64.ActiveCfg = Release|x64
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release|x64.Build.0 = Release|x64
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release|x86.ActiveCfg = Release|Win32
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release|x86.Build.0 = Release|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
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Debug|x86.ActiveCfg = Debug|Win32
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Debug|x86.Build.0 = Debug|Win32
-		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|x64
-		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release_oxford50|Any CPU.Build.0 = Release_oxford50|x64
+		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Win32
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release_oxford50|x86.ActiveCfg = Release_oxford50|Win32
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release_oxford50|x86.Build.0 = Release_oxford50|Win32
-		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release|Any CPU.ActiveCfg = Release|x64
-		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release|Any CPU.Build.0 = Release|x64
+		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release|Any CPU.ActiveCfg = Release|Win32
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release|x64.ActiveCfg = Release|x64
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release|x64.Build.0 = Release|x64
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release|x86.ActiveCfg = Release|Win32
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release|x86.Build.0 = Release|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
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Debug|x86.ActiveCfg = Debug|Win32
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Debug|x86.Build.0 = Debug|Win32
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Win32
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford50|x86.ActiveCfg = Release_oxford50|Win32
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford50|x86.Build.0 = Release_oxford50|Win32
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release|Any CPU.ActiveCfg = Release|Win32
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release|x64.ActiveCfg = Release|x64
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release|x64.Build.0 = Release|x64
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release|x86.ActiveCfg = Release|Win32
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release|x86.Build.0 = Release|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
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Debug|x86.ActiveCfg = Debug|Win32
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Debug|x86.Build.0 = Debug|Win32
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Win32
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford50|x86.ActiveCfg = Release_oxford50|Win32
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford50|x86.Build.0 = Release_oxford50|Win32
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release|Any CPU.ActiveCfg = Release|Win32
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release|x64.ActiveCfg = Release|x64
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release|x64.Build.0 = Release|x64
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release|x86.ActiveCfg = Release|Win32
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release|x86.Build.0 = Release|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
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Debug|x86.ActiveCfg = Debug|Win32
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Debug|x86.Build.0 = Debug|Win32
-		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release_oxford50|Any CPU.ActiveCfg = Debug|Win32
-		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release_oxford50|Any CPU.Build.0 = Debug|Win32
+		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release_oxford50|Any CPU.ActiveCfg = Debug|x64
+		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release_oxford50|Any CPU.Build.0 = Debug|x64
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release_oxford50|x64.ActiveCfg = Release|x64
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release_oxford50|x64.Build.0 = Release|x64
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release_oxford50|x86.ActiveCfg = Release|Win32
@@ -277,10 +252,34 @@ Global
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release|x64.Build.0 = Release|x64
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release|x86.ActiveCfg = Release|Win32
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release|x86.Build.0 = Release|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
+		{490A8592-7B13-4536-B475-028E73007FAE}.Debug|x86.ActiveCfg = Debug|Win32
+		{490A8592-7B13-4536-B475-028E73007FAE}.Debug|x86.Build.0 = Debug|Win32
+		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Win32
+		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
+		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
+		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford50|x86.ActiveCfg = Release_oxford50|Win32
+		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford50|x86.Build.0 = Release_oxford50|Win32
+		{490A8592-7B13-4536-B475-028E73007FAE}.Release|Any CPU.ActiveCfg = Release|Win32
+		{490A8592-7B13-4536-B475-028E73007FAE}.Release|x64.ActiveCfg = Release|x64
+		{490A8592-7B13-4536-B475-028E73007FAE}.Release|x64.Build.0 = Release|x64
+		{490A8592-7B13-4536-B475-028E73007FAE}.Release|x86.ActiveCfg = Release|Win32
+		{490A8592-7B13-4536-B475-028E73007FAE}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854} = {58614F3D-F080-4BAF-80E9-F2035806D205}
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B} = {58614F3D-F080-4BAF-80E9-F2035806D205}
+		{201A7F92-48AE-4BCC-B75E-988E3AAC117C} = {58614F3D-F080-4BAF-80E9-F2035806D205}
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B} = {58614F3D-F080-4BAF-80E9-F2035806D205}
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6} = {58614F3D-F080-4BAF-80E9-F2035806D205}
+		{11A59D12-007A-40D9-9D74-D8F079BD9F86} = {58614F3D-F080-4BAF-80E9-F2035806D205}
+		{490A8592-7B13-4536-B475-028E73007FAE} = {58614F3D-F080-4BAF-80E9-F2035806D205}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {03FC2F6F-34FA-4A85-9D5A-ED80BABA5FC8}
 	EndGlobalSection

OTSCPP/OTSClrInterface/OTSClrInterface.vcxproj

@@ -217,6 +217,12 @@
     <ClCompile Include="ControlClr\OTSControlFunExport.cpp" />
     <ClCompile Include="GBCalculateClr\GridDataClr.cpp" />
     <ClCompile Include="GBCalculateClr\OTSReportCalculateClr.cpp" />
+    <ClCompile Include="GBCalculateClr\OTSReportProjFileClr.cpp" />
+    <ClCompile Include="GBCalculateClr\OTSReportProjFileMgrClr.cpp" />
+    <ClCompile Include="GBCalculateClr\RptParamFileClr.cpp" />
+    <ClCompile Include="GBCalculateClr\RptParamFileMgrClr.cpp" />
+    <ClCompile Include="GBCalculateClr\SmplMsrResultFileClr.cpp" />
+    <ClCompile Include="GBCalculateClr\SmplMsrResultFileMgrClr.cpp" />
     <ClCompile Include="ImageProClr\FieldMgrClr.cpp" />
     <ClCompile Include="ImageProClr\ImageProForClr.cpp" />
     <ClCompile Include="ImageProClr\OTSImgProcPrmClr.cpp" />
@@ -238,6 +244,12 @@
     <ClInclude Include="ControlClr\OTSControlFunExport.h" />
     <ClInclude Include="GBCalculateClr\GridDataClr.h" />
     <ClInclude Include="GBCalculateClr\OTSReportCalculateClr.h" />
+    <ClInclude Include="GBCalculateClr\OTSReportProjFileClr.h" />
+    <ClInclude Include="GBCalculateClr\OTSReportProjFileMgrClr.h" />
+    <ClInclude Include="GBCalculateClr\RptParamFileClr.h" />
+    <ClInclude Include="GBCalculateClr\RptParamFileMgrClr.h" />
+    <ClInclude Include="GBCalculateClr\SmplMsrResultFileClr.h" />
+    <ClInclude Include="GBCalculateClr\SmplMsrResultFileMgrClr.h" />
     <ClInclude Include="ImageProClr\FieldMgrClr.h" />
     <ClInclude Include="ImageProClr\ImageProForClr.h" />
     <ClInclude Include="ImageProClr\OTSImgProcPrmClr.h" />

OTSCPP/OTSClrInterface/OTSClrInterface.vcxproj.filters

@@ -87,6 +87,24 @@
     <ClCompile Include="GBCalculateClr\OTSReportCalculateClr.cpp">
       <Filter>RptCalculateClr</Filter>
     </ClCompile>
+    <ClCompile Include="GBCalculateClr\OTSReportProjFileClr.cpp">
+      <Filter>RptCalculateClr</Filter>
+    </ClCompile>
+    <ClCompile Include="GBCalculateClr\OTSReportProjFileMgrClr.cpp">
+      <Filter>RptCalculateClr</Filter>
+    </ClCompile>
+    <ClCompile Include="GBCalculateClr\SmplMsrResultFileClr.cpp">
+      <Filter>RptCalculateClr</Filter>
+    </ClCompile>
+    <ClCompile Include="GBCalculateClr\SmplMsrResultFileMgrClr.cpp">
+      <Filter>RptCalculateClr</Filter>
+    </ClCompile>
+    <ClCompile Include="GBCalculateClr\RptParamFileClr.cpp">
+      <Filter>RptCalculateClr</Filter>
+    </ClCompile>
+    <ClCompile Include="GBCalculateClr\RptParamFileMgrClr.cpp">
+      <Filter>RptCalculateClr</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CommonClr\BSEImgClr.h">
@@ -146,5 +164,23 @@
     <ClInclude Include="GBCalculateClr\OTSReportCalculateClr.h">
       <Filter>RptCalculateClr</Filter>
     </ClInclude>
+    <ClInclude Include="GBCalculateClr\OTSReportProjFileClr.h">
+      <Filter>RptCalculateClr</Filter>
+    </ClInclude>
+    <ClInclude Include="GBCalculateClr\OTSReportProjFileMgrClr.h">
+      <Filter>RptCalculateClr</Filter>
+    </ClInclude>
+    <ClInclude Include="GBCalculateClr\SmplMsrResultFileClr.h">
+      <Filter>RptCalculateClr</Filter>
+    </ClInclude>
+    <ClInclude Include="GBCalculateClr\SmplMsrResultFileMgrClr.h">
+      <Filter>RptCalculateClr</Filter>
+    </ClInclude>
+    <ClInclude Include="GBCalculateClr\RptParamFileClr.h">
+      <Filter>RptCalculateClr</Filter>
+    </ClInclude>
+    <ClInclude Include="GBCalculateClr\RptParamFileMgrClr.h">
+      <Filter>RptCalculateClr</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

OTSCPP/OTSRptCalculate/GBCal/CGBCalculate.h

@@ -1,44 +1,29 @@
 #pragma once
-
-#include "OTSSample.h"
+#include "ReportProjFile.h"
+//#include "GridIn.h"
 #include "GridData.h"
 #include "GBFieldData.h"
-
+#include "ReportProjFileMgr.h"
 
 namespace OTSGBCalculate
 {
 	//define String Resources for GB Grid
-	typedef enum class __declspec(dllexport) CALCULATE_TABLE_TYPE
-	{
-		INVALID = -1,
-		MIN = 0,
-		MEASURE_INFO = 0,
-		PARTICALE_GENE_INFO = 1,
-		PARTICALE_COMP = 2,
-		ELEMENT_COMP = 3,
-		PARTICALE_SIZE_DISTRIBUTION = 4,
-		AVE_ELEMENT_COMP = 5,
-		GB_Method1 = 6,
-		GB_Method2 = 7,
-		ASTM = 8,
-		DIN = 9,
-		MAX = 9
-	}CALCULATE_TABLE_TYPE;
+	using namespace OTSMODEL;
 
 	class __declspec(dllexport) CGBCalculate
 	{
 	public:
-		CGBCalculate(COTSSamplePtr a_sample, CALCULATE_TABLE_TYPE GBType);
+		CGBCalculate(CReportProjFileMgr* rptMgrPtr);
 		~CGBCalculate();
-		CGridDatasList GetGBInclusion();
+		CGridDatasList GetGBInclusion(CString sourceNames, CALCULATE_TABLE_TYPE tableType);
 
 		const int GB_FIELD_WIDTH = 707;
 	protected:
 
 		//计算一个数据源中所获得的GBFields转化的统计数据
-		CGridDatasList GetGridDataListForOneDataSource(CGBFieldList listCGBField);
+		CGridDatasList GetGridDataListForOneDataSource(CGBFieldList listCGBField, CALCULATE_TABLE_TYPE tableType);
 		//计算一个数据源中所获得的GBFields转化的统计数据德标
-		CGridDatasList GetGridDataListForOneDataSourceDIN(COTSParticleList listParticle);
+		CGridDatasList GetGridDataListForOneDataSourceDIN(COTSParticleList listParticle, CALCULATE_TABLE_TYPE tableType);
 		//获得所有计算得到的国标Field及particle的分级信息
 		CGridDataPtr GetGBFieldGrid(CGBFieldList listCGBField);
 
@@ -51,35 +36,34 @@ namespace OTSGBCalculate
 
 
 		// calculate GB fields
-		CGBFieldList CalGBFields();
+		CGBFieldList CalGBFields(CSmplMsrResultFileMgr* pSmplMgr);
 
 		// calculate how many fields needed (horizontal) 
-		void CalOTSFieldsNo(int& a_nRow, int& a_nColumn, int a_nFieldWidth);
+		void CalOTSFieldsNo(int& a_nRow, int& a_nColumn, int a_nFieldWidth);			
 		// convert ots fields to gb fields
-		BOOL OTSFieldToGBField(COTSFieldDataList allOTSFields, CGBFieldList* m_listGBFields, int a_nRow, int a_nColumn, CSize sizePixelImage, int a_nFieldWidth);
+		BOOL OTSFieldToGBField(COTSFieldDataList allOTSFields, CGBFieldList* m_listGBFields, int a_nRow, int a_nColumn, CSize sizePixelImage,int a_nFieldWidth);
 		//get the GB field within thr rectangle
-		CGBFieldDataPtr GetOneGBField(CRect a_rectGBField, COTSFieldDataList& a_listOTSFields, int a_nRow, int a_nColumn, CSize sizePixelImage, int a_nFieldWidth);
+		CGBFieldDataPtr GetOneGBField(CRect a_rectGBField, COTSFieldDataList& a_listOTSFields, int a_nRow, int a_nColumn, CSize sizePixelImage, int a_nFieldWidth);   
 		//  normalize particles for the GBFields
-		CGBFieldDataPtr NormalizeParticles(CRect a_rectGBField, COTSFieldDataList a_listOTSFields, CSize sizePixelImage, int a_nFieldWidth);
-
-		BOOL GetGBFieldSegmentsList(int nColum, int nRow, COTSParticleList a_listOTSFieldParticles, int a_nCalNo, COTSSegmentsList &a_listGBFieldSegments, CSize a_sizePixelImage, int a_nFieldWidth);
+		CGBFieldDataPtr NormalizeParticles(CRect a_rectGBField, COTSFieldDataList a_listOTSFields, CSize sizePixelImage, int a_nFieldWidth);			
+		
+		BOOL GetGBFieldSegmentsList(int nColum, int nRow, COTSParticleList a_listOTSFieldParticles, int a_nCalNo,COTSSegmentsList &a_listGBFieldSegments, CSize a_sizePixelImage, int a_nFieldWidth);
 		// merge the segment
-		BOOL MergSegment(COTSSegmentsList &a_listGBFieldSegments, COTSSegmentPtr pGBFieldSegment, int a_nLastSegmentNo);
+		BOOL MergSegment(COTSSegmentsList &a_listGBFieldSegments, COTSSegmentPtr pGBFieldSegment, int a_nLastSegmentNo);           
 		// merge the segment,get new particles
-		BOOL GetGBParticles(COTSSegmentsList a_listGBFieldSegments, COTSParticleList &a_listNormalizedParticles);
+		BOOL GetGBParticles(COTSSegmentsList a_listGBFieldSegments, COTSParticleList &a_listNormalizedParticles);					
 		// get feature list of up-down segment
 		BOOL GetFeatureList(COTSSegmentsList& a_listSegments, COTSFeatureList& a_listFeatures);
 		BOOL GetFeatureList1(COTSSegmentsList & a_listSegments, COTSFeatureList & a_listFeatures);
 		// change feature into particle
-		BOOL ChangeFeaturelist(COTSFeatureList& a_listFeatures, COTSParticleList& a_listParticle);
+		BOOL ChangeFeaturelist(COTSFeatureList& a_listFeatures, COTSParticleList& a_listParticle);									
 		// particle list
 		DOUBLE& GetPixSize() { return PixSize; }
 		void SetPixSize(double p);
 		DOUBLE PixSize;
 		//pointer to the whole reportprojfilemgr
-		COTSSamplePtr m_sample;
-		CALCULATE_TABLE_TYPE m_GBType;
+		CReportProjFileMgr* m_rptMgrPtr;
 	};
-
+	
 
 }

OTSCPP/OTSRptCalculate/OTSRptCalculate.vcxproj

@@ -40,7 +40,12 @@
     <ClCompile Include="Model\MsrResults.cpp" />
     <ClCompile Include="Model\MsrSampleStatus.cpp" />
     <ClCompile Include="Model\PosXrayFileMgr.cpp" />
+    <ClCompile Include="Model\ReportProjFile.cpp" />
+    <ClCompile Include="Model\ReportProjFileMgr.cpp" />
+    <ClCompile Include="Model\RptParamFile.cpp" />
+    <ClCompile Include="Model\RptParamFileMgr.cpp" />
     <ClCompile Include="Model\SmplMsrResultFile.cpp" />
+    <ClCompile Include="Model\SmplMsrResultFileMgr.cpp" />
     <ClCompile Include="Tools\OTSFileSys.cpp" />
     <ClCompile Include="Tools\OTSHelper.cpp" />
   </ItemGroup>
@@ -66,7 +71,13 @@
     <ClInclude Include="Model\MsrResults.h" />
     <ClInclude Include="Model\MsrSampleStatus.h" />
     <ClInclude Include="Model\PosXrayFileMgr.h" />
+    <ClInclude Include="Model\ReportProjFile.h" />
+    <ClInclude Include="Model\ReportProjFileMgr.h" />
+    <ClInclude Include="Model\RptParamFile.h" />
+    <ClInclude Include="Model\RptParamFileMgr.h" />
     <ClInclude Include="Model\SmplMsrResultFile.h" />
+    <ClInclude Include="Model\SmplMsrResultFileMgr.h" />
+    <ClInclude Include="Resource.h" />
     <ClInclude Include="Tools\GdiplusNew.h" />
     <ClInclude Include="Tools\OTSFileSys.h" />
     <ClInclude Include="Tools\OTSHelper.h" />
@@ -133,7 +144,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)\OTSCPP\OTSControl;$(SolutionDir)OTSCPP\OTSData;$(SolutionDir)OTSCPP\Tools;$(SolutionDir)OTSCPP\OTSLog;$(SolutionDir)OTSCPP\OTSImagePro;$(SolutionDir)OTSCPP\OTSSQLiteDll;$(SolutionDir)OTSCPP\OTSRptCalculate\Tools;$(SolutionDir)OTSCPP\OTSRptCalculate\Model;$(SolutionDir)OTSCPP\OTSRptCalculate\DTL;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\OTSCPP\OTSControl;$(SolutionDir)OTSCPP\OTSData;$(SolutionDir)OTSCPP\Tools;$(SolutionDir)OTSCPP\OTSLog;$(SolutionDir)OTSCPP\OTSImagePro;$(SolutionDir)OTSCPP\OTSSQLiteDll;$(SolutionDir)OTSCPP\OTSRptCalculate\Tools;$(SolutionDir)OTSCPP\OTSRptCalculate\Model;$(SolutionDir)OTSCPP\OTSRptCalculate\DTL;$(SolutionDir)OTSCPP\OTSRptCalculate\GBCal;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\Obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>

OTSCPP/OTSRptCalculate/OTSRptCalculate.vcxproj.filters

@@ -99,6 +99,21 @@
     <ClCompile Include="Model\PosXrayFileMgr.cpp">
       <Filter>Model</Filter>
     </ClCompile>
+    <ClCompile Include="Model\ReportProjFile.cpp">
+      <Filter>Model</Filter>
+    </ClCompile>
+    <ClCompile Include="Model\ReportProjFileMgr.cpp">
+      <Filter>Model</Filter>
+    </ClCompile>
+    <ClCompile Include="Model\SmplMsrResultFileMgr.cpp">
+      <Filter>Model</Filter>
+    </ClCompile>
+    <ClCompile Include="Model\RptParamFile.cpp">
+      <Filter>Model</Filter>
+    </ClCompile>
+    <ClCompile Include="Model\RptParamFileMgr.cpp">
+      <Filter>Model</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="DTL\ElementChemistryDB.h">
@@ -176,5 +191,23 @@
     <ClInclude Include="Model\PosXrayFileMgr.h">
       <Filter>Model</Filter>
     </ClInclude>
+    <ClInclude Include="Model\ReportProjFile.h">
+      <Filter>Model</Filter>
+    </ClInclude>
+    <ClInclude Include="Model\ReportProjFileMgr.h">
+      <Filter>Model</Filter>
+    </ClInclude>
+    <ClInclude Include="Model\SmplMsrResultFileMgr.h">
+      <Filter>Model</Filter>
+    </ClInclude>
+    <ClInclude Include="Model\RptParamFile.h">
+      <Filter>Model</Filter>
+    </ClInclude>
+    <ClInclude Include="Model\RptParamFileMgr.h">
+      <Filter>Model</Filter>
+    </ClInclude>
+    <ClInclude Include="Resource.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/StageParam.cs

@@ -5,7 +5,7 @@ using System.IO;
 using System.Windows.Forms;
 using System.Xml;
 using OTSDataType;
-using OTSModelSharp.Measure.GetStageInfo;
+//using OTSModelSharp.Measure.GetStageInfo;
 using static OTSDataType.otsdataconst;
 
 namespace OTSModelSharp

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -9,8 +9,9 @@ using OTSDataType;
 using OTSModelSharp;
 using System.IO;
 using static OTSModelSharp.ResourceManage.ResourceData;
-using OTSModelSharp.Measure.GetStageInfo;
+//using OTSModelSharp.Measure.GetStageInfo;
 using static OTSDataType.otsdataconst;
+using OTSModelSharp.Measure.GetStageInfo;
 
 namespace OTSMeasureApp
 {

OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -169,23 +169,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="0-OTSModel\DTLBase\ColumnType.cs" />
-    <Compile Include="0-OTSModel\DTLBase\CSQLiteDB.cs" />
-    <Compile Include="0-OTSModel\DTLBase\CSQLiteDBStore.cs" />
-    <Compile Include="0-OTSModel\DTLBase\CSQLiteQuery.cs" />
-    <Compile Include="0-OTSModel\DTLBase\CSQLiteTable.cs" />
-    <Compile Include="0-OTSModel\DTLBase\DBConst.cs" />
-    <Compile Include="0-OTSModel\DTLBase\IDBBase.cs" />
-    <Compile Include="0-OTSModel\DTLBase\IDBFileBase.cs" />
-    <Compile Include="0-OTSModel\DTLBase\IDBQueryBase.cs" />
-    <Compile Include="0-OTSModel\DTLBase\IDBStoreBase.cs" />
-    <Compile Include="0-OTSModel\DTLBase\IDBTableBase.cs" />
-    <Compile Include="0-OTSModel\DTLBase\SQLiteFactory.cs" />
-    <Compile Include="0-OTSModel\DTLBase\SQliteHelper.cs" />
-    <Compile Include="0-OTSModel\DTLBase\SQLiteHelper2.cs" />
-    <Compile Include="0-OTSModel\DTLBase\SQLiteHelper3.cs" />
-    <Compile Include="0-OTSModel\DTLBase\SQLiteHelper4.cs" />
-    <Compile Include="0-OTSModel\DTLBase\TableModel.cs" />
     <Compile Include="0-OTSModel\Measure\1-OTSInclution\CFieldDataIncA.cs" />
     <Compile Include="0-OTSModel\Measure\1-OTSInclution\SmplMeasureInclution.cs" />
     <Compile Include="0-OTSModel\Measure\2-OTSCleanliness\CFieldDataClean.cs" />
@@ -251,10 +234,39 @@
     <Compile Include="0-OTSModel\OTSDataType\SEMStageData.cs" />
     <Compile Include="0-OTSModel\OTSDataType\XmlResourceData.cs" />
     <Compile Include="0-OTSModel\OTSDataType\XMLSerialization.cs" />
+    <Compile Include="7-OTSProgMgrInfo\Stage\DlgStageMgr.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="7-OTSProgMgrInfo\Stage\DlgStageMgr.Designer.cs">
+      <DependentUpon>DlgStageMgr.cs</DependentUpon>
+    </Compile>
+    <Compile Include="7-OTSProgMgrInfo\Stage\DlgStageRename.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="7-OTSProgMgrInfo\Stage\DlgStageRename.Designer.cs">
+      <DependentUpon>DlgStageRename.cs</DependentUpon>
+    </Compile>
     <Compile Include="ResourceManage\ResourceData.cs" />
     <Compile Include="ResourceManage\ResourceID.cs" />
     <Compile Include="ServiceCenter\CClassifyEngine.cs" />
     <Compile Include="ServiceCenter\CImageHandler.cs" />
+    <Compile Include="ServiceCenter\DTLBase\ColumnType.cs" />
+    <Compile Include="ServiceCenter\DTLBase\CSQLiteDB.cs" />
+    <Compile Include="ServiceCenter\DTLBase\CSQLiteDBStore.cs" />
+    <Compile Include="ServiceCenter\DTLBase\CSQLiteQuery.cs" />
+    <Compile Include="ServiceCenter\DTLBase\CSQLiteTable.cs" />
+    <Compile Include="ServiceCenter\DTLBase\DBConst.cs" />
+    <Compile Include="ServiceCenter\DTLBase\IDBBase.cs" />
+    <Compile Include="ServiceCenter\DTLBase\IDBFileBase.cs" />
+    <Compile Include="ServiceCenter\DTLBase\IDBQueryBase.cs" />
+    <Compile Include="ServiceCenter\DTLBase\IDBStoreBase.cs" />
+    <Compile Include="ServiceCenter\DTLBase\IDBTableBase.cs" />
+    <Compile Include="ServiceCenter\DTLBase\SQLiteFactory.cs" />
+    <Compile Include="ServiceCenter\DTLBase\SQliteHelper.cs" />
+    <Compile Include="ServiceCenter\DTLBase\SQLiteHelper2.cs" />
+    <Compile Include="ServiceCenter\DTLBase\SQLiteHelper3.cs" />
+    <Compile Include="ServiceCenter\DTLBase\SQLiteHelper4.cs" />
+    <Compile Include="ServiceCenter\DTLBase\TableModel.cs" />
     <Compile Include="ServiceCenter\EDSController.cs" />
     <Compile Include="ServiceCenter\FileHelper.cs" />
     <Compile Include="ServiceCenter\IClassifyEngine.cs" />
@@ -417,6 +429,12 @@
     <EmbeddedResource Include="1-OTSMeasure\MeasureCheckResultInfoWindow.resx">
       <DependentUpon>MeasureCheckResultInfoWindow.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="7-OTSProgMgrInfo\Stage\DlgStageMgr.resx">
+      <DependentUpon>DlgStageMgr.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="7-OTSProgMgrInfo\Stage\DlgStageRename.resx">
+      <DependentUpon>DlgStageRename.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="About.resx">
       <DependentUpon>About.cs</DependentUpon>
     </EmbeddedResource>

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -346,15 +346,27 @@
     <Compile Include="GBCalculate\ASTMStandardABCDDS.cs">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="GBCalculate\ASTMStandardABCDDS.designer.cs">
+      <DependentUpon>ASTMStandardABCDDS.cs</DependentUpon>
+    </Compile>
     <Compile Include="GBCalculate\ChineseStandardABCDDS.cs">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="GBCalculate\ChineseStandardABCDDS.designer.cs">
+      <DependentUpon>ChineseStandardABCDDS.cs</DependentUpon>
+    </Compile>
     <Compile Include="GBCalculate\DINStandardABCDDS.cs">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="GBCalculate\DINStandardABCDDS.designer.cs">
+      <DependentUpon>DINStandardABCDDS.cs</DependentUpon>
+    </Compile>
     <Compile Include="GBCalculate\NationalStandardMethodTwo.cs">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="GBCalculate\NationalStandardMethodTwo.designer.cs">
+      <DependentUpon>NationalStandardMethodTwo.cs</DependentUpon>
+    </Compile>
     <Compile Include="OutputNlog.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -545,6 +557,18 @@
     <EmbeddedResource Include="frmMultiSourceSelect.resx">
       <DependentUpon>frmMultiSourceSelect.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="GBCalculate\ASTMStandardABCDDS.resx">
+      <DependentUpon>ASTMStandardABCDDS.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GBCalculate\ChineseStandardABCDDS.resx">
+      <DependentUpon>ChineseStandardABCDDS.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GBCalculate\DINStandardABCDDS.resx">
+      <DependentUpon>DINStandardABCDDS.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GBCalculate\NationalStandardMethodTwo.resx">
+      <DependentUpon>NationalStandardMethodTwo.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="OTSMgrInfo\FormNewLJFile.resx">
       <DependentUpon>FormNewLJFile.cs</DependentUpon>
     </EmbeddedResource>