update

seto77 · Nov 25, 2024 · b074232 · b074232
1 parent ab988a0
commit b074232
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 23 deletions.
diff --git a/Crystallography.Controls/Crystal/PoleFigureControl.cs b/Crystallography.Controls/Crystal/PoleFigureControl.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -286,7 +287,7 @@ public void DrawOutline(Graphics g)
     private int justBeforeCrystallineNumber = -1;
     private IEnumerable<(int Radial, int Sector)>[] Index;
 
-    public object lockObject = new object();
+    public Lock lockObject = new();
 
     public double[][] generateDensityArrayNormal(double angleResolution)
     {

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.11.25.0714</AssemblyVersion>
-    <FileVersion>2024.11.25.0714</FileVersion>
+    <AssemblyVersion>2024.11.25.0723</AssemblyVersion>
+    <FileVersion>2024.11.25.0723</FileVersion>
     <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
     <ApplicationUseCompatibleTextRendering>true</ApplicationUseCompatibleTextRendering>
     <ApplicationVisualStyles>true</ApplicationVisualStyles>

diff --git a/Crystallography.Controls/DataSet.cs b/Crystallography.Controls/DataSet.cs
@@ -5,6 +5,7 @@
 using System.Drawing;
 using System.Linq;
 using System.Numerics;
+using System.Threading;
 
 namespace Crystallography.Controls;
 
@@ -258,7 +259,7 @@ public void Replace(object srcCrystal, Crystal2 targetcrystal)
             }
         }
 
-        readonly object lockObj = new();
+        readonly Lock lockObj = new();
         public DataTableCrystalDatabaseRow CreateRow(Crystal2 c)
         {
             DataTableCrystalDatabaseRow dr;

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.0714</AssemblyVersion>
-    <FileVersion>2024.11.25.0714</FileVersion>
+    <AssemblyVersion>2024.11.25.0723</AssemblyVersion>
+    <FileVersion>2024.11.25.0723</FileVersion>
     <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>

diff --git a/Crystallography.OpenGL/GLObject.cs b/Crystallography.OpenGL/GLObject.cs
@@ -23,6 +23,7 @@
 using PT = OpenTK.Graphics.OpenGL4.PrimitiveType;
 using MathNet.Numerics.Distributions;
 using static System.Windows.Forms.DataFormats;
+using System.Threading;
 #endregion 定義
 
 namespace Crystallography.OpenGL;
@@ -149,7 +150,7 @@ abstract public class GLObject
     private static readonly int sizeOfUInt = sizeof(uint);
     private static readonly List<(string Product, string Version)> GraphicsInfo;
     private static int serialNumber = 0;
-    public static readonly object LockObj = new();
+    public static readonly Lock LockObj = new();
 
     public static float LineWidthStatic = 1f;
 

diff --git a/Crystallography/ChemicalStandard.cs b/Crystallography/ChemicalStandard.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 
 namespace Crystallography
 {
@@ -679,7 +680,7 @@ public static double ChontinuousFluorescenceFactor(Element[] elements, int index
             return c * elements[index].MolarWeight * zAve * EcA * mu_rhoAAe / mu_rhoUnkAe * gammaMinusOnePerGamma * Math.Log(1 + g * U0A) / g / U0A;
         }
 
-        private static object lockObJforBetaArray = new object();
+        private static Lock lockObJforBetaArray = new Lock();
 
         /// <summary>
         /// betaの値を保管する一時変数.

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.11.25.0714</AssemblyVersion>
-    <FileVersion>2024.11.25.0714</FileVersion>
+    <AssemblyVersion>2024.11.25.0723</AssemblyVersion>
+    <FileVersion>2024.11.25.0723</FileVersion>
     <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>

diff --git a/Crystallography/Detector/Ring.cs b/Crystallography/Detector/Ring.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Crystallography;
@@ -144,7 +145,7 @@ public static class Ring
     public enum Rotation { Clockwise, Counterclockwise }
     public enum Direction { Right, Left, Top, Bottom }
 
-    private static readonly object lockObj = new();
+    private static readonly Lock lockObj = new();
 
 
     public enum ImageTypeEnum

diff --git a/Crystallography/Images/ImageProcessor.cs b/Crystallography/Images/ImageProcessor.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Crystallography;
@@ -218,7 +219,7 @@ unsafe static public double[] DustAndScratches(double[] pixels, int width, doubl
         return results;
     }
 
-    private static readonly object lockObj = new object();
+    private static readonly Lock lockObj = new Lock();
 
     /// <summary>
     /// 画像中から、スポットを検出する。戻り値はList<Vector3DBase>. X, Y: スポットのピクセル上の位置,  Int: 強度

diff --git a/Crystallography/Mathematics/Statistics.cs b/Crystallography/Mathematics/Statistics.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Crystallography;
@@ -273,7 +274,7 @@ public static double SigmaProduct(double[] values1, double[] values2)
     }
 
 
-    public static object lockObject = new();
+    public static Lock lockObject = new();
 
     /// <summary>
     /// 平均mu, 標準偏差sigmaの正規分布乱数を得る。Box-Muller法による。

diff --git a/Crystallography/Matrix.cs b/Crystallography/Matrix.cs
@@ -434,11 +434,11 @@ public static Matrix3D RotZ(double theta)
 
     public static Matrix3D GenerateRamdomRotationMatrix(int seed) => GenerateRamdomRotationMatrix(new Random(seed));
 
-    private static readonly Lock o = new();
+    private static readonly Lock lockObj = new();
     public static Matrix3D GenerateRamdomRotationMatrix(Random rn)
     {
         double rn1, rn2, rn3;
-        lock (o)
+        lock (lockObj)
         {
             rn1 = rn.NextDouble();
             rn2 = rn.NextDouble();

diff --git a/ReciPro/FormTrajectory.cs b/ReciPro/FormTrajectory.cs
@@ -8,6 +8,7 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using V3 = OpenTK.Vector3d;
@@ -22,7 +23,7 @@ public partial class FormTrajectory : Form
 
     private GLControlAlpha glControlTrajectory;
 
-    private object lockObj = new();
+    private readonly Lock lockObj = new();
 
     (V3 p, double e)[][] Trajectories = [];
     private double EnergyThreshold = 2;

diff --git a/ReciPro/PolycrystallineDiffraction/DiffractionPatternControl.cs b/ReciPro/PolycrystallineDiffraction/DiffractionPatternControl.cs
@@ -3,6 +3,7 @@
 using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Xml.Serialization;
@@ -378,7 +379,7 @@ private void graphControlFrequency_LinePositionChanged()
 
     //private delegate SortedList<uint, int> calcFreqDelegate(int start, int end);
 
-    private object lockObj = new object();
+    private readonly Lock lockObj = new();
 
     /// <summary>
     /// Frequencyを計算

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.0714</AssemblyVersion>
-    <FileVersion>2024.11.25.0714</FileVersion>
+    <AssemblyVersion>2024.11.25.0723</AssemblyVersion>
+    <FileVersion>2024.11.25.0723</FileVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <ApplicationIcon>App.ico</ApplicationIcon>

diff --git a/ReciPro/SpotID/FormSpotIDV2.cs b/ReciPro/SpotID/FormSpotIDV2.cs
@@ -10,6 +10,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using MQ = Crystallography.Marquardt;
@@ -49,7 +50,7 @@ public double PixelSize
 
     public double FittingRange => numericBoxFittingRange.Value;
 
-    private readonly object lockObj = new object();
+    private readonly Lock lockObj = new();
 
     private readonly Stopwatch sw = new Stopwatch();
 

diff --git a/ReciPro/StructureViewer/FormStructureViewer.cs b/ReciPro/StructureViewer/FormStructureViewer.cs
@@ -39,9 +39,9 @@ public partial class FormStructureViewer : Form
     public List<GLObject> GLObjects = [];
     private readonly ParallelQuery<GLObject> GLObjectsP;
 
-    public readonly object lockObj1 = new();
-    public readonly object lockObj2 = new();
-    public readonly object lockObj3 = new();
+    public readonly Lock lockObj1 = new();
+    public readonly Lock lockObj2 = new();
+    public readonly Lock lockObj3 = new();
 
 
     private bool skipSetCrystal = false;