Add Rad-Xcam3030 support, fix Radicon1520 bugs, and auto-detect image orientation

- Added support for FlatPanel Rad-Xcam3030 and 2048x2048 resolution
- Added auto-detection of width/height orientation for RadIcon images
- Removed unused NativeMemoryArray package, updated System.Linq.Dynamic.Core
- Removed System.Linq.Dynamic.Core from Controls project
- Updated assembly versions to 2026.4.7.0209

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: seto77

Crystallography.Controls/Crystallography.Controls.csproj

@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net10.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2026.4.5.2311</AssemblyVersion>
-    <FileVersion>2026.4.5.2311</FileVersion>
+    <AssemblyVersion>2026.4.7.0209</AssemblyVersion>
+    <FileVersion>2026.4.7.0209</FileVersion>
     <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
     <ApplicationUseCompatibleTextRendering>true</ApplicationUseCompatibleTextRendering>
     <ApplicationVisualStyles>true</ApplicationVisualStyles>
@@ -49,7 +49,6 @@
     <PackageReference Include="OpenTK" Version="4.9.4" />
     <PackageReference Include="SimdLinq" Version="1.3.2" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.7.1" />
     <PackageReference Include="ZLinq" Version="1.5.5" />
   </ItemGroup>
 

Crystallography/Crystallography.csproj

@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net10.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2026.4.5.2311</AssemblyVersion>
-    <FileVersion>2026.4.5.2311</FileVersion>
+    <AssemblyVersion>2026.4.7.0209</AssemblyVersion>
+    <FileVersion>2026.4.7.0209</FileVersion>
     <!-- <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion> --><!-- 260405Cl .NET 10はWindows7非対応のため削除 -->
     <Platforms>x64</Platforms>
     <PublishReadyToRun>true</PublishReadyToRun>
@@ -36,11 +36,11 @@
   <ItemGroup>
     <PackageReference Include="MathNet.Numerics" Version="6.0.0-beta2" />
     <PackageReference Include="MemoryPack" Version="1.21.4" />
-    <PackageReference Include="NativeMemoryArray" Version="1.2.2" />
+    <!--<PackageReference Include="NativeMemoryArray" Version="1.2.2" />--><!-- 260407Cl 未使用のため削除 -->
     <PackageReference Include="OpenTK" Version="4.9.4" />
     <PackageReference Include="PureHDF" Version="2.1.2" />
     <PackageReference Include="SimdLinq" Version="1.3.2" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.7.1" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.7.2" />
     <PackageReference Include="ZLinq" Version="1.5.5" />
   </ItemGroup>
 

Crystallography/Images/ImageIO.cs

@@ -332,8 +332,22 @@ private static bool SMV(string filename)
 
     #region  rawファイル (RadIcon など)
 
-    static readonly Size[] RadIconSize 
-        = [new (688, 2064), new(1548, 2064), new(2064, 2236), new(2080, 2238), new(3096, 3100), new(1300, 4608), new(2940, 4608), new(5888, 4608),];
+    /// <summary> 指定された行幅wに対して、行折り返し不連続性と縦方向連続性の平均を計算する </summary> 
+    private static (double WrapAvg, double VertAvg) CalcWrapAndVertAvg(int w, int h)
+    {
+        double wrapSum = 0, vertSum = 0;
+        for (int row = 0; row < h - 1; row++)
+        {
+            int rowStart = row * w;
+            wrapSum += Math.Abs(Ring.Intensity[rowStart + w] - Ring.Intensity[rowStart + w - 1]);// 行折り返し不連続性: 行末と次行先頭のピクセル差
+            for (int x = 0; x < w; x++)
+                vertSum += Math.Abs(Ring.Intensity[rowStart + w + x] - Ring.Intensity[rowStart + x]); // 縦方向連続性: 同列の隣接行ピクセル差
+        }
+        return (wrapSum / Math.Max(h - 1, 1), vertSum / Math.Max((long)(h - 1) * w, 1));
+    }
+
+    static readonly Size[] RadIconSize
+        = [new (688, 2064), new(2048, 2048), new(2064, 1548), new(2064, 2236), new(2080, 2238), new(3096, 3100), new(1300, 4608), new(2940, 4608), new(5888, 4608),];
     public static bool RadIcon(string str)
     {
         try
@@ -358,6 +372,23 @@ public static bool RadIcon(string str)
                 }
                 br.Close();
 
+                //全く同じファイルサイズで、2064x1548と1548x2064のケースがある (20200410辻野さんへの対応)
+                //横方向連続性、縦方向連続性、行折り返し不連続性を評価しRing.SrcImgSizeのwidthとheightを入れ替える
+                if (Ring.SrcImgSize.Width != Ring.SrcImgSize.Height)
+                {
+                    var original = CalcWrapAndVertAvg(Ring.SrcImgSize.Width, Ring.SrcImgSize.Height);
+                    var swapped = CalcWrapAndVertAvg(Ring.SrcImgSize.Height, Ring.SrcImgSize.Width);
+
+                    bool swapNeeded;
+                    if (original.WrapAvg == 0 || swapped.WrapAvg == 0)// どちらか一方でもwrapAvgがゼロなら、vertAvgだけで評価 (小さい方が正しい向き)
+                        swapNeeded = swapped.VertAvg < original.VertAvg;
+                    else// スコア = 行折り返し不連続性 / 縦方向連続性 (大きいほど行幅が正しい)
+                        swapNeeded = swapped.WrapAvg / (swapped.VertAvg + 1e-10) > original.WrapAvg / (original.VertAvg + 1e-10);
+
+                    if (swapNeeded)
+                        Ring.SrcImgSize = new Size(Ring.SrcImgSize.Height, Ring.SrcImgSize.Width);
+                }
+
                 Ring.BitsPerPixels = 16;
                 Ring.ImageType = Ring.ImageTypeEnum.RadIcon;
                 Ring.Comments = "";

IPAnalyzer/Version.cs

@@ -9,6 +9,7 @@ static class Version
 
     static public string History =
         "History" +
+        "\r\n ver3.975(2026/04/10) Added support for FlatPanel Rad-Xcam3030 and fixed bugs on Radicon1520. " +
         "\r\n ver3.974(2026/04/06) Reduced the size of the installer package. " +
         "\r\n ver3.973(2026/01/21) Fixed bugs on loading *.nxs files." +
         "\r\n ver3.972(2026/01/16) Fixed bugs on loading *.nxs files." +