update

seto77 · Jul 30, 2020 · 8d8b000 · 8d8b000
1 parent 402b0f4
commit 8d8b000
Show file tree

Hide file tree

Showing 13 changed files with 2,342 additions and 1,534 deletions.
diff --git a/Crystallography.Controls/Properties/AssemblyInfo.cs b/Crystallography.Controls/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2020.7.28.1404")]
-[assembly: AssemblyFileVersion("2020.7.28.1404")]
+[assembly: AssemblyVersion("2020.7.29.1125")]
+[assembly: AssemblyFileVersion("2020.7.29.1125")]
diff --git a/Crystallography/Properties/AssemblyInfo.cs b/Crystallography/Properties/AssemblyInfo.cs
@@ -26,7 +26,7 @@
 // 下にあるように、'*' を使って、すべての値を指定するか、
 // ビルドおよびリビジョン番号を既定値にすることができます。
 
-[assembly: AssemblyVersion("2020.7.28.1404")]
+[assembly: AssemblyVersion("2020.7.29.1125")]
 
 //
 // アセンブリに署名するには、使用するキーを指定しなければなりません。
@@ -57,5 +57,5 @@
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
 [assembly: ComVisibleAttribute(true)]
-[assembly: AssemblyFileVersion("2020.7.28.1404")]
+[assembly: AssemblyFileVersion("2020.7.29.1125")]
 
diff --git a/PDIndexer/FormCrystal.Designer.cs b/PDIndexer/FormCrystal.Designer.cs
diff --git a/PDIndexer/FormCrystal.cs b/PDIndexer/FormCrystal.cs
@@ -8,6 +8,7 @@
 using Crystallography;
 using Crystallography.Controls;
 using System.Collections.Generic;
+using System.IO;
 
 namespace PDIndexer{
 	/// <summary>
@@ -27,6 +28,12 @@ public FormCrystal()
 
         }
 
+        private void FormCrystal_Load(object sender, EventArgs e)
+        {
+            if (File.Exists(formMain.UserAppDataPath + "StdDB.cdb3"))
+                crystalDatabaseControl.ReadDatabase(formMain.UserAppDataPath + "StdDB.cdb3");
+        }
+
         void crystalControl_CrystalChanged(object sender, EventArgs e)
         {
             formMain.InitializeCrystalPlane();
@@ -241,8 +248,11 @@ private void dataGridViewCrystal_CellMouseClick(object sender, DataGridViewCellM
             formMain.dataGridViewCrystals_CellMouseClick(sender, e);
         }
 
-
+        private void buttonSearch_Click(object sender, EventArgs e)
+            => crystalDatabaseControl.Filter = searchCrystalControl.Filter;
 
+        private void crystalDatabaseControl_CrystalChanged(object sender, EventArgs e)
+            => crystalControl.Crystal = crystalDatabaseControl.Crystal;
 
     }
 }
diff --git a/PDIndexer/FormCrystal.ja.resx b/PDIndexer/FormCrystal.ja.resx
diff --git a/PDIndexer/FormCrystal.resx b/PDIndexer/FormCrystal.resx
diff --git a/PDIndexer/FormMain.Designer.cs b/PDIndexer/FormMain.Designer.cs
diff --git a/PDIndexer/FormMain.resx b/PDIndexer/FormMain.resx
diff --git a/PDIndexer/PDIndexer.csproj b/PDIndexer/PDIndexer.csproj
@@ -478,6 +478,9 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <Content Include="StdDb.cdb3">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">

diff --git a/PDIndexer/Properties/AssemblyInfo.cs b/PDIndexer/Properties/AssemblyInfo.cs
@@ -27,7 +27,7 @@
 // 下にあるように、'*' を使って、すべての値を指定するか、
 // ビルドおよびリビジョン番号を既定値にすることができます。
 
-[assembly: AssemblyVersion("2020.5.23.1221")]
+[assembly: AssemblyVersion("2020.7.30.0301")]
 
 //
 // アセンブリに署名するには、使用するキーを指定しなければなりません。 
@@ -57,6 +57,6 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersion("2020.5.23.1221")]
+[assembly: AssemblyFileVersion("2020.7.30.0301")]
 [assembly: ComVisible(false)]
 
diff --git a/PDIndexer/StdDb.cdb3 b/PDIndexer/StdDb.cdb3
diff --git a/PDIndexer/Version.cs b/PDIndexer/Version.cs
@@ -28,6 +28,7 @@ static public string RecentHistory
         /// </summary>
         static public string History = 
             "History" +
+            "\r\n ver4.384(2020/07/30) Added the AMCSD crystal database to 'Crystal Parameter' window." +
             "\r\n ver4.383(2020/05/01) Fixed GUIs." +
             "\r\n ver4.382(2020/04/26) Fixed a problem on loading Neutron TOF data." +
             "\r\n ver4.381(2020/03/27) Refixed a bug on loading multiple profiles." +

diff --git a/PDIndexer/image/Database.png b/PDIndexer/image/Database.png