update

seto77 · Nov 1, 2024 · b68cb86 · b68cb86
1 parent 33aad92
commit b68cb86
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 2 deletions.
diff --git a/Crystallography/Crystallography.csproj b/Crystallography/Crystallography.csproj
@@ -38,7 +38,7 @@
     <PackageReference Include="MemoryPack" Version="1.21.3" />
     <PackageReference Include="OpenTK" Version="3.3.3" />
     <PackageReference Include="SimdLinq" Version="1.3.2" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.7" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.8" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Crystallography/Miscellaneous.cs b/Crystallography/Miscellaneous.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
+using System.IO;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading;
@@ -108,6 +109,53 @@ public static bool IsDecimalPointComma
 
     public static (int Division, int Modulus) DivMod(int n, int m) => (n / m, n % m);
 
+    /// <summary>
+    /// ファイルが使用中かどうかをチェック
+    /// </summary>
+    /// <param name="path"></param>
+    /// <returns></returns>
+    public static bool isFileExistsAndLocked(string path)
+    {
+        if (File.Exists(path))
+        {
+            FileStream stream = null;
+
+            try
+            {
+                stream = new FileStream(path, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite);
+            }
+            catch (DirectoryNotFoundException e)
+            {
+                return false;
+            }
+            catch (FileNotFoundException e)
+            {
+                return false;
+            }
+            catch (IOException e)
+            {
+                if (File.Exists(path))
+                {
+                    return true;
+                }
+            }
+            catch (Exception e)
+            {
+                return false;
+            }
+            finally
+            {
+                if (stream != null)
+                {
+                    stream.Close();
+                }
+            }
+
+            return false;
+        }
+
+        return false;
+    }
 }
 
 

diff --git a/ReciPro/Version.cs b/ReciPro/Version.cs
@@ -7,7 +7,7 @@ internal static class Version
 
     public const string History =
         "History" +
-        "\r\n ver4.893(2024/11/01)  Fixed bugs on the 'Diffraction Simulator' and 'HRTEM/STEM simulator' (thanks to lukmuk-san and Nakamura-san!)." +
+        "\r\n ver4.894(2024/11/01)  Fixed bugs on the 'Diffraction Simulator' and 'HRTEM/STEM simulator' (thanks to lukmuk-san and Nakamura-san!)." +
         "\r\n ver4.892(2024/10/04)  Added several 'Macro' functions." +
         "\r\n ver4.891(2024/09/06)  Added the function to simulate electron trajectories based on the Monte Carlo method." +
         "\r\n ver4.890(2024/08/10)  Improved 'Macro' functions." +