diff --git a/COD/COD.cdb3 b/COD/COD.cdb3 index 7a9016a..70db664 100644 Binary files a/COD/COD.cdb3 and b/COD/COD.cdb3 differ diff --git a/COD/COD/COD.000 b/COD/COD/COD.000 index 18f5956..8144f4a 100644 Binary files a/COD/COD/COD.000 and b/COD/COD/COD.000 differ diff --git a/COD/COD/COD.001 b/COD/COD/COD.001 index 219e57c..7383933 100644 Binary files a/COD/COD/COD.001 and b/COD/COD/COD.001 differ diff --git a/COD/COD/COD.002 b/COD/COD/COD.002 index 7f3eec2..eaab3e1 100644 Binary files a/COD/COD/COD.002 and b/COD/COD/COD.002 differ diff --git a/COD/COD/COD.003 b/COD/COD/COD.003 index 6ab8232..6b3c65d 100644 Binary files a/COD/COD/COD.003 and b/COD/COD/COD.003 differ diff --git a/COD/COD/COD.004 b/COD/COD/COD.004 index 6377a8d..f9053be 100644 Binary files a/COD/COD/COD.004 and b/COD/COD/COD.004 differ diff --git a/COD/COD/COD.005 b/COD/COD/COD.005 index 0871a2b..22b10ea 100644 Binary files a/COD/COD/COD.005 and b/COD/COD/COD.005 differ diff --git a/COD/COD/COD.006 b/COD/COD/COD.006 index b90a62c..839a7af 100644 Binary files a/COD/COD/COD.006 and b/COD/COD/COD.006 differ diff --git a/COD/COD/COD.007 b/COD/COD/COD.007 index 250cb0f..f01a4fb 100644 Binary files a/COD/COD/COD.007 and b/COD/COD/COD.007 differ diff --git a/COD/COD/COD.008 b/COD/COD/COD.008 index c60fa17..ad84cc1 100644 Binary files a/COD/COD/COD.008 and b/COD/COD/COD.008 differ diff --git a/COD/COD/COD.009 b/COD/COD/COD.009 index 6f05d4b..239f7ad 100644 Binary files a/COD/COD/COD.009 and b/COD/COD/COD.009 differ diff --git a/COD/COD/COD.010 b/COD/COD/COD.010 index 7e3b903..a2e6212 100644 Binary files a/COD/COD/COD.010 and b/COD/COD/COD.010 differ diff --git a/COD/COD/COD.011 b/COD/COD/COD.011 index c2cb953..8474549 100644 Binary files a/COD/COD/COD.011 and b/COD/COD/COD.011 differ diff --git a/COD/COD/COD.012 b/COD/COD/COD.012 index 71acd2b..2392e5d 100644 Binary files a/COD/COD/COD.012 and b/COD/COD/COD.012 differ diff --git a/COD/COD/COD.013 b/COD/COD/COD.013 index 6983e36..2a65c02 100644 Binary files a/COD/COD/COD.013 and b/COD/COD/COD.013 differ diff --git a/COD/COD/COD.014 b/COD/COD/COD.014 index b4e6028..1fea85a 100644 Binary files a/COD/COD/COD.014 and b/COD/COD/COD.014 differ diff --git a/COD/COD/COD.015 b/COD/COD/COD.015 index ef89561..335a8fa 100644 Binary files a/COD/COD/COD.015 and b/COD/COD/COD.015 differ diff --git a/COD/COD/COD.016 b/COD/COD/COD.016 index 46f78b8..cdb293b 100644 Binary files a/COD/COD/COD.016 and b/COD/COD/COD.016 differ diff --git a/COD/COD/COD.017 b/COD/COD/COD.017 index 4b5299b..f0854a8 100644 Binary files a/COD/COD/COD.017 and b/COD/COD/COD.017 differ diff --git a/COD/COD/COD.018 b/COD/COD/COD.018 index b91beaa..1f9af58 100644 Binary files a/COD/COD/COD.018 and b/COD/COD/COD.018 differ diff --git a/COD/COD/COD.019 b/COD/COD/COD.019 index 8450427..17f3d0b 100644 Binary files a/COD/COD/COD.019 and b/COD/COD/COD.019 differ diff --git a/COD/COD/COD.020 b/COD/COD/COD.020 index 988b9d9..8280f7d 100644 Binary files a/COD/COD/COD.020 and b/COD/COD/COD.020 differ diff --git a/COD/COD/COD.021 b/COD/COD/COD.021 index 3ec54ad..893f3df 100644 Binary files a/COD/COD/COD.021 and b/COD/COD/COD.021 differ diff --git a/COD/COD/COD.022 b/COD/COD/COD.022 index 7b3cd25..3bff9ff 100644 Binary files a/COD/COD/COD.022 and b/COD/COD/COD.022 differ diff --git a/COD/COD/COD.023 b/COD/COD/COD.023 index bb31afd..5688731 100644 Binary files a/COD/COD/COD.023 and b/COD/COD/COD.023 differ diff --git a/COD/COD/COD.024 b/COD/COD/COD.024 index 232bc8b..2ad594e 100644 Binary files a/COD/COD/COD.024 and b/COD/COD/COD.024 differ diff --git a/COD/COD/COD.025 b/COD/COD/COD.025 index f1607d7..457d498 100644 Binary files a/COD/COD/COD.025 and b/COD/COD/COD.025 differ diff --git a/COD/COD/COD.026 b/COD/COD/COD.026 index f5ca779..bd1e555 100644 Binary files a/COD/COD/COD.026 and b/COD/COD/COD.026 differ diff --git a/COD/COD/COD.027 b/COD/COD/COD.027 index 27fe0fe..f868309 100644 Binary files a/COD/COD/COD.027 and b/COD/COD/COD.027 differ diff --git a/COD/COD/COD.028 b/COD/COD/COD.028 index 6f6c77f..17cf5cd 100644 Binary files a/COD/COD/COD.028 and b/COD/COD/COD.028 differ diff --git a/COD/COD/COD.029 b/COD/COD/COD.029 index d8607ee..457387b 100644 Binary files a/COD/COD/COD.029 and b/COD/COD/COD.029 differ diff --git a/COD/COD/COD.030 b/COD/COD/COD.030 index 378a05a..2e297f7 100644 Binary files a/COD/COD/COD.030 and b/COD/COD/COD.030 differ diff --git a/COD/COD/COD.031 b/COD/COD/COD.031 index c5acaab..3f4b5cb 100644 Binary files a/COD/COD/COD.031 and b/COD/COD/COD.031 differ diff --git a/COD/COD/COD.032 b/COD/COD/COD.032 index 29afee0..9335946 100644 Binary files a/COD/COD/COD.032 and b/COD/COD/COD.032 differ diff --git a/COD/COD/COD.033 b/COD/COD/COD.033 index 017fd2d..74bc57c 100644 Binary files a/COD/COD/COD.033 and b/COD/COD/COD.033 differ diff --git a/CSManager/CSManager.csproj b/CSManager/CSManager.csproj index 1a93bf2..fe4845c 100644 --- a/CSManager/CSManager.csproj +++ b/CSManager/CSManager.csproj @@ -4,8 +4,8 @@ WinExe net8.0-windows10.0.22621.0 true - 2024.6.30.0309 - 2024.6.30.0309 + 2024.7.2.2223 + 2024.7.2.2223 App.ico 7.0 diff --git a/CSManager/FormMain.cs b/CSManager/FormMain.cs index acad44c..0bc78a1 100644 --- a/CSManager/FormMain.cs +++ b/CSManager/FormMain.cs @@ -405,8 +405,8 @@ protected override WebRequest GetWebRequest(Uri uri) #region ImportAll フォルダ内に存在する全てのCIF,AMCファイルを取得し、データベースに書き込む private void importAllCrystalsMenuItem_Click(object sender, EventArgs e) => GetAllImport(); - private BackgroundWorker workerAllImport = new BackgroundWorker() { WorkerReportsProgress = true, WorkerSupportsCancellation = true }; - private Crystal2[] crystal2Array = Array.Empty(); + private BackgroundWorker workerAllImport = new() { WorkerReportsProgress = true, WorkerSupportsCancellation = true }; + private Crystal2[] crystal2Array = []; /// /// フォルダ内に存在する全てのCIF,AMCファイルを取得し、データベースに書き込む /// diff --git a/CSManager/Version.cs b/CSManager/Version.cs index 5dc1b6b..7de8ef3 100644 --- a/CSManager/Version.cs +++ b/CSManager/Version.cs @@ -12,11 +12,11 @@ static class Version static public string VersionAndDate { get => History.Remove(0, 10).Remove(20); } static public int AMCSD = 21_026; - static public int COD = 510_777; + static public int COD = 514_854; static public string History = "History" + - "\r\n ver1.896(2024/06/30) Renewed AMCSD database (contains 21,026)." + + "\r\n ver1.896(2024/06/30) Renewed AMCSD database (contains 21,026) and COD database (514,854)." + "\r\n ver1.896(2024/01/04) Updated .Net Desktop Runtime to 8.0. Fixed a broken link to manual pages." + "\r\n ver1.895(2023/09/29) Renewed AMCSD database (contains 21,004) and COD database (506,047)." + "\r\n ver1.894(2022/11/16) Updated .Net Desktop Runtime to 7.0. Renewed COD database (494,508). Changed algorithm when saving and loading." + diff --git a/Crystallography.Controls/Crystallography.Controls.csproj b/Crystallography.Controls/Crystallography.Controls.csproj index 604e97e..0e3b5cf 100644 --- a/Crystallography.Controls/Crystallography.Controls.csproj +++ b/Crystallography.Controls/Crystallography.Controls.csproj @@ -4,8 +4,8 @@ Library net8.0-windows10.0.22621.0 true - 2024.6.30.0309 - 2024.6.30.0309 + 2024.7.2.2223 + 2024.7.2.2223 PerMonitorV2 true true diff --git a/Crystallography/Crystallography.csproj b/Crystallography/Crystallography.csproj index d1cdd27..ddced96 100644 --- a/Crystallography/Crystallography.csproj +++ b/Crystallography/Crystallography.csproj @@ -4,8 +4,8 @@ Library net8.0-windows10.0.22621.0 true - 2024.6.30.0309 - 2024.6.30.0309 + 2024.7.2.2223 + 2024.7.2.2223 7.0 @@ -28,7 +28,7 @@ - +