فهرست منبع

optimize the otscontrol dll (OxfordControllerWrapper.cpp)

gsp 3 سال پیش
والد
کامیت
98a5d0562f

+ 93 - 0
OTS.sln

@@ -75,6 +75,9 @@ Global
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		projectconfig|Any CPU = projectconfig|Any CPU
+		projectconfig|x64 = projectconfig|x64
+		projectconfig|x86 = projectconfig|x86
 		Release_oxford50|Any CPU = Release_oxford50|Any CPU
 		Release_oxford50|x64 = Release_oxford50|x64
 		Release_oxford50|x86 = Release_oxford50|x86
@@ -89,6 +92,12 @@ Global
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Debug|x64.Build.0 = Debug|x64
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Debug|x86.Build.0 = Debug|Any CPU
+		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.projectconfig|Any CPU.ActiveCfg = Release|Any CPU
+		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.projectconfig|Any CPU.Build.0 = Release|Any CPU
+		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.projectconfig|x64.ActiveCfg = Release|x64
+		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.projectconfig|x64.Build.0 = Release|x64
+		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.projectconfig|x86.ActiveCfg = Release|Any CPU
+		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.projectconfig|x86.Build.0 = Release|Any CPU
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Any CPU
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release_oxford50|Any CPU.Build.0 = Release_oxford50|Any CPU
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
@@ -107,6 +116,12 @@ Global
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Debug|x64.Build.0 = Debug|x64
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Debug|x86.Build.0 = Debug|Any CPU
+		{3B7695AA-8231-45AC-B493-84390A945D02}.projectconfig|Any CPU.ActiveCfg = Release|Any CPU
+		{3B7695AA-8231-45AC-B493-84390A945D02}.projectconfig|Any CPU.Build.0 = Release|Any CPU
+		{3B7695AA-8231-45AC-B493-84390A945D02}.projectconfig|x64.ActiveCfg = Release|x64
+		{3B7695AA-8231-45AC-B493-84390A945D02}.projectconfig|x64.Build.0 = Release|x64
+		{3B7695AA-8231-45AC-B493-84390A945D02}.projectconfig|x86.ActiveCfg = Release|Any CPU
+		{3B7695AA-8231-45AC-B493-84390A945D02}.projectconfig|x86.Build.0 = Release|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release_oxford50|Any CPU.Build.0 = Release_oxford50|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
@@ -124,6 +139,12 @@ Global
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Debug|x64.Build.0 = Debug|x64
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Debug|x86.ActiveCfg = Debug|x86
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Debug|x86.Build.0 = Debug|x86
+		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.projectconfig|Any CPU.ActiveCfg = Release_oxford50|Any CPU
+		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.projectconfig|Any CPU.Build.0 = Release_oxford50|Any CPU
+		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.projectconfig|x64.ActiveCfg = Release|x64
+		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.projectconfig|x64.Build.0 = Release|x64
+		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.projectconfig|x86.ActiveCfg = Release|x86
+		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.projectconfig|x86.Build.0 = Release|x86
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|x64
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release_oxford50|Any CPU.Build.0 = Release_oxford50|x64
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
@@ -142,6 +163,12 @@ Global
 		{BA8F9918-E809-4957-99D3-B2CD823BB236}.Debug|x64.Build.0 = Debug|x64
 		{BA8F9918-E809-4957-99D3-B2CD823BB236}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{BA8F9918-E809-4957-99D3-B2CD823BB236}.Debug|x86.Build.0 = Debug|Any CPU
+		{BA8F9918-E809-4957-99D3-B2CD823BB236}.projectconfig|Any CPU.ActiveCfg = Release|Any CPU
+		{BA8F9918-E809-4957-99D3-B2CD823BB236}.projectconfig|Any CPU.Build.0 = Release|Any CPU
+		{BA8F9918-E809-4957-99D3-B2CD823BB236}.projectconfig|x64.ActiveCfg = Release|x64
+		{BA8F9918-E809-4957-99D3-B2CD823BB236}.projectconfig|x64.Build.0 = Release|x64
+		{BA8F9918-E809-4957-99D3-B2CD823BB236}.projectconfig|x86.ActiveCfg = Release|Any CPU
+		{BA8F9918-E809-4957-99D3-B2CD823BB236}.projectconfig|x86.Build.0 = Release|Any CPU
 		{BA8F9918-E809-4957-99D3-B2CD823BB236}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Any CPU
 		{BA8F9918-E809-4957-99D3-B2CD823BB236}.Release_oxford50|Any CPU.Build.0 = Release_oxford50|Any CPU
 		{BA8F9918-E809-4957-99D3-B2CD823BB236}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
@@ -159,6 +186,12 @@ Global
 		{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}.projectconfig|Any CPU.ActiveCfg = Release|x64
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.projectconfig|Any CPU.Build.0 = Release|x64
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.projectconfig|x64.ActiveCfg = Release|x64
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.projectconfig|x64.Build.0 = Release|x64
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.projectconfig|x86.ActiveCfg = Release|Win32
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.projectconfig|x86.Build.0 = Release|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
@@ -174,6 +207,12 @@ Global
 		{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}.projectconfig|Any CPU.ActiveCfg = Release|x64
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.projectconfig|Any CPU.Build.0 = Release|x64
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.projectconfig|x64.ActiveCfg = Release|x64
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.projectconfig|x64.Build.0 = Release|x64
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.projectconfig|x86.ActiveCfg = Release|Win32
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.projectconfig|x86.Build.0 = Release|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
@@ -189,6 +228,12 @@ Global
 		{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}.projectconfig|Any CPU.ActiveCfg = Release|x64
+		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.projectconfig|Any CPU.Build.0 = Release|x64
+		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.projectconfig|x64.ActiveCfg = Release|x64
+		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.projectconfig|x64.Build.0 = Release|x64
+		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.projectconfig|x86.ActiveCfg = Release|Win32
+		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.projectconfig|x86.Build.0 = Release|Win32
 		{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
@@ -204,6 +249,12 @@ Global
 		{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}.projectconfig|Any CPU.ActiveCfg = Release|x64
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.projectconfig|Any CPU.Build.0 = Release|x64
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.projectconfig|x64.ActiveCfg = Release|x64
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.projectconfig|x64.Build.0 = Release|x64
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.projectconfig|x86.ActiveCfg = Release|Win32
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.projectconfig|x86.Build.0 = Release|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
@@ -219,6 +270,12 @@ Global
 		{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}.projectconfig|Any CPU.ActiveCfg = Release|x64
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.projectconfig|Any CPU.Build.0 = Release|x64
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.projectconfig|x64.ActiveCfg = Release|x64
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.projectconfig|x64.Build.0 = Release|x64
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.projectconfig|x86.ActiveCfg = Release|Win32
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.projectconfig|x86.Build.0 = Release|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
@@ -234,6 +291,12 @@ Global
 		{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}.projectconfig|Any CPU.ActiveCfg = Release_oxford50|Win32
+		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.projectconfig|Any CPU.Build.0 = Release_oxford50|Win32
+		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.projectconfig|x64.ActiveCfg = Release|x64
+		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.projectconfig|x64.Build.0 = Release|x64
+		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.projectconfig|x86.ActiveCfg = Release_oxford50|Win32
+		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.projectconfig|x86.Build.0 = Release_oxford50|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_oxford50|x64
@@ -250,6 +313,12 @@ Global
 		{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}.projectconfig|Any CPU.ActiveCfg = Release|x64
+		{490A8592-7B13-4536-B475-028E73007FAE}.projectconfig|Any CPU.Build.0 = Release|x64
+		{490A8592-7B13-4536-B475-028E73007FAE}.projectconfig|x64.ActiveCfg = Release|x64
+		{490A8592-7B13-4536-B475-028E73007FAE}.projectconfig|x64.Build.0 = Release|x64
+		{490A8592-7B13-4536-B475-028E73007FAE}.projectconfig|x86.ActiveCfg = Release|Win32
+		{490A8592-7B13-4536-B475-028E73007FAE}.projectconfig|x86.Build.0 = Release|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
@@ -265,6 +334,12 @@ Global
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Debug|x64.Build.0 = Debug|x64
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Debug|x86.ActiveCfg = Debug|Win32
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Debug|x86.Build.0 = Debug|Win32
+		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.projectconfig|Any CPU.ActiveCfg = Release|x64
+		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.projectconfig|Any CPU.Build.0 = Release|x64
+		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.projectconfig|x64.ActiveCfg = Release|x64
+		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.projectconfig|x64.Build.0 = Release|x64
+		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.projectconfig|x86.ActiveCfg = Release|Win32
+		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.projectconfig|x86.Build.0 = Release|Win32
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Win32
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
@@ -280,6 +355,12 @@ Global
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Debug|x64.Build.0 = Debug|x64
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Debug|x86.ActiveCfg = Debug|Win32
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Debug|x86.Build.0 = Debug|Win32
+		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.projectconfig|Any CPU.ActiveCfg = Release|x64
+		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.projectconfig|Any CPU.Build.0 = Release|x64
+		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.projectconfig|x64.ActiveCfg = Release|x64
+		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.projectconfig|x64.Build.0 = Release|x64
+		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.projectconfig|x86.ActiveCfg = Release|Win32
+		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.projectconfig|x86.Build.0 = Release|Win32
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Win32
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
@@ -296,6 +377,12 @@ Global
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Debug|x64.Build.0 = Debug|x64
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Debug|x86.ActiveCfg = Debug|x86
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Debug|x86.Build.0 = Debug|x86
+		{474772DC-334A-4E87-BB46-3ABD913AA44A}.projectconfig|Any CPU.ActiveCfg = Release|Any CPU
+		{474772DC-334A-4E87-BB46-3ABD913AA44A}.projectconfig|Any CPU.Build.0 = Release|Any CPU
+		{474772DC-334A-4E87-BB46-3ABD913AA44A}.projectconfig|x64.ActiveCfg = Release|x64
+		{474772DC-334A-4E87-BB46-3ABD913AA44A}.projectconfig|x64.Build.0 = Release|x64
+		{474772DC-334A-4E87-BB46-3ABD913AA44A}.projectconfig|x86.ActiveCfg = Release|x86
+		{474772DC-334A-4E87-BB46-3ABD913AA44A}.projectconfig|x86.Build.0 = Release|x86
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Any CPU
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release_oxford50|Any CPU.Build.0 = Release_oxford50|Any CPU
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
@@ -314,6 +401,12 @@ Global
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Debug|x64.Build.0 = Debug|x64
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Debug|x86.Build.0 = Debug|Any CPU
+		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.projectconfig|Any CPU.ActiveCfg = Release|Any CPU
+		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.projectconfig|Any CPU.Build.0 = Release|Any CPU
+		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.projectconfig|x64.ActiveCfg = Release|x64
+		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.projectconfig|x64.Build.0 = Release|x64
+		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.projectconfig|x86.ActiveCfg = Release|Any CPU
+		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.projectconfig|x86.Build.0 = Release|Any CPU
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Any CPU
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release_oxford50|Any CPU.Build.0 = Release_oxford50|Any CPU
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64

+ 7 - 6
OTSCPP/OTSControl/OTSSemBase.cpp

@@ -2,7 +2,6 @@
 #include "OTSSemBase.h"
 
 #include "otsdataconst.h"
-//#include "OTSHelper.h"
 
 namespace OTSController {
 
@@ -48,10 +47,11 @@ namespace OTSController {
 			if (!GetPositionXY(dGetPositionX, dGetPositionY, dGetPositionR))
 			{
 				// failed to call GetPositionXY method
-				//LogErrorTrace(__FILE__, __LINE__, "COTSSemBase::MoveSEMToPoint: failed to call GetPositionXY method.");
+				LogErrorTrace(__FILE__, __LINE__, "COTSSemBase::MoveSEMToPoint: failed to call GetPositionXY method.");
 				
 				return FALSE;
 			}
+			Sleep(1000);
 
 			// don't rotation at all
 			dSetPositionR = dGetPositionR;
@@ -59,8 +59,9 @@ namespace OTSController {
 		// Move SEM to position
 		if (!SetPositionXY(dSetPositionX, dSetPositionY, dSetPositionR))
 		{
-
+			LogErrorTrace(__FILE__, __LINE__, "COTSSemBase::MoveSEMToPoint: failed to call SetPositionXY method.");
 		}
+		Sleep(2000);
 		while (nAttempTime > 0 && !bInPlace)
 		{
 			
@@ -68,13 +69,13 @@ namespace OTSController {
 			if (!GetPositionXY(dGetPositionX, dGetPositionY, dGetPositionR))
 			{
 				// failed to call GetPositionXY method
-				//LogErrorTrace(__FILE__, __LINE__, "COTSSemBase::MoveSEMToPoint: failed to call GetPositionXY method.");
+				LogErrorTrace(__FILE__, __LINE__, "COTSSemBase::MoveSEMToPoint: failed to call GetPositionXY method.");
 				--nAttempTime;
 				continue;
 			}
 			else
 			{
-				//LogTrace(__FILE__, __LINE__, _T("COTSSemBase::MoveSEMToPoint: call GetPositionXY method------------%0.3f, %0.3f, %0.3f"), dGetPositionX, dGetPositionY, dGetPositionR);
+				LogTrace(__FILE__, __LINE__, _T("COTSSemBase::MoveSEMToPoint: call GetPositionXY method------------%0.3f, %0.3f, %0.3f"), dGetPositionX, dGetPositionY, dGetPositionR);
 			}
 			
 
@@ -102,7 +103,7 @@ namespace OTSController {
 
 
 
-				Sleep(100);//ÑÓʱ100ºÁÃë 
+				Sleep(1000);//ÑÓʱ100ºÁÃë 
 			}
 
 			// tried once

+ 15 - 10
OTSCPP/OTSControl/Oxford/OTSOxfordImpl.cpp

@@ -3,7 +3,6 @@
 #include "../OTSControl/ControllerHelper.h"
 #include "COTSUtilityDllFunExport.h"
 #include "OxfordImplConst.h"
-//#include "boost/smart_ptr/scoped_array.hpp"
 
 
 #ifdef _DEBUG
@@ -17,7 +16,7 @@
     OxfordImpl::OxfordImpl(void)
         : m_bInit(false)
     {
-		/*features=new OxfordXrayData[nCollectCount]*/
+		
     }
 
     OxfordImpl::~OxfordImpl(void)
@@ -372,8 +371,10 @@
 					if (!m_oxfordPtr->CollectXrayData(a_nACTimeMS, (long*)nChannelData, GENERALXRAYCHANNELS))
 					{
 						// error
-						/*LogError(_T("Call CollectOneXRayPoint failed: index = %d(x:%d, y:%d)"),
-							i, poi.x, poi.y);*/
+						CString s;
+						s.Format(_T("Call CollectOneXRayPoint failed: index = %d(x:%d, y:%d))"), i, poi.x, poi.y);
+						LogErrorTrace(__FILE__,__LINE__,s);
+							
 
 						return false;
 					}
@@ -383,13 +384,17 @@
 					nTatolXrayCount = a_listXrayPois[i]->GetTotalCount();
 					if (nTatolXrayCount < 20)
 					{
-						/*LogWarn(_T("Single point spectrum still low count (%d counts), index = %d(x:%d, y:%d.) This could be caused by charging."),
-							nTatolXrayCount, i, poi.x, poi.y);*/
+						CString s1;
+						s1.Format(_T("Single point spectrum still low count (%d counts), index = %d(x:%d, y:%d.) This could be caused by charging."),
+							nTatolXrayCount, i, poi.x, poi.y);
+						LogTrace(__FILE__, __LINE__, s1);
 					}
 					else
 					{
-						/*LogWarn(_T("Single point spectrum collected successfully (%d counts), index = %d(x:%d, y:%d.)"),
-							nTatolXrayCount, i, poi.x, poi.y);*/
+						CString s2;
+						s2.Format(_T("Single point spectrum collected successfully (%d counts), index = %d(x:%d, y:%d.)"),
+							nTatolXrayCount, i, poi.x, poi.y);
+						LogTrace(__FILE__, __LINE__, s2);
 					}
 				}
 			}
@@ -398,9 +403,9 @@
 			return TRUE;
 
 		}
-		catch (const std::exception&)
+		catch (const std::exception e)
 		{
-			LogErrorTrace(__FILE__, __LINE__, _T("COTSOxfordImpl::GetXRayByPoints: exception."));
+			LogErrorTrace(__FILE__, __LINE__, _T("COTSOxfordImpl::GetXRayByPoints: exception.")+ CString(e.what()));
 		}
 
 		// error, return false

+ 24 - 24
OTSCPP/OTSControl/Oxford/OxfordWrapper/OxfordController.cpp

@@ -57,7 +57,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->GetPositionXY(a_dPosX, a_dPosY))
 		{
-			OutputDebugString(_T("GetPositionXY command failed."));
+			LogErrorTrace(__FILE__,__LINE__,_T("GetPositionXY command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -73,7 +73,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->SetPositionXY(a_dPosX, a_dPosY))
 		{
-			OutputDebugString(_T("SetPositionXY command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("SetPositionXY command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -89,7 +89,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->GetWorkingDistance(a_dWorkingDistance))
 		{
-			OutputDebugString(_T("GetWorkingDistance command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("GetWorkingDistance command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -105,7 +105,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->SetWorkingDistance(a_dWorkingDistance))
 		{
-			OutputDebugString(_T("SetWorkingDistance command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("SetWorkingDistance command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -121,7 +121,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->GetMagnification(a_dMagnification))
 		{
-			OutputDebugString(_T("GetMagnification command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("GetMagnification command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -137,7 +137,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->SetMagnification(a_dMagnification))
 		{
-			OutputDebugString(_T("SetMagnification command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("SetMagnification command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -153,7 +153,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->GetHighVoltage(a_dHighVoltage))
 		{
-			OutputDebugString(_T("GetHighVoltage command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("GetHighVoltage command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -169,7 +169,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->SetHighVoltage(a_dHighVoltage))
 		{
-			OutputDebugString(_T("SetHighVoltage command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("SetHighVoltage command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -185,7 +185,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->GetBeamOn(a_bBeamOn))
 		{
-			OutputDebugString(_T("GetBeamOn command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("GetBeamOn command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -201,7 +201,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->SetBeamOn(a_bBeamOn))
 		{
-			OutputDebugString(_T("SetBeamOn command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("SetBeamOn command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -217,7 +217,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->GetBeamBlank(a_bBeamBlank))
 		{
-			OutputDebugString(_T("GetBeamBlank command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("GetBeamBlank command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -233,7 +233,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->SetBeamBlank(a_bBeamBlank))
 		{
-			OutputDebugString(_T("SetBeamBlank command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("SetBeamBlank command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -249,7 +249,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->GetExternalScan(a_bExternal))
 		{
-			OutputDebugString(_T("GetExternal command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("GetExternal command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -265,7 +265,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->SetExternalScan(a_bExternal))
 		{
-			OutputDebugString(_T("SetExternal command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("SetExternal command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -281,7 +281,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->SetBeamPosition(a_dPosX, a_dPosY))
 		{
-			OutputDebugString(_T("SetBeamPosition command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("SetBeamPosition command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -297,7 +297,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->CollectXrayPoint(a_nAcTime, a_pnCounts, a_nBufferSize))
 		{
-			OutputDebugString(_T("CollectXrayData command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("CollectXrayData command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -313,7 +313,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->CollectXrayPoint(a_dPosX, a_dPosY, a_nAcTime, a_pnCounts, a_nBufferSize))
 		{
-			OutputDebugString(_T("CollectXrayDataAtPos command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("CollectXrayDataAtPos command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -329,7 +329,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->CollectXrayPoints(a_nAcTime, a_pXrayDataList, a_nXrayDataCount, a_nBufferSize))
 		{
-			OutputDebugString(_T("CollectXrayList command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("CollectXrayList command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -345,7 +345,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->CollectXrayArea(a_nAcTime, a_pXrayDataList, a_nXrayDataCount, a_nBufferSize))
 		{
-			OutputDebugString(_T("CollectXrayList command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("CollectXrayList command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -361,7 +361,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->SetScanSpeed(a_nMilliseconds))
 		{
-			OutputDebugString(_T("SetScanSpeed command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("SetScanSpeed command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -377,7 +377,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->GetImageSize(a_nWidth, a_nHeight))
 		{
-			OutputDebugString(_T("GetImageSize command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("GetImageSize command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -393,7 +393,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->SetImageSize(a_nWidth, a_nHeight))
 		{
-			OutputDebugString(_T("SetImageSize command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("SetImageSize command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -409,7 +409,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->CollectImage(a_pImageBits))
 		{
-			//OutputDebugString(_T("CollectImage command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("CollectImage command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 
@@ -425,7 +425,7 @@ using namespace OTSController;
 
 		if (!ManagedGlobals::oxfordController->QuantifySpectrum(cResult))
 		{
-			OutputDebugString(_T("CollectImage command failed."));
+			LogErrorTrace(__FILE__, __LINE__, _T("CollectImage command failed."));
 			return (int)OxfordWrapperErrorCode::COMMAND_FAILED;
 		}
 

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 164 - 616
OTSCPP/OTSControl/Oxford/OxfordWrapper/OxfordControllerWrapper.cpp


+ 1 - 2
OTSCPP/OTSControl/Oxford/OxfordWrapper/OxfordControllerWrapper.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../OTSControl/Oxford/OxfordImplConst.h"
-//#include "OxfordXrayData1.h"
+
 
 using namespace System::Collections::Generic;
 
@@ -27,7 +27,6 @@ using namespace OINA::Extender::Processing;
 using namespace OINA::Extender::Processing::Ed;
 using namespace OINA::Extender::Processing::Quant;
 
-//using namespace OINA::Extender::Testharness::Properties;
 
 using namespace OTSController;
 ref class OxfordControllerWrapper

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است