update

seto77 · Mar 5, 2024 · 4c68549 · 4c68549
1 parent 146ecb1
commit 4c68549
Show file tree

Hide file tree

Showing 57 changed files with 11,472 additions and 9,813 deletions.
diff --git a/Crystallography.Controls/Crystal/AtomControl.cs b/Crystallography.Controls/Crystal/AtomControl.cs
@@ -589,7 +589,7 @@ private Atoms GetFromInterface()
 
         double[] aniso = UseTypeU ?
             [Aniso11 / 100, Aniso22 / 100, Aniso33 / 100, Aniso12 / 100, Aniso23 / 100, Aniso13 / 100] :
-            new[] { Aniso11, Aniso22, Aniso33, Aniso12, Aniso23, Aniso13 };
+            [Aniso11, Aniso22, Aniso33, Aniso12, Aniso23, Aniso13];
 
         double[] anisoErr = UseTypeU ?
             [Aniso11Err / 100, Aniso22Err / 100, Aniso33Err / 100, Aniso12Err / 100, Aniso23Err / 100, Aniso13Err / 100] :

diff --git a/Crystallography.Controls/Crystal/CrystalControl.Designer.cs b/Crystallography.Controls/Crystal/CrystalControl.Designer.cs
diff --git a/Crystallography.Controls/Crystal/CrystalControl.cs b/Crystallography.Controls/Crystal/CrystalControl.cs
@@ -554,7 +554,7 @@ public void toAnotherSpaceGroup(int destNum)
             cry.SymmetrySeriesNumber = destNum;
             cry.SetAxis();
 
-            Vector3D srcA = cry.A_Axis, srcB = cry.B_Axis, srcC = cry.C_Axis, dstA, dstB, dstC;
+            Vector3DBase srcA = cry.A_Axis, srcB = cry.B_Axis, srcC = cry.C_Axis, dstA, dstB, dstC;
 
             if (srcExtra == "H")
             {//HをRに変換
@@ -637,7 +637,7 @@ public void toAnotherSpaceGroup(int destNum)
             _ => (x, y, z),
         };
 
-    static (Vector3D A, Vector3D B, Vector3D C) convertAxisMonoclinic(Vector3D a, Vector3D b, Vector3D c, string setting, bool forward = true)
+    static (Vector3DBase A, Vector3DBase B, Vector3DBase C) convertAxisMonoclinic(Vector3DBase a, Vector3DBase b, Vector3DBase c, string setting, bool forward = true)
         => setting switch
         {
             "b2" => forward ? (-c - a, b, a) : (c, b, -c - a),