update

Author: seto

Crystallography.Controls/Crystallography.Controls.csproj

@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2025.5.13.2300</AssemblyVersion>
-    <FileVersion>2025.5.13.2300</FileVersion>
+    <AssemblyVersion>2025.5.17.0235</AssemblyVersion>
+    <FileVersion>2025.5.17.0235</FileVersion>
     <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
     <ApplicationUseCompatibleTextRendering>true</ApplicationUseCompatibleTextRendering>
     <ApplicationVisualStyles>true</ApplicationVisualStyles>
@@ -49,7 +49,7 @@
     <PackageReference Include="OpenTK" Version="4.9.4" />
     <PackageReference Include="SimdLinq" Version="1.3.2" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.3" />
-    <PackageReference Include="ZLinq" Version="1.4.2" />
+    <PackageReference Include="ZLinq" Version="1.4.5" />
   </ItemGroup>
 
   <ItemGroup>

Crystallography/Crystallography.csproj

@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2025.5.13.2300</AssemblyVersion>
-    <FileVersion>2025.5.13.2300</FileVersion>
+    <AssemblyVersion>2025.5.17.0235</AssemblyVersion>
+    <FileVersion>2025.5.17.0235</FileVersion>
     <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
     <Platforms>AnyCPU;x64</Platforms>
     <PublishReadyToRun>true</PublishReadyToRun>
@@ -38,13 +38,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="HDF.PInvoke.1.10" Version="1.10.612" />
     <PackageReference Include="MathNet.Numerics" Version="6.0.0-beta2" />
     <PackageReference Include="MemoryPack" Version="1.21.4" />
     <PackageReference Include="OpenTK" Version="4.9.4" />
+    <PackageReference Include="PureHDF" Version="2.1.1" />
     <PackageReference Include="SimdLinq" Version="1.3.2" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.3" />
-    <PackageReference Include="ZLinq" Version="1.4.2" />
+    <PackageReference Include="ZLinq" Version="1.4.5" />
   </ItemGroup>
 
   <ItemGroup>
@@ -75,4 +75,20 @@
     <Using Include="SimdLinq" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="C:\Users\seto\.nuget\packages\hdf.pinvoke\1.10.11\build\bin32\hdf5.dll" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="C:\Users\seto\.nuget\packages\hdf.pinvoke\1.10.11\build\bin32\hdf5_hl.dll" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="C:\Users\seto\.nuget\packages\hdf.pinvoke\1.10.11\build\bin64\hdf5.dll" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="C:\Users\seto\.nuget\packages\hdf.pinvoke\1.10.11\build\bin64\hdf5_hl.dll" />
+  </ItemGroup>
+
 </Project>

Crystallography/Detector/Ring.cs

@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
-using static System.Windows.Forms.AxHost;
 
 namespace Crystallography;
 
@@ -221,8 +219,12 @@ public enum ImageTypeEnum
         /// <summary>
         /// PILATUSで出力されたcbfファイルを、ADXVというソフトで変換したフォーマット (拡張子img). (references\ImageExsample\ADXV 柴咲さん )
         /// </summary>
-        ADXV
+        ADXV,
 
+        /// <summary>
+        /// NeXus Data Format (拡張子nxs), X-Spectrum社　LAMBDAX線検出器　. (\references\ImageExsample\LAMBDA (20250516平尾さんより))
+        /// </summary>
+        NXS,
 
 
         #endregion 画像タイプ