update

seto77 · Dec 6, 2024 · e96911f · e96911f
1 parent 51726f7
commit e96911f
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 13 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.0246</AssemblyVersion>
-    <FileVersion>2024.12.6.0246</FileVersion>
+    <AssemblyVersion>2024.12.6.2328</AssemblyVersion>
+    <FileVersion>2024.12.6.2328</FileVersion>
     <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
     <ApplicationUseCompatibleTextRendering>true</ApplicationUseCompatibleTextRendering>
     <ApplicationVisualStyles>true</ApplicationVisualStyles>

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

diff --git a/Crystallography/Atom/AtomMinimum.cs b/Crystallography/Atom/AtomMinimum.cs
@@ -6,7 +6,7 @@ namespace Crystallography;
 /// <summary>
 /// Atoms2クラス
 /// </summary>
-[Serializable()]
+//[Serializable()]
 [MemoryPackable]
 public partial class Atoms2
 {

diff --git a/Crystallography/Crystal/CrystalMinimum.cs b/Crystallography/Crystal/CrystalMinimum.cs
@@ -1,4 +1,5 @@
 using MemoryPack;
+using MemoryPack.Compression;
 using System;
 using System.Collections.Frozen;
 using System.Collections.Generic;
@@ -11,7 +12,7 @@ namespace Crystallography;
 
 //必要最小限の情報だけを保存するクラス
 //[ProtoContract]
-[Serializable()]
+//[Serializable()]
 [MemoryPackable]
 public partial class Crystal2
 {
@@ -217,6 +218,43 @@ [ Compose(a.Dsf.Aniso11, a.Dsf.Aniso11_err),
         return c2;
     }
 
+    /// <summary>
+    /// MemoryPackでシリアライズしてbyte[]配列を返す
+    /// </summary>
+    /// <returns></returns>
+    public byte[] Serialize()
+    {
+        return Serialize(this);
+    }
+
+    /// <summary>
+    /// 静的メソッド　MemoryPackでシリアライズしてbyte[]配列を返す
+    /// </summary>
+    /// <param name="c"></param>
+    /// <returns></returns>
+    public static byte[] Serialize(Crystal2 c )
+    {
+        using var compressor = new BrotliCompressor(System.IO.Compression.CompressionLevel.Optimal);
+        MemoryPackSerializer.Serialize(compressor, c);
+        var data = compressor.ToArray();
+        return data;
+    }
+
+    /// <summary>
+    /// MemoryPackでシリアライズされたbyte[]配列からCrystal2を返す. 不適切な入力値だった場合はnull返し。
+    /// </summary>
+    /// <param name="bytes"></param>
+    /// <returns></returns>
+    public static Crystal2 Deserialize(byte[] bytes)
+    {
+        try
+        {
+            using var decompressor = new BrotliDecompressor();// Decompression(require using)
+            return MemoryPackSerializer.Deserialize<Crystal2>(decompressor.Decompress(bytes));
+        }
+        catch { return null; }
+    }
+
     [MemoryPackIgnore]
     private static readonly CultureInfo culture = CultureInfo.InvariantCulture;
     [MemoryPackIgnore]

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.0246</AssemblyVersion>
-    <FileVersion>2024.12.6.0246</FileVersion>
+    <AssemblyVersion>2024.12.6.2328</AssemblyVersion>
+    <FileVersion>2024.12.6.2328</FileVersion>
     <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>

diff --git a/ReciPro/DiffractionSimulator/FormDiffractionSimulator.cs b/ReciPro/DiffractionSimulator/FormDiffractionSimulator.cs
@@ -944,6 +944,8 @@ double fillCircleSpread(Color c, PointD pt, double intensity, double sigma)
                                 {
                                     g.Flag2 = true;
                                     var rInt = g.RelativeIntensity;
+                                    if (radioButtonIntensityExcitation.Checked)
+                                        rInt = 1;
 
                                     if (checkBoxDrawSameSize.Checked && Math.Abs(dev) < 3 * ExcitationError)//全て同一サイズで描画する場合はここで dev2=0, rInt=1;
                                     {
@@ -976,6 +978,9 @@ double fillCircleSpread(Color c, PointD pt, double intensity, double sigma)
                                 var sphereRadius = bethe ?
                                     ExcitationError * Math.Sqrt(g.RelativeIntensity) ://ベーテ法の場合は、相対強度の平方根が半径に比例
                                     ExcitationError * Math.Pow(g.RelativeIntensity, 1.0 / 3.0);//excitaion only あるいは Kinematicの場合は、半径に相対強度の1/3乗を掛ける
+
+                                if (radioButtonIntensityExcitation.Checked)
+                                    sphereRadius = ExcitationError;
 
                                 if (bethe || Math.Abs(dev) < sphereRadius)
                                 {

diff --git a/ReciPro/FormMain.cs b/ReciPro/FormMain.cs
@@ -70,10 +70,10 @@ protected override void WndProc(ref System.Windows.Forms.Message msg)
         switch (msg.Msg)
         {
             case WM_DRAWCLIPBOARD:
-                if ((Clipboard.GetDataObject()).GetDataPresent(typeof(Crystal2)))
+                if (Clipboard.GetDataObject().GetDataPresent(typeof(byte[])))
                 {
-                    var data = Clipboard.GetDataObject();
-                    var c2 = (Crystal2)data.GetData(typeof(Crystal2));
+                    var bytes = (byte[])Clipboard.GetDataObject().GetData(typeof(byte[]));
+                    var c2 = Crystal2.Deserialize(bytes);
                     crystalControl.Crystal = Crystal2.GetCrystal(c2);
                 }
 

diff --git a/ReciPro/ReciPro.csproj b/ReciPro/ReciPro.csproj
@@ -4,8 +4,8 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2024.11.25.0729</AssemblyVersion>
-    <FileVersion>2024.11.25.0729</FileVersion>
+    <AssemblyVersion>2024.12.6.2329</AssemblyVersion>
+    <FileVersion>2024.12.6.2329</FileVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <ApplicationIcon>App.ico</ApplicationIcon>