Просмотр исходного кода

Merge branch 'GSP' into Release2.7

gsp 2 лет назад
Родитель
Сommit
5c535fe767

+ 103 - 0
OTS.sln

@@ -87,6 +87,9 @@ Global
 		Release_oxford60|Any CPU = Release_oxford60|Any CPU
 		Release_oxford60|x64 = Release_oxford60|x64
 		Release_oxford60|x86 = Release_oxford60|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.CleannessRelease|Any CPU.ActiveCfg = CleannessRelease|Any CPU
@@ -113,6 +116,12 @@ Global
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Any CPU
 		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release_oxford60|x86.Build.0 = Release_oxford60|Any CPU
+		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release|Any CPU.ActiveCfg = Release_oxford50|Any CPU
+		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release|Any CPU.Build.0 = Release_oxford50|Any CPU
+		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release|x64.ActiveCfg = Release|x64
+		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release|x64.Build.0 = Release|x64
+		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release|x86.ActiveCfg = Release_oxford50|Any CPU
+		{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}.Release|x86.Build.0 = Release_oxford50|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
@@ -137,6 +146,12 @@ Global
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release_oxford60|x86.ActiveCfg = Release_oxford60|x86
 		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release_oxford60|x86.Build.0 = Release_oxford60|x86
+		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release|Any CPU.ActiveCfg = Release_oxford50|x64
+		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release|Any CPU.Build.0 = Release_oxford50|x64
+		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release|x64.ActiveCfg = Release|x64
+		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release|x64.Build.0 = Release|x64
+		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release|x86.ActiveCfg = Release_oxford50|x86
+		{A3059BB1-9315-49DB-9680-FE16FAB1499D}.Release|x86.Build.0 = Release_oxford50|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
@@ -157,6 +172,11 @@ Global
 		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Win32
 		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release_oxford60|x86.Build.0 = Release_oxford60|Win32
+		{CEA06DD1-5CD7-4B7D-A807-785718C3A854}.Release|Any CPU.ActiveCfg = Release_oxford50|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}.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
@@ -177,6 +197,11 @@ Global
 		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Win32
 		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release_oxford60|x86.Build.0 = Release_oxford60|Win32
+		{3737BD0B-0DBB-4C11-AAD1-6E2B9822270B}.Release|Any CPU.ActiveCfg = Release_oxford50|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}.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
@@ -197,6 +222,11 @@ Global
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Win32
 		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release_oxford60|x86.Build.0 = Release_oxford60|Win32
+		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release|Any CPU.ActiveCfg = Release_oxford50|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_oxford50|Win32
+		{201A7F92-48AE-4BCC-B75E-988E3AAC117C}.Release|x86.Build.0 = Release_oxford50|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
@@ -217,6 +247,11 @@ Global
 		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Win32
 		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release_oxford60|x86.Build.0 = Release_oxford60|Win32
+		{CD59EA38-9ADF-40D3-B1C0-7A66A9D2F77B}.Release|Any CPU.ActiveCfg = Release_oxford50|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}.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
@@ -237,6 +272,11 @@ Global
 		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Win32
 		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release_oxford60|x86.Build.0 = Release_oxford60|Win32
+		{DAA6170E-5984-46DC-A8BA-DE696299DCA6}.Release|Any CPU.ActiveCfg = Release_oxford50|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}.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
@@ -258,6 +298,12 @@ Global
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Win32
 		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release_oxford60|x86.Build.0 = Release_oxford60|Win32
+		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release|Any CPU.ActiveCfg = Debug|x64
+		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release|Any CPU.Build.0 = Debug|x64
+		{11A59D12-007A-40D9-9D74-D8F079BD9F86}.Release|x64.ActiveCfg = Release|x64
+		{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}.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
@@ -278,6 +324,11 @@ Global
 		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Win32
 		{490A8592-7B13-4536-B475-028E73007FAE}.Release_oxford60|x86.Build.0 = Release_oxford60|Win32
+		{490A8592-7B13-4536-B475-028E73007FAE}.Release|Any CPU.ActiveCfg = Release_oxford50|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
 		{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
@@ -298,6 +349,11 @@ Global
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Win32
 		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release_oxford60|x86.Build.0 = Release_oxford60|Win32
+		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release|Any CPU.ActiveCfg = Release_oxford50|Win32
+		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release|x64.ActiveCfg = Release|x64
+		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release|x64.Build.0 = Release|x64
+		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release|x86.ActiveCfg = Release_oxford50|Win32
+		{EC722DFC-BD72-4673-B9E2-226C70B015A8}.Release|x86.Build.0 = Release_oxford50|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
@@ -318,6 +374,11 @@ Global
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Win32
 		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release_oxford60|x86.Build.0 = Release_oxford60|Win32
+		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release|Any CPU.ActiveCfg = Release_oxford50|Win32
+		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release|x64.ActiveCfg = Release|x64
+		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release|x64.Build.0 = Release|x64
+		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release|x86.ActiveCfg = Release_oxford50|Win32
+		{0FF40344-34D5-49D0-9467-1F43C81A0D31}.Release|x86.Build.0 = Release_oxford50|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
@@ -342,6 +403,12 @@ Global
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Any CPU
 		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release_oxford60|x86.Build.0 = Release_oxford60|Any CPU
+		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release|Any CPU.ActiveCfg = Release_oxford50|Any CPU
+		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release|Any CPU.Build.0 = Release_oxford50|Any CPU
+		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release|x64.ActiveCfg = Release|x64
+		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release|x64.Build.0 = Release|x64
+		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release|x86.ActiveCfg = Release_oxford50|Any CPU
+		{52B47C78-BF08-4670-AB88-FDC972B4D7B4}.Release|x86.Build.0 = Release_oxford50|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
@@ -366,6 +433,12 @@ Global
 		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Any CPU
 		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Release_oxford60|x86.Build.0 = Release_oxford60|Any CPU
+		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Release|x64.ActiveCfg = Release|x64
+		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Release|x64.Build.0 = Release|x64
+		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Release|x86.ActiveCfg = Release|Any CPU
+		{8B08AA54-13CA-4D28-8F70-3B1F238E10A4}.Release|x86.Build.0 = Release|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
@@ -390,6 +463,12 @@ Global
 		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Any CPU
 		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Release_oxford60|x86.Build.0 = Release_oxford60|Any CPU
+		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Release|x64.ActiveCfg = Release|x64
+		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Release|x64.Build.0 = Release|x64
+		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Release|x86.ActiveCfg = Release|Any CPU
+		{2A6A6643-02DC-4361-9C8B-0BBBF8BE79BE}.Release|x86.Build.0 = Release|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
@@ -414,6 +493,12 @@ Global
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release_oxford60|x86.ActiveCfg = Release_oxford60|x86
 		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release_oxford60|x86.Build.0 = Release_oxford60|x86
+		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release|Any CPU.ActiveCfg = Release_oxford50|Any CPU
+		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release|Any CPU.Build.0 = Release_oxford50|Any CPU
+		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release|x64.ActiveCfg = Release|x64
+		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release|x64.Build.0 = Release|x64
+		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release|x86.ActiveCfg = Release_oxford50|x86
+		{474772DC-334A-4E87-BB46-3ABD913AA44A}.Release|x86.Build.0 = Release_oxford50|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
@@ -438,6 +523,12 @@ Global
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Any CPU
 		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Release_oxford60|x86.Build.0 = Release_oxford60|Any CPU
+		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Release|x64.ActiveCfg = Release|x64
+		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Release|x64.Build.0 = Release|x64
+		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Release|x86.ActiveCfg = Release|Any CPU
+		{BBA845E8-27ED-4832-90FA-32F737E1FCA7}.Release|x86.Build.0 = Release|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
@@ -462,6 +553,12 @@ Global
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release_oxford60|x86.ActiveCfg = Release_oxford60|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release_oxford60|x86.Build.0 = Release_oxford60|Any CPU
+		{3B7695AA-8231-45AC-B493-84390A945D02}.Release|Any CPU.ActiveCfg = Release_oxford50|Any CPU
+		{3B7695AA-8231-45AC-B493-84390A945D02}.Release|Any CPU.Build.0 = Release_oxford50|Any CPU
+		{3B7695AA-8231-45AC-B493-84390A945D02}.Release|x64.ActiveCfg = Release|x64
+		{3B7695AA-8231-45AC-B493-84390A945D02}.Release|x64.Build.0 = Release|x64
+		{3B7695AA-8231-45AC-B493-84390A945D02}.Release|x86.ActiveCfg = Release|Any CPU
+		{3B7695AA-8231-45AC-B493-84390A945D02}.Release|x86.Build.0 = Release|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
@@ -486,6 +583,12 @@ Global
 		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release_oxford60|x64.Build.0 = Release_oxford60|x64
 		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release_oxford60|x86.ActiveCfg = Release|Any CPU
 		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release_oxford60|x86.Build.0 = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release|x64.ActiveCfg = Release|x64
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release|x64.Build.0 = Release|x64
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release|x86.ActiveCfg = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Разница между файлами не показана из-за своего большого размера
+ 339 - 419
OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs


+ 5 - 6
OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSXRayParam.cs

@@ -37,7 +37,7 @@ namespace OTSDataType
         const int Default_Xray_Limit = 50;
         private OTS_X_RAY_SCAN_MODE m_nScanMode;
 
-        private OTS_IMAGE_SCANSPEED_OPTIONS m_nAnalySpeed;
+        //private OTS_IMAGE_SCANSPEED_OPTIONS m_nAnalySpeed;
         private int m_nAnalyExpCount;
         private int m_nMidSearchAQTime;
         private int m_nMidAnalyAQTime;
@@ -55,7 +55,7 @@ namespace OTSDataType
         {
             m_nScanMode = DEFAULE_XRAY_SCAN_MODE;
     
-            m_nAnalySpeed = DEFAULE_ANALYSIS_XRAY_SPEED;
+            //m_nAnalySpeed = DEFAULE_ANALYSIS_XRAY_SPEED;
             m_nAnalyExpCount = DEFAULE_XRAY_EXP_COUNT;
             m_nMidSearchAQTime = DEFAULE_XRAY_SEARCH_MID_TIME;
             m_nMidAnalyAQTime = DEFAULE_XRAY_ANALY_MID_TIME;
@@ -75,7 +75,7 @@ namespace OTSDataType
             // copy data over
             m_nScanMode = a_oSource.m_nScanMode;
 
-            m_nAnalySpeed = a_oSource.m_nAnalySpeed;
+            //m_nAnalySpeed = a_oSource.m_nAnalySpeed;
             m_nAnalyExpCount = a_oSource.m_nAnalyExpCount;
             m_nMidSearchAQTime = a_oSource.m_nMidSearchAQTime;
             m_nMidAnalyAQTime = a_oSource.m_nMidAnalyAQTime;
@@ -97,7 +97,7 @@ namespace OTSDataType
             // return test result
             return m_nScanMode == a_oSource.m_nScanMode &&
    
-                m_nAnalySpeed == a_oSource.m_nAnalySpeed &&
+                //m_nAnalySpeed == a_oSource.m_nAnalySpeed &&
                 m_nAnalyExpCount == a_oSource.m_nAnalyExpCount &&
                 m_nMidSearchAQTime == a_oSource.m_nMidSearchAQTime &&
                 m_nMidAnalyAQTime == a_oSource.m_nMidAnalyAQTime &&
@@ -115,8 +115,7 @@ namespace OTSDataType
 
 
 
-        public OTS_IMAGE_SCANSPEED_OPTIONS GetAnalySpeed() { return m_nAnalySpeed; }
-        public void SetAnalySpeed(OTS_IMAGE_SCANSPEED_OPTIONS a_nVal) { m_nAnalySpeed = a_nVal; }
+     
 
         public int GetAnalyExpCount() { return m_nAnalyExpCount; }
         public void SetAnalyExpCount(int a_nVal) { m_nAnalyExpCount = a_nVal; }

+ 27 - 44
OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -441,49 +441,42 @@ namespace OTSMeasureApp
             if (a_strHoleName != "")
             {
                 // try to find matched hole
-                //bool IsChanged = false;
-                //int holeIndex = -1;
+             
                 for (int i = 0; i < listHoles.Count; i++)
                 {
                     if (listHoles[i].GetName() == a_strHoleName)
                     {
                         cReHole = listHoles[i];
                         return cReHole;
-                        //listHoles.RemoveAt(itr);
-                        //IsChanged = true;
-                        //holeIndex = itr;
-                        //break;
+                       
                     }
                 }
 
-                //if (IsChanged)
-                //{
-                    
-                //}
+               
             }
 
             // can't find a matched hole, then pick the first empty hole
-            //没有按照孔进行添加,则与样品列表进行判断
+          
             // go through the holes list
-            //foreach (var pHole in listHoles)
-            //{
-            //    // has this hole any sample in it?
-            //    String strHoleName = pHole.GetName();
-            //    bool IsChanged = false;
-            //    var m_listSamples = GetResultData().GetSampleList();
-            //    foreach (COTSSample sampleItem in m_listSamples)
-            //    {
-            //        if (strHoleName == sampleItem.GetSampleHoleName())
-            //        {
-            //            //listHoles.RemoveAt(itr);
-            //            IsChanged = true;
-            //        }
-            //    }
-            //    if (!IsChanged)
-            //    {
-            //        return pHole;
-            //    }
-            //}
+            foreach (var pHole in listHoles)
+            {
+                // has this hole any sample in it?
+                String strHoleName = pHole.GetName();
+                bool IsChanged = false;
+                var m_listSamples = GetResultData().GetSampleList();
+                foreach (COTSSample sampleItem in m_listSamples)
+                {
+                    if (strHoleName == sampleItem.GetSampleHoleName())
+                    {
+                       
+                        IsChanged = true;
+                    }
+                }
+                if (!IsChanged)
+                {
+                    return pHole;
+                }
+            }
 
             // no empty hole, then the first hole will be the one
             return listHoles[0];
@@ -533,15 +526,7 @@ namespace OTSMeasureApp
             COTSSample WSample = GetResultData().GetWorkingSample();
 
             bool bSetFalg = false;
-            //判断样品名是否有效
-            if (ItemId == OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME)
-            {
-                if (!GetResultData().IsValidSampleName((string)objVal))
-                {
-                    bSetFalg = false;
-                    return false;
-                }
-            }
+        
             bSetFalg = WSample.SetParamVal(ItemId, ValType, objVal);
 
             if (bSetFalg)
@@ -699,7 +684,7 @@ namespace OTSMeasureApp
 
         }
 
-  
+
 
         //设置样品参数锁
         //bool ParaLockFlag : 样品参数锁
@@ -1368,6 +1353,7 @@ namespace OTSMeasureApp
 
         public bool GetWorkSamplePerameter(COTSSample Sample, ref OTSSamplePropertyInfo SMeasureInfo)
         {
+            SMeasureInfo.ClearGrp();
             //设置工作样品属性项
             if (Sample.GetMsrParams().m_nPackId == OTS_SysType_ID.CleannessA)
             {
@@ -1377,10 +1363,7 @@ namespace OTSMeasureApp
             {
                 Sample.SetPropItemGrpsForIncA();
             }
-            else if (Sample.GetMsrParams().m_nPackId == OTS_SysType_ID.MiningA)
-            {
-                Sample.SetPropItemGrpsWithOutIncASysLib();
-            }
+           
 
                 bool MeasurementStatus = false;
            

+ 1 - 1
OTSIncAMeasureApp/3-OTSDisplaySourceGridData/MeasureStopMode.Designer.cs

@@ -1,7 +1,7 @@
 
 namespace OTSMeasureApp._3_OTSDisplaySourceGridData
 {
-    partial class MeasureStopMode
+    partial class frmMeasureStopMode
     {
         /// <summary>
         /// Required designer variable.

+ 2 - 2
OTSIncAMeasureApp/3-OTSDisplaySourceGridData/MeasureStopMode.cs

@@ -11,7 +11,7 @@ using static OTSDataType.otsdataconst;
 
 namespace OTSMeasureApp._3_OTSDisplaySourceGridData
 {
-    public partial class MeasureStopMode : Form
+    public partial class frmMeasureStopMode : Form
     {
         string m_StopMode="";
         int m_FieldMode = 100;
@@ -81,7 +81,7 @@ namespace OTSMeasureApp._3_OTSDisplaySourceGridData
         OTSCommon.Language lan;
         System.Collections.Hashtable table;
 
-        public MeasureStopMode()
+        public frmMeasureStopMode()
         {
             InitializeComponent();
 

+ 3 - 3
OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSDisplaySampleGrid.cs

@@ -892,7 +892,7 @@ namespace OTSMeasureApp
             if (m_SampleGrid.m_PropWindow.PropGrid.Rows[m_SampleGrid.m_ClickRow].Tag != null)   //需要判断每行的Tag 是否绑定sampleID
             {
                 OTS_SAMPLE_PROP_GRID_ITEMS SampleId = (OTS_SAMPLE_PROP_GRID_ITEMS)m_SampleGrid.m_PropWindow.PropGrid.Rows[m_SampleGrid.m_ClickRow].Tag;
-                String sName = (string)m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 1].Value;
+             
                 object objVal = m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value;               
                 if(m_SampleGrid.m_ReqChangeValFlag)
                 {
@@ -904,7 +904,7 @@ namespace OTSMeasureApp
                         objVal= m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Editor.StandardValuesIndexOf(objVal);
                     }
 
-                    m_SampleGrid.m_PropWindow.SampleGridInfoChange((OTS_SAMPLE_PROP_GRID_ITEMS)SampleId, ValType, objVal);
+                    m_SampleGrid.m_PropWindow.SampleGridInfoChange(SampleId, ValType, objVal);
                 }
             }
         }
@@ -1222,7 +1222,7 @@ namespace OTSMeasureApp
                     OTS_SAMPLE_PROP_GRID_ITEMS SampleId = (OTS_SAMPLE_PROP_GRID_ITEMS)m_Grid.m_PropWindow.PropGrid.Rows[m_Grid.m_ClickRow].Tag;
                     String sName = (string)m_Grid.m_PropWindow.PropGrid[m_Grid.m_ClickRow, 1].Value;
                     object objVal = m_Grid.m_PropWindow.PropGrid[m_Grid.m_ClickRow, 2].Value;
-                  
+
                     m_Grid.m_PropWindow.SampleGridInfoChange((OTS_SAMPLE_PROP_GRID_ITEMS)SampleId, OTS_ITEM_TYPES.BOOL, objVal);
                 }
 

+ 123 - 106
OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -15,7 +15,7 @@ namespace OTSMeasureApp
 
         public OTSIncAMeasureAppForm m_MeasureAppForm = null;   
         public OTSDisplaySampleGrid m_SampleGrid = null;
-        MeasureStopMode StopModeDialog;
+        frmMeasureStopMode frmStopModeDialog;
         public OTSPropertyWindow(OTSIncAMeasureAppForm MeasureAppForm)
         {
             InitializeComponent();
@@ -83,149 +83,164 @@ namespace OTSMeasureApp
 
         public void SampleGridInfoChange(OTS_SAMPLE_PROP_GRID_ITEMS SampleId, OTS_ITEM_TYPES ValType, object ObjVal)
         {
+           
+
             var PropertyMeasureThreadRunFlag = m_MeasureAppForm.m_MsrThreadWrapper.BGWorkThreadIsRunning();
             var measureTreadIsPaused= m_MeasureAppForm.m_MsrThreadWrapper.BgWorkIsPaused();
-          
-            var m_SolutionWindows = m_MeasureAppForm.m_SolutionWindows;
-            //设置样品属性参数成功
-            OTSSamplePropertyInfo SMInfo = new OTSSamplePropertyInfo();
-            var m_measurePara = m_MeasureAppForm.m_ProjParam;
-            var curSample = m_MeasureAppForm.m_ProjParam.GetWorkSample();
-            var curpara = curSample.GetMsrParams();
-            //当前正在测量
-            if (PropertyMeasureThreadRunFlag)//measureThread is running
-            {
-                if (measureTreadIsPaused == false)//and is not paused
-                {
-                    goto HERE;
-                }
 
-            }
-            string sWSampleName = m_measurePara.GetWorkSampleName();
-            if ("" == sWSampleName)
+            if (measureTreadIsPaused == false && PropertyMeasureThreadRunFlag == true)
             {
                 return;
             }
 
+
+
+            var m_measurePara = m_MeasureAppForm.m_ProjParam;
+           
            
-            //更新 STD_FILE_NAME FILE_LIST
-             if (OTS_SAMPLE_PROP_GRID_ITEMS.STD_FILE_NAME == SampleId)
+
+            OTSSamplePropertyInfo SMInfo = new OTSSamplePropertyInfo();
+
+
+            switch (SampleId)
             {
+                case OTS_SAMPLE_PROP_GRID_ITEMS.STD_FILE_NAME:
                 if (m_measurePara.SetSTDFileName((int)ObjVal))
                 {
-              
+
                     m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-                   
+
                     DisplaySampleMeasureInfo(SMInfo);
                     return;
                 }
-            }
-            else
+                    break;
+                case OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME:
+                    string strNewName = (string)ObjVal;
+                    strNewName = strNewName.Trim();
+                    string oldName = m_measurePara.GetWorkSampleName();
+                    if (!m_measurePara.CheckSampleNameIsValid(strNewName))
             {
         
-               
-                if (!m_measurePara.SetSampleParamVal(SampleId, ValType, ObjVal))    // Prop值变化,修改样品值成功
-                {
-                  
+                        //update source grid,recover to the original value
+                        DisplaySampleMeasureInfo(SMInfo);
+                        return;
+                    }
+
+                    m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME, OTS_ITEM_TYPES.STRING, strNewName);
+                    //update visual stage
+                    m_MeasureAppForm.m_SamplepaceWindow.ChangeWorkSampleName(strNewName);
+                    var m_SolutionWindows = m_MeasureAppForm.m_SolutionWindows;
+                    //update the project sample list on the left of the main gui interface.
+                    m_SolutionWindows.m_TreeViewBase.EditTreeWorkSampleName(oldName, strNewName);
+
                     m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
+                    //update source grid
+                    DisplaySampleMeasureInfo(SMInfo);
+
                    
                   
+
+                    break;
+                case OTS_SAMPLE_PROP_GRID_ITEMS.STOP_MODE:
+                    if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD, OTS_ITEM_TYPES.INT, frmStopModeDialog.FieldMode))    // Prop值变化,修改样品值成功
+                    {
+
+                        m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
+
+
                     DisplaySampleMeasureInfo(SMInfo);
                     return;
                 }
-                if(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_MODE==SampleId)
+                    if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME, OTS_ITEM_TYPES.INT, frmStopModeDialog.TimeMode))    // Prop值变化,修改样品值成功
                 {
-                    if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD, OTS_ITEM_TYPES.INT, StopModeDialog.FieldMode))    // Prop值变化,修改样品值成功
-                    {
-                       
+
                         m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-                       
-                 
+
+
                         DisplaySampleMeasureInfo(SMInfo);
                         return;
                     }
-                    if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME, OTS_ITEM_TYPES.INT, StopModeDialog.TimeMode))    // Prop值变化,修改样品值成功
+                    if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE, OTS_ITEM_TYPES.INT, frmStopModeDialog.ParticleMode))    // Prop值变化,修改样品值成功
                     {
-                      
+
                         m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-                       
-                    
+
+
                         DisplaySampleMeasureInfo(SMInfo);
                         return;
                     }
-                    if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE, OTS_ITEM_TYPES.INT, StopModeDialog.ParticleMode))    // Prop值变化,修改样品值成功
+                    if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_AREA, OTS_ITEM_TYPES.INT, frmStopModeDialog.AreaMode))    // Prop值变化,修改样品值成功
                     {
-                      
+
                         m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-                       
-                    
+
+
                         DisplaySampleMeasureInfo(SMInfo);
                         return;
                     }
-                    if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_AREA, OTS_ITEM_TYPES.INT, StopModeDialog.AreaMode))    // Prop值变化,修改样品值成功
+                    if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_MODE, OTS_ITEM_TYPES.STRING, frmStopModeDialog.StopMode))    // Prop值变化,修改样品值成功
                     {
-                     
+
                         m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-                            
-                      
+
+
                         DisplaySampleMeasureInfo(SMInfo);
                         return;
                     }
-                }
-            }
-            //更新GROUPID和ITEMID的变化
-            OTS_SAMPLE_PROP_GRID_ITEMS ItemID = (OTS_SAMPLE_PROP_GRID_ITEMS)SampleId;
-            m_measurePara.UpdateGroupValAndItemVal(ItemID);
+                    break;
 
-            //修改Treeview 工作样品名字
-            if (OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME == SampleId)
+                default:
+                    if (!m_measurePara.SetSampleParamVal(SampleId, ValType, ObjVal))    // Prop值变化,修改样品值成功
             {
-                m_SolutionWindows.m_TreeViewBase.EditTreeWorkSampleName(sWSampleName, (string)ObjVal);
 
-             
-            }
+                        m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
 
-        HERE:
 
-            m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-           
-         
-                // 修改TREEVIEW 工作样品的CHECKBOX值
-                if (OTS_SAMPLE_PROP_GRID_ITEMS.SWITCH == SampleId)
-                {
-                    //修改TREEVIEW对应的样品的CHECKBOX值
-                    m_SolutionWindows.Rev_MeasureApp_CheckboxStatuChange_Event(m_measurePara.GetWorkSampleName(), SMInfo.TSampleParam.bSwitch);
-                    // 设置 开始 ,停止 和检查参数 按钮状态
-                   m_MeasureAppForm. m_RibbonFun.SetMeasureRibbonButnStatu();
+                        DisplaySampleMeasureInfo(SMInfo);
+                        return;
                 }
+                    break;
              
-                sWSampleName = m_measurePara.GetWorkSampleName();
-                if ("" != sWSampleName)
-                {
-                   m_MeasureAppForm. m_SamplepaceWindow.ChangeWorkSampleName(sWSampleName);
                 }
-                
-                DisplaySampleMeasureInfo(SMInfo);
-                //当修改了 样品图尺寸、放大倍数和样品图的Pix大小等,SAMPLEWINDOW需要重新绘制样品台
-                if (OTS_SAMPLE_PROP_GRID_ITEMS.IMAGE_GRP_MAX == SampleId 
+
+            //---after modify the value of current sample properties,update the corresponding value of GUI.---
+
+            if (OTS_SAMPLE_PROP_GRID_ITEMS.IMAGE_GRP_MAX == SampleId
                     || OTS_SAMPLE_PROP_GRID_ITEMS.MAGNIFICATION == SampleId
                     || OTS_SAMPLE_PROP_GRID_ITEMS.IMAGERESOLUTION_SIZE == SampleId
-                    || OTS_SAMPLE_PROP_GRID_ITEMS.START_MODE == SampleId
+                   || OTS_SAMPLE_PROP_GRID_ITEMS.START_PHOTO_MODE == SampleId
                     || OTS_SAMPLE_PROP_GRID_ITEMS.SCAN_MODE == SampleId
                     )
                 {
 
-                    if (!measureTreadIsPaused && !PropertyMeasureThreadRunFlag)
-                    {
-                        
+
+
                         var sam = m_MeasureAppForm.m_SamplepaceWindow.GetWorkingVisualSample();
 
                         m_MeasureAppForm.m_SamplepaceWindow.PrepareMeasureField(sam, MSR_RUN_TYPE.RUNMEASURE);
 
+
+                m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
+                DisplaySampleMeasureInfo(SMInfo);
+                return;
                     }
+
+
+            m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
+            if (OTS_SAMPLE_PROP_GRID_ITEMS.SWITCH == SampleId)
+            {
                     
+                m_MeasureAppForm.m_SolutionWindows.Rev_MeasureApp_CheckboxStatuChange_Event(m_measurePara.GetWorkSampleName(), SMInfo.TSampleParam.bSwitch);
+                // 设置 开始 ,停止 和检查参数 按钮状态
+                m_MeasureAppForm.m_RibbonFun.SetMeasureRibbonButnStatu();
                }
+
            
+          
+            m_measurePara.UpdateGroupValAndItemVal(SampleId);
+            //update the source grid value
+            DisplaySampleMeasureInfo(SMInfo);
+
 
         }
 
@@ -248,27 +263,28 @@ namespace OTSMeasureApp
             if(m_SampleGrid.m_ClickRow>=0 && m_SampleGrid.m_ClickColumn>=0)
             {
                 m_SampleGrid.SetGridTitleStatus();
-                if(m_MeasureAppForm.m_ProjData.m_systemTypeId == otsdataconst.OTS_SysType_ID.CleannessA || m_MeasureAppForm.m_ProjData.m_systemTypeId == otsdataconst.OTS_SysType_ID.MiningA)
+                if(m_MeasureAppForm.m_ProjData.m_systemTypeId == otsdataconst.OTS_SysType_ID.CleannessA )
                 {
-                    if (m_SampleGrid.m_ClickRow == 7 && m_SampleGrid.m_ClickColumn == 2)
+                    const int CleannessASysStopModeGridRowPos = 7;
+                    if (m_SampleGrid.m_ClickRow == CleannessASysStopModeGridRowPos && m_SampleGrid.m_ClickColumn == 2)
                     {
-                        StopModeDialog = new MeasureStopMode();
-                        StopModeDialog.FieldMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value.ToString());
-                        StopModeDialog.TimeMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value.ToString());
-                        StopModeDialog.ParticleMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value.ToString());
-                        StopModeDialog.StopMode = PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value.ToString();
-                        StopModeDialog.AreaMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 4, m_SampleGrid.m_ClickColumn].Value.ToString());
-                        DialogResult result = StopModeDialog.ShowDialog();
+                        frmStopModeDialog = new frmMeasureStopMode();
+                        frmStopModeDialog.FieldMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        frmStopModeDialog.TimeMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        frmStopModeDialog.ParticleMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        frmStopModeDialog.StopMode = PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value.ToString();
+                        frmStopModeDialog.AreaMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 4, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        DialogResult result = frmStopModeDialog.ShowDialog();
 
                         if (result == DialogResult.OK)
                         {
                             string str = PropGrid[0, 0].Value.ToString();
 
-                            PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.StopMode;
-                            PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.FieldMode;
-                            PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.TimeMode;
-                            PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.ParticleMode;
-                            PropGrid[m_SampleGrid.m_ClickRow + 4, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.AreaMode;
+                            PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value = frmStopModeDialog.StopMode;
+                            PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value = frmStopModeDialog.FieldMode;
+                            PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value = frmStopModeDialog.TimeMode;
+                            PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value = frmStopModeDialog.ParticleMode;
+                            PropGrid[m_SampleGrid.m_ClickRow + 4, m_SampleGrid.m_ClickColumn].Value = frmStopModeDialog.AreaMode;
 
                             PropGrid[0, 0].Value = str;
                             PropGrid.Refresh();
@@ -278,25 +294,26 @@ namespace OTSMeasureApp
                 }
                 else
                 {
-                    if (m_SampleGrid.m_ClickRow == 9 && m_SampleGrid.m_ClickColumn == 2)
+                    const int IncASysStopModeGridRowPos = 9;
+                    if (m_SampleGrid.m_ClickRow == IncASysStopModeGridRowPos && m_SampleGrid.m_ClickColumn == 2)
                     {
-                        StopModeDialog = new MeasureStopMode();
-                        StopModeDialog.FieldMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value.ToString());
-                        StopModeDialog.TimeMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value.ToString());
-                        StopModeDialog.ParticleMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value.ToString());
-                        StopModeDialog.StopMode = PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value.ToString();
-                        StopModeDialog.AreaMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 4, m_SampleGrid.m_ClickColumn].Value.ToString());
-                        DialogResult result = StopModeDialog.ShowDialog();
+                        frmStopModeDialog = new frmMeasureStopMode();
+                        frmStopModeDialog.FieldMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        frmStopModeDialog.TimeMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        frmStopModeDialog.ParticleMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        frmStopModeDialog.StopMode = PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value.ToString();
+                        frmStopModeDialog.AreaMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 4, m_SampleGrid.m_ClickColumn].Value.ToString());
+                        DialogResult result = frmStopModeDialog.ShowDialog();
 
                         if (result == DialogResult.OK)
                         {
                             string str = PropGrid[0, 0].Value.ToString();
 
-                            PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.StopMode;
-                            PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.FieldMode;
-                            PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.TimeMode;
-                            PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.ParticleMode;
-                            PropGrid[m_SampleGrid.m_ClickRow + 4, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.AreaMode;
+                            PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value = frmStopModeDialog.StopMode;
+                            PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value = frmStopModeDialog.FieldMode;
+                            PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value = frmStopModeDialog.TimeMode;
+                            PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value = frmStopModeDialog.ParticleMode;
+                            PropGrid[m_SampleGrid.m_ClickRow + 4, m_SampleGrid.m_ClickColumn].Value = frmStopModeDialog.AreaMode;
 
                             PropGrid[0, 0].Value = str;
                             PropGrid.Refresh();

+ 2 - 13
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -2978,21 +2978,10 @@ namespace OTSMeasureApp
                     var ctrlPos = m_visualStage.OTSCoordToCtrlCoord(fieldPos);
                     if (sam.FrameOfHoleGDIObjects[i].IfContains(ctrlPos))
                     { 
-                        //ImgRegionF = sam.FieldGDIObjects[i].GetOrigionalDrawRegionF();
-                        //ImgRegionWidth = Convert.ToInt32(ImgRegionF.Width);
-                        //ImgRegionHeight = Convert.ToInt32(ImgRegionF.Height);
 
-                        //获取图片
                         bseImage = CImageHandler.ToGrayBitmap(ImageData, m_iWidth, m_iHeigh);
                         sam.FrameOfHoleGDIObjects[i].BSEImage = bseImage;
-                        //绘制图像
-                        //CRectangleGDIObject createImageRect =new CRectangleGDIObject (ImgRegionF, fieldPos.X, fieldPos.Y, itemWorkSample.SampleName, itemWorkSample.NameOrHoleName, bseImage, ImgRegionWidth, ImgRegionHeight, CreateRectangleType.DrawFrameOfHoleBSEImage);
-                        ////添加至List集合中
-                        //createImageRect.SetInitRegionF(sam.FieldGDIObjects[i].GetOrigionalDrawRegionF());
-                        //createImageRect.NameOrHoleName =sam. FieldGDIObjects[i].NameOrHoleName;
-                        //createImageRect.SetZoomNumber(m_visualStage.GetZoomNum());
-                        //createImageRect.SetDisplayRefPoint(m_visualStage.GetDisplayRefPoint());
-                        //sam. FrameOfHoleGDIObjects.Add(createImageRect);
+                
                        
                         break;
                     }
@@ -3009,7 +2998,7 @@ namespace OTSMeasureApp
         public void DeleteHoleBSEImageDataNoMessageBox()
         {
           
-            //GetWorkingVisualSample().FieldGDIObjects.Clear();
+         
             GetWorkingVisualSample().FrameOfHoleGDIObjects.Clear();
             Invalidate();
 

+ 35 - 83
OTSIncAMeasureApp/6-OTSDisplayTreeViewData/OTSDisplayTreeBase.cs

@@ -56,8 +56,7 @@ namespace OTSMeasureApp
             m_SolutionWindow.treeView1.Focus();
             m_SolutionWindow.m_WorkSampleNode = node;
           
-            //根据样品属性数据中的SWITCH状态来设定Treeview的checkbox状态 和工作样品焦点
-            //      this.SetSampleCheckBoxAndWorkSampleFoucs();
+           
 
             m_SolutionWindow.treeView1.ExpandAll();    //展开Treeview 树形节点
             m_SolutionWindow.treeView1.Refresh();
@@ -168,32 +167,18 @@ namespace OTSMeasureApp
             for (int iTNodeCount = 0; iTNodeCount < m_SolutionWindow.treeView1.Nodes.Count; iTNodeCount++)
             {
                 bSwithFlag = false;
-                FindWorkSampleNode(m_SolutionWindow.treeView1.Nodes[iTNodeCount], sWOldName, sWNewName);
-            }
-
-            m_SolutionWindow.treeView1.Refresh();
-        }
-
-        private void FindWorkSampleNode(TreeNode node, string sWOldName, string sNewWSampleName)
-        {
-            if (node.IsSelected)
-            {
-                node.Text = sNewWSampleName;
-            }
-
-            if (node.Nodes.Count != 0)
-            {
-                for (int i = 0; i < node.Nodes.Count; i++)
+                var curNode = m_SolutionWindow.treeView1.Nodes[iTNodeCount];
+              
+                if (curNode.Text == sWOldName)
                 {
-
-                    FindWorkSampleNode(node.Nodes[i], sWOldName, sNewWSampleName);
+                    curNode.Text = sWNewName;
                 }
             }
 
+            m_SolutionWindow.treeView1.Refresh();
         }
 
-        //List<CTreeSampleParam> TSampleParamList  打开已保存的样品文件中的样品列表
-        //CTreeSampleParam WorkSampleParam :  工作样品
+
         public void DisplayTreeViewData(List<CTreeSampleParam> TSampleParamList, CTreeSampleParam WorkSampleParam)
         {
             m_SolutionWindow.treeView1.Nodes.Clear();     //清除Treeview所有节点    
@@ -246,35 +231,23 @@ namespace OTSMeasureApp
 
             for (int iTNodeCount = 0; iTNodeCount < m_SolutionWindow.treeView1.Nodes.Count; iTNodeCount++)
             {
-               
-                FindEditSampleNode(m_SolutionWindow.treeView1.Nodes[iTNodeCount], sOldSampleName, sNewSampleName);
+                var node = m_SolutionWindow.treeView1.Nodes[iTNodeCount];
+                if (node.Text == sOldSampleName)
+                {
+                    node.Text = sNewSampleName;
+                }
+              
             }
 
             m_SolutionWindow.treeView1.ExpandAll();
             m_SolutionWindow.treeView1.Show();
-            m_SolutionWindow.treeView1.Visible = true; ;
+            m_SolutionWindow.treeView1.Visible = true; 
             m_SolutionWindow.treeView1.Refresh();
             m_SolutionWindow.treeView1.Update();
             m_SolutionWindow.Invalidate();
         }
 
-        private void FindEditSampleNode(TreeNode node, string sWOldName, string sNewWSampleName)
-        {
-            if (node.Text == sWOldName)
-            {
-                node.Text = sNewWSampleName;
-            }
-
-            if (node.Nodes.Count != 0)
-            {
-                for (int i = 0; i < node.Nodes.Count; i++)
-                {
-
-                    FindEditSampleNode(node.Nodes[i], sWOldName, sNewWSampleName);
-                }
-            }
-
-        }
+        
 
         //根据样品的SWITCH状态设置TREEVIEW的CHECKBOX值
         private void SetSampleNodeCheckBox(TreeNode node, List<OTSSamplePropertyInfo> SampleNameList)
@@ -367,10 +340,9 @@ namespace OTSMeasureApp
         /// <param name="SNameList">排序后节点名称列表</param>
         private void GetAfterSortTreeNode(TreeNode node,ref List<string> SNameList)
         {
-            //if (null != node.Parent)
-            //{
+            
                 SNameList.Add(node.Text);
-            //}
+           
 
             if (node.Nodes.Count != 0)
             {
@@ -429,61 +401,41 @@ namespace OTSMeasureApp
         {
             for (int iTNodeCount = 0; iTNodeCount < m_SolutionWindow.treeView1.Nodes.Count; iTNodeCount++)
             {
-                FindTreeNode(m_SolutionWindow.treeView1.Nodes[iTNodeCount], sSampleName, bStatu);
-            }
-        }
-
-
-        private void FindTreeNode(TreeNode Tnode, string sSampleName, bool bStatu)
-        {
-            if (Tnode.Text == sSampleName)
-            {
-                Tnode.Checked = bStatu;
-                m_SolutionWindow.treeView1.SelectedNode = Tnode;
-                m_SolutionWindow.treeView1.Focus();
-                return;
-            }
-
-            if (Tnode.Nodes.Count != 0)
-            {
-                for (int i = 0; i < Tnode.Nodes.Count; i++)
+                var Tnode = m_SolutionWindow.treeView1.Nodes[iTNodeCount];
+                if (Tnode.Text == sSampleName)
                 {
-                    FindTreeNode(Tnode.Nodes[i], sSampleName, bStatu);
+                    Tnode.Checked = bStatu;
+                    m_SolutionWindow.treeView1.SelectedNode = Tnode;
+                    m_SolutionWindow.treeView1.Focus();
+                    
                 }
+              
             }
         }
 
+
+       
+
         //根据工作样品名称查找TREEVIEW 中工作样品节点
         public void GetTreeWorkSampleNode(string sWorkSampleName)
         {
             for (int iTNodeCount = 0; iTNodeCount < m_SolutionWindow.treeView1.Nodes.Count; iTNodeCount++)
             {
-                FindTreeWorkSampleNode(m_SolutionWindow.treeView1.Nodes[iTNodeCount], sWorkSampleName);
-            }
-        }
-
-
-        private void FindTreeWorkSampleNode(TreeNode Tnode, string sWorkSampleName)
-        {
-            if (Tnode.Text == sWorkSampleName)
-            {
-                m_SolutionWindow.m_WorkSampleNode = Tnode;
-                m_SolutionWindow.treeView1.SelectedNode = Tnode;
-                m_SolutionWindow.treeView1.Focus();
-                return;
-            }
-
-            if (Tnode.Nodes.Count != 0)
-            {
-                for (int i = 0; i < Tnode.Nodes.Count; i++)
+                var Tnode = m_SolutionWindow.treeView1.Nodes[iTNodeCount];
+                if (Tnode.Text == sWorkSampleName)
                 {
-                    FindTreeWorkSampleNode(Tnode.Nodes[i], sWorkSampleName);
+                    m_SolutionWindow.m_WorkSampleNode = Tnode;
+                    m_SolutionWindow.treeView1.SelectedNode = Tnode;
+                    m_SolutionWindow.treeView1.Focus();
+                    return;
                 }
+             
             }
         }
 
 
 
+
         //重新设置TREEVIEW的工作样品焦点
         public void ReSetWorkSampleFoucs()
         {

+ 33 - 33
OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -41,7 +41,7 @@ namespace OTSMeasureApp
         //定位程序管理路径用的变量
         public string m_ParameterPath;
 
-        MeasureStopMode StopModeDialog;
+        frmMeasureStopMode StopModeDialog;
         //国际化
         OTSCommon.Language lan;
         Hashtable table;
@@ -457,14 +457,14 @@ namespace OTSMeasureApp
 
             //测量终止方式
             tB_StopMode.Text = m_cotsimgscanprm.GetStopMode().ToString();
-            //终止时间
-            IDC_EDIT_STOP_TIME.Text = m_cotsimgscanprm.GetStopParamMeasTime().ToString();
-            //终止帧图数
-            IDC_EDIT_STOP_FIELD_NUM.Text = m_cotsimgscanprm.GetStopParamFields().ToString();
-            //终止夹杂物数
-            IDC_EDIT_STOP_INCA_NUM.Text = m_cotsimgscanprm.GetStopParamParticles().ToString();
-            //终止面积
-            IDC_EDIT_STOP_INCA_AREA.Text = m_cotsimgscanprm.GetStopParamArea().ToString();
+            ////终止时间
+            //IDC_EDIT_STOP_TIME.Text = m_cotsimgscanprm.GetStopParamMeasTime().ToString();
+            ////终止帧图数
+            //IDC_EDIT_STOP_FIELD_NUM.Text = m_cotsimgscanprm.GetStopParamFields().ToString();
+            ////终止夹杂物数
+            //IDC_EDIT_STOP_INCA_NUM.Text = m_cotsimgscanprm.GetStopParamParticles().ToString();
+            ////终止面积
+            //IDC_EDIT_STOP_INCA_AREA.Text = m_cotsimgscanprm.GetStopParamArea().ToString();
             //取图方式
             foreach (ComboBoxItem cbi in IDC_COMBO_FETCHIMGMODE.Items)
             {
@@ -656,14 +656,14 @@ namespace OTSMeasureApp
             IDC_USINGXRAY_LIB.Checked = m_cotsxrayprm.GetUsingXray();
 
             //分析X-ray精度
-            foreach (ComboBoxItem cbi in IDC_COMBO_ANALYXRAYSPEED.Items)
-            {
-                if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == (int)m_cotsxrayprm.GetAnalySpeed())
-                    {
-                        IDC_COMBO_ANALYXRAYSPEED.SelectedItem = cbi;
-                    }
-            }
+            //foreach (ComboBoxItem cbi in IDC_COMBO_ANALYXRAYSPEED.Items)
+            //{
+            //    if (cbi.Value.ToString() != "")
+            //        if (Convert.ToInt32(cbi.Value) == (int)m_cotsxrayprm.GetAnalySpeed())
+            //        {
+            //            IDC_COMBO_ANALYXRAYSPEED.SelectedItem = cbi;
+            //        }
+            //}
 
             //分析X-ray精度对应的时间
             IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Text = m_cotsxrayprm.GetMidAnalyAQTime().ToString();
@@ -721,16 +721,16 @@ namespace OTSMeasureApp
             m_cotsimgscanprm.SetStopMode(tB_StopMode.Text);
 
             //终止时间
-            m_cotsimgscanprm.SetStopParamMeasTime(Convert.ToInt32(IDC_EDIT_STOP_TIME.Text));
+            //m_cotsimgscanprm.SetStopParamMeasTime(Convert.ToInt32(IDC_EDIT_STOP_TIME.Text));
 
-            //终止帧图数
-            m_cotsimgscanprm.SetStopParamFields(Convert.ToInt32(IDC_EDIT_STOP_FIELD_NUM.Text));
+            ////终止帧图数
+            //m_cotsimgscanprm.SetStopParamFields(Convert.ToInt32(IDC_EDIT_STOP_FIELD_NUM.Text));
 
-            //终止夹杂物数
-            m_cotsimgscanprm.SetStopParamParticles(Convert.ToInt32(IDC_EDIT_STOP_INCA_NUM.Text));
+            ////终止夹杂物数
+            //m_cotsimgscanprm.SetStopParamParticles(Convert.ToInt32(IDC_EDIT_STOP_INCA_NUM.Text));
 
-            //终止面积
-            m_cotsimgscanprm.SetStopParamArea(Convert.ToInt32(IDC_EDIT_STOP_INCA_AREA.Text));
+            ////终止面积
+            //m_cotsimgscanprm.SetStopParamArea(Convert.ToInt32(IDC_EDIT_STOP_INCA_AREA.Text));
 
             //取图方式
             ComboBoxItem enum_fetchimgmode = (ComboBoxItem)IDC_COMBO_FETCHIMGMODE.SelectedItem;
@@ -840,8 +840,8 @@ namespace OTSMeasureApp
             m_cotsxrayprm.SetUsingXray(IDC_USINGXRAY_LIB.Checked);
 
             //分析X-ray精度
-            ComboBoxItem enum_analyxrayspeed = (ComboBoxItem)IDC_COMBO_ANALYXRAYSPEED.SelectedItem;
-            m_cotsxrayprm.SetAnalySpeed((otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS)Convert.ToInt32(enum_analyxrayspeed.Value));
+            //ComboBoxItem enum_analyxrayspeed = (ComboBoxItem)IDC_COMBO_ANALYXRAYSPEED.SelectedItem;
+            //m_cotsxrayprm.SetAnalySpeed((otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS)Convert.ToInt32(enum_analyxrayspeed.Value));
 
             //分析X-ray精度对应的时间
             m_cotsxrayprm.SetMidAnalyAQTime(Convert.ToInt32(IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Text.Trim()));
@@ -1170,8 +1170,8 @@ namespace OTSMeasureApp
             {
                 string message = table["message7"].ToString();
                 MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                IDC_EDIT_STOP_TIME.Focus();
-                IDC_EDIT_STOP_TIME.SelectAll();
+                //IDC_EDIT_STOP_TIME.Focus();
+                //IDC_EDIT_STOP_TIME.SelectAll();
                 return false;
             }
             if ("" == IDC_COMBO_FETCHIMGMODE.Text)
@@ -2044,7 +2044,7 @@ namespace OTSMeasureApp
         {
             if (StopModeDialog == null)
             {
-                StopModeDialog = new MeasureStopMode();
+                StopModeDialog = new frmMeasureStopMode();
                 StopModeDialog.FieldMode = m_cotsimgscanprm.GetStopParamFields();
                 StopModeDialog.TimeMode = m_cotsimgscanprm.GetStopParamMeasTime();
                 StopModeDialog.ParticleMode = m_cotsimgscanprm.GetStopParamParticles();
@@ -2062,10 +2062,10 @@ namespace OTSMeasureApp
                     str += rst[k].Split(':')[0] + " + ";
                 }
                 tB_StopMode.Text = str.Substring(0, str.Length - 3);
-                IDC_EDIT_STOP_TIME.Text = StopModeDialog.TimeMode.ToString();
-                IDC_EDIT_STOP_FIELD_NUM.Text = StopModeDialog.FieldMode.ToString();
-                IDC_EDIT_STOP_INCA_NUM.Text = StopModeDialog.ParticleMode.ToString();
-                IDC_EDIT_STOP_INCA_AREA.Text = StopModeDialog.AreaMode.ToString();
+                //IDC_EDIT_STOP_TIME.Text = StopModeDialog.TimeMode.ToString();
+                //IDC_EDIT_STOP_FIELD_NUM.Text = StopModeDialog.FieldMode.ToString();
+                //IDC_EDIT_STOP_INCA_NUM.Text = StopModeDialog.ParticleMode.ToString();
+                //IDC_EDIT_STOP_INCA_AREA.Text = StopModeDialog.AreaMode.ToString();
             }
         }
 

+ 6 - 362
OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.designer.cs

@@ -60,19 +60,6 @@
             this.label12 = new System.Windows.Forms.Label();
             this.label11 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
-            this.IDC_EDIT_STOP_INCA_NUM = new System.Windows.Forms.TextBox();
-            this.IDC_EDIT_STOP_FIELD_NUM = new System.Windows.Forms.TextBox();
-            this.IDC_EDIT_STOP_TIME = new System.Windows.Forms.TextBox();
-            this.label10 = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
-            this.IDC_IMAGE_SIZE_SWITCH = new System.Windows.Forms.CheckBox();
-            this.IDC_SCAN_SPEED_SWITCH = new System.Windows.Forms.CheckBox();
-            this.IDC_FETCH_IMAGE_SWITCH = new System.Windows.Forms.CheckBox();
-            this.IDC_STOP_PARTICAL_SWITCH = new System.Windows.Forms.CheckBox();
-            this.IDC_STOP_FIELD_SWITCH = new System.Windows.Forms.CheckBox();
-            this.IDC_STOP_TIME_SWITCH = new System.Windows.Forms.CheckBox();
-            this.IDC_STOP_MODE_SWITCH = new System.Windows.Forms.CheckBox();
             this.groupBox4 = new System.Windows.Forms.GroupBox();
             this.IDC_COMBO_STDSelect = new System.Windows.Forms.ComboBox();
             this.IDC_SYS_LIB = new System.Windows.Forms.CheckBox();
@@ -116,12 +103,6 @@
             this.label26 = new System.Windows.Forms.Label();
             this.label23 = new System.Windows.Forms.Label();
             this.label20 = new System.Windows.Forms.Label();
-            this.IDC_PART_GRAY_MIN_SWITCH = new System.Windows.Forms.CheckBox();
-            this.IDC_BACK_MIN_SWITCH = new System.Windows.Forms.CheckBox();
-            this.IDC_PART_MIN_SWITCH = new System.Windows.Forms.CheckBox();
-            this.IDC_PART_GRAY_MAX_SWITCH = new System.Windows.Forms.CheckBox();
-            this.IDC_BACK_MAX_SWITCH = new System.Windows.Forms.CheckBox();
-            this.IDC_PART_MAX_SWITCH = new System.Windows.Forms.CheckBox();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
             this.IDC_EDIT_XrayLimit = new System.Windows.Forms.TextBox();
             this.label47 = new System.Windows.Forms.Label();
@@ -147,17 +128,12 @@
             this.IDC_EDIT_ANALYXRAYAIMVALUE = new System.Windows.Forms.TextBox();
             this.label33 = new System.Windows.Forms.Label();
             this.label31 = new System.Windows.Forms.Label();
-            this.IDC_XRAY_COUNT_SWITCH = new System.Windows.Forms.CheckBox();
-            this.IDC_XRAY_TIME_SWITCH = new System.Windows.Forms.CheckBox();
-            this.IDC_XRAY_MODE_SWITCH = new System.Windows.Forms.CheckBox();
             this.btnok = new System.Windows.Forms.Button();
             this.btncancel = new System.Windows.Forms.Button();
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
             this.lbModelSel = new System.Windows.Forms.Label();
             this.IDC_COMBO_Model = new System.Windows.Forms.ComboBox();
             this.groupBox7 = new System.Windows.Forms.GroupBox();
-            this.IDC_EDIT_STOP_INCA_AREA = new System.Windows.Forms.TextBox();
-            this.label48 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
@@ -173,7 +149,7 @@
             this.groupBox1.Controls.Add(this.IDC_COMBO_STAGE);
             this.groupBox1.Controls.Add(this.label41);
             this.groupBox1.Controls.Add(this.label1);
-            this.groupBox1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.groupBox1.Font = new System.Drawing.Font("SimSun", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.groupBox1.Location = new System.Drawing.Point(6, 63);
             this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox1.Name = "groupBox1";
@@ -243,7 +219,7 @@
             this.groupBox2.Controls.Add(this.label4);
             this.groupBox2.Controls.Add(this.label3);
             this.groupBox2.Controls.Add(this.label2);
-            this.groupBox2.Location = new System.Drawing.Point(334, 9);
+            this.groupBox2.Location = new System.Drawing.Point(334, 23);
             this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
@@ -425,7 +401,7 @@
             this.groupBox3.Controls.Add(this.label12);
             this.groupBox3.Controls.Add(this.label11);
             this.groupBox3.Controls.Add(this.label7);
-            this.groupBox3.Location = new System.Drawing.Point(334, 193);
+            this.groupBox3.Location = new System.Drawing.Point(334, 197);
             this.groupBox3.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Padding = new System.Windows.Forms.Padding(2);
@@ -527,159 +503,6 @@
             this.label7.TabIndex = 240;
             this.label7.Text = "测量终止方式";
             // 
-            // IDC_EDIT_STOP_INCA_NUM
-            // 
-            this.IDC_EDIT_STOP_INCA_NUM.Location = new System.Drawing.Point(760, 514);
-            this.IDC_EDIT_STOP_INCA_NUM.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_EDIT_STOP_INCA_NUM.MaxLength = 10;
-            this.IDC_EDIT_STOP_INCA_NUM.Name = "IDC_EDIT_STOP_INCA_NUM";
-            this.IDC_EDIT_STOP_INCA_NUM.Size = new System.Drawing.Size(117, 21);
-            this.IDC_EDIT_STOP_INCA_NUM.TabIndex = 310;
-            this.IDC_EDIT_STOP_INCA_NUM.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.IDC_EDIT_STOP_INCA_NUM.Visible = false;
-            this.IDC_EDIT_STOP_INCA_NUM.TextChanged += new System.EventHandler(this.IDC_EDIT_STOP_INCA_NUM_TextChanged);
-            // 
-            // IDC_EDIT_STOP_FIELD_NUM
-            // 
-            this.IDC_EDIT_STOP_FIELD_NUM.Location = new System.Drawing.Point(760, 490);
-            this.IDC_EDIT_STOP_FIELD_NUM.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_EDIT_STOP_FIELD_NUM.MaxLength = 10;
-            this.IDC_EDIT_STOP_FIELD_NUM.Name = "IDC_EDIT_STOP_FIELD_NUM";
-            this.IDC_EDIT_STOP_FIELD_NUM.Size = new System.Drawing.Size(117, 21);
-            this.IDC_EDIT_STOP_FIELD_NUM.TabIndex = 290;
-            this.IDC_EDIT_STOP_FIELD_NUM.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.IDC_EDIT_STOP_FIELD_NUM.Visible = false;
-            this.IDC_EDIT_STOP_FIELD_NUM.TextChanged += new System.EventHandler(this.IDC_EDIT_STOP_FIELD_NUM_TextChanged);
-            // 
-            // IDC_EDIT_STOP_TIME
-            // 
-            this.IDC_EDIT_STOP_TIME.Location = new System.Drawing.Point(760, 467);
-            this.IDC_EDIT_STOP_TIME.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_EDIT_STOP_TIME.MaxLength = 10;
-            this.IDC_EDIT_STOP_TIME.Name = "IDC_EDIT_STOP_TIME";
-            this.IDC_EDIT_STOP_TIME.Size = new System.Drawing.Size(117, 21);
-            this.IDC_EDIT_STOP_TIME.TabIndex = 270;
-            this.IDC_EDIT_STOP_TIME.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.IDC_EDIT_STOP_TIME.Visible = false;
-            this.IDC_EDIT_STOP_TIME.TextChanged += new System.EventHandler(this.IDC_EDIT_STOP_TIME_TextChanged);
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(674, 518);
-            this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(77, 12);
-            this.label10.TabIndex = 300;
-            this.label10.Text = "终止夹杂物数";
-            this.label10.Visible = false;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(674, 494);
-            this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(65, 12);
-            this.label9.TabIndex = 280;
-            this.label9.Text = "终止帧图数";
-            this.label9.Visible = false;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(674, 471);
-            this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(77, 12);
-            this.label8.TabIndex = 260;
-            this.label8.Text = "终止时间(秒)";
-            this.label8.Visible = false;
-            // 
-            // IDC_IMAGE_SIZE_SWITCH
-            // 
-            this.IDC_IMAGE_SIZE_SWITCH.AutoSize = true;
-            this.IDC_IMAGE_SIZE_SWITCH.Location = new System.Drawing.Point(700, 161);
-            this.IDC_IMAGE_SIZE_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_IMAGE_SIZE_SWITCH.Name = "IDC_IMAGE_SIZE_SWITCH";
-            this.IDC_IMAGE_SIZE_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_IMAGE_SIZE_SWITCH.TabIndex = 539;
-            this.IDC_IMAGE_SIZE_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_IMAGE_SIZE_SWITCH.Visible = false;
-            this.IDC_IMAGE_SIZE_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_IMAGE_SIZE_SWITCH_CheckedChanged);
-            // 
-            // IDC_SCAN_SPEED_SWITCH
-            // 
-            this.IDC_SCAN_SPEED_SWITCH.AutoSize = true;
-            this.IDC_SCAN_SPEED_SWITCH.Location = new System.Drawing.Point(700, 139);
-            this.IDC_SCAN_SPEED_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_SCAN_SPEED_SWITCH.Name = "IDC_SCAN_SPEED_SWITCH";
-            this.IDC_SCAN_SPEED_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_SCAN_SPEED_SWITCH.TabIndex = 538;
-            this.IDC_SCAN_SPEED_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_SCAN_SPEED_SWITCH.Visible = false;
-            this.IDC_SCAN_SPEED_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_SCAN_SPEED_SWITCH_CheckedChanged);
-            // 
-            // IDC_FETCH_IMAGE_SWITCH
-            // 
-            this.IDC_FETCH_IMAGE_SWITCH.AutoSize = true;
-            this.IDC_FETCH_IMAGE_SWITCH.Location = new System.Drawing.Point(700, 117);
-            this.IDC_FETCH_IMAGE_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_FETCH_IMAGE_SWITCH.Name = "IDC_FETCH_IMAGE_SWITCH";
-            this.IDC_FETCH_IMAGE_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_FETCH_IMAGE_SWITCH.TabIndex = 537;
-            this.IDC_FETCH_IMAGE_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_FETCH_IMAGE_SWITCH.Visible = false;
-            this.IDC_FETCH_IMAGE_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_FETCH_IMAGE_SWITCH_CheckedChanged);
-            // 
-            // IDC_STOP_PARTICAL_SWITCH
-            // 
-            this.IDC_STOP_PARTICAL_SWITCH.AutoSize = true;
-            this.IDC_STOP_PARTICAL_SWITCH.Location = new System.Drawing.Point(700, 95);
-            this.IDC_STOP_PARTICAL_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_STOP_PARTICAL_SWITCH.Name = "IDC_STOP_PARTICAL_SWITCH";
-            this.IDC_STOP_PARTICAL_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_STOP_PARTICAL_SWITCH.TabIndex = 536;
-            this.IDC_STOP_PARTICAL_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_STOP_PARTICAL_SWITCH.Visible = false;
-            this.IDC_STOP_PARTICAL_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_STOP_PARTICAL_SWITCH_CheckedChanged);
-            // 
-            // IDC_STOP_FIELD_SWITCH
-            // 
-            this.IDC_STOP_FIELD_SWITCH.AutoSize = true;
-            this.IDC_STOP_FIELD_SWITCH.Location = new System.Drawing.Point(700, 71);
-            this.IDC_STOP_FIELD_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_STOP_FIELD_SWITCH.Name = "IDC_STOP_FIELD_SWITCH";
-            this.IDC_STOP_FIELD_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_STOP_FIELD_SWITCH.TabIndex = 535;
-            this.IDC_STOP_FIELD_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_STOP_FIELD_SWITCH.Visible = false;
-            this.IDC_STOP_FIELD_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_STOP_FIELD_SWITCH_CheckedChanged);
-            // 
-            // IDC_STOP_TIME_SWITCH
-            // 
-            this.IDC_STOP_TIME_SWITCH.AutoSize = true;
-            this.IDC_STOP_TIME_SWITCH.Location = new System.Drawing.Point(700, 48);
-            this.IDC_STOP_TIME_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_STOP_TIME_SWITCH.Name = "IDC_STOP_TIME_SWITCH";
-            this.IDC_STOP_TIME_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_STOP_TIME_SWITCH.TabIndex = 534;
-            this.IDC_STOP_TIME_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_STOP_TIME_SWITCH.Visible = false;
-            this.IDC_STOP_TIME_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_STOP_TIME_SWITCH_CheckedChanged);
-            // 
-            // IDC_STOP_MODE_SWITCH
-            // 
-            this.IDC_STOP_MODE_SWITCH.AutoSize = true;
-            this.IDC_STOP_MODE_SWITCH.Location = new System.Drawing.Point(700, 25);
-            this.IDC_STOP_MODE_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_STOP_MODE_SWITCH.Name = "IDC_STOP_MODE_SWITCH";
-            this.IDC_STOP_MODE_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_STOP_MODE_SWITCH.TabIndex = 533;
-            this.IDC_STOP_MODE_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_STOP_MODE_SWITCH.Visible = false;
-            this.IDC_STOP_MODE_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_STOP_MODE_SWITCH_CheckedChanged);
-            // 
             // groupBox4
             // 
             this.groupBox4.Controls.Add(this.IDC_COMBO_STDSelect);
@@ -702,7 +525,7 @@
             this.groupBox4.Controls.Add(this.label15);
             this.groupBox4.Controls.Add(this.label14);
             this.groupBox4.Controls.Add(this.IDC_BUTTON_MEASPRAMPATHSET);
-            this.groupBox4.Location = new System.Drawing.Point(6, 346);
+            this.groupBox4.Location = new System.Drawing.Point(6, 334);
             this.groupBox4.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.Padding = new System.Windows.Forms.Padding(2);
@@ -940,7 +763,7 @@
             this.groupBox5.Controls.Add(this.label26);
             this.groupBox5.Controls.Add(this.label23);
             this.groupBox5.Controls.Add(this.label20);
-            this.groupBox5.Location = new System.Drawing.Point(334, 365);
+            this.groupBox5.Location = new System.Drawing.Point(334, 364);
             this.groupBox5.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox5.Name = "groupBox5";
             this.groupBox5.Padding = new System.Windows.Forms.Padding(2);
@@ -1159,78 +982,6 @@
             this.label20.TabIndex = 550;
             this.label20.Text = "颗粒尺寸范围";
             // 
-            // IDC_PART_GRAY_MIN_SWITCH
-            // 
-            this.IDC_PART_GRAY_MIN_SWITCH.AutoSize = true;
-            this.IDC_PART_GRAY_MIN_SWITCH.Location = new System.Drawing.Point(700, 314);
-            this.IDC_PART_GRAY_MIN_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_PART_GRAY_MIN_SWITCH.Name = "IDC_PART_GRAY_MIN_SWITCH";
-            this.IDC_PART_GRAY_MIN_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_PART_GRAY_MIN_SWITCH.TabIndex = 812;
-            this.IDC_PART_GRAY_MIN_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_PART_GRAY_MIN_SWITCH.Visible = false;
-            this.IDC_PART_GRAY_MIN_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_PART_GRAY_SWITCH_CheckedChanged);
-            // 
-            // IDC_BACK_MIN_SWITCH
-            // 
-            this.IDC_BACK_MIN_SWITCH.AutoSize = true;
-            this.IDC_BACK_MIN_SWITCH.Location = new System.Drawing.Point(700, 287);
-            this.IDC_BACK_MIN_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_BACK_MIN_SWITCH.Name = "IDC_BACK_MIN_SWITCH";
-            this.IDC_BACK_MIN_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_BACK_MIN_SWITCH.TabIndex = 811;
-            this.IDC_BACK_MIN_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_BACK_MIN_SWITCH.Visible = false;
-            this.IDC_BACK_MIN_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_BACK_MIN_SWITCH_CheckedChanged);
-            // 
-            // IDC_PART_MIN_SWITCH
-            // 
-            this.IDC_PART_MIN_SWITCH.AutoSize = true;
-            this.IDC_PART_MIN_SWITCH.Location = new System.Drawing.Point(700, 262);
-            this.IDC_PART_MIN_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_PART_MIN_SWITCH.Name = "IDC_PART_MIN_SWITCH";
-            this.IDC_PART_MIN_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_PART_MIN_SWITCH.TabIndex = 810;
-            this.IDC_PART_MIN_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_PART_MIN_SWITCH.Visible = false;
-            this.IDC_PART_MIN_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_PART_MIN_SWITCH_CheckedChanged);
-            // 
-            // IDC_PART_GRAY_MAX_SWITCH
-            // 
-            this.IDC_PART_GRAY_MAX_SWITCH.AutoSize = true;
-            this.IDC_PART_GRAY_MAX_SWITCH.Location = new System.Drawing.Point(745, 312);
-            this.IDC_PART_GRAY_MAX_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_PART_GRAY_MAX_SWITCH.Name = "IDC_PART_GRAY_MAX_SWITCH";
-            this.IDC_PART_GRAY_MAX_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_PART_GRAY_MAX_SWITCH.TabIndex = 692;
-            this.IDC_PART_GRAY_MAX_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_PART_GRAY_MAX_SWITCH.Visible = false;
-            this.IDC_PART_GRAY_MAX_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_PART_GRAY_MAX_CheckedChanged);
-            // 
-            // IDC_BACK_MAX_SWITCH
-            // 
-            this.IDC_BACK_MAX_SWITCH.AutoSize = true;
-            this.IDC_BACK_MAX_SWITCH.Location = new System.Drawing.Point(745, 285);
-            this.IDC_BACK_MAX_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_BACK_MAX_SWITCH.Name = "IDC_BACK_MAX_SWITCH";
-            this.IDC_BACK_MAX_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_BACK_MAX_SWITCH.TabIndex = 691;
-            this.IDC_BACK_MAX_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_BACK_MAX_SWITCH.Visible = false;
-            this.IDC_BACK_MAX_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_BACK_MAX_SWITCH_CheckedChanged);
-            // 
-            // IDC_PART_MAX_SWITCH
-            // 
-            this.IDC_PART_MAX_SWITCH.AutoSize = true;
-            this.IDC_PART_MAX_SWITCH.Location = new System.Drawing.Point(745, 260);
-            this.IDC_PART_MAX_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_PART_MAX_SWITCH.Name = "IDC_PART_MAX_SWITCH";
-            this.IDC_PART_MAX_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_PART_MAX_SWITCH.TabIndex = 540;
-            this.IDC_PART_MAX_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_PART_MAX_SWITCH.Visible = false;
-            this.IDC_PART_MAX_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_PART_MAX_SWITCH_CheckedChanged);
-            // 
             // groupBox6
             // 
             this.groupBox6.Controls.Add(this.IDC_EDIT_XrayLimit);
@@ -1500,42 +1251,6 @@
             this.label31.TabIndex = 750;
             this.label31.Text = "X-ray扫描方式";
             // 
-            // IDC_XRAY_COUNT_SWITCH
-            // 
-            this.IDC_XRAY_COUNT_SWITCH.AutoSize = true;
-            this.IDC_XRAY_COUNT_SWITCH.Location = new System.Drawing.Point(709, 410);
-            this.IDC_XRAY_COUNT_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_XRAY_COUNT_SWITCH.Name = "IDC_XRAY_COUNT_SWITCH";
-            this.IDC_XRAY_COUNT_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_XRAY_COUNT_SWITCH.TabIndex = 809;
-            this.IDC_XRAY_COUNT_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_XRAY_COUNT_SWITCH.Visible = false;
-            this.IDC_XRAY_COUNT_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_XRAY_COUNT_SWITCH_CheckedChanged);
-            // 
-            // IDC_XRAY_TIME_SWITCH
-            // 
-            this.IDC_XRAY_TIME_SWITCH.AutoSize = true;
-            this.IDC_XRAY_TIME_SWITCH.Location = new System.Drawing.Point(709, 385);
-            this.IDC_XRAY_TIME_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_XRAY_TIME_SWITCH.Name = "IDC_XRAY_TIME_SWITCH";
-            this.IDC_XRAY_TIME_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_XRAY_TIME_SWITCH.TabIndex = 808;
-            this.IDC_XRAY_TIME_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_XRAY_TIME_SWITCH.Visible = false;
-            this.IDC_XRAY_TIME_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_XRAY_TIME_SWITCH_CheckedChanged);
-            // 
-            // IDC_XRAY_MODE_SWITCH
-            // 
-            this.IDC_XRAY_MODE_SWITCH.AutoSize = true;
-            this.IDC_XRAY_MODE_SWITCH.Location = new System.Drawing.Point(709, 361);
-            this.IDC_XRAY_MODE_SWITCH.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_XRAY_MODE_SWITCH.Name = "IDC_XRAY_MODE_SWITCH";
-            this.IDC_XRAY_MODE_SWITCH.Size = new System.Drawing.Size(15, 14);
-            this.IDC_XRAY_MODE_SWITCH.TabIndex = 693;
-            this.IDC_XRAY_MODE_SWITCH.UseVisualStyleBackColor = true;
-            this.IDC_XRAY_MODE_SWITCH.Visible = false;
-            this.IDC_XRAY_MODE_SWITCH.CheckedChanged += new System.EventHandler(this.IDC_XRAY_MODE_SWITCH_CheckedChanged);
-            // 
             // btnok
             // 
             this.btnok.Location = new System.Drawing.Point(478, 606);
@@ -1594,63 +1309,17 @@
             this.groupBox7.TabStop = false;
             this.groupBox7.Text = "模式选择";
             // 
-            // IDC_EDIT_STOP_INCA_AREA
-            // 
-            this.IDC_EDIT_STOP_INCA_AREA.Location = new System.Drawing.Point(760, 540);
-            this.IDC_EDIT_STOP_INCA_AREA.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_EDIT_STOP_INCA_AREA.MaxLength = 10;
-            this.IDC_EDIT_STOP_INCA_AREA.Name = "IDC_EDIT_STOP_INCA_AREA";
-            this.IDC_EDIT_STOP_INCA_AREA.Size = new System.Drawing.Size(117, 21);
-            this.IDC_EDIT_STOP_INCA_AREA.TabIndex = 824;
-            this.IDC_EDIT_STOP_INCA_AREA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.IDC_EDIT_STOP_INCA_AREA.Visible = false;
-            // 
-            // label48
-            // 
-            this.label48.AutoSize = true;
-            this.label48.Location = new System.Drawing.Point(675, 542);
-            this.label48.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label48.Name = "label48";
-            this.label48.Size = new System.Drawing.Size(77, 12);
-            this.label48.TabIndex = 823;
-            this.label48.Text = "终止测量面积";
-            this.label48.Visible = false;
-            // 
             // ProgMgrInfoForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(644, 637);
-            this.Controls.Add(this.IDC_EDIT_STOP_INCA_AREA);
-            this.Controls.Add(this.label48);
-            this.Controls.Add(this.IDC_IMAGE_SIZE_SWITCH);
+            this.ClientSize = new System.Drawing.Size(645, 640);
             this.Controls.Add(this.groupBox7);
-            this.Controls.Add(this.IDC_EDIT_STOP_INCA_NUM);
-            this.Controls.Add(this.IDC_SCAN_SPEED_SWITCH);
-            this.Controls.Add(this.IDC_EDIT_STOP_FIELD_NUM);
-            this.Controls.Add(this.IDC_EDIT_STOP_TIME);
             this.Controls.Add(this.btncancel);
-            this.Controls.Add(this.IDC_FETCH_IMAGE_SWITCH);
-            this.Controls.Add(this.IDC_XRAY_COUNT_SWITCH);
-            this.Controls.Add(this.IDC_STOP_PARTICAL_SWITCH);
             this.Controls.Add(this.btnok);
-            this.Controls.Add(this.IDC_STOP_FIELD_SWITCH);
-            this.Controls.Add(this.IDC_PART_GRAY_MIN_SWITCH);
-            this.Controls.Add(this.label10);
-            this.Controls.Add(this.IDC_STOP_TIME_SWITCH);
-            this.Controls.Add(this.label9);
-            this.Controls.Add(this.IDC_XRAY_TIME_SWITCH);
-            this.Controls.Add(this.label8);
             this.Controls.Add(this.groupBox6);
-            this.Controls.Add(this.IDC_STOP_MODE_SWITCH);
-            this.Controls.Add(this.IDC_BACK_MIN_SWITCH);
-            this.Controls.Add(this.IDC_PART_MIN_SWITCH);
-            this.Controls.Add(this.IDC_XRAY_MODE_SWITCH);
-            this.Controls.Add(this.IDC_PART_GRAY_MAX_SWITCH);
             this.Controls.Add(this.groupBox5);
-            this.Controls.Add(this.IDC_BACK_MAX_SWITCH);
             this.Controls.Add(this.groupBox4);
-            this.Controls.Add(this.IDC_PART_MAX_SWITCH);
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);
@@ -1679,7 +1348,6 @@
             this.groupBox7.ResumeLayout(false);
             this.groupBox7.PerformLayout();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -1702,9 +1370,6 @@
         private System.Windows.Forms.Label label13;
         private System.Windows.Forms.Label label12;
         private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.Label label8;
         private System.Windows.Forms.Label label7;
         private System.Windows.Forms.Label label14;
         private System.Windows.Forms.Label label19;
@@ -1737,9 +1402,6 @@
         public System.Windows.Forms.TextBox IDC_EDIT_YSTART;
         public System.Windows.Forms.TextBox IDC_EDIT_XEND;
         public System.Windows.Forms.TextBox IDC_EDIT_XSTART;
-        public System.Windows.Forms.TextBox IDC_EDIT_STOP_INCA_NUM;
-        public System.Windows.Forms.TextBox IDC_EDIT_STOP_FIELD_NUM;
-        public System.Windows.Forms.TextBox IDC_EDIT_STOP_TIME;
         public System.Windows.Forms.TextBox IDC_EDIT_ANALYSESTDLIBPATH;
         public System.Windows.Forms.TextBox IDC_EDIT_MEASUREPARAMPATH;
         public System.Windows.Forms.Button IDC_BUTTON_MEASPRAMPATHSET;
@@ -1767,22 +1429,6 @@
         private System.Windows.Forms.Label label41;
         public System.Windows.Forms.ComboBox IDC_COMBO_TECHNOLOGY;
         private System.Windows.Forms.Label label42;
-        public System.Windows.Forms.CheckBox IDC_IMAGE_SIZE_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_SCAN_SPEED_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_FETCH_IMAGE_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_STOP_PARTICAL_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_STOP_FIELD_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_STOP_TIME_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_STOP_MODE_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_PART_GRAY_MIN_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_BACK_MIN_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_PART_MIN_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_PART_GRAY_MAX_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_BACK_MAX_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_PART_MAX_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_XRAY_COUNT_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_XRAY_TIME_SWITCH;
-        public System.Windows.Forms.CheckBox IDC_XRAY_MODE_SWITCH;
         private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
         private System.Windows.Forms.Label lbShape;
         public System.Windows.Forms.TextBox tBMeasArea;
@@ -1811,8 +1457,6 @@
         private System.Windows.Forms.Label label47;
         private System.Windows.Forms.TextBox tB_StopMode;
         private System.Windows.Forms.Button btn_StopMode;
-        public System.Windows.Forms.TextBox IDC_EDIT_STOP_INCA_AREA;
-        private System.Windows.Forms.Label label48;
         private System.Windows.Forms.ComboBox IDC_COMBO_CorrosionExpansionCoefficient;
         private System.Windows.Forms.Label label49;
     }

+ 7 - 9
OTSIncAMeasureApp/8-OTSSampleMeasureInfo/OTSSampleMeasureInfo.cs

@@ -9,12 +9,6 @@ namespace OTSMeasureApp
 {
 
 
-   
-
-
-
-
-
     //MeasureApp 给 SoluWindow 发送添加样品的样品信息
     public class CTreeSampleParam
     {
@@ -32,8 +26,7 @@ namespace OTSMeasureApp
         public string sSampleName;
         public string sampleHoleName;
         public ShapeType iShape;   //测量区域形状                                
-        //public List<Point> PolygonPointRegion;//多边形点集合                                
-        //public List<PointF> PolygonPointRegionF;//多边形点集合                                
+                              
         public List<PointF> DrawPolygonPointList;//多边形点集合
         public RectangleF MeasureRect;      //测量区域大小
     };
@@ -115,6 +108,11 @@ namespace OTSMeasureApp
         {
             return SampleDataGrps;
         }
+        public void ClearGrp()
+        {
+            SampleDataGrps.Clear();
+            SampleDataList.Clear();
+        }
 
         public String sSampleSoluName;          //样品的标题名 (Treeview的根节点名)
         public bool bSwitch;                   //样品参数锁,默认都是false, 当执行测量完成后,设置为true,则客户不允许修改GRID等数据。
@@ -122,7 +120,7 @@ namespace OTSMeasureApp
         //MeasureApp 给SampleWindow窗口发送添加样品的样品孔名,测量区域信息
         public SampleMeasurePara SMeasurePara;
 
-        //public SampleNodeMeaInfo st_SNodeMeaInfo;
+       
 
         public CTreeSampleParam TSampleParam;
 

+ 2 - 2
OTSIncAMeasureApp/ResourceManage/ResourceData.cs

@@ -5,7 +5,7 @@ namespace OTSModelSharp.ResourceManage
     //every possible display item in the sample property grid should be a member in this enum.
     public enum OTS_SAMPLE_PROP_GRID_ITEMS
     {// we prepare 10 items for every group.so the first group starts from 0,the second starts from 10,and so on.
-     //the item's value is contrast to the position exactly when it's displayed in the property grid.and the caption string is read from the resource file by the value too.
+     //the item's value is corresponding to the position exactly when it's displayed in the property grid.and the caption string is read from the resource file by the value too.
         INVALID = -1,
         MIN = 0,
         GENERAL_GRP_MIN = 0,
@@ -20,7 +20,7 @@ namespace OTSModelSharp.ResourceManage
         SYS_STD_SWITCH = 8,
         GENERAL_GRP_MAX = 8,
         IMAGE_GRP_MIN = 10,
-        START_MODE = 10,
+        START_PHOTO_MODE = 10,
         STOP_MODE = 11,
         STOP_PARAM_PARTICLE = 12,
         STOP_PARAM_FIELD = 13,

Некоторые файлы не были показаны из-за большого количества измененных файлов