update

seto77 · Oct 26, 2022 · d163051 · d163051
1 parent 8554656
commit d163051
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/CSManager/CSManager.csproj b/CSManager/CSManager.csproj
@@ -4,8 +4,8 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2022.10.26.1147</AssemblyVersion>
-    <FileVersion>2022.10.26.1147</FileVersion>
+    <AssemblyVersion>2022.10.26.1158</AssemblyVersion>
+    <FileVersion>2022.10.26.1158</FileVersion>
     <ApplicationIcon>App.ico</ApplicationIcon>
   </PropertyGroup>
 

diff --git a/CSManager/FormMain.cs b/CSManager/FormMain.cs
@@ -419,7 +419,7 @@ private void GetAllImport()
             for (int i = 0; i < fn.Count; i += division)
             {
                 var crystalList = new List<Crystal2>();
-                Parallel.For(i, Math.Min(i + division, fn.Count), new ParallelOptions() { MaxDegreeOfParallelism = 1 }, j =>
+                Parallel.For(i, Math.Min(i + division, fn.Count)/*, new ParallelOptions() { MaxDegreeOfParallelism = 1 }*/, j =>
                 {
                     var crystal2 = ConvertCrystalData.ConvertToCrystal2(fn[j]);
                     if (crystal2 != null)

diff --git a/CSManager/Version.cs b/CSManager/Version.cs
@@ -28,6 +28,7 @@ static public string RecentHistory
 
         static public string History = 
             "History" +
+                "\r\n ver1.892(2022/10/26) Fixed minor bugs." +
                 "\r\n ver1.891(2022/09/09) Renewed AMCSD database (contains 20,997) and COD database (490,180)." +
                 "\r\n ver1.890(2021/11/12) Target framework is changed to .Net 6.0." +
                 "\r\n ver1.888(2021/07/16) Renewed AMCSD database (contains 20,819)" +

diff --git a/Crystallography.Controls/Crystallography.Controls.csproj b/Crystallography.Controls/Crystallography.Controls.csproj
@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2022.10.26.0247</AssemblyVersion>
-    <FileVersion>2022.10.26.0247</FileVersion>
+    <AssemblyVersion>2022.10.26.0258</AssemblyVersion>
+    <FileVersion>2022.10.26.0258</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/Crystallography.Controls/DataSet.cs b/Crystallography.Controls/DataSet.cs
@@ -274,9 +274,12 @@ public DataTableCrystalDatabaseRow CreateRow(Crystal2 c)
                 var d = ArrayPool<float>.Shared.Rent(8);
                 if (c.d != null)
                     Array.Copy(c.d, d, c.d.Length);
-                if (c.d == null || c.d.Length < 8)
-                    for (int i = c.d == null ? 0 : c.d.Length; i < 8; i++)
+
+                if (c.atoms.Count == 0 || c.d == null || c.d.Length < 8)
+                {
+                    for (int i = c.atoms.Count == 0 || c.d == null ? 0 : c.d.Length; i < 8; i++)
                         d[i] = float.MinValue;
+                }
 
                 dr.D1 = d[0] * 10;
                 dr.D2 = d[1] * 10;

diff --git a/Crystallography/Crystallography.csproj b/Crystallography/Crystallography.csproj
@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2022.10.26.0239</AssemblyVersion>
-    <FileVersion>2022.10.26.0239</FileVersion>
+    <AssemblyVersion>2022.10.26.0258</AssemblyVersion>
+    <FileVersion>2022.10.26.0258</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">