diff --git a/Crystallography.Controls/Crystallography.Controls.csproj b/Crystallography.Controls/Crystallography.Controls.csproj index c1e71b3..c126add 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.0513 - 2023.1.30.0513 + 2023.1.30.0802 + 2023.1.30.0802 PerMonitorV2 true true diff --git a/Crystallography.Controls/Numeric/NumericBox.cs b/Crystallography.Controls/Numeric/NumericBox.cs index 45fb893..db4a6e8 100644 --- a/Crystallography.Controls/Numeric/NumericBox.cs +++ b/Crystallography.Controls/Numeric/NumericBox.cs @@ -572,7 +572,7 @@ internal string GetString() private static string separateThousands(string valueString) { - char decimalPoint = '.'; + var decimalPoint = '.'; if (valueString.Contains(',')) decimalPoint = ','; @@ -686,8 +686,5 @@ private void textBox_Leave(object sender, EventArgs e) } } - private void textBox_Enter(object sender, EventArgs e) - { - textBox.SelectAll(); - } + private void textBox_Enter(object sender, EventArgs e) => textBox.SelectAll(); } \ No newline at end of file diff --git a/Crystallography/Crystallography.csproj b/Crystallography/Crystallography.csproj index e8cfed6..6059e81 100644 --- a/Crystallography/Crystallography.csproj +++ b/Crystallography/Crystallography.csproj @@ -4,8 +4,8 @@ Library net7.0-windows true - 2023.1.30.0447 - 2023.1.30.0447 + 2023.1.30.0802 + 2023.1.30.0802 diff --git a/PDIndexer/FormSequentialAnalysis.Designer.cs b/PDIndexer/FormSequentialAnalysis.Designer.cs index 8037aa3..33f7f2d 100644 --- a/PDIndexer/FormSequentialAnalysis.Designer.cs +++ b/PDIndexer/FormSequentialAnalysis.Designer.cs @@ -60,6 +60,7 @@ private void InitializeComponent() this.textBoxDirectory = new System.Windows.Forms.TextBox(); this.panel1 = new System.Windows.Forms.Panel(); this.numericBoxStartNumber = new Crystallography.Controls.NumericBox(); + this.checkBoxLoop = new System.Windows.Forms.CheckBox(); this.checkBoxStartNumber = new System.Windows.Forms.CheckBox(); this.buttonSetDirectory = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); @@ -89,6 +90,7 @@ private void InitializeComponent() // // tabControl // + resources.ApplyResources(this.tabControl, "tabControl"); this.tabControl.Controls.Add(this.tabPage2theta); this.tabControl.Controls.Add(this.tabPageDspacing); this.tabControl.Controls.Add(this.tabPageFWHM); @@ -96,15 +98,14 @@ private void InitializeComponent() this.tabControl.Controls.Add(this.tabPageCellConstants); this.tabControl.Controls.Add(this.tabPagePressure); this.tabControl.Controls.Add(this.tabPageSingh); - resources.ApplyResources(this.tabControl, "tabControl"); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; // // tabPage2theta // + resources.ApplyResources(this.tabPage2theta, "tabPage2theta"); this.tabPage2theta.Controls.Add(this.textBox2theta); this.tabPage2theta.Controls.Add(this.checkBoxAutoSaveTwoTheta); - resources.ApplyResources(this.tabPage2theta, "tabPage2theta"); this.tabPage2theta.Name = "tabPage2theta"; this.tabPage2theta.UseVisualStyleBackColor = true; // @@ -116,9 +117,9 @@ private void InitializeComponent() // // tabPageDspacing // + resources.ApplyResources(this.tabPageDspacing, "tabPageDspacing"); this.tabPageDspacing.Controls.Add(this.textBoxDspacing); this.tabPageDspacing.Controls.Add(this.checkBoxAutoSaveD); - resources.ApplyResources(this.tabPageDspacing, "tabPageDspacing"); this.tabPageDspacing.Name = "tabPageDspacing"; this.tabPageDspacing.UseVisualStyleBackColor = true; // @@ -135,9 +136,9 @@ private void InitializeComponent() // // tabPageFWHM // + resources.ApplyResources(this.tabPageFWHM, "tabPageFWHM"); this.tabPageFWHM.Controls.Add(this.textBoxFWHM); this.tabPageFWHM.Controls.Add(this.checkBoxAutoSaveFWHM); - resources.ApplyResources(this.tabPageFWHM, "tabPageFWHM"); this.tabPageFWHM.Name = "tabPageFWHM"; this.tabPageFWHM.UseVisualStyleBackColor = true; // @@ -154,9 +155,9 @@ private void InitializeComponent() // // tabPageIntensity // + resources.ApplyResources(this.tabPageIntensity, "tabPageIntensity"); this.tabPageIntensity.Controls.Add(this.textBoxIntensity); this.tabPageIntensity.Controls.Add(this.checkBoxAutoSaveInt); - resources.ApplyResources(this.tabPageIntensity, "tabPageIntensity"); this.tabPageIntensity.Name = "tabPageIntensity"; this.tabPageIntensity.UseVisualStyleBackColor = true; // @@ -173,9 +174,9 @@ private void InitializeComponent() // // tabPageCellConstants // + resources.ApplyResources(this.tabPageCellConstants, "tabPageCellConstants"); this.tabPageCellConstants.Controls.Add(this.textBoxCellConstants); this.tabPageCellConstants.Controls.Add(this.checkBoxAutoSaveCell); - resources.ApplyResources(this.tabPageCellConstants, "tabPageCellConstants"); this.tabPageCellConstants.Name = "tabPageCellConstants"; this.tabPageCellConstants.UseVisualStyleBackColor = true; // @@ -192,9 +193,9 @@ private void InitializeComponent() // // tabPagePressure // + resources.ApplyResources(this.tabPagePressure, "tabPagePressure"); this.tabPagePressure.Controls.Add(this.textBoxPressure); this.tabPagePressure.Controls.Add(this.checkBoxAutoSavePressure); - resources.ApplyResources(this.tabPagePressure, "tabPagePressure"); this.tabPagePressure.Name = "tabPagePressure"; this.tabPagePressure.UseVisualStyleBackColor = true; // @@ -211,10 +212,10 @@ private void InitializeComponent() // // tabPageSingh // + resources.ApplyResources(this.tabPageSingh, "tabPageSingh"); this.tabPageSingh.Controls.Add(this.textBoxSingh); this.tabPageSingh.Controls.Add(this.checkBoxAutoSaveSingh); this.tabPageSingh.Controls.Add(this.graphControl1); - resources.ApplyResources(this.tabPageSingh, "tabPageSingh"); this.tabPageSingh.Name = "tabPageSingh"; this.tabPageSingh.UseVisualStyleBackColor = true; // @@ -231,12 +232,12 @@ private void InitializeComponent() // // graphControl1 // + resources.ApplyResources(this.graphControl1, "graphControl1"); this.graphControl1.AllowMouseOperation = true; this.graphControl1.BackgroundColor = System.Drawing.Color.White; this.graphControl1.BottomMargin = 0D; this.graphControl1.DivisionLineColor = System.Drawing.Color.Gray; this.graphControl1.DivisionSubLineColor = System.Drawing.Color.LightGray; - resources.ApplyResources(this.graphControl1, "graphControl1"); this.graphControl1.FixRangeHorizontal = false; this.graphControl1.FixRangeVertical = false; this.graphControl1.GraphName = ""; @@ -276,15 +277,15 @@ private void InitializeComponent() // // statusStrip1 // + resources.ApplyResources(this.statusStrip1, "statusStrip1"); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabel1}); - resources.ApplyResources(this.statusStrip1, "statusStrip1"); this.statusStrip1.Name = "statusStrip1"; // // toolStripStatusLabel1 // - this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; resources.ApplyResources(this.toolStripStatusLabel1, "toolStripStatusLabel1"); + this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; // // buttonCopy // @@ -308,7 +309,9 @@ private void InitializeComponent() // // panel1 // + resources.ApplyResources(this.panel1, "panel1"); this.panel1.Controls.Add(this.numericBoxStartNumber); + this.panel1.Controls.Add(this.checkBoxLoop); this.panel1.Controls.Add(this.checkBoxStartNumber); this.panel1.Controls.Add(this.textBoxDirectory); this.panel1.Controls.Add(this.buttonSetDirectory); @@ -316,13 +319,12 @@ private void InitializeComponent() this.panel1.Controls.Add(this.buttonCopy); this.panel1.Controls.Add(this.buttonExecute); this.panel1.Controls.Add(this.label1); - resources.ApplyResources(this.panel1, "panel1"); this.panel1.Name = "panel1"; // // numericBoxStartNumber // - this.numericBoxStartNumber.BackColor = System.Drawing.Color.Transparent; resources.ApplyResources(this.numericBoxStartNumber, "numericBoxStartNumber"); + this.numericBoxStartNumber.BackColor = System.Drawing.Color.Transparent; this.numericBoxStartNumber.Minimum = 1D; this.numericBoxStartNumber.Name = "numericBoxStartNumber"; this.numericBoxStartNumber.RadianValue = 0.017453292519943295D; @@ -331,6 +333,15 @@ private void InitializeComponent() this.numericBoxStartNumber.TextFont = new System.Drawing.Font("メイリオ", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.numericBoxStartNumber.Value = 1D; // + // checkBoxLoop + // + resources.ApplyResources(this.checkBoxLoop, "checkBoxLoop"); + this.checkBoxLoop.Checked = true; + this.checkBoxLoop.CheckState = System.Windows.Forms.CheckState.Checked; + this.checkBoxLoop.Name = "checkBoxLoop"; + this.checkBoxLoop.UseVisualStyleBackColor = true; + this.checkBoxLoop.CheckedChanged += new System.EventHandler(this.checkBoxStartNumber_CheckedChanged); + // // checkBoxStartNumber // resources.ApplyResources(this.checkBoxStartNumber, "checkBoxStartNumber"); @@ -420,5 +431,6 @@ private void InitializeComponent() private System.Windows.Forms.Button buttonSetDirectory; private System.Windows.Forms.CheckBox checkBoxStartNumber; private Crystallography.Controls.NumericBox numericBoxStartNumber; + private System.Windows.Forms.CheckBox checkBoxLoop; } } \ No newline at end of file diff --git a/PDIndexer/FormSequentialAnalysis.cs b/PDIndexer/FormSequentialAnalysis.cs index 9819769..50221b0 100644 --- a/PDIndexer/FormSequentialAnalysis.cs +++ b/PDIndexer/FormSequentialAnalysis.cs @@ -108,12 +108,18 @@ private void buttonExecute_Click(object sender, EventArgs e) formMain.toolStripButtonEquationOfState.Checked = true; } - int initialPosition = stressMode ? 1 : formMain.bindingSourceProfile.Position; - if (checkBoxStartNumber.Checked && !(stressMode && numericBoxStartNumber.ValueInteger == 0)) - initialPosition = numericBoxStartNumber.ValueInteger; - var total = formMain.dataSet.DataTableProfile.Items.Count; + var targetList=new List(); + for (int i = checkBoxStartNumber.Checked ? numericBoxStartNumber.ValueInteger : 0; i < total; i++) + targetList.Add(i); + if (checkBoxStartNumber.Checked && checkBoxLoop.Checked) + targetList.AddRange(Enumerable.Range(0, numericBoxStartNumber.ValueInteger)); + if (stressMode) + targetList.Remove(0); + + var initialPosition = formMain.bindingSourceProfile.Position; + //現在のプロファイルチェック状況を保存後、全てチェック外す var checkStates = new List(); for (int i = 0; i < total; i++) @@ -123,7 +129,7 @@ private void buttonExecute_Click(object sender, EventArgs e) formMain.Enabled = false; //ここから、メインのループ - for (int i = initialPosition; i < total; i++) + foreach (var i in targetList) { formMain.SkipDrawing = true;//メイン画面の描画をキャンセル formMain.bindingSourceProfile.Position = i; @@ -267,8 +273,7 @@ public void AutoSave() !checkBoxAutoSavePressure.Checked && !checkBoxAutoSaveSingh.Checked && !checkBoxAutoSaveTwoTheta.Checked) - return; - + return;//何もチェックされていなかったら終了 if (!Path.Exists(textBoxDirectory.Text)) { @@ -551,6 +556,7 @@ public string GetText(bool CSV = true, int index = -1) private void checkBoxStartNumber_CheckedChanged(object sender, EventArgs e) { numericBoxStartNumber.ReadOnly = !checkBoxStartNumber.Checked; + checkBoxLoop.Enabled = checkBoxStartNumber.Checked; } #endregion } diff --git a/PDIndexer/FormSequentialAnalysis.ja.resx b/PDIndexer/FormSequentialAnalysis.ja.resx index b222f12..c6cf711 100644 --- a/PDIndexer/FormSequentialAnalysis.ja.resx +++ b/PDIndexer/FormSequentialAnalysis.ja.resx @@ -71,7 +71,7 @@ 実行 - 734, 242 + 744, 242 @@ -88,16 +88,13 @@ 0, 242 - 734, 22 + 744, 22 自動保存 - 734, 264 - - - 2θ (°) + 744, 264 734, 242 @@ -256,6 +253,9 @@ 自動保存 + + 471, 0 + 263, 264 @@ -269,7 +269,7 @@ 0, 44 - 742, 292 + 752, 292 メイリオ, 9pt @@ -299,13 +299,25 @@ メイリオ, 9pt - 555, 10 + 565, 10 137, 25 - 391, 10 + 336, 12 + + + メイリオ, 8pt + + + 382, 14 + + + 60, 21 + + + ループ メイリオ, 8pt @@ -314,17 +326,17 @@ 163, 4 - 225, 38 + 170, 38 - 指定した番号のプロファイルから解析を -実行する (最初のプロファイルはゼロ) + 指定番号のプロファイルから +解析を実行 (最初はゼロ) メイリオ, 9pt - 692, 9 + 702, 9 42, 28 @@ -336,7 +348,7 @@ メイリオ, 8pt - 475, 3 + 485, 3 0, 3, 0, 0 @@ -352,12 +364,9 @@ 0, 1, 0, 1 - 742, 44 + 752, 44 メイリオ, 10pt - - 連続解析 - \ No newline at end of file diff --git a/PDIndexer/FormSequentialAnalysis.resx b/PDIndexer/FormSequentialAnalysis.resx index 78e0ae0..8564f4f 100644 --- a/PDIndexer/FormSequentialAnalysis.resx +++ b/PDIndexer/FormSequentialAnalysis.resx @@ -57,1210 +57,1069 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - - GrowAndShrink + + tabPage2theta - - 0, 7 - - - - 2, 2, 2, 2 - - - 62, 27 - - - 0 - - - Execute - - - buttonExecute - - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 6 - - - Fill - - + 0, 0 - - 4, 5, 4, 5 - - - True - - - Both - - - 734, 243 - - - 1 - - - False - - - textBox2theta - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2theta - - - 0 - - - Bottom - - - Segoe UI, 9pt + + Segoe UI Symbol, 9pt - + 0, 243 - - 734, 24 + + 744, 267 - + + 7 - - Auto save + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - checkBoxAutoSaveTwoTheta + + + Both - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + textBoxDspacing - - tabPage2theta + + 3 - - 1 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4, 24 + + checkBoxAutoSavePressure - - 4, 5, 4, 5 + + 204, 30 - - 734, 267 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + Right - - 2θ (°) + + True - - tabPage2theta + + 0, 0 - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - - tabControl + + Segoe UI, 8pt - + 0 - - textBoxDspacing - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 506, 2 - - tabPageDspacing + + 3 - + 0 - - checkBoxAutoSaveD + + tabControl - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 2, 2, 2, 2 - - tabPageDspacing + + 4, 24 - - 1 + + tabPage2theta - - 4, 24 + + Top, Right - - 4, 5, 4, 5 + + 3 - - 734, 267 + + 481, 243 - - 1 + + 744, 243 d-spacing (Å) - - tabPageDspacing - - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 1 - - - textBoxFWHM - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageFWHM - - - 0 - - - checkBoxAutoSaveFWHM + + True - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 7 - - tabPageFWHM + + True - - 1 + + 422, 12 - - 4, 24 + + Bottom - - 734, 267 + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 2 + + 0, 336 - - FWHM (deg.) + + Auto save - - tabPageFWHM + + textBoxSingh - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6 - - tabControl + + tabPage2theta - - 2 + + System.Windows.Forms.Form, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - textBoxIntensity + + 744, 24 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 10, 17 - - tabPageIntensity + + Auto save - - 0 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - checkBoxAutoSaveInt + + 8 - + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageIntensity - - - 1 + + textBoxDirectory - - 4, 24 + + 0, 4, 0, 0 - - 734, 267 + + 481, 24 - - 3 + + Segoe UI, 9pt - - Intensity + + Directory + to be saved - - tabPageIntensity + + FormSequentialAnalysis - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 752, 22 - + tabControl - - 3 + + 6 - - Fill + + textBoxFWHM - - 0, 0 + + - + 4, 5, 4, 5 - - True - - - Both - - - 734, 243 - - - 3 - - - False - - - textBoxCellConstants - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCellConstants - - - 0 - - - Bottom - - - 0, 243 - - - 734, 24 - - - 7 - - - Auto save - - - checkBoxAutoSaveCell - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageCellConstants + + Copy - + 1 - - 4, 24 - - - 734, 267 - - - 5 - - - Cell constants (Å, °) - - - tabPageCellConstants - - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 4 - - - textBoxPressure - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4 - - tabPagePressure + + 7 - - 0 + + Segoe UI, 9pt - - checkBoxAutoSavePressure + + buttonSetDirectory - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + panel1 - - tabPagePressure + + Execute - - 1 + + 7 - - 4, 24 + + Fill - - 734, 267 + + 4, 5, 4, 5 - - 6 + + 0, 243 - - Pressure (GPa) + + Auto save - - tabPagePressure + + 744, 24 System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabControl + + 1 - - 5 + + 0 - - textBoxSingh + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + numericBoxStartNumber - + tabPageSingh - - 0 + + 3 - - checkBoxAutoSaveSingh + + panel1 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - tabPageSingh + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 1 - - graphControl1 - - - Crystallography.Controls.GraphControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - - tabPageSingh - - - 2 + + tabControl - - 4, 24 + + Bottom - - 734, 267 + + 65, 6 - - 4 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Singh's equation + + 128, 23 - - tabPageSingh + + 0, 0 - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 243 - - tabControl + + tabPageDspacing - - 6 + + Top - - Fill + + tabPageIntensity - - Segoe UI, 9pt + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 41 + + 744, 243 - + 4, 5, 4, 5 - - 742, 295 + + 4, 5, 4, 5 - - 2 + + 0 - - tabControl + + tabPageFWHM - - System.Windows.Forms.TabControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + 744, 267 - + 0 - - Fill + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + Fill - - 4, 5, 4, 5 + + NoControl - - True + + tabControl - - Both + + Set - - 734, 243 + + statusStrip1 - - 2 + + Bottom - - False + + textBoxIntensity - - textBoxDspacing + + 6 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill - - tabPageDspacing + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + Auto save Bottom - - Segoe UI, 9pt - - - 0, 243 - - - 734, 24 - - - 7 + + checkBoxAutoSaveTwoTheta - + Auto save + + Both + checkBoxAutoSaveD - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 52, 17 - - tabPageDspacing + + 4, 24 - - 1 + + 582, 9 - - Fill + + 5 - - 0, 0 + + False + + + 3 + + + 6 + + + 2 + + + False + + + $this + + + Cell constants (Å, °) + + + 744, 267 + + + 0 - - 4, 5, 4, 5 + + False - - True + + 1 Both - - 734, 243 + + checkBoxAutoSaveFWHM - - 2 + + buttonCopy - - False + + 1 - - textBoxFWHM + + 7 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageFWHM + + 0, 243 - - 0 + + Fill - - Bottom + + 4, 5, 4, 5 - - Segoe UI, 9pt + + 1, 25 - - 0, 243 + + tabPageSingh - - 734, 24 + + panel1 - - 7 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Auto save + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - checkBoxAutoSaveFWHM + + tabPageDspacing - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Both - - tabPageFWHM + + 744, 243 - + 1 - - Fill + + GrowAndShrink - - 0, 0 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4, 5, 4, 5 + + 62, 27 - - True + + False - - Both + + tabPageDspacing - - 734, 243 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - + + tabControl + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 744, 243 + + + $this + + 2 + + 744, 24 + + + 0, 0 + False - - textBoxIntensity + + 744, 243 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 - - tabPageIntensity + + 744, 24 - + 0 - - Bottom + + label1 - - Segoe UI, 9pt + + tabPageFWHM + + + 172, 5 + + + checkBoxAutoSaveSingh 0, 243 - - 734, 24 + + panel1 - - 7 + + Top, Right - - Auto save + + tabPageCellConstants - - checkBoxAutoSaveInt + + 744, 24 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - tabPageIntensity + + 7 - + 1 - - Fill - - - 0, 0 + + True - - 4, 5, 4, 5 + + 744, 267 - - True + + Both Both - - 734, 243 - - - 3 - - + False - - textBoxPressure + + 1 - + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPagePressure - - - 0 - - - Bottom + + panel1 - - 0, 243 + + False - - 734, 24 + + textBoxCellConstants - - 7 + + 4, 5, 4, 5 - - Auto save + + 96, 96 - - checkBoxAutoSavePressure + + tabPageIntensity - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 5, 4, 5 - - tabPagePressure + + tabPageFWHM - - 1 + + True - - Fill + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 0, 0 - - True + + Auto save - - Both + + 752, 41 - - 471, 243 + + True - - 3 + + panel1 - - False + + メイリオ, 9pt - - textBoxSingh + + 5 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 744, 243 - - tabPageSingh + + 1 - - 0 + + 1 + + + statusStrip1 Bottom - - 0, 243 + + 6 - - 471, 24 + + 4 - - 6 + + Segoe UI, 9pt - - Auto save + + 2 - - checkBoxAutoSaveSingh + + Segoe UI, 8pt - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + textBox2theta - - tabPageSingh + + 2 - + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Both + + 1 - - Right + + tabPageCellConstants - - Segoe UI Symbol, 9pt + + 0, 0 - - 471, 0 + + $this - - 263, 267 + + toolStripStatusLabel1 - - 7 + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 graphControl1 - - Crystallography.Controls.GraphControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + textBoxPressure - - tabPageSingh + + Segoe UI, 9pt - - 2 + + Crystallography.Controls.GraphControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - 17, 17 - - - 0, 336 + + 1 - - 742, 22 + + 0 - - 3 + + 0, 0, 0, 0 - - statusStrip1 + + 744, 267 - - statusStrip1 + + GrowAndShrink - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPageIntensity - - $this + + Bottom - - 2 + + 0 - - 10, 17 + + 5 - - + + Fill - - True + + 5 - - GrowAndShrink + + Top, Right - - 62, 7 + + checkBoxStartNumber - - 48, 27 + + 36, 27 - - 1 + + 7 - - Copy + + 5 - - buttonCopy + + 481, 0 - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 5, 4, 5 - - panel1 + + 0 - - 5 + + 3 - - True + + GrowAndShrink GrowAndShrink - - 110, 7 - - - 45, 27 - - - 1 - - - Save + + 4, 5, 4, 5 - - buttonSave + + Fill - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 744, 267 - - panel1 + + System.Windows.Forms.TabControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4 + + 4, 24 - - Top, Right + + 48, 27 - - Segoe UI, 9pt + + 0 - - 548, 9 + + Bottom - - 158, 23 + + 113, 6 2 - - textBoxDirectory + + buttonSave - + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - panel1 + + 376, 9 - - 2 + + 263, 267 - - numericBoxStartNumber + + 4, 24 - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + checkBoxAutoSaveInt - - panel1 + + Segoe UI, 9pt - - 0 + + 744, 267 - - checkBoxStartNumber + + True - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Sequential Analysis - + + 2 + + + tabPagePressure + + panel1 - - 1 + + buttonExecute - - buttonSetDirectory + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4 + + + 0, 41 - - panel1 + + 4, 24 - + 3 - - label1 + + Save - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - + panel1 - - 7 - - - Top + + Segoe UI, 9.75pt - - 0, 0 + + 752, 358 - - 742, 41 + + tabControl - - 5 + + 0, 243 panel1 - - System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - メイリオ, 9pt + + Auto save - - 392, 9 + + Intensity - - 0, 0, 0, 0 + + Loop - - 1000, 27 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1, 25 + + 4, 5, 4, 5 43, 27 - - 6 - - - numericBoxStartNumber + + tabPageSingh - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + True - - panel1 + + True - - 0 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + 7 - - Segoe UI, 9pt + + 4, 24 - - 180, 5 + + tabControl - - 210, 34 + + True - - 5 + + 716, 5 - - Execute analysis from the specified - number (note: the first index is 0) + + False - - checkBoxStartNumber + + Segoe UI, 9pt - + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - panel1 + + 4 - - 1 + + Singh's equation - - Top, Right + + 2 - + + 70, 34 + + True - - GrowAndShrink + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 706, 5 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 36, 27 + + 3, 6 - - 3 + + Fill - - Set + + checkBoxLoop - - buttonSetDirectory + + Pressure (GPa) - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - panel1 + + tabPageSingh - - 3 + + 2 - - Top, Right + + 752, 295 - - True + + FWHM (deg.) - + + 0, 0 + + + 5 + + Segoe UI, 9pt - - 475, 2 + + tabPagePressure - - 0, 4, 0, 0 + + 2 - - 70, 34 + + panel1 - - 4 + + tabPageCellConstants - - Directory - to be saved + + True - - label1 + + tabPagePressure - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 744, 24 - - panel1 + + 45, 27 - - 7 + + tabControl - - True - - - 96, 96 + + Fill - - 742, 358 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Segoe UI, 9.75pt + + 0, 243 - - 4, 5, 4, 5 + + 1000, 27 - - Sequential Analysis + + Execute analysis from the specified + number (note: the first index is 0) - - toolStripStatusLabel1 + + True - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 24 - - FormSequentialAnalysis + + checkBoxAutoSaveCell - - System.Windows.Forms.Form, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 + + + 2θ (°) + + True + + + ja + + + 17, 17 + \ No newline at end of file diff --git a/PDIndexer/PDIndexer.csproj b/PDIndexer/PDIndexer.csproj index e670819..1706202 100644 --- a/PDIndexer/PDIndexer.csproj +++ b/PDIndexer/PDIndexer.csproj @@ -4,8 +4,8 @@ WinExe net7.0-windows true - 2023.1.30.0536 - 2023.1.30.0536 + 2023.1.30.0804 + 2023.1.30.0804 App.ico diff --git a/PDIndexer/Version.cs b/PDIndexer/Version.cs index 34ce426..f9c2de7 100644 --- a/PDIndexer/Version.cs +++ b/PDIndexer/Version.cs @@ -25,7 +25,7 @@ static public string RecentHistory /// static public string History = "History" + - "\r\n ver4.429(2023/01/30) 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'." + "\r\n ver4.426(2023/01/25) Improved peak fitting accuracy." +