update

seto77 · Jan 31, 2023 · bba5d76 · bba5d76
1 parent a7d97b6
commit bba5d76
Show file tree

Hide file tree

Showing 9 changed files with 710 additions and 725 deletions.
diff --git a/Crystallography.Controls/Crystallography.Controls.csproj b/Crystallography.Controls/Crystallography.Controls.csproj
@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net7.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2023.1.30.0818</AssemblyVersion>
-    <FileVersion>2023.1.30.0818</FileVersion>
+    <AssemblyVersion>2023.1.31.0545</AssemblyVersion>
+    <FileVersion>2023.1.31.0545</FileVersion>
     <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
     <ApplicationUseCompatibleTextRendering>true</ApplicationUseCompatibleTextRendering>
     <ApplicationVisualStyles>true</ApplicationVisualStyles>

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

diff --git a/PDIndexer/FormCrystal.cs b/PDIndexer/FormCrystal.cs
@@ -64,11 +64,6 @@ void crystalControl_CrystalChanged(object sender, EventArgs e)
         formMain.SetFormEOS();
     }
 
-    private void textBoxNumOnly_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e)
-    {
-        if ((e.KeyChar < '.' || e.KeyChar > '9') && e.KeyChar != '\b' && e.KeyChar != 3 && e.KeyChar != 22)
-            e.Handled = true;
-    }
     private void buttonAddCrystal_Click(object sender, System.EventArgs e)
     {
         crystalControl.GenerateFromInterface();
@@ -115,8 +110,8 @@ public void AddCrystal(Crystal cry)
         if (cry != null)
         {
 
-            Bitmap bmp = new Bitmap(18, 18);
-            Graphics g = Graphics.FromImage(bmp);
+            var bmp = new Bitmap(18, 18);
+            var g = Graphics.FromImage(bmp);
             g.Clear(Color.FromArgb(cry.Argb));
             formMain.dataSet.DataTableCrystal.Rows.Add(new object[] { false, cry, bmp });
             formMain.bindingSourceCrystal.Position = formMain.bindingSourceCrystal.List.Count - 1;

diff --git a/PDIndexer/FormSequentialAnalysis.Designer.cs b/PDIndexer/FormSequentialAnalysis.Designer.cs
diff --git a/PDIndexer/FormSequentialAnalysis.cs b/PDIndexer/FormSequentialAnalysis.cs
@@ -21,7 +21,7 @@ public partial class FormSequentialAnalysis : Form
     #region プロパティ、フィールド、イベント
     public FormMain formMain;
 
-    private readonly Stopwatch sw = new Stopwatch();
+    private readonly Stopwatch sw = new();
     #endregion
 
     #region コンストラクタ、オープン、クローズ
@@ -516,11 +516,6 @@ private void buttonSave_Click(object sender, EventArgs e)
         }
     }
 
-    public void Save(string filename, bool CSV = true, int index = -1)
-    {
-
-    }
-
     /// <summary>
     /// 計算結果をタブ区切りあるいはカンマ区切りテキストとして得る。
     /// index = -1:アクティブなタブ, 0: 2θ, 1: d, 2: 半値幅, 3: 強度, 4: 格子定数, 5: 圧力, 6: Singh
@@ -544,12 +539,8 @@ public string GetText(bool CSV = true, int index = -1)
             6 => textBoxSingh.Text,
             _ => ""
         };
-
         return CSV ? txt.Replace('\t', ',') : txt;
     }
-
-
-
     #endregion
 
     #region その他イベント

diff --git a/PDIndexer/FormSequentialAnalysis.ja.resx b/PDIndexer/FormSequentialAnalysis.ja.resx
@@ -97,7 +97,7 @@
     <value>744, 264</value>
   </data>
   <data name="textBoxDspacing.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 242</value>
+    <value>744, 242</value>
   </data>
   <data name="checkBoxAutoSaveD.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -112,19 +112,19 @@
     <value>0, 242</value>
   </data>
   <data name="checkBoxAutoSaveD.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 22</value>
+    <value>744, 22</value>
   </data>
   <data name="checkBoxAutoSaveD.Text" xml:space="preserve">
     <value>自動保存</value>
   </data>
   <data name="tabPageDspacing.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 264</value>
+    <value>744, 264</value>
   </data>
   <data name="tabPageDspacing.Text" xml:space="preserve">
     <value>d値 (Å)</value>
   </data>
   <data name="textBoxFWHM.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 242</value>
+    <value>744, 242</value>
   </data>
   <data name="checkBoxAutoSaveFWHM.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -139,13 +139,13 @@
     <value>0, 242</value>
   </data>
   <data name="checkBoxAutoSaveFWHM.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 22</value>
+    <value>744, 22</value>
   </data>
   <data name="checkBoxAutoSaveFWHM.Text" xml:space="preserve">
     <value>自動保存</value>
   </data>
   <data name="tabPageFWHM.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 264</value>
+    <value>744, 264</value>
   </data>
   <data name="tabPageFWHM.Text" xml:space="preserve">
     <value>半値全幅 (°)</value>
@@ -154,7 +154,7 @@
     <value>メイリオ, 9pt</value>
   </data>
   <data name="textBoxIntensity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 245</value>
+    <value>744, 245</value>
   </data>
   <data name="checkBoxAutoSaveInt.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -166,13 +166,13 @@
     <value>0, 245</value>
   </data>
   <data name="checkBoxAutoSaveInt.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 19</value>
+    <value>744, 19</value>
   </data>
   <data name="checkBoxAutoSaveInt.Text" xml:space="preserve">
     <value>自動保存</value>
   </data>
   <data name="tabPageIntensity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 264</value>
+    <value>744, 264</value>
   </data>
   <data name="tabPageIntensity.Text" xml:space="preserve">
     <value>積分強度</value>
@@ -181,7 +181,7 @@
     <value>メイリオ, 9pt</value>
   </data>
   <data name="textBoxCellConstants.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 245</value>
+    <value>744, 245</value>
   </data>
   <data name="checkBoxAutoSaveCell.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -193,13 +193,13 @@
     <value>0, 245</value>
   </data>
   <data name="checkBoxAutoSaveCell.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 19</value>
+    <value>744, 19</value>
   </data>
   <data name="checkBoxAutoSaveCell.Text" xml:space="preserve">
     <value>自動保存</value>
   </data>
   <data name="tabPageCellConstants.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 264</value>
+    <value>744, 264</value>
   </data>
   <data name="tabPageCellConstants.Text" xml:space="preserve">
     <value>格子定数 (Å, °)</value>
@@ -208,7 +208,7 @@
     <value>メイリオ, 9pt</value>
   </data>
   <data name="textBoxPressure.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 245</value>
+    <value>744, 245</value>
   </data>
   <data name="checkBoxAutoSavePressure.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -220,13 +220,13 @@
     <value>0, 245</value>
   </data>
   <data name="checkBoxAutoSavePressure.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 19</value>
+    <value>744, 19</value>
   </data>
   <data name="checkBoxAutoSavePressure.Text" xml:space="preserve">
     <value>自動保存</value>
   </data>
   <data name="tabPagePressure.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 264</value>
+    <value>744, 264</value>
   </data>
   <data name="tabPagePressure.Text" xml:space="preserve">
     <value>圧力 (GPa)</value>
@@ -239,7 +239,7 @@
     <value>4, 5, 4, 5</value>
   </data>
   <data name="textBoxSingh.Size" type="System.Drawing.Size, System.Drawing">
-    <value>471, 245</value>
+    <value>481, 245</value>
   </data>
   <data name="checkBoxAutoSaveSingh.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -248,19 +248,16 @@
     <value>0, 245</value>
   </data>
   <data name="checkBoxAutoSaveSingh.Size" type="System.Drawing.Size, System.Drawing">
-    <value>471, 19</value>
+    <value>481, 19</value>
   </data>
   <data name="checkBoxAutoSaveSingh.Text" xml:space="preserve">
     <value>自動保存</value>
   </data>
-  <data name="graphControl1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>471, 0</value>
-  </data>
   <data name="graphControl1.Size" type="System.Drawing.Size, System.Drawing">
     <value>263, 264</value>
   </data>
   <data name="tabPageSingh.Size" type="System.Drawing.Size, System.Drawing">
-    <value>734, 264</value>
+    <value>744, 264</value>
   </data>
   <data name="tabPageSingh.Text" xml:space="preserve">
     <value>Singhの式</value>