diff --git a/CSManager/CSManager.csproj b/CSManager/CSManager.csproj index bc8499d..837e668 100644 --- a/CSManager/CSManager.csproj +++ b/CSManager/CSManager.csproj @@ -1,11 +1,11 @@ - + WinExe net8.0-windows10.0.22621.0 true - 2024.1.4.0750 - 2024.1.4.0750 + 2024.1.4.0758 + 2024.1.4.0758 App.ico 7.0 @@ -15,10 +15,18 @@ + + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -38,9 +46,6 @@ - - PreserveNewest - SettingsSingleFileGenerator Settings.Designer.cs diff --git a/CSManager/Version.cs b/CSManager/Version.cs index cceb33f..978b4fa 100644 --- a/CSManager/Version.cs +++ b/CSManager/Version.cs @@ -9,26 +9,14 @@ static class Version static public string Software = "CSManager" ; - static public string VersionAndDate { get => History.Remove(0, 10).Remove(20); } - static public string RecentHistory - { - get - { - var list = History.Remove(0, 10).Split(new string[] { "\r\n " }, StringSplitOptions.RemoveEmptyEntries); - var str = ""; - for (int i = 0; i < 5; i++) - str += list[i] + "
\r\n"; - return str; - } - } static public int AMCSD = 21004; static public int COD = 506047; static public string History = "History" + - "\r\n ver1.895(2024/01/24) Fixed a broken link to manual pages." + + "\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." + "\r\n ver1.893(2022/10/27) Improved search function." + diff --git a/CSManager/doc/CSManager(en).docx b/CSManager/doc/CSManager(en).docx new file mode 100644 index 0000000..d1fb07d Binary files /dev/null and b/CSManager/doc/CSManager(en).docx differ diff --git a/CSManager/doc/CSManager(en).pdf b/CSManager/doc/CSManager(en).pdf new file mode 100644 index 0000000..7bbe1b9 Binary files /dev/null and b/CSManager/doc/CSManager(en).pdf differ diff --git a/CSManager/doc/CSManager(ja).docx b/CSManager/doc/CSManager(ja).docx index 7dcc6b6..d1fb07d 100644 Binary files a/CSManager/doc/CSManager(ja).docx and b/CSManager/doc/CSManager(ja).docx differ diff --git a/CSManager/doc/CSManagerl(en).docx b/CSManager/doc/CSManagerl(en).docx deleted file mode 100644 index a70f90c..0000000 Binary files a/CSManager/doc/CSManagerl(en).docx and /dev/null differ diff --git a/Crystallography.Controls/Crystallography.Controls.csproj b/Crystallography.Controls/Crystallography.Controls.csproj index dc78358..33c21f7 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.1.4.0748 - 2024.1.4.0748 + 2024.1.11.1015 + 2024.1.11.1015 PerMonitorV2 true true @@ -33,7 +33,7 @@ - + diff --git a/Crystallography.Controls/doc/CrystalInformationManual.docx b/Crystallography.Controls/doc/CrystalInformationManual.docx index 0607729..603b9a2 100644 Binary files a/Crystallography.Controls/doc/CrystalInformationManual.docx and b/Crystallography.Controls/doc/CrystalInformationManual.docx differ diff --git a/Crystallography/Crystallography.csproj b/Crystallography/Crystallography.csproj index f1a9648..459b15f 100644 --- a/Crystallography/Crystallography.csproj +++ b/Crystallography/Crystallography.csproj @@ -4,8 +4,8 @@ Library net8.0-windows10.0.22621.0 true - 2024.1.4.0748 - 2024.1.4.0748 + 2024.1.11.1015 + 2024.1.11.1015 7.0 diff --git a/Crystallography/Euler.cs b/Crystallography/Euler.cs index fdeec73..b64a9af 100644 --- a/Crystallography/Euler.cs +++ b/Crystallography/Euler.cs @@ -221,9 +221,9 @@ public static Matrix3D SerchEulerAngleFromZoneAxes(ZoneAxis za1, ZoneAxis za2, Z var v2 = Vector3DBase.Normarize(za2.u * cry.A_Axis + za2.v * cry.B_Axis + za2.w * cry.C_Axis); var v3 = Vector3DBase.Normarize(za3.u * cry.A_Axis + za3.v * cry.B_Axis + za3.w * cry.C_Axis); - Vector3D V1 = new Vector3D(-Math.Sin(tilt1), -Math.Cos(tilt1) * Math.Sin(azimuth1), Math.Cos(tilt1) * Math.Cos(azimuth1)); - Vector3D V2 = new Vector3D(-Math.Sin(tilt2), -Math.Cos(tilt2) * Math.Sin(azimuth2), Math.Cos(tilt2) * Math.Cos(azimuth2)); - Vector3D V3 = new Vector3D(-Math.Sin(tilt3), -Math.Cos(tilt3) * Math.Sin(azimuth3), Math.Cos(tilt3) * Math.Cos(azimuth3)); + Vector3D V1 = new(-Math.Sin(tilt1), -Math.Cos(tilt1) * Math.Sin(azimuth1), Math.Cos(tilt1) * Math.Cos(azimuth1)); + Vector3D V2 = new(-Math.Sin(tilt2), -Math.Cos(tilt2) * Math.Sin(azimuth2), Math.Cos(tilt2) * Math.Cos(azimuth2)); + Vector3D V3 = new(-Math.Sin(tilt3), -Math.Cos(tilt3) * Math.Sin(azimuth3), Math.Cos(tilt3) * Math.Cos(azimuth3)); double Phi, phi1, phi2, PhiStart, PhiEnd, phi1Start, phi1End, phi2Start, phi2End, step, PhiBest, phi1Best, phi2Best; double dev, devTemp; @@ -415,18 +415,18 @@ public static double[] DecomposeMatrix2(Matrix3D targetRotation, params (Vector3 return -(mat * rotInv).SumOfDiagonalCompenent(); }); - var temp = func(new DVec(initialAngles.ToArray())); + var temp = func(new DVec([.. initialAngles])); try { - var result = FindMinimum.OfFunction(func, new DVec(initialAngles.ToArray()), 1e-12, 100000).ToList(); + var result = FindMinimum.OfFunction(func, new DVec([.. initialAngles]), 1e-12, 100000).ToList(); for (int i = 0; i < settings.Length; i++) if (!settings[i].Variable) result.Insert(i, settings[i].Angle); - return result.ToArray(); + return [.. result]; } catch { - return initialAngles.ToArray(); + return [.. initialAngles]; } }