update

seto77 · Dec 7, 2024 · 4228bf9 · 4228bf9
1 parent 48a75ea
commit 4228bf9
Show file tree

Hide file tree

Showing 7 changed files with 3,409 additions and 3,404 deletions.
diff --git a/Crystallography.Controls/Crystallography.Controls.csproj b/Crystallography.Controls/Crystallography.Controls.csproj
@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2024.12.6.2348</AssemblyVersion>
-    <FileVersion>2024.12.6.2348</FileVersion>
+    <AssemblyVersion>2024.12.7.0019</AssemblyVersion>
+    <FileVersion>2024.12.7.0019</FileVersion>
     <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
     <ApplicationUseCompatibleTextRendering>true</ApplicationUseCompatibleTextRendering>
     <ApplicationVisualStyles>true</ApplicationVisualStyles>

diff --git a/Crystallography/Crystallography.csproj b/Crystallography/Crystallography.csproj
@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2024.12.6.2348</AssemblyVersion>
-    <FileVersion>2024.12.6.2348</FileVersion>
+    <AssemblyVersion>2024.12.7.0019</AssemblyVersion>
+    <FileVersion>2024.12.7.0019</FileVersion>
     <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>

diff --git a/Crystallography/PdiFile.cs b/Crystallography/PdiFile.cs
@@ -22,8 +22,7 @@ public static bool SavePdi2File(DiffractionProfile2[] dp, string fileName)
         }
         catch
         {
-            if (fs != null)
-                fs.Close();
+            fs?.Close();
             return false;
         }
     }
@@ -70,7 +69,7 @@ public static DiffractionProfile2[] ReadPdi2File(string fileName, int version =
                 if (dp.Length > 0)
                     return dp;
                 else
-                    return Array.Empty<DiffractionProfile2>();
+                    return [];
             }
             else //バージョン1
             {

diff --git a/Crystallography/Profile.cs b/Crystallography/Profile.cs
@@ -4,6 +4,7 @@
 using System.Drawing;
 using System.Linq;
 using System.Numerics;
+using System.Text.Json.Serialization;
 using System.Xml.Serialization;
 
 namespace Crystallography;

diff --git a/IPAnalyzer/FormMain.cs b/IPAnalyzer/FormMain.cs
@@ -3506,7 +3506,10 @@ public void GetProfile(string fileName = "")
                     if (result = mutex.WaitOne(azimuthalDivMode ? 5000 : 500, true))
                     {
                         mutex.ReleaseMutex();
+
                         Clipboard.SetDataObject(dpList.ToArray());
+
+
                     }
                     Thread.Sleep(500);
 

diff --git a/IPAnalyzer/FormMain.resx b/IPAnalyzer/FormMain.resx
diff --git a/IPAnalyzer/IPAnalyzer.csproj b/IPAnalyzer/IPAnalyzer.csproj
@@ -4,13 +4,14 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2024.12.6.2348</AssemblyVersion>
-    <FileVersion>2024.12.6.2348</FileVersion>
+    <AssemblyVersion>2024.12.7.0021</AssemblyVersion>
+    <FileVersion>2024.12.7.0021</FileVersion>
     <ApplicationIcon>App.ico</ApplicationIcon>
     <StartupObject>IPAnalyzer.Program</StartupObject>
     <DebugType>embedded</DebugType>
     <Version>1.1.1.1</Version>
     <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
+    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -35,6 +36,7 @@
   <ItemGroup>
     <PackageReference Include="HDF.PInvoke.1.10" Version="1.10.612" />
     <PackageReference Include="SimdLinq" Version="1.3.2" />
+    <PackageReference Include="System.Runtime.Serialization.Formatters" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>