From bba5d76acc7f39c43d17868e6edaf6b1251bffd3 Mon Sep 17 00:00:00 2001 From: seto Date: Tue, 31 Jan 2023 14:45:57 +0900 Subject: [PATCH] update --- .../Crystallography.Controls.csproj | 4 +- Crystallography/Crystallography.csproj | 4 +- PDIndexer/FormCrystal.cs | 9 +- PDIndexer/FormSequentialAnalysis.Designer.cs | 1 + PDIndexer/FormSequentialAnalysis.cs | 11 +- PDIndexer/FormSequentialAnalysis.ja.resx | 39 +- PDIndexer/FormSequentialAnalysis.resx | 1362 ++++++++--------- PDIndexer/PDIndexer.csproj | 4 +- PDIndexer/Version.cs | 1 + 9 files changed, 710 insertions(+), 725 deletions(-) diff --git a/Crystallography.Controls/Crystallography.Controls.csproj b/Crystallography.Controls/Crystallography.Controls.csproj index b0a9ed1..fe4fdcd 100644 --- a/Crystallography.Controls/Crystallography.Controls.csproj +++ b/Crystallography.Controls/Crystallography.Controls.csproj @@ -4,8 +4,8 @@ Library net7.0-windows true - 2023.1.30.0818 - 2023.1.30.0818 + 2023.1.31.0545 + 2023.1.31.0545 PerMonitorV2 true true diff --git a/Crystallography/Crystallography.csproj b/Crystallography/Crystallography.csproj index 018809f..9eeb16b 100644 --- a/Crystallography/Crystallography.csproj +++ b/Crystallography/Crystallography.csproj @@ -4,8 +4,8 @@ Library net7.0-windows true - 2023.1.30.0818 - 2023.1.30.0818 + 2023.1.31.0545 + 2023.1.31.0545 diff --git a/PDIndexer/FormCrystal.cs b/PDIndexer/FormCrystal.cs index fec9d59..1729fc2 100644 --- 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 index 33f7f2d..a30fbaf 100644 --- a/PDIndexer/FormSequentialAnalysis.Designer.cs +++ b/PDIndexer/FormSequentialAnalysis.Designer.cs @@ -369,6 +369,7 @@ private void InitializeComponent() this.Controls.Add(this.panel1); this.Controls.Add(this.statusStrip1); this.Name = "FormSequentialAnalysis"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormStressAnalysis_FormClosing); this.tabControl.ResumeLayout(false); this.tabPage2theta.ResumeLayout(false); this.tabPage2theta.PerformLayout(); diff --git a/PDIndexer/FormSequentialAnalysis.cs b/PDIndexer/FormSequentialAnalysis.cs index 460b6ed..ce38b4b 100644 --- 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) - { - - } - /// /// 計算結果をタブ区切りあるいはカンマ区切りテキストとして得る。 /// 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 index c6cf711..0d194f3 100644 --- a/PDIndexer/FormSequentialAnalysis.ja.resx +++ b/PDIndexer/FormSequentialAnalysis.ja.resx @@ -97,7 +97,7 @@ 744, 264 - 734, 242 + 744, 242 True @@ -112,19 +112,19 @@ 0, 242 - 734, 22 + 744, 22 自動保存 - 734, 264 + 744, 264 d値 (Å) - 734, 242 + 744, 242 True @@ -139,13 +139,13 @@ 0, 242 - 734, 22 + 744, 22 自動保存 - 734, 264 + 744, 264 半値全幅 (°) @@ -154,7 +154,7 @@ メイリオ, 9pt - 734, 245 + 744, 245 True @@ -166,13 +166,13 @@ 0, 245 - 734, 19 + 744, 19 自動保存 - 734, 264 + 744, 264 積分強度 @@ -181,7 +181,7 @@ メイリオ, 9pt - 734, 245 + 744, 245 True @@ -193,13 +193,13 @@ 0, 245 - 734, 19 + 744, 19 自動保存 - 734, 264 + 744, 264 格子定数 (Å, °) @@ -208,7 +208,7 @@ メイリオ, 9pt - 734, 245 + 744, 245 True @@ -220,13 +220,13 @@ 0, 245 - 734, 19 + 744, 19 自動保存 - 734, 264 + 744, 264 圧力 (GPa) @@ -239,7 +239,7 @@ 4, 5, 4, 5 - 471, 245 + 481, 245 True @@ -248,19 +248,16 @@ 0, 245 - 471, 19 + 481, 19 自動保存 - - 471, 0 - 263, 264 - 734, 264 + 744, 264 Singhの式 diff --git a/PDIndexer/FormSequentialAnalysis.resx b/PDIndexer/FormSequentialAnalysis.resx index 8564f4f..35f6b79 100644 --- a/PDIndexer/FormSequentialAnalysis.resx +++ b/PDIndexer/FormSequentialAnalysis.resx @@ -57,1069 +57,1069 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage2theta - - - 0, 0 + + 4, 24 - - Segoe UI Symbol, 9pt + + buttonSetDirectory - - 0, 243 + + 0 - - 744, 267 + + 744, 24 - + 7 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Both - - - textBoxDspacing - - - 3 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - checkBoxAutoSavePressure + + Fill - - 204, 30 + + 0, 243 System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Right + + 7 - - True + + Top, Right - + 0, 0 - - 3 + + 752, 22 - - Segoe UI, 8pt + + Fill 0 - - 506, 2 + + 7 - - 3 + + Segoe UI, 9pt - - 0 + + 0, 243 - - tabControl + + label1 - - - 2, 2, 2, 2 + + Bottom - - 4, 24 + + False - - tabPage2theta + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top, Right + + Fill - - 3 + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 481, 243 + + GrowAndShrink - - 744, 243 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - d-spacing (Å) + + Top, Right - - True + + + 4, 5, 4, 5 - - 7 + + 1 - - True + + tabPage2theta - - 422, 12 + + Segoe UI, 9pt - - Bottom + + Auto save - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Auto save - - 0, 336 + + 6 - - Auto save + + 4, 5, 4, 5 - - textBoxSingh + + 3 - - 6 + + Fill - - tabPage2theta + + 744, 267 - - System.Windows.Forms.Form, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 744, 24 + + 0, 0, 0, 0 - - 10, 17 + + Both - - Auto save + + Copy - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - - 8 + + 0 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - textBoxDirectory + + 0, 243 - - 0, 4, 0, 0 + + d-spacing (Å) - - 481, 24 + + 4, 5, 4, 5 - - Segoe UI, 9pt + + 0, 0 - - Directory - to be saved + + 4, 24 - - FormSequentialAnalysis + + tabPagePressure - - 752, 22 + + 0, 0 - + + 0 + + + 2 + + tabControl - - 6 + + 1 - - textBoxFWHM + + buttonExecute - - + + statusStrip1 - - 4, 5, 4, 5 + + 3 - - Copy + + Auto save 1 - + 4 - - 7 + + 481, 0 - - Segoe UI, 9pt + + statusStrip1 - - buttonSetDirectory + + Cell constants (Å, °) - - panel1 - - - Execute - - - 7 + + 0, 0 - - Fill + + checkBoxAutoSaveD - - 4, 5, 4, 5 + + 744, 243 - - 0, 243 + + tabPageIntensity - - Auto save + + 744, 267 - - 744, 24 + + checkBoxAutoSaveTwoTheta - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 24 - - 1 + + panel1 - - 0 + + 1000, 27 - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - numericBoxStartNumber + + GrowAndShrink - - tabPageSingh + + 582, 9 - - 3 + + Auto save - - panel1 + + 0 - - True + + tabControl - - System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + buttonSave - - 1 + + Segoe UI, 9pt - + tabControl - - Bottom + + 4, 24 - - 65, 6 + + checkBoxAutoSaveSingh - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 128, 23 + + $this - - 0, 0 + + 376, 9 - - 0, 243 + + 4, 24 + + + 2θ (°) tabPageDspacing - - Top - - - tabPageIntensity - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 744, 243 - - - 4, 5, 4, 5 - - - 4, 5, 4, 5 - - - 0 - - - tabPageFWHM + + buttonCopy - + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 744, 267 + + tabPageFWHM - + 0 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - NoControl + + Both - + tabControl - - Set - - - statusStrip1 - - + Bottom - - textBoxIntensity - - - 6 - - - Fill - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Auto save + + 2 - - Bottom + + 506, 2 - - checkBoxAutoSaveTwoTheta + + True - - Auto save + + True - - Both + + 744, 267 - - checkBoxAutoSaveD + + 0, 243 - - 52, 17 + + Fill - - 4, 24 + + tabPageCellConstants - - 582, 9 + + Segoe UI, 8pt - - 5 + + 744, 243 - - False + + 752, 295 - - 3 + + tabControl - - 6 + + Auto save - - 2 + + 744, 243 - - False + + textBoxDirectory - - $this + + GrowAndShrink - - Cell constants (Å, °) + + 3 - - 744, 267 + + tabPageIntensity - - 0 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False + + Intensity - + 1 - - Both + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 checkBoxAutoSaveFWHM - - buttonCopy + + Execute - + 1 - - 7 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 243 + + panel1 - - Fill + + tabPageSingh - - 4, 5, 4, 5 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1, 25 + + False - + tabPageSingh - - panel1 + + 7 - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Both - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top - - tabPageDspacing + + 744, 243 - - Both + + 204, 30 - - 744, 243 + + 4 - + 1 - - GrowAndShrink + + False - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9pt - - 62, 27 + + Segoe UI, 9pt - - False + + panel1 - - tabPageDspacing + + 0, 243 - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + 744, 24 - - tabControl + + Execute analysis from the specified + number (note: the first index is 0) - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 716, 5 - - 744, 243 + + 52, 17 - - $this + + False - - 2 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 744, 24 + + Top, Right - - 0, 0 + + Both - - False + + 45, 27 - + 744, 243 - - 0, 0 + + 263, 267 + + + Segoe UI, 9pt + + + True + + + textBox2theta + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 744, 24 - - 0 + + 2, 2, 2, 2 - - label1 + + 744, 267 - - tabPageFWHM + + Segoe UI, 8pt - - 172, 5 + + textBoxSingh - - checkBoxAutoSaveSingh + + numericBoxStartNumber - - 0, 243 + + Bottom - - panel1 + + tabPageIntensity - - Top, Right + + 3 - - tabPageCellConstants + + Fill + + + tabPage2theta + + + Save + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 744, 24 - + 1 - - 7 + + checkBoxAutoSavePressure - - 1 + + 422, 12 - + + 744, 24 + + + Right + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 113, 6 + + True - - 744, 267 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Both + + 4, 5, 4, 5 - - Both + + 10, 17 - - False + + 752, 41 - - 1 + + 2 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolStripStatusLabel1 - - panel1 + + tabPageCellConstants - - False + + 4 - - textBoxCellConstants + + 1 - - 4, 5, 4, 5 + + tabPageDspacing - - 96, 96 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageIntensity + + 752, 358 - - 4, 5, 4, 5 + + textBoxPressure - - tabPageFWHM + + 4 - - True + + 48, 27 - + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + 5 - - Auto save + + panel1 - - 752, 41 + + 744, 267 + + + False + + + 0, 4, 0, 0 True - - panel1 + + Both - - メイリオ, 9pt + + 744, 267 - - 5 + + Bottom - - 744, 243 + + tabControl - - 1 + + panel1 - - 1 + + panel1 - - statusStrip1 + + 7 - - Bottom + + 0, 243 - + + 3, 6 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6 - - 4 + + 0, 41 - - Segoe UI, 9pt + + 43, 27 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + graphControl1 + + + 7 + + + 0 + + + tabPageSingh - + 2 - - Segoe UI, 8pt - - - textBox2theta + + True - - 2 + + 172, 5 - + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Both + + tabPageDspacing - - 1 + + checkBoxLoop - - tabPageCellConstants + + 6 + + + 0, 336 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 0, 0 - - $this - - - toolStripStatusLabel1 + + 3 - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False - - graphControl1 + + True - - textBoxPressure + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Segoe UI, 9pt + + tabPageSingh - - Crystallography.Controls.GraphControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + 8 - + 1 - - 0 + + 36, 27 - - 0, 0, 0, 0 + + 4, 24 - - 744, 267 + + System.Windows.Forms.Form, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - GrowAndShrink + + tabPageFWHM - - tabPageIntensity + + Loop - - Bottom + + 65, 6 - - 0 + + Crystallography.Controls.GraphControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - 5 + + Auto save - - Fill + + True - - 5 + + 1 - - Top, Right + + Auto save - - checkBoxStartNumber + + Fill - - 36, 27 + + 2 - - 7 + + Segoe UI, 9pt - - 5 + + 2 - - 481, 0 + + textBoxDspacing + + + 1 4, 5, 4, 5 - - 0 - - - 3 - - - GrowAndShrink + + tabControl GrowAndShrink - - 4, 5, 4, 5 + + checkBoxAutoSaveInt - - Fill + + NoControl - - 744, 267 + + 0, 0 - - System.Windows.Forms.TabControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4, 24 + + 3 - - 48, 27 + + textBoxCellConstants - + 0 - - Bottom - - - 113, 6 - - - 2 - - - buttonSave - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 5, 4, 5 - - 376, 9 + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 263, 267 + + tabPageFWHM - - 4, 24 + + 0, 243 - - checkBoxAutoSaveInt + + Directory + to be saved - - Segoe UI, 9pt + + Sequential Analysis - - 744, 267 + + Bottom - - True + + False - - Sequential Analysis + + 744, 24 - + 2 - - tabPagePressure + + textBoxFWHM - - panel1 + + False - - buttonExecute + + 3 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - 4 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - 0, 41 + + Bottom - - 4, 24 + + checkBoxAutoSaveCell - - 3 + + 744, 267 - - Save + + tabPageCellConstants + + + 5 - - 0 + + 128, 23 - + panel1 Segoe UI, 9.75pt - - 752, 358 - - - tabControl - - - 0, 243 + + tabPagePressure - + panel1 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Auto save - - - Intensity + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Loop + + Both - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - 4, 5, 4, 5 + + 1 - - 43, 27 + + 744, 243 - - tabPageSingh + + 7 - - True + + 2 - + True - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 7 - - 4, 24 + + 4, 5, 4, 5 - - tabControl + + Set - - True + + $this - - 716, 5 + + 5 - - False + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Segoe UI, 9pt + + メイリオ, 9pt - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + FWHM (deg.) - - 4 + + True + + + checkBoxStartNumber Singh's equation - - 2 - - - 70, 34 + + 0 - - True + + Bottom - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 62, 27 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + panel1 - - 3, 6 + + 1 - - Fill + + True - - checkBoxLoop + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 Pressure (GPa) - - 1 + + tabPage2theta - - tabPageSingh + + FormSequentialAnalysis - - 2 + + 70, 34 - - 752, 295 + + - - FWHM (deg.) + + $this + + + 6 0, 0 - - 5 + + textBoxIntensity - - Segoe UI, 9pt + + 0, 0 - - tabPagePressure + + 96, 96 - - 2 + + 481, 24 - - panel1 + + tabControl - - tabPageCellConstants + + 5 - - True + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPagePressure + + 4, 5, 4, 5 - - 744, 24 + + 0 - - 45, 27 + + Fill - - tabControl + + 1, 25 - - Fill + + 2 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5 - - 0, 243 + + 4, 24 - - 1000, 27 + + 481, 243 - - Execute analysis from the specified - number (note: the first index is 0) + + Segoe UI, 9pt + + + 2 True - - 4, 24 - - - checkBoxAutoSaveCell + + Both - - 2 + + 6 - - 2θ (°) + + panel1 - + True + + + 4, 5, 4, 5 + + + 0 + + + 5 + + + 4, 5, 4, 5 + + + tabPagePressure + + + 17, 17 ja - - 17, 17 + + True \ No newline at end of file diff --git a/PDIndexer/PDIndexer.csproj b/PDIndexer/PDIndexer.csproj index eef2831..19dd29d 100644 --- a/PDIndexer/PDIndexer.csproj +++ b/PDIndexer/PDIndexer.csproj @@ -4,8 +4,8 @@ WinExe net7.0-windows true - 2023.1.30.0818 - 2023.1.30.0818 + 2023.1.31.0538 + 2023.1.31.0538 App.ico diff --git a/PDIndexer/Version.cs b/PDIndexer/Version.cs index f9c2de7..2606709 100644 --- a/PDIndexer/Version.cs +++ b/PDIndexer/Version.cs @@ -25,6 +25,7 @@ static public string RecentHistory /// static public string History = "History" + + "\r\n ver4.431(2023/01/31) Fixed minor bugs on 'Sequential Analysis'." + "\r\n ver4.430(2023/01/30) Fixed minor bugs on 'Sequential Analysis'." + "\r\n ver4.428(2023/01/27) Fixed minor bugs on 'Sequential Analysis'." + "\r\n ver4.427(2023/01/26) Fixed minor bugs on 'Sequential Analysis'." +