diff --git a/Crystallography.Controls/Crystal/EOSControl.cs b/Crystallography.Controls/Crystal/EOSControl.cs index b506d96..6876984 100644 --- a/Crystallography.Controls/Crystal/EOSControl.cs +++ b/Crystallography.Controls/Crystal/EOSControl.cs @@ -141,7 +141,8 @@ public void CalculatePressure() numericBoxEOS_V0perMol.Value = numericBoxEOS_V0perCell.Value * 6.0221367 / crystal.ChemicalFormulaZ / 10; if (checkBoxUseEOS.Checked) - numericBoxPressure.Value = crystal.EOSCondition.GetPressure(crystal.Volume * 1000); + EOScondition.Pressure = numericBoxPressure.Value = crystal.EOSCondition.GetPressure(crystal.Volume * 1000); + SkipEvent = false; } diff --git a/Crystallography.Controls/Properties/AssemblyInfo.cs b/Crystallography.Controls/Properties/AssemblyInfo.cs index 62b094a..3d0328e 100644 --- a/Crystallography.Controls/Properties/AssemblyInfo.cs +++ b/Crystallography.Controls/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2020.10.16.0824")] -[assembly: AssemblyFileVersion("2020.10.16.0824")] \ No newline at end of file +[assembly: AssemblyVersion("2020.10.16.0943")] +[assembly: AssemblyFileVersion("2020.10.16.0943")] \ No newline at end of file diff --git a/Crystallography/EOS.cs b/Crystallography/EOS.cs index e1fcb7c..36726a0 100644 Binary files a/Crystallography/EOS.cs and b/Crystallography/EOS.cs differ diff --git a/Crystallography/Properties/AssemblyInfo.cs b/Crystallography/Properties/AssemblyInfo.cs index c9662db..36fc41c 100644 --- a/Crystallography/Properties/AssemblyInfo.cs +++ b/Crystallography/Properties/AssemblyInfo.cs @@ -26,7 +26,7 @@ // ɂ悤ɁA'*' gāAׂĂ̒lw肷邩A // rhуrWԍlɂ邱Ƃł܂B -[assembly: AssemblyVersion("2020.10.16.0824")] +[assembly: AssemblyVersion("2020.10.16.0943")] // // AZuɏɂ́AgpL[w肵Ȃ΂Ȃ܂B @@ -57,5 +57,5 @@ [assembly: AssemblyKeyFile("")] [assembly: AssemblyKeyName("")] [assembly: ComVisibleAttribute(true)] -[assembly: AssemblyFileVersion("2020.10.16.0824")] +[assembly: AssemblyFileVersion("2020.10.16.0943")] diff --git a/PDIndexer/FormFitting.Designer.cs b/PDIndexer/FormFitting.Designer.cs index 4293fe4..290857c 100644 --- a/PDIndexer/FormFitting.Designer.cs +++ b/PDIndexer/FormFitting.Designer.cs @@ -80,6 +80,7 @@ private void InitializeComponent() this.textBoxB = new System.Windows.Forms.TextBox(); this.textBoxAlpha = new System.Windows.Forms.TextBox(); this.textBoxBeta = new System.Windows.Forms.TextBox(); + this.buttonResetTakeoffAngle = new System.Windows.Forms.Button(); this.buttonCopyCellConstantsToClipboard = new System.Windows.Forms.Button(); this.buttonConfirm = new System.Windows.Forms.Button(); this.label8 = new System.Windows.Forms.Label(); @@ -114,6 +115,8 @@ private void InitializeComponent() this.buttonApplyRangeToAll = new System.Windows.Forms.Button(); this.dataGridViewCrystals = new System.Windows.Forms.DataGridView(); this.Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.PeakColor = new System.Windows.Forms.DataGridViewImageColumn(); + this.crystalDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.bindingSourceCrystals = new System.Windows.Forms.BindingSource(this.components); this.dataSet = new PDIndexer.DataSet(); this.dataGridViewPlaneList = new System.Windows.Forms.DataGridView(); @@ -139,10 +142,7 @@ private void InitializeComponent() this.groupBox5 = new System.Windows.Forms.GroupBox(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.buttonSaveTableAsCSV = new System.Windows.Forms.Button(); - this.buttonResetTakeoffAngle = new System.Windows.Forms.Button(); this.numericBoxEffectiveDigit = new Crystallography.Controls.NumericBox(); - this.PeakColor = new System.Windows.Forms.DataGridViewImageColumn(); - this.crystalDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.groupBox1.SuspendLayout(); this.groupBox3.SuspendLayout(); this.flowLayoutPanelPatternDecomposition.SuspendLayout(); @@ -204,12 +204,14 @@ private void InitializeComponent() this.groupBox1.Controls.Add(this.label16); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; + this.toolTip.SetToolTip(this.groupBox1, resources.GetString("groupBox1.ToolTip")); // // textBoxGamma_err // resources.ApplyResources(this.textBoxGamma_err, "textBoxGamma_err"); this.textBoxGamma_err.Name = "textBoxGamma_err"; this.textBoxGamma_err.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxGamma_err, resources.GetString("textBoxGamma_err.ToolTip")); // // textBoxAlpha_err // @@ -217,54 +219,63 @@ private void InitializeComponent() this.textBoxAlpha_err.ForeColor = System.Drawing.SystemColors.WindowText; this.textBoxAlpha_err.Name = "textBoxAlpha_err"; this.textBoxAlpha_err.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxAlpha_err, resources.GetString("textBoxAlpha_err.ToolTip")); // // textBoxBeta_err // resources.ApplyResources(this.textBoxBeta_err, "textBoxBeta_err"); this.textBoxBeta_err.Name = "textBoxBeta_err"; this.textBoxBeta_err.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxBeta_err, resources.GetString("textBoxBeta_err.ToolTip")); // // textBoxC_err // resources.ApplyResources(this.textBoxC_err, "textBoxC_err"); this.textBoxC_err.Name = "textBoxC_err"; this.textBoxC_err.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxC_err, resources.GetString("textBoxC_err.ToolTip")); // // textBoxB_err // resources.ApplyResources(this.textBoxB_err, "textBoxB_err"); this.textBoxB_err.Name = "textBoxB_err"; this.textBoxB_err.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxB_err, resources.GetString("textBoxB_err.ToolTip")); // // textBoxV // resources.ApplyResources(this.textBoxV, "textBoxV"); this.textBoxV.Name = "textBoxV"; this.textBoxV.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxV, resources.GetString("textBoxV.ToolTip")); // // textBoxV_err // resources.ApplyResources(this.textBoxV_err, "textBoxV_err"); this.textBoxV_err.Name = "textBoxV_err"; this.textBoxV_err.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxV_err, resources.GetString("textBoxV_err.ToolTip")); // // textBoxC // resources.ApplyResources(this.textBoxC, "textBoxC"); this.textBoxC.Name = "textBoxC"; this.textBoxC.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxC, resources.GetString("textBoxC.ToolTip")); // // textBoxGamma // resources.ApplyResources(this.textBoxGamma, "textBoxGamma"); this.textBoxGamma.Name = "textBoxGamma"; this.textBoxGamma.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxGamma, resources.GetString("textBoxGamma.ToolTip")); // // textBoxA_err // resources.ApplyResources(this.textBoxA_err, "textBoxA_err"); this.textBoxA_err.Name = "textBoxA_err"; this.textBoxA_err.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxA_err, resources.GetString("textBoxA_err.ToolTip")); this.textBoxA_err.TextChanged += new System.EventHandler(this.textBoxA_TextChanged); // // textBoxA @@ -272,88 +283,105 @@ private void InitializeComponent() resources.ApplyResources(this.textBoxA, "textBoxA"); this.textBoxA.Name = "textBoxA"; this.textBoxA.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxA, resources.GetString("textBoxA.ToolTip")); this.textBoxA.TextChanged += new System.EventHandler(this.textBoxA_TextChanged); // // label26 // resources.ApplyResources(this.label26, "label26"); this.label26.Name = "label26"; + this.toolTip.SetToolTip(this.label26, resources.GetString("label26.ToolTip")); // // label25 // resources.ApplyResources(this.label25, "label25"); this.label25.Name = "label25"; + this.toolTip.SetToolTip(this.label25, resources.GetString("label25.ToolTip")); // // label24 // resources.ApplyResources(this.label24, "label24"); this.label24.Name = "label24"; + this.toolTip.SetToolTip(this.label24, resources.GetString("label24.ToolTip")); // // label3 // resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; + this.toolTip.SetToolTip(this.label3, resources.GetString("label3.ToolTip")); // // label29 // resources.ApplyResources(this.label29, "label29"); this.label29.Name = "label29"; + this.toolTip.SetToolTip(this.label29, resources.GetString("label29.ToolTip")); // // label23 // resources.ApplyResources(this.label23, "label23"); this.label23.Name = "label23"; + this.toolTip.SetToolTip(this.label23, resources.GetString("label23.ToolTip")); // // label22 // resources.ApplyResources(this.label22, "label22"); this.label22.Name = "label22"; + this.toolTip.SetToolTip(this.label22, resources.GetString("label22.ToolTip")); // // label21 // resources.ApplyResources(this.label21, "label21"); this.label21.Name = "label21"; + this.toolTip.SetToolTip(this.label21, resources.GetString("label21.ToolTip")); // // label10 // resources.ApplyResources(this.label10, "label10"); this.label10.Name = "label10"; + this.toolTip.SetToolTip(this.label10, resources.GetString("label10.ToolTip")); // // label20 // resources.ApplyResources(this.label20, "label20"); this.label20.Name = "label20"; + this.toolTip.SetToolTip(this.label20, resources.GetString("label20.ToolTip")); // // label19 // resources.ApplyResources(this.label19, "label19"); this.label19.Name = "label19"; + this.toolTip.SetToolTip(this.label19, resources.GetString("label19.ToolTip")); // // label17 // resources.ApplyResources(this.label17, "label17"); this.label17.Name = "label17"; + this.toolTip.SetToolTip(this.label17, resources.GetString("label17.ToolTip")); // // label27 // resources.ApplyResources(this.label27, "label27"); this.label27.Name = "label27"; + this.toolTip.SetToolTip(this.label27, resources.GetString("label27.ToolTip")); // // label11 // resources.ApplyResources(this.label11, "label11"); this.label11.Name = "label11"; + this.toolTip.SetToolTip(this.label11, resources.GetString("label11.ToolTip")); // // label9 // resources.ApplyResources(this.label9, "label9"); this.label9.Name = "label9"; + this.toolTip.SetToolTip(this.label9, resources.GetString("label9.ToolTip")); // // textBoxB // resources.ApplyResources(this.textBoxB, "textBoxB"); this.textBoxB.Name = "textBoxB"; this.textBoxB.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxB, resources.GetString("textBoxB.ToolTip")); // // textBoxAlpha // @@ -361,59 +389,77 @@ private void InitializeComponent() this.textBoxAlpha.ForeColor = System.Drawing.SystemColors.WindowText; this.textBoxAlpha.Name = "textBoxAlpha"; this.textBoxAlpha.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxAlpha, resources.GetString("textBoxAlpha.ToolTip")); // // textBoxBeta // resources.ApplyResources(this.textBoxBeta, "textBoxBeta"); this.textBoxBeta.Name = "textBoxBeta"; this.textBoxBeta.ReadOnly = true; + this.toolTip.SetToolTip(this.textBoxBeta, resources.GetString("textBoxBeta.ToolTip")); + // + // buttonResetTakeoffAngle + // + resources.ApplyResources(this.buttonResetTakeoffAngle, "buttonResetTakeoffAngle"); + this.buttonResetTakeoffAngle.Name = "buttonResetTakeoffAngle"; + this.toolTip.SetToolTip(this.buttonResetTakeoffAngle, resources.GetString("buttonResetTakeoffAngle.ToolTip")); + this.buttonResetTakeoffAngle.Click += new System.EventHandler(this.buttonResetTakeoffAngle_Click); // // buttonCopyCellConstantsToClipboard // resources.ApplyResources(this.buttonCopyCellConstantsToClipboard, "buttonCopyCellConstantsToClipboard"); this.buttonCopyCellConstantsToClipboard.Name = "buttonCopyCellConstantsToClipboard"; + this.toolTip.SetToolTip(this.buttonCopyCellConstantsToClipboard, resources.GetString("buttonCopyCellConstantsToClipboard.ToolTip")); this.buttonCopyCellConstantsToClipboard.Click += new System.EventHandler(this.buttonCopyClipboard_Click); // // buttonConfirm // resources.ApplyResources(this.buttonConfirm, "buttonConfirm"); this.buttonConfirm.Name = "buttonConfirm"; + this.toolTip.SetToolTip(this.buttonConfirm, resources.GetString("buttonConfirm.ToolTip")); this.buttonConfirm.Click += new System.EventHandler(this.buttonConfirm_Click); // // label8 // resources.ApplyResources(this.label8, "label8"); this.label8.Name = "label8"; + this.toolTip.SetToolTip(this.label8, resources.GetString("label8.ToolTip")); // // label12 // resources.ApplyResources(this.label12, "label12"); this.label12.Name = "label12"; + this.toolTip.SetToolTip(this.label12, resources.GetString("label12.ToolTip")); // // label28 // resources.ApplyResources(this.label28, "label28"); this.label28.Name = "label28"; + this.toolTip.SetToolTip(this.label28, resources.GetString("label28.ToolTip")); // // label13 // resources.ApplyResources(this.label13, "label13"); this.label13.Name = "label13"; + this.toolTip.SetToolTip(this.label13, resources.GetString("label13.ToolTip")); // // label14 // resources.ApplyResources(this.label14, "label14"); this.label14.Name = "label14"; + this.toolTip.SetToolTip(this.label14, resources.GetString("label14.ToolTip")); // // label15 // resources.ApplyResources(this.label15, "label15"); this.label15.Name = "label15"; + this.toolTip.SetToolTip(this.label15, resources.GetString("label15.ToolTip")); // // label16 // resources.ApplyResources(this.label16, "label16"); this.label16.Name = "label16"; + this.toolTip.SetToolTip(this.label16, resources.GetString("label16.ToolTip")); // // buttonCopyTableToClipboard // @@ -438,6 +484,7 @@ private void InitializeComponent() this.groupBox3.Controls.Add(this.buttonApplyRangeToAll); this.groupBox3.Name = "groupBox3"; this.groupBox3.TabStop = false; + this.toolTip.SetToolTip(this.groupBox3, resources.GetString("groupBox3.ToolTip")); // // flowLayoutPanelPatternDecomposition // @@ -445,6 +492,7 @@ private void InitializeComponent() this.flowLayoutPanelPatternDecomposition.Controls.Add(this.radioButtonEachCrystal); this.flowLayoutPanelPatternDecomposition.Controls.Add(this.radioButtonBetweenCrystals); this.flowLayoutPanelPatternDecomposition.Name = "flowLayoutPanelPatternDecomposition"; + this.toolTip.SetToolTip(this.flowLayoutPanelPatternDecomposition, resources.GetString("flowLayoutPanelPatternDecomposition.ToolTip")); // // radioButtonEachCrystal // @@ -452,6 +500,7 @@ private void InitializeComponent() this.radioButtonEachCrystal.Checked = true; this.radioButtonEachCrystal.Name = "radioButtonEachCrystal"; this.radioButtonEachCrystal.TabStop = true; + this.toolTip.SetToolTip(this.radioButtonEachCrystal, resources.GetString("radioButtonEachCrystal.ToolTip")); this.radioButtonEachCrystal.UseVisualStyleBackColor = true; this.radioButtonEachCrystal.CheckedChanged += new System.EventHandler(this.radioButtonEachCrystal_CheckedChanged); // @@ -459,24 +508,27 @@ private void InitializeComponent() // resources.ApplyResources(this.radioButtonBetweenCrystals, "radioButtonBetweenCrystals"); this.radioButtonBetweenCrystals.Name = "radioButtonBetweenCrystals"; + this.toolTip.SetToolTip(this.radioButtonBetweenCrystals, resources.GetString("radioButtonBetweenCrystals.ToolTip")); this.radioButtonBetweenCrystals.UseVisualStyleBackColor = true; // // groupBox2 // + resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Controls.Add(this.radioButtonSymmetricPearson); this.groupBox2.Controls.Add(this.radioButtonPseudoVoigt); this.groupBox2.Controls.Add(this.radioButtonSplitPseudoVoigt); this.groupBox2.Controls.Add(this.radioButtonSimple); this.groupBox2.Controls.Add(this.radioButtonSplitPearson); this.groupBox2.Controls.Add(this.buttonApplyFunctionToAll); - resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Name = "groupBox2"; this.groupBox2.TabStop = false; + this.toolTip.SetToolTip(this.groupBox2, resources.GetString("groupBox2.ToolTip")); // // radioButtonSymmetricPearson // resources.ApplyResources(this.radioButtonSymmetricPearson, "radioButtonSymmetricPearson"); this.radioButtonSymmetricPearson.Name = "radioButtonSymmetricPearson"; + this.toolTip.SetToolTip(this.radioButtonSymmetricPearson, resources.GetString("radioButtonSymmetricPearson.ToolTip")); this.radioButtonSymmetricPearson.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged); // // radioButtonPseudoVoigt @@ -485,49 +537,55 @@ private void InitializeComponent() this.radioButtonPseudoVoigt.Checked = true; this.radioButtonPseudoVoigt.Name = "radioButtonPseudoVoigt"; this.radioButtonPseudoVoigt.TabStop = true; + this.toolTip.SetToolTip(this.radioButtonPseudoVoigt, resources.GetString("radioButtonPseudoVoigt.ToolTip")); this.radioButtonPseudoVoigt.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged); // // radioButtonSplitPseudoVoigt // resources.ApplyResources(this.radioButtonSplitPseudoVoigt, "radioButtonSplitPseudoVoigt"); this.radioButtonSplitPseudoVoigt.Name = "radioButtonSplitPseudoVoigt"; + this.toolTip.SetToolTip(this.radioButtonSplitPseudoVoigt, resources.GetString("radioButtonSplitPseudoVoigt.ToolTip")); this.radioButtonSplitPseudoVoigt.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged); // // radioButtonSimple // resources.ApplyResources(this.radioButtonSimple, "radioButtonSimple"); this.radioButtonSimple.Name = "radioButtonSimple"; + this.toolTip.SetToolTip(this.radioButtonSimple, resources.GetString("radioButtonSimple.ToolTip")); this.radioButtonSimple.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged); // // radioButtonSplitPearson // resources.ApplyResources(this.radioButtonSplitPearson, "radioButtonSplitPearson"); this.radioButtonSplitPearson.Name = "radioButtonSplitPearson"; + this.toolTip.SetToolTip(this.radioButtonSplitPearson, resources.GetString("radioButtonSplitPearson.ToolTip")); this.radioButtonSplitPearson.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged); // // buttonApplyFunctionToAll // resources.ApplyResources(this.buttonApplyFunctionToAll, "buttonApplyFunctionToAll"); this.buttonApplyFunctionToAll.Name = "buttonApplyFunctionToAll"; + this.toolTip.SetToolTip(this.buttonApplyFunctionToAll, resources.GetString("buttonApplyFunctionToAll.ToolTip")); this.buttonApplyFunctionToAll.Click += new System.EventHandler(this.buttonApplyFunctionToAll_Click); // // panelFWHM // + resources.ApplyResources(this.panelFWHM, "panelFWHM"); this.panelFWHM.Controls.Add(this.numericUpDownInitialFWHM); this.panelFWHM.Controls.Add(this.buttonApplyFWHMToAll); this.panelFWHM.Controls.Add(this.label1); - resources.ApplyResources(this.panelFWHM, "panelFWHM"); this.panelFWHM.Name = "panelFWHM"; + this.toolTip.SetToolTip(this.panelFWHM, resources.GetString("panelFWHM.ToolTip")); // // numericUpDownInitialFWHM // + resources.ApplyResources(this.numericUpDownInitialFWHM, "numericUpDownInitialFWHM"); this.numericUpDownInitialFWHM.DecimalPlaces = 3; this.numericUpDownInitialFWHM.Increment = new decimal(new int[] { 2, 0, 0, 131072}); - resources.ApplyResources(this.numericUpDownInitialFWHM, "numericUpDownInitialFWHM"); this.numericUpDownInitialFWHM.Maximum = new decimal(new int[] { 100000, 0, @@ -539,6 +597,7 @@ private void InitializeComponent() 0, 196608}); this.numericUpDownInitialFWHM.Name = "numericUpDownInitialFWHM"; + this.toolTip.SetToolTip(this.numericUpDownInitialFWHM, resources.GetString("numericUpDownInitialFWHM.ToolTip")); this.numericUpDownInitialFWHM.Value = new decimal(new int[] { 6, 0, @@ -550,17 +609,20 @@ private void InitializeComponent() // resources.ApplyResources(this.buttonApplyFWHMToAll, "buttonApplyFWHMToAll"); this.buttonApplyFWHMToAll.Name = "buttonApplyFWHMToAll"; + this.toolTip.SetToolTip(this.buttonApplyFWHMToAll, resources.GetString("buttonApplyFWHMToAll.ToolTip")); this.buttonApplyFWHMToAll.Click += new System.EventHandler(this.buttonApplyFWHMToAll_Click); // // label1 // resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; + this.toolTip.SetToolTip(this.label1, resources.GetString("label1.ToolTip")); // // checkBoxUseInitialFWHM // resources.ApplyResources(this.checkBoxUseInitialFWHM, "checkBoxUseInitialFWHM"); this.checkBoxUseInitialFWHM.Name = "checkBoxUseInitialFWHM"; + this.toolTip.SetToolTip(this.checkBoxUseInitialFWHM, resources.GetString("checkBoxUseInitialFWHM.ToolTip")); this.checkBoxUseInitialFWHM.UseVisualStyleBackColor = true; this.checkBoxUseInitialFWHM.CheckedChanged += new System.EventHandler(this.checkBoxUseInitialFWHM_CheckedChanged); // @@ -568,18 +630,19 @@ private void InitializeComponent() // resources.ApplyResources(this.checkBoxPatternDecomposition, "checkBoxPatternDecomposition"); this.checkBoxPatternDecomposition.Name = "checkBoxPatternDecomposition"; + this.toolTip.SetToolTip(this.checkBoxPatternDecomposition, resources.GetString("checkBoxPatternDecomposition.ToolTip")); this.checkBoxPatternDecomposition.UseVisualStyleBackColor = true; this.checkBoxPatternDecomposition.CheckedChanged += new System.EventHandler(this.checkBoxPatternDecomposition_CheckedChanged); // // numericUpDownSearchRange // + resources.ApplyResources(this.numericUpDownSearchRange, "numericUpDownSearchRange"); this.numericUpDownSearchRange.DecimalPlaces = 3; this.numericUpDownSearchRange.Increment = new decimal(new int[] { 2, 0, 0, 131072}); - resources.ApplyResources(this.numericUpDownSearchRange, "numericUpDownSearchRange"); this.numericUpDownSearchRange.Maximum = new decimal(new int[] { 100000, 0, @@ -591,6 +654,7 @@ private void InitializeComponent() 0, 196608}); this.numericUpDownSearchRange.Name = "numericUpDownSearchRange"; + this.toolTip.SetToolTip(this.numericUpDownSearchRange, resources.GetString("numericUpDownSearchRange.ToolTip")); this.numericUpDownSearchRange.Value = new decimal(new int[] { 6, 0, @@ -602,30 +666,34 @@ private void InitializeComponent() // resources.ApplyResources(this.label7, "label7"); this.label7.Name = "label7"; + this.toolTip.SetToolTip(this.label7, resources.GetString("label7.ToolTip")); // // label2 // resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; + this.toolTip.SetToolTip(this.label2, resources.GetString("label2.ToolTip")); // // label18 // resources.ApplyResources(this.label18, "label18"); this.label18.Name = "label18"; + this.toolTip.SetToolTip(this.label18, resources.GetString("label18.ToolTip")); // // buttonApplyRangeToAll // resources.ApplyResources(this.buttonApplyRangeToAll, "buttonApplyRangeToAll"); this.buttonApplyRangeToAll.Name = "buttonApplyRangeToAll"; + this.toolTip.SetToolTip(this.buttonApplyRangeToAll, resources.GetString("buttonApplyRangeToAll.ToolTip")); this.buttonApplyRangeToAll.Click += new System.EventHandler(this.buttonApplyRangeToAll_Click); // // dataGridViewCrystals // + resources.ApplyResources(this.dataGridViewCrystals, "dataGridViewCrystals"); this.dataGridViewCrystals.AllowUserToAddRows = false; this.dataGridViewCrystals.AllowUserToDeleteRows = false; this.dataGridViewCrystals.AllowUserToResizeColumns = false; this.dataGridViewCrystals.AllowUserToResizeRows = false; - resources.ApplyResources(this.dataGridViewCrystals, "dataGridViewCrystals"); this.dataGridViewCrystals.AutoGenerateColumns = false; this.dataGridViewCrystals.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridViewCrystals.ColumnHeadersVisible = false; @@ -648,6 +716,7 @@ private void InitializeComponent() this.dataGridViewCrystals.RowHeadersVisible = false; this.dataGridViewCrystals.RowTemplate.Height = 21; this.dataGridViewCrystals.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.toolTip.SetToolTip(this.dataGridViewCrystals, resources.GetString("dataGridViewCrystals.ToolTip")); this.dataGridViewCrystals.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridViewCrystals_CellMouseClick); this.dataGridViewCrystals.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridViewCrystals_CellMouseClick); // @@ -658,6 +727,23 @@ private void InitializeComponent() this.Check.Name = "Check"; this.Check.ReadOnly = true; // + // PeakColor + // + this.PeakColor.DataPropertyName = "PeakColor"; + resources.ApplyResources(this.PeakColor, "PeakColor"); + this.PeakColor.Name = "PeakColor"; + this.PeakColor.ReadOnly = true; + this.PeakColor.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.PeakColor.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // crystalDataGridViewTextBoxColumn + // + this.crystalDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.crystalDataGridViewTextBoxColumn.DataPropertyName = "Crystal"; + resources.ApplyResources(this.crystalDataGridViewTextBoxColumn, "crystalDataGridViewTextBoxColumn"); + this.crystalDataGridViewTextBoxColumn.Name = "crystalDataGridViewTextBoxColumn"; + this.crystalDataGridViewTextBoxColumn.ReadOnly = true; + // // bindingSourceCrystals // this.bindingSourceCrystals.DataMember = "DataTableCrystal"; @@ -670,11 +756,11 @@ private void InitializeComponent() // // dataGridViewPlaneList // + resources.ApplyResources(this.dataGridViewPlaneList, "dataGridViewPlaneList"); this.dataGridViewPlaneList.AllowUserToAddRows = false; this.dataGridViewPlaneList.AllowUserToDeleteRows = false; this.dataGridViewPlaneList.AllowUserToResizeColumns = false; this.dataGridViewPlaneList.AllowUserToResizeRows = false; - resources.ApplyResources(this.dataGridViewPlaneList, "dataGridViewPlaneList"); this.dataGridViewPlaneList.AutoGenerateColumns = false; this.dataGridViewPlaneList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dataGridViewPlaneList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -706,6 +792,7 @@ private void InitializeComponent() this.dataGridViewPlaneList.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.dataGridViewPlaneList.RowTemplate.Height = 21; this.dataGridViewPlaneList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.toolTip.SetToolTip(this.dataGridViewPlaneList, resources.GetString("dataGridViewPlaneList.ToolTip")); this.dataGridViewPlaneList.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewPlanes_CellContentClick); this.dataGridViewPlaneList.SelectionChanged += new System.EventHandler(this.dataGridViewPlaneList_SelectionChanged); // @@ -802,15 +889,16 @@ private void InitializeComponent() // // contextMenuStrip1 // + resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1"); this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.copyToClipboradToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1"); + this.toolTip.SetToolTip(this.contextMenuStrip1, resources.GetString("contextMenuStrip1.ToolTip")); // // copyToClipboradToolStripMenuItem // - this.copyToClipboradToolStripMenuItem.Name = "copyToClipboradToolStripMenuItem"; resources.ApplyResources(this.copyToClipboradToolStripMenuItem, "copyToClipboradToolStripMenuItem"); + this.copyToClipboradToolStripMenuItem.Name = "copyToClipboradToolStripMenuItem"; // // bindingSourcePlanes // @@ -822,9 +910,9 @@ private void InitializeComponent() // resources.ApplyResources(this.buttonSendToCellFinder, "buttonSendToCellFinder"); this.buttonSendToCellFinder.Name = "buttonSendToCellFinder"; + this.toolTip.SetToolTip(this.buttonSendToCellFinder, resources.GetString("buttonSendToCellFinder.ToolTip")); this.buttonSendToCellFinder.UseVisualStyleBackColor = true; this.buttonSendToCellFinder.Click += new System.EventHandler(this.buttonSendToCellFinder_Click); - // // useForCalcDataGridViewCheckBoxColumn // @@ -848,16 +936,19 @@ private void InitializeComponent() this.groupBox4.Controls.Add(this.label4); this.groupBox4.Name = "groupBox4"; this.groupBox4.TabStop = false; + this.toolTip.SetToolTip(this.groupBox4, resources.GetString("groupBox4.ToolTip")); // // textBoxRemovedProfileName // resources.ApplyResources(this.textBoxRemovedProfileName, "textBoxRemovedProfileName"); this.textBoxRemovedProfileName.Name = "textBoxRemovedProfileName"; + this.toolTip.SetToolTip(this.textBoxRemovedProfileName, resources.GetString("textBoxRemovedProfileName.ToolTip")); // // label4 // resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; + this.toolTip.SetToolTip(this.label4, resources.GetString("label4.ToolTip")); // // groupBox5 // @@ -865,6 +956,7 @@ private void InitializeComponent() this.groupBox5.Controls.Add(this.buttonSendToCellFinder); this.groupBox5.Name = "groupBox5"; this.groupBox5.TabStop = false; + this.toolTip.SetToolTip(this.groupBox5, resources.GetString("groupBox5.ToolTip")); // // buttonSaveTableAsCSV // @@ -873,62 +965,29 @@ private void InitializeComponent() this.toolTip.SetToolTip(this.buttonSaveTableAsCSV, resources.GetString("buttonSaveTableAsCSV.ToolTip")); this.buttonSaveTableAsCSV.UseVisualStyleBackColor = true; this.buttonSaveTableAsCSV.Click += new System.EventHandler(this.ButtonSaveTableAsCSV_Click); - - // - // buttonResetTakeoffAngle - // - resources.ApplyResources(this.buttonResetTakeoffAngle, "buttonResetTakeoffAngle"); - this.buttonResetTakeoffAngle.Name = "buttonResetTakeoffAngle"; - this.buttonResetTakeoffAngle.Click += new System.EventHandler(this.buttonResetTakeoffAngle_Click); // // numericBoxEffectiveDigit // resources.ApplyResources(this.numericBoxEffectiveDigit, "numericBoxEffectiveDigit"); this.numericBoxEffectiveDigit.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxEffectiveDigit.DecimalPlaces = -2; + this.numericBoxEffectiveDigit.FooterBackColor = System.Drawing.SystemColors.Control; + this.numericBoxEffectiveDigit.HeaderBackColor = System.Drawing.SystemColors.Control; this.numericBoxEffectiveDigit.Maximum = 16D; this.numericBoxEffectiveDigit.Minimum = 1D; - this.numericBoxEffectiveDigit.Multiline = false; this.numericBoxEffectiveDigit.Name = "numericBoxEffectiveDigit"; this.numericBoxEffectiveDigit.RadianValue = 0.087266462599716474D; - this.numericBoxEffectiveDigit.ReadOnly = false; - this.numericBoxEffectiveDigit.RestrictLimitValue = true; - this.numericBoxEffectiveDigit.ShowFraction = false; - this.numericBoxEffectiveDigit.ShowPositiveSign = false; this.numericBoxEffectiveDigit.ShowUpDown = true; this.numericBoxEffectiveDigit.SkipEventDuringInput = false; - this.numericBoxEffectiveDigit.SmartIncrement = false; - this.numericBoxEffectiveDigit.TextBoxBackColor = System.Drawing.SystemColors.Window; - this.numericBoxEffectiveDigit.TextBoxForeColor = System.Drawing.SystemColors.WindowText; this.numericBoxEffectiveDigit.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F); this.numericBoxEffectiveDigit.ThonsandsSeparator = true; this.toolTip.SetToolTip(this.numericBoxEffectiveDigit, resources.GetString("numericBoxEffectiveDigit.ToolTip")); - this.numericBoxEffectiveDigit.UpDown_Increment = 1D; this.numericBoxEffectiveDigit.Value = 5D; - this.numericBoxEffectiveDigit.WordWrap = true; this.numericBoxEffectiveDigit.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.NumericBoxEffectiveDigit_ValueChanged); // - // PeakColor - // - this.PeakColor.DataPropertyName = "PeakColor"; - resources.ApplyResources(this.PeakColor, "PeakColor"); - this.PeakColor.Name = "PeakColor"; - this.PeakColor.ReadOnly = true; - this.PeakColor.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.PeakColor.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // crystalDataGridViewTextBoxColumn - // - this.crystalDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.crystalDataGridViewTextBoxColumn.DataPropertyName = "Crystal"; - resources.ApplyResources(this.crystalDataGridViewTextBoxColumn, "crystalDataGridViewTextBoxColumn"); - this.crystalDataGridViewTextBoxColumn.Name = "crystalDataGridViewTextBoxColumn"; - this.crystalDataGridViewTextBoxColumn.ReadOnly = true; - // // FormFitting // - this.AllowDrop = true; resources.ApplyResources(this, "$this"); + this.AllowDrop = true; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.numericBoxEffectiveDigit); this.Controls.Add(this.groupBox5); @@ -942,6 +1001,7 @@ private void InitializeComponent() this.KeyPreview = true; this.MaximizeBox = false; this.Name = "FormFitting"; + this.toolTip.SetToolTip(this, resources.GetString("$this.ToolTip")); this.Closed += new System.EventHandler(this.FormFitting_Closed); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormFitting_FormClosing); this.VisibleChanged += new System.EventHandler(this.FormFitting_VisibleChanged); @@ -957,6 +1017,7 @@ private void InitializeComponent() this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); this.panelFWHM.ResumeLayout(false); + this.panelFWHM.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownInitialFWHM)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSearchRange)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewCrystals)).EndInit(); diff --git a/PDIndexer/FormFitting.ja.resx b/PDIndexer/FormFitting.ja.resx index 273b3f9..8a406c5 100644 --- a/PDIndexer/FormFitting.ja.resx +++ b/PDIndexer/FormFitting.ja.resx @@ -117,7 +117,100 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 171, 193 + + + + メイリオ, 9pt @@ -130,6 +223,9 @@ クリップボードにコピー + + + メイリオ, 9pt @@ -142,6 +238,30 @@ 選択中の結晶に適用 + + + + + + + + + + + + + + + + + + + + + + + + メイリオ, 9pt @@ -149,16 +269,19 @@ 560, 326 - 193, 228 + 232, 228 最適化した格子定数 + + + メイリオ, 9pt - 614, 0 + 650, 0 150, 28 @@ -175,6 +298,9 @@ 個々の結晶に対して + + + メイリオ, 9pt @@ -187,36 +313,60 @@ 全ての結晶に対して + + + 280, 28 + + + 163, 22 + + + 169, 22 + + + 185, 38 130, 22 + + + 110, 22 + + + 185, 61 124, 22 + + + 126, 24 全てのピークに適用 + + + メイリオ, 9pt @@ -226,6 +376,9 @@ ピーク関数 + + + True @@ -233,6 +386,9 @@ 75, 25 + + + True @@ -242,12 +398,21 @@ 全てのピークに適用 + + + + + + メイリオ, 9pt 235, 31 + + + メイリオ, 9pt @@ -257,6 +422,9 @@ 初期半値幅 + + + メイリオ, 9pt @@ -266,18 +434,27 @@ パターン分解 + + + メイリオ, 9pt 75, 25 + + + メイリオ, 9pt 93, 19 + + + True @@ -290,9 +467,15 @@ 範囲 + + + メイリオ, 9pt + + + True @@ -305,6 +488,9 @@ 全てのピークに適用 + + + メイリオ, 9pt @@ -317,35 +503,62 @@ フィッティング条件 + + + 196, 322 + + + + + + - 562, 295 + 598, 295 + + + + + + 172, 25 + + + 111, 18 + + + メイリオ, 9pt 367, 326 + + + メイリオ, 9pt 367, 458 + + + メイリオ, 9pt - 509, 0 + 545, 0 102, 28 @@ -353,11 +566,23 @@ CSV形式で保存 + + メイリオ, 9pt + + + 小数点以下桁数 + - 367, 2 + 396, 2 + + + 1000, 23 + + + 146, 23 - 766, 555 + 802, 555 @@ -445,4 +670,7 @@ //////////////////////////////////////////////////////////////////w= + + + \ No newline at end of file diff --git a/PDIndexer/FormFitting.resx b/PDIndexer/FormFitting.resx index 5769d9c..7dcb33b 100644 --- a/PDIndexer/FormFitting.resx +++ b/PDIndexer/FormFitting.resx @@ -117,2860 +117,2764 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Bottom, Left - - - Arial, 9pt - - - Disable - - - 123, 119 + + 12, 187 - - True - - - 85, 19 - - - 13 - - - textBoxGamma_err + + 52 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - groupBox1 + + in each crystal - - 0 + + 41 - - Arial, 9pt + + xDataGridViewTextBoxColumn - - Disable + + 1, 23 - - 123, 79 + + 208, 142 - - True + + 25 - - 85, 19 + + + NoControl - - 11 + + label26 - - textBoxAlpha_err + + NoControl - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - + groupBox1 - - 1 + + Segoe UI Symbol, 9pt - - Arial, 9pt + + radioButtonBetweenCrystals - - Disable + + - - 123, 99 + + 79, 25 - - True + + groupBox4 - - 85, 19 + + 6, 20 - - 12 + + ± - - textBoxBeta_err + + 31 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 + + 312, 299 - - 2 + + label27 - - Arial, 9pt + + 1 - - Disable + + 137, 161 - - 123, 58 + + textBoxV - - True + + 54 - - 85, 19 + + - - 10 + + groupBox2 - - textBoxC_err + + groupBox3 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + bindingSourcePlanes - - groupBox1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3 + + 210, 121 - + Arial, 9pt - - Disable - - - 123, 38 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 85, 19 + + Bottom, Left - - 9 + + 3, 3 - - textBoxB_err + + groupBox4 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - groupBox1 + + - - 4 + + groupBox3 - - Arial, 9pt + + 15 - - Disable + + Microsoft Sans Serif, 8.25pt - - 20, 141 + + 29 - - True + + NoControl - - 85, 19 + + ± - - 10 + + 1 - - textBoxV + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 + + 155, 19 - - 5 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Arial, 9pt + + 46 - - Disable + + 17 - - 123, 140 + + 210, 101 - - True + + Split Pearson VII - - 85, 19 + + False - - 10 + + flowLayoutPanelPatternDecomposition - - textBoxV_err - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + textBoxA_err - - groupBox1 + + Intensity - - 6 + + groupBox5 - - Arial, 9pt + + 75, 23 - - Disable + + 1 - - 20, 59 + + label22 - + True - - 85, 19 - - - 10 + + FWHM - - textBoxC + + 16 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 + + 121, 19 - - 7 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Arial, 9pt + + 4, 61 - - Disable + + 169, 38 - - 20, 120 + + 85, 19 - - True + + 8 - - 85, 19 + + 9 - - 13 + + a - - textBoxGamma + + NoControl - + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 + + 1 - - 8 + + label23 - - Arial, 9pt + + radioButtonEachCrystal - - Disable + + Apply to all - - 123, 18 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + 34 - - 85, 19 + + Search Range - - 8 + + Bottom, Left - - textBoxA_err + + 62 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 172, 23 - - groupBox1 + + X - - 9 + + 20, 120 - - Arial, 9pt + + label28 - - Disable + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 20, 19 + + 9, 19 - - True + + 0 - - 85, 19 + + Disable - - 8 + + 219, 142 - - textBoxA + + NoControl - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - groupBox1 + + 15 - - 10 + + 169, 61 - - Microsoft Sans Serif, 8.25pt + + 168, 22 - - NoControl + + - - 210, 121 + + True - - 8, 16 + + 4, 21 - - 1 + + 2 - - ° + + label29 - - label26 + + 40 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 - - - 11 + + 36 - - Microsoft Sans Serif, 8.25pt + + 148, 19 - - NoControl + + groupBox1 - - 210, 101 + + - - 8, 16 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 1 - - ° - - - label25 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + HKL - - groupBox1 + + 13 - - 12 + + 20, 100 - - Microsoft Sans Serif, 8.25pt + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + NoControl - - 210, 81 + + 9 - - 8, 16 + + FormFitting - - 1 + + 37 - - ° + + 39 - - label24 + + label14 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + groupBox1 - - 13 - - - True - - - Microsoft Sans Serif, 6pt + + - + NoControl - - 219, 142 - - - 9, 9 - - - 1 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3 + + Disable - - label3 + + 7 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 + + 6, 61 - - 14 + + groupBox3 - + True - - Microsoft Sans Serif, 9pt - - - NoControl - - - 208, 142 - - - 15, 15 + + 6 - - 1 + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + label15 - - label29 + + 6, 38 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 10 - - groupBox1 + + Save below table data as CSV file format. - - 15 + + $this - - Microsoft Sans Serif, 9pt + + numericUpDownInitialFWHM - - NoControl + + True - - 209, 60 + + groupBox1 - - 16, 16 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + 85, 19 - - + + c - - label23 + + Disable - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bottom, Right - - groupBox1 + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 16 + + 1 - - Microsoft Sans Serif, 9pt + + 1 - - NoControl + + Arial, 9pt - - 209, 40 + + $this - - 16, 16 + + 22 - - 1 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label22 + + 120, 25 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - groupBox1 + + Segoe UI Symbol, 9pt - - 17 + + 19 - - Microsoft Sans Serif, 9pt + + True - - NoControl + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 209, 20 + + - - 16, 16 + + 9 - - 1 + + Symmetric Pearson VII - - + + Initial FWHM - - label21 + + 23 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Arial, 9pt - - groupBox1 + + textBoxBeta_err - - 18 + + 3 - + NoControl - - 107, 22 + + - - 12, 16 + + NoControl - - 1 + + ° - - ± + + 60 label10 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 + + 24 - - 19 + + - - NoControl + + Microsoft Sans Serif, 8.25pt - - 107, 123 + + 143, 19 - - 12, 16 + + Segoe UI Symbol, 9pt - - 1 + + True - - ± + + 107, 22 - - label20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 20 + + 1 - + NoControl - - 107, 103 + + - - 12, 16 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + 440, 0 - - ± + + label11 - - label19 + + - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Arial, 9pt - + + Copy to clipborad + + groupBox1 - - 21 + + 38 - + + textBoxRemovedProfileName + + NoControl - - 107, 83 + + groupBox1 - - 12, 16 + + 123, 18 - + 1 - - ± - - - label17 + + buttonResetTakeoffAngle - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 54 - - groupBox1 + + Save as CSV 22 - - NoControl + + label16 - - 107, 140 + + - - 12, 16 + + - - 1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ± + + groupBox1 - - label27 + + 2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9pt - - groupBox1 + + 114, 25 - - 23 + + 107, 140 - - NoControl + + 96, 96 - - 107, 62 + + groupBox1 - - 12, 16 + + groupBox1 - - 1 + + 14 - - ± + + 112, 19 - - label11 + + bindingSourceCrystals - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - groupBox1 + + - - 24 + + True - - NoControl + + 0 - - 107, 42 + + True - - 12, 16 + + Top, Right - + 1 - - ± + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label9 + + label17 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 138, 23 - + groupBox1 - - 25 + + - - Arial, 9pt + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Disable + + NoControl - - 20, 39 + + 20, 80 - - True + + - - 85, 19 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 9 + + 42 - - textBoxB + + textBoxAlpha_err - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - groupBox1 + + Check - - 26 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Arial, 9pt + + Remove fitted peaks of the selected crystal from the current profiles, and generate the new profile + - - Disable + + groupBox3 - - 20, 80 + + 224, 25 - - True + + toolTip - - 85, 19 + + groupBox1 - - 11 + + ± - - textBoxAlpha + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 + + 2 - - 27 + + - - Arial, 9pt + + Split Pseudo Voigt - - Disable - - - 20, 100 - - - True + + R - - 85, 19 + + Reset take off angle - - 12 + + NoControl - - textBoxBeta + + 4, 41 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - + groupBox1 - - 28 - - - True + + groupBox1 - - GrowAndShrink + + buttonCopyCellConstantsToClipboard - - False + + 5 - - Segoe UI Symbol, 9pt + + 12, 16 - - NoControl + + 9 - - 12, 187 + + β - - 120, 25 + + 12, 16 - - 42 + + Disable - - Reset take off angle + + label12 - + False - - buttonResetTakeoffAngle - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 35 - + groupBox1 - - 29 - - - True + + R - - GrowAndShrink + + 74, 24 - - False + + buttonApplyFunctionToAll - - Segoe UI Symbol, 9pt + + label2 - + NoControl - - 137, 161 - - - 114, 25 - - + 42 - - Copy to Clipboard - - - buttonCopyCellConstantsToClipboard + + groupBox1 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9pt - - groupBox1 + + between crystals - - 30 + + 85, 19 - - True + + 209, 20 - - GrowAndShrink + + Check - - False + + - - Segoe UI Symbol, 9pt + + groupBox2 - - NoControl + + panelFWHM - - 12, 161 + + 85, 19 - - 119, 25 + + label13 - - 42 + + NoControl - - Apply to the crystal + + 85, 19 - - buttonConfirm + + 8, 16 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 22 - + groupBox1 - - 31 + + buttonApplyRangeToAll - - Times New Roman, 9pt, style=Italic + + 99, 19 - + NoControl - - 4, 21 + + 6 - - 12, 16 + + V - - 1 + + Arial, 9pt - - a + + textBoxB_err - - label8 + + Effective digit - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 - - groupBox1 + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 32 + + groupBox1 - - Times New Roman, 9pt, style=Italic + + 46 - - NoControl + + 21 - - 4, 41 + + 3 - - 12, 16 + + Apply to all - - 1 + + New profile name - - b + + False - - label12 + + 10 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + label19 - - groupBox1 + + 10 - - 33 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Times New Roman, 9pt, style=Italic + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl + + dataGridViewCrystals - - 4, 143 + + checkBoxPatternDecomposition - - 20, 16 + + - - 1 + + Disable - - V + + 85, 19 - - label28 + + weightDataGridViewTextBoxColumn - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - groupBox1 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 34 + + functionDataGridViewTextBoxColumn - - Times New Roman, 9pt, style=Italic + + - - NoControl + + True - - 4, 61 + + - - 12, 16 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + useForCalcDataGridViewCheckBoxColumn - - c + + - - label13 + + 4, 82 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 42 - - groupBox1 + + panelFWHM - - 35 + + 85, 19 - - Times New Roman, 9pt, style=Italic + + groupBox1 - - NoControl + + groupBox3 - - 4, 82 + + 6, 16 - - 20, 16 + + 32 - - 1 + + 212, 12 - - α + + 57 - - label14 + + 20, 59 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GrowAndShrink - - groupBox1 + + NoControl - - 36 + + 42 - + Times New Roman, 9pt, style=Italic - - NoControl + + 8 - - 4, 102 + + 12, 16 - - 20, 16 + + True - - 1 + + groupBox1 - - β + + Disable - - label15 + + calcXDataGridViewTextBoxColumn - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ± - - groupBox1 + + NoControl - - 37 + + 4 - - Times New Roman, 9pt, style=Italic + + groupBox1 - + NoControl - - 4, 122 - - - 20, 16 + + Segoe UI Symbol, 9pt - - 1 + + 4 - - γ + + 27 - - label16 + + panelFWHM - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + textBoxGamma - - groupBox1 + + ± - - 38 + + 209, 60 - - Arial, 9pt + + Microsoft Sans Serif, 6pt - - 514, 299 + + 12, 16 - - 255, 212 + + 57 - - 41 + + 12, 16 Optimized cell constants - + + 9, 41 + + + 98, 19 + + groupBox1 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + PeakColor - - $this + + Microsoft Sans Serif, 9pt - - 8 + + 107, 103 - - Top, Right + + radioButtonPseudoVoigt - - True + + Times New Roman, 9pt, style=Italic - - GrowAndShrink + + 109, 19 - - NoControl + + 4, 143 - - 663, 0 + + textBoxBeta - - 114, 25 + + Calc X - - 54 + + Microsoft Sans Serif, 8.25pt - - Copy to Clipboard + + 95, 19 - - 647, 17 - - - Copy below table data to clipboard. -You can paste it to Excel directly. - - - buttonCopyTableToClipboard + + Peak function - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 20, 19 - - $this + + groupBox3 - - 5 + + - - Bottom, Left + + Disable - + True - - GrowAndShrink + + 16, 16 - - True + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Segoe UI Symbol, 9pt + + 1 - - NoControl + + groupBox4 - - 3, 3 + + Segoe UI Symbol, 9pt - - 100, 19 + + 4, 122 - - 56 + + groupBox1 - - in each crystal + + 1 - - radioButtonEachCrystal + + - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - flowLayoutPanelPatternDecomposition + + Fitting option - - 0 + + 123, 58 - - True + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Segoe UI Symbol, 9pt + + 74, 24 - + + 31, 16 + + NoControl - - 109, 3 + + Times New Roman, 9pt, style=Italic - - 112, 19 + + groupBox1 - + + 69 + + 57 - - between crystals + + groupBox1 - - radioButtonBetweenCrystals + + 85, 19 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - flowLayoutPanelPatternDecomposition + + 2 - - 1 + + numericUpDownSearchRange - - False + + Arial, 9pt - - 36, 179 + + 101, 15 - - 224, 25 + + + AAABAAMAEBAAAAAAGABoAwAANgAAACAgAAAAABgAqAwAAJ4DAAAgIBAAAAAEAOgCAABGEAAAKAAAABAA + AAAgAAAAAQAYAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAALv/u+P/4wAAAAAAAAAAAAAAAAAAAFpa/4aG + /wAAAAAAAAAAAAAAAMDzyzZi0x9RzMyQXZmlP1ntSN//3wAAAAAAAAAAAOfn/2pq/15e//+iov9aWtR+ + UxVFzmyezO3/7f/Y2P+MjPZBOEjtN9//3wAAAAAAAAAAAAAAAKsrfu1TZafxmkSzkDw9/QAAAAAAAAAA + AAAAAP/GxvRIPVP/UwAAAAAAAAAAAP/Jye09T1he+T3/PV5e/7Oz/wAAAAAAAAAAAAAAAAAAAP9+fpqt + SM3/zQAAAAAAAP9TU/vKzRkt6pv/myEh/wAAAAAAAAAAAAAAAAAAAAAAAP/m5vdBOVb/VgAAAP/j4/9I + SPz//A5Fx8/P/zU1/wAAAAAAAAAAAAAAAAAAAAAAAAAAAP9EREvqN/H/8f+iov+Jicn/ySduuGJi/2Ji + /wAAAAAAAAAAAAAAAAAAAAAAAAAAAP+FhbmiXaX/pf9lZf/Gxoz/jGWmvQAA/4aG/wAAAAAAAAAAAAAA + AAAAAAAAAAAAAP+/v+5oV2H/Yf9BQQAAAF3/XdHr5QAA/8/P/wAAAAAAAAAAAAAAAAAAAAAAAAAAAP/1 + 9f4yMkT/RP8yMgAAADb/NgAAAOPj/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP9ERGvfTP9PT/H/ + 8UH/QQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP9vb813Ret3Y83/zWX/ZQAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP+bm/onI7ypZqX/pYn/iQAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAP/19ep6ZmH/YX7/frT/tAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAPj/+C//L0T/RPH/8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIH/gVr/ + WgAAAAAAAAAAAAAAAAAAAAAAAAAAAD54AAAOAAAAB4MAAMcDAADjBwAA4gcAAPAHAADwBwAA8IcAAPCv + AAD4PwAA+D8AAPg/AAD4PwAA/D8AAP5/AAAoAAAAIAAAAEAAAAABABgAAAAAAAAMAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA7u7/qqr/iIj/0v/Sw//Dw//DAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZmb/MzP/d3f/3d3/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAtP+0HlXHDzPaI3eqQruFpf+lhv+GaP9oLP8slv+WAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAA7u7/iIj/AAD/3d3/AAAAAAAAAAAAAAAA/8PD/4aG8uHUO/87LVXWVGbtAAAAAAAAAAAA/5aW/1lZ + /6Wl5eHHWf9ZO/874f/hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzMz/ERH/3d3///Dw/0pK + /xwc/1lZ5KWKSOEqYIjXRET/AAAAAAAAAAAAAAAAAAAA/+Hh/6Wl/3d3/3d3tP+0LP8s4f/hAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAmZn/QDLw/zs7/7S0AAAA8P/wHP8c0u7jAAD/AAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA/6Wl/1lZ0v/SHP8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + /9LS/xwc6J20AAAAAAAAO/87lv+Wd3f/VVX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/6Wl + /zs7pf+lSv9KAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/zs7r2S0VVX/AAAApf+lO/87AAAAERH/ + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/4aG/5aWSv9K4f/hAAAAAAAAAAAAAAAA + AAAAAAAAAAAA/8PD/0pK3d3/AAD/AAAALP8s4f/h3d3/AAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAA//Dw/ywsw//DSv9KAAAAAAAAAAAAAAAAAAAAAAAAAAAA/0pK/+HhAAAAIiL/qd3L + Sv9KAAAAmZn/RET/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/4aG/5aWSv9K + 4f/hAAAAAAAAAAAAAAAAAAAA/9LS/0pKAAAAAAAAiIj/Hma24f/hAAAAd3f/d3f/AAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//Dw/ywsw//DSv9KAAAAAAAAAAAAAAAAAAAA/2ho/+Hh + AAAAAAAAqMzbDzPaAAAAAAAAMzP/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA/3d3/+HhSv9Kw//DAAAAAAAAAAAAAAAA/ywsAAAAAAAAAAAAd/93DxH9AAAAAAAAERH/AAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/7S0/2holv+WaP9oAAAAAAAA + AAAA/+Hh/0pKAAAAAAAAAAAALP8sMzP/AAAA7u7/AAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAA/xwc4f/hHP8cAAAAAAAAAAAA/5aW/4aGAAAAAAAA4f/hSv9KVVX/ + AAAAu7v/MzP/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/1lZ + /8PDLP8sAAAAAAAAAAAA/1lZ/+HhAAAAAAAAlv+Wpf+ld3f/mZn/d3f/Zmb/AAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/5aW/2hod/93hv+GAAAAAAAA/ywsAAAAAAAA + AAAAO/87AAAAqqr/RET/Zmb/u7v/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAA/8PD/0pKtP+0Sv9KAAAA//Dw/zs7AAAAAAAA8P/wHP8cAAAA7u7/AAD/ERH/AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/xwc8P/wHP8cAAAA + /8PD/2hoAAAAAAAAw//DSv9KAAAAAAAAmZn/d3f/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/ywsAAAAO/87AAAA/5aW/8PDAAAAAAAAlv+Wd/93AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + /1lZ/+Hhd/93hv+G/2hoAAAAAAAAAAAAaP9ow//DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/4aG/4aGpf+lWf9Z/zs7AAAAAAAAAAAA + Sv9KAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAA/8PD/0pK4f/hHP8c/xwcAAAAAAAAAAAAHP8cAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//Dw/xwcAAAAWMMc + /0pKAAAAAAAAAAAALP8sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/zs7AAAAkqU4/1lZAAAAAAAAw//DSv9KAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAA/3d3/4aGyHdB1YZcAAAAAAAAw//Dd/93AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/8PD/xwc+Cwld/93AAAAAAAAlv+W + pf+lAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA/3d344ZqSv9KAAAAAAAAhv+GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + HP8cAAAAAAAASv9KAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASv9K4f/hAAAAHP8cAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAlv+WaP9o0v/SWf9ZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8P/wLP8saP9ow//D + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApf+llv+WAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA////+B/8P+AH/h4HAf+AD4D/wh/w/8Yf+H/Ev/w/hD/8P5E//h8xP/4f + M3//D3N//w5yf/+OYn//jmB//4bof/+EyP//xMz//9TP///Bz///wd///8Hf///J3///6Z///+Gf///h + n///8b////2////8v////D////w////+f/8oAAAAIAAAAEAAAAABAAQAAAAAAAACAAAAAAAAAAAAABAA + AAAQAAAA7gQLAO7uUwAAAAAA////AIAAAAAzOP8AP/pNAICAgADAwMAAAAD/AAD/AAAA//8A/wAAAP8A + /wD//wAA////ACIiYiIiIiIiImIiIiIiKiIiImIiIiIiIiJiIiIiIioiIiJiIiIiIiIiYiIiIiIqIiIi + YiIiIiIiImIiIiIiKiIiImIiIiIiIiJiIiIiIioiIiJiIiIiIiIiYiIiIiIqIiIiYiIiIiIiImIiIiIi + KiIiImIiIiIiIiJiIiIiIioiIiJiIiIiIiIiYiIiIiIqIiIiYiIiIiIiImIiIiIiKiIiImIiIiIiIiJi + IiIiIioiIiJiIiIiIiIiYiIiIiIqIiIiYiIiIiIiImIiIiIiKiIiImIiIiIiIiJiIiIiIioiIiJiIiIi + IiIiYiIiIiIiIiIiYiIiIiIiImIiIiIiIiIiImIiIiIiIiJiIiIiIiIiIiJiIiIiIiIiYiIiIiIiIiIi + IiIiIiIiImIiIiIiIiIiIiIiIiIiIiJiIiIiIiIiIiIiIiIiIiIiYiIiIiIiIiIiIiIiIiIiImIiIiIi + IiIiIiIiIiIiIiJiIiIiIiIiIiIiIiIiIiIiYiIiIiIiIiIiIiIiIiIiImIiIiIiIiIiIiIiIiIiIiJi + IiIiIiIiIiIiIiIiIiIiYiIiIiIiIiIiIiIiIiIiImIiIiIiIiIiIiIiIiIiIiJiIiIiIiIiIiIiIiIi + IiIiYiIiIiIiIiIiIiIiIiIiImIiIiIiIiIiIiIiIiIiIiJiIiIiIiIi//////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////w= + - - 62 + + NoControl - - flowLayoutPanelPatternDecomposition + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox1 - - groupBox3 + + Microsoft Sans Serif, 9pt - - 0 + + Send d-values - - True + + 10 - - NoControl + + groupBox1 - - 6, 61 + + 31, 16 - - 143, 19 + + 42 - - 46 + + False - - Symmetric Pearson VII + + Copy to Clipboard - - radioButtonSymmetricPearson + + Top, Bottom, Left - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 20, 16 - - groupBox2 + + - - 0 + + - - True + + Crystal - - NoControl + + groupBox1 - - 6, 38 + + 16, 16 - - 155, 19 + + 25 - - 46 + + System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Symmetric Pseudo Voigt + + 1 - - radioButtonPseudoVoigt + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - groupBox2 + + 100, 19 - - 1 + + Disable - - True + + groupBox3 - + + contextMenuStrip1 + + NoControl - - 169, 38 + + groupBox1 - - 121, 19 + + $this - - 46 + + 85, 19 - - Split Pseudo Voigt + + 54 - - radioButtonSplitPseudoVoigt + + 70 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 110, 17 - - groupBox2 + + 0 - - 2 + + 85, 19 - - True + + copyToClipboradToolStripMenuItem - - NoControl + + buttonSendToCellFinder - - 6, 16 + + buttonApplyFWHMToAll - - 99, 19 + + 6 - - 46 + + 2 - - Simple Search + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - radioButtonSimple + + Disable - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + panelFWHM - - groupBox2 + + 1 - - 3 + + unit - - True + + - - NoControl + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 169, 61 + + True - - 109, 19 + + 85, 19 - - 46 + + groupBox3 - - Split Pearson VII + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - radioButtonSplitPearson + + 74, 24 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Set effective digit - - groupBox2 + + Copy below table data to clipboard. +You can paste it to Excel directly. - - 4 + + Top, Bottom, Left, Right - - NoControl + + True - - 212, 12 + + 61 - - 74, 24 + + - - 42 + + Apply to the crystal - - Apply to all + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - buttonApplyFunctionToAll + + True - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - + groupBox2 - - 5 - - - Segoe UI Symbol, 9pt + + False - - 4, 68 + + 1 - - 298, 86 + + NoControl - - 61 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Peak function + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox2 + + 56 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 677, 0 groupBox3 - - 1 + + groupBox2 - - 0, 3 + + 26 - - 75, 23 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + groupBox2 + + 54 - - numericUpDownInitialFWHM + + Set effective digit - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox2 - - panelFWHM + + True - - 0 + + Arial, 9pt - - NoControl + + 10 - - 106, 0 + + 216, 14 - - 74, 24 + + dataGridViewPlaneList - - 42 + + 143, 57 - - Apply to all + + 3 - - buttonApplyFWHMToAll + + Disable - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - panelFWHM + + 187, 105 - - 1 + + groupBox1 - - NoControl + + groupBox1 - - 76, 5 + + groupBox1 - - 31, 16 + + - - 1 + + Bottom, Left - - unit + + NoControl - - label1 + + 4 - + + buttonCopyTableToClipboard + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - panelFWHM + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 2 + + 46 - - False + + NoControl - - 110, 40 + + - - 180, 26 + + - - 60 + + 39 - - panelFWHM + + - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox3 + + True - - 2 + + 0 - - True + + numericBoxEffectiveDigit - + + 12 + + NoControl - - 12, 44 + + Disable - - 95, 19 + + NoControl - - 59 + + 110, 40 - - Initial FWHM + + label25 - - checkBoxUseInitialFWHM + + 12, 16 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + textBoxAlpha - - groupBox3 + + 1 - - 3 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + - - Segoe UI Symbol, 9pt + + textBoxGamma_err - - NoControl + + - - 12, 159 + + 119, 25 - - 148, 19 + + True - - 55 + + 12 - - Pattern Decomposition + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - checkBoxPatternDecomposition + + ± - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - groupBox3 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4 + + NoControl - - 110, 17 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 75, 23 + + 46 - - 54 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - numericUpDownSearchRange + + label20 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9pt - - groupBox3 + + NoControl - - 5 + + label4 - - NoControl + + radioButtonSimple - - 98, 19 + + 106, 0 - - 12, 16 + + 59 - - 1 + + label8 - - ± + + - - label7 + + True - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox3 + + - - 6 - - - NoControl + + Top, Right - - 9, 19 + + 20, 16 - - 93, 16 + + True - - 1 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Search Range + + xErrDataGridViewTextBoxColumn - - label2 + + True - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9pt - - groupBox3 + + 1000, 25 - - 7 + + Arial, 9pt - - NoControl + + - - 186, 19 + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 31, 16 + + flowLayoutPanelPatternDecomposition - - 1 + + Remove peaks - - unit + + ° - - label18 + + 0, 299 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 107, 83 - - groupBox3 + + GrowAndShrink - - 8 + + 12, 16 - - NoControl + + 312, 415 - - 216, 14 + + 0 - - 74, 24 + + groupBox1 - - 42 + + groupBox5 - - Apply to all + + NoControl - - buttonApplyRangeToAll + + NoControl - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 93, 16 - - groupBox3 + + NoControl - - 9 + + groupBox1 - - Segoe UI Symbol, 9pt + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 299 + + intensityDataGridViewTextBoxColumn - - 306, 212 + + 8 - - 52 + + hKLDataGridViewTextBoxColumn - - Fitting option + + Apply to all - - groupBox3 + + NoControl - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + radioButtonSymmetricPearson - - 6 + + 46 - - Top, Bottom, Left + + - - True - - - Check + + 187, 87 - - 20 + + 13 - - True - - - PeakColor + + - - 15 + + checkDataGridViewCheckBoxColumn - - Crystal + + - - 462, 17 - - - 131, 15 - - - 0, 0 + + - - 22 + + 12, 16 - - 196, 293 + + 8, 16 - - 53 + + groupBox2 - - dataGridViewCrystals + + - - System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 20, 141 - - $this + + - - 9 + + - - Top, Bottom, Left, Right + + Weight - - + + ° - - 25 + + False - - HKL + + True - - 54 + + checkBoxUseInitialFWHM - - Calc X + + - - 65 + + 0, 0, 0, 0 Func - - 58 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - X + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 39 + + 1 - - X Err + + Segoe UI Symbol, 11pt - - 56 + + 30 - - FWHM + + - - 69 + + - - Intensity + + 123, 140 - - 77 + + radioButtonSplitPseudoVoigt - - Weight + + 107, 42 - - 70 + + 0, 3 - - True - - - R + + Disable - - 39 + + groupBox3 - - 740, 17 - - - 168, 22 + + PDIndexer.DataSet, DataSet.Designer.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Copy to clipborad + + 107, 62 - - 169, 26 + + - - contextMenuStrip1 + + α - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 589, 265 - - 286, 17 - - - 202, 28 + + crystalDataGridViewTextBoxColumn - - 22 + + 57 - - 575, 265 + + 4 - - 55 + + 8 - - dataGridViewPlaneList + + 114, 25 - - System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 11 - - $this + + 12, 44 - - 7 + + 795, 514 - - Crystal + + 54 - - Plane + + Bottom, Left - - 40 + + True - - Bottom, Right + + buttonSaveTableAsCSV - - Segoe UI Symbol, 9pt + + Arial, 9pt - + + Arial, 9pt + + + + + NoControl - - 6, 20 + + 1 - - 143, 57 + + Disable - - 54 + + label18 - - Send d-values -to CellFinder -&& AtomicPositionFinder + + 75, 23 - - buttonSendToCellFinder + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - groupBox5 + + - - 0 + + 58 - - Plane + + textBoxA - - 40 + + 3 - - Crystal + + 12, 161 - - Crystal + + NoControl - - Plane + + 169, 26 - - Crystal + + $this - - Crystal + + NoControl - + - - 40 + + NoControl - - Crystal + + - - Crystal + + 123, 38 - - NoControl + + 8, 16 - - 43, 68 + + 1 - - 138, 23 + + label1 - - 56 + + 139, 25 - - Remove fitted peaks + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Remove fitted peaks of the selected crystal from the current profiles, and generate the new profile - + + 20 - - buttonRemovePeaks + + Disable - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + label9 - - groupBox4 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + - - Bottom, Left + + groupBox1 - - 9, 41 + + buttonConfirm - - 172, 23 + + - - 57 + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - textBoxRemovedProfileName + + Arial, 9pt - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9pt - - groupBox4 + + - - 0 + + 255, 212 - - True + + 123, 99 - - NoControl + + 85, 19 - - 6, 22 + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 101, 15 + + groupBox1 - - 1 - - - New profile name - - - label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 2 + + Symmetric Pseudo Voigt - - 312, 299 + + 85, 19 - - 187, 105 + + 1 - - 57 + + 1 - - Remove peaks + + 76, 5 - - groupBox4 + + groupBox1 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GrowAndShrink - - $this + + fWHMDataGridViewTextBoxColumn - - 3 + + - - Bottom, Left + + 107, 123 - - 312, 415 + + 109, 3 - - 187, 87 + + - - 57 + + 591, 0 - - Send d-values + + Remove fitted peaks - - groupBox5 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox1 - - $this + + 36, 179 - - 2 + + Times New Roman, 9pt, style=Italic - - Top, Right + + 20, 39 - - True + + 298, 86 - - GrowAndShrink + + 56 - + NoControl - - 577, 0 - - - 79, 25 - - - 54 - - - Save as CSV - - - Save below table data as CSV file format. - - - buttonSaveTableAsCSV - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this + + 196, 293 - - 4 + + textBoxC_err - - Crystal + + Times New Roman, 9pt, style=Italic - - Crystal + + 186, 19 - - Crystal + + 56 - - Crystal + + buttonRemovePeaks - - PeakColor + + Top, Right - - Crystal + + NoControl - - PeakColor + + True - - 15 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Crystal + + 0 - - PeakColor + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 15 + + Pattern Decomposition - - Crystal + + $this - - PeakColor + + 3 - - 15 + + - - Crystal + + 7 - - Crystal + + 306, 212 - - PlaneObject + + label3 - - PeakColor + + GrowAndShrink - - 15 + + NoControl - - PeakColor + + 20, 16 - - 15 + + label7 - - Crystal + + NoControl - - PeakColor + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 15 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Crystal + + 53 - - PeakColor + + γ - - 15 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Crystal + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top, Right + + Copy to Clipboard - - GrowAndShrink + + 65 - - Segoe UI Symbol, 11pt + + Send d-values +to CellFinder +&& AtomicPositionFinder - - Segoe UI Symbol, 9pt + + $this - - + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Segoe UI Symbol, 9pt + + 514, 299 - - Effective digit + + 7 - - 426, 0 + + 202, 28 - - 0, 0, 0, 0 + + 0, 0 - - 1000, 23 + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1, 23 + + 15, 15 - - 0, 0, 1, 0 + + 1 - - 139, 23 + + 43, 68 - - 58 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Set effective digit + + 8 - - Set effective digit + + NoControl - - numericBoxEffectiveDigit + + NoControl - - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2019.11.8.111, Culture=neutral, PublicKeyToken=null + + groupBox3 - - $this + + Times New Roman, 9pt, style=Italic - + 1 - - True - - - 101 - - - 96, 96 - - - 781, 514 + + GrowAndShrink - - Segoe UI Symbol, 9pt + + True - - - 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 - HP8cAAAAAAAASv9KAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASv9K4f/hAAAAHP8cAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAlv+WaP9o0v/SWf9ZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8P/wLP8saP9ow//D - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApf+llv+WAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA////+B/8P+AH/h4HAf+AD4D/wh/w/8Yf+H/Ev/w/hD/8P5E//h8xP/4f - M3//D3N//w5yf/+OYn//jmB//4bof/+EyP//xMz//9TP///Bz///wd///8Hf///J3///6Z///+Gf///h - n///8b////2////8v////D////w////+f/8oAAAAIAAAAEAAAAABAAQAAAAAAAACAAAAAAAAAAAAABAA - AAAQAAAA7gQLAO7uUwAAAAAA////AIAAAAAzOP8AP/pNAICAgADAwMAAAAD/AAD/AAAA//8A/wAAAP8A - /wD//wAA////ACIiYiIiIiIiImIiIiIiKiIiImIiIiIiIiJiIiIiIioiIiJiIiIiIiIiYiIiIiIqIiIi - YiIiIiIiImIiIiIiKiIiImIiIiIiIiJiIiIiIioiIiJiIiIiIiIiYiIiIiIqIiIiYiIiIiIiImIiIiIi - KiIiImIiIiIiIiJiIiIiIioiIiJiIiIiIiIiYiIiIiIqIiIiYiIiIiIiImIiIiIiKiIiImIiIiIiIiJi - IiIiIioiIiJiIiIiIiIiYiIiIiIqIiIiYiIiIiIiImIiIiIiKiIiImIiIiIiIiJiIiIiIioiIiJiIiIi - IiIiYiIiIiIiIiIiYiIiIiIiImIiIiIiIiIiImIiIiIiIiJiIiIiIiIiIiJiIiIiIiIiYiIiIiIiIiIi - IiIiIiIiImIiIiIiIiIiIiIiIiIiIiJiIiIiIiIiIiIiIiIiIiIiYiIiIiIiIiIiIiIiIiIiImIiIiIi - IiIiIiIiIiIiIiJiIiIiIiIiIiIiIiIiIiIiYiIiIiIiIiIiIiIiIiIiImIiIiIiIiIiIiIiIiIiIiJi - IiIiIiIiIiIiIiIiIiIiYiIiIiIiIiIiIiIiIiIiImIiIiIiIiIiIiIiIiIiIiJiIiIiIiIiIiIiIiIi - IiIiYiIiIiIiIiIiIiIiIiIiImIiIiIiIiIiIiIiIiIiIiJiIiIiIiIi//////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////w= - + + 4, 102 - - NoControl + + 209, 40 - - FormFitting + + 4, 68 - - Check + + Times New Roman, 9pt, style=Italic - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - bindingSourceCrystals + + GrowAndShrink - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - dataSet + + radioButtonSplitPearson - - PDIndexer.DataSet, DataSet.Designer.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - checkDataGridViewCheckBoxColumn + + 13 - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - hKLDataGridViewTextBoxColumn + + - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox4 - - calcXDataGridViewTextBoxColumn + + - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - functionDataGridViewTextBoxColumn + + flowLayoutPanelPatternDecomposition - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Simple Search - - xDataGridViewTextBoxColumn + + X Err - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - xErrDataGridViewTextBoxColumn + + 12, 16 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5 - - fWHMDataGridViewTextBoxColumn + + 28 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 12, 16 - - intensityDataGridViewTextBoxColumn + + 33 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + textBoxV_err - - weightDataGridViewTextBoxColumn + + 12 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - R + + label24 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 9, 9 - - copyToClipboradToolStripMenuItem + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - bindingSourcePlanes + + 55 - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 123, 79 - - dataGridViewTextBoxColumn1 + + Microsoft Sans Serif, 9pt - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5 - - dataGridViewTextBoxColumn2 + + - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6, 22 - - dataGridViewTextBoxColumn4 + + Microsoft Sans Serif, 9pt - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 42 - - dataGridViewTextBoxColumn3 + + 9 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - dataGridViewTextBoxColumn5 + + 123, 119 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - dataGridViewTextBoxColumn6 + + Arial, 9pt - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - dataGridViewTextBoxColumn7 + + groupBox1 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - dataGridViewTextBoxColumn8 + + groupBox1 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 210, 81 - - useForCalcDataGridViewCheckBoxColumn + + 1 - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - dataGridViewTextBoxColumn9 + + 55 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - dataGridViewTextBoxColumn10 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - toolTip + + 85, 19 - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 12, 16 - - dataGridViewTextBoxColumn11 + + - + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - dataGridViewTextBoxColumn12 + + - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - dataGridViewTextBoxColumn13 + + 77 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox1 - - dataGridViewTextBoxColumn14 + + 12, 159 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - dataGridViewTextBoxColumn15 + + textBoxB - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - dataGridViewTextBoxColumn16 + + 20 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - dataGridViewImageColumn1 + + 1 - - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - dataGridViewTextBoxColumn17 + + ± - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + FormFitting - - dataGridViewImageColumn2 + + dataSet - - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - dataGridViewTextBoxColumn18 + + - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9pt - - dataGridViewImageColumn3 + + 1 - - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Arial, 9pt - - dataGridViewTextBoxColumn19 + + b - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + textBoxC - - dataGridViewTextBoxColumn20 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - dataGridViewTextBoxColumn21 + + 5 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 18 - - dataGridViewImageColumn4 + + 0, 0, 1, 0 - - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - dataGridViewImageColumn5 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 20, 16 - - dataGridViewTextBoxColumn22 + + ± - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GrowAndShrink - - dataGridViewImageColumn6 + + 58 - - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 16, 16 - - dataGridViewTextBoxColumn23 + + 180, 26 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - dataGridViewImageColumn7 + + - - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + unit - - dataGridViewTextBoxColumn24 + + 54 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 11 - + PeakColor - - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - crystalDataGridViewTextBoxColumn + + label21 - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - FormFitting + + 11 - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + Arial, 9pt + + + Arial, 9pt + + + Segoe UI Symbol, 9pt + + True + + + True + + + True + + + 462, 17 + + + 740, 17 + + + 286, 17 + + + True + + + 131, 15 + + + 647, 17 + + + ja + + + 101 + \ No newline at end of file diff --git a/PDIndexer/FormMain.cs b/PDIndexer/FormMain.cs index d2e6121..6f07f72 100644 --- a/PDIndexer/FormMain.cs +++ b/PDIndexer/FormMain.cs @@ -1198,7 +1198,7 @@ public void DrawPrint(ref System.Drawing.Printing.PrintPageEventArgs e) return; } - FormPrintOption formPrintOption = new FormPrintOption(); + var formPrintOption = new FormPrintOption(); if (formPrintOption.ShowDialog() == DialogResult.OK) { @@ -1418,6 +1418,7 @@ private void DrawProfile() foreach (var trimmedPts in Geometriy.GetPointsWithinRectangle(srcPts, rect).Where(pts => pts.Length > 1)) { var finalPts = ConvToPicBoxCoord(trimmedPts); + //var finalPts = trimmedPts.Select(p => ConvToPicBoxCoord(p)).ToArray(); lock (lockObj) profiles.Add((pen, finalPts)); } @@ -1888,9 +1889,10 @@ private PointF[] ConvToPicBoxCoord(PointD[] p) var coeffX2 = - coeffX1 * LowerX + OriginPos.X; var coeffY1 = pictureBoxMain.Height - OriginPos.Y - BottomMargin; var coeffY2 = - coeffY1 / (UpperY - LowerY); - var coeffY3 = coeffY1 + coeffY2 * LowerY; + var coeffY3 = coeffY1 - coeffY2 * LowerY; for (int i= 0; i< result.Length; i++) - result[i] = new PointF((float)(coeffX1 * p[i].X + coeffX2), (float)(coeffY3 + coeffY2 * p[i].Y)); + result[i] = new PointF((float)(coeffX1 * p[i].X + coeffX2), + (float)(coeffY3 + coeffY2 * p[i].Y)); return result; } @@ -4587,8 +4589,11 @@ public CrystalClass(Macro _p) : base(_p.main) p.help.Add("PDI.Crystal.Pressure # Get the pressure (GPa) of the selected crystal by EOS."); } - public double CellVolume => Execute(() => ((Crystal)((DataRowView)p.main.bindingSourceCrystal.Current).Row[1]).Volume * 1000); - + + private Crystal SelectedCrystal => (Crystal)((DataRowView)p.main.bindingSourceCrystal.Current).Row[1]; + public double CellVolume => Execute(() => SelectedCrystal.Volume * 1000); + public double Pressure => Execute(() => SelectedCrystal.EOSCondition.GetPressure(SelectedCrystal.Volume * 1000)); + } diff --git a/PDIndexer/FormMain.resx b/PDIndexer/FormMain.resx index f8f3447..cadb4c1 100644 --- a/PDIndexer/FormMain.resx +++ b/PDIndexer/FormMain.resx @@ -238,7 +238,7 @@ horizontalAxisUserControl - Crystallography.Controls.HorizontalAxisUserControl, Crystallography.Controls, Version=2020.10.16.338, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.HorizontalAxisUserControl, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null tabPage1 @@ -590,7 +590,7 @@ numericalTextBoxIncreasingPixels - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.10.16.338, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null groupBox3 @@ -839,7 +839,7 @@ colorControlScaleText - Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.10.16.338, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null groupBox2 @@ -896,7 +896,7 @@ colorControlScaleLine - Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.10.16.338, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null groupBox2 @@ -953,7 +953,7 @@ colorControlBack - Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.10.16.338, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null groupBox2 @@ -1565,7 +1565,7 @@ graphControlFrequency - Crystallography.Controls.GraphControl, Crystallography.Controls, Version=2020.10.16.338, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.GraphControl, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null tabPage3 @@ -1703,7 +1703,7 @@ You can set the limit value in right-click menu. numericBoxUpperX - Crystallography.Controls.NumericBoxWithMenu, Crystallography.Controls, Version=2020.10.16.338, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBoxWithMenu, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1753,7 +1753,7 @@ You can set the limit value in right-click menu. numericBoxUpperY - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.10.16.338, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1797,7 +1797,7 @@ You can set the limit value in right-click menu. numericBoxLowerX - Crystallography.Controls.NumericBoxWithMenu, Crystallography.Controls, Version=2020.10.16.338, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBoxWithMenu, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1883,7 +1883,7 @@ You can set the limit value in right-click menu. numericBoxLowerY - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.10.16.338, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 diff --git a/PDIndexer/FormProfileSetting.Designer.cs b/PDIndexer/FormProfileSetting.Designer.cs index c01ef20..c61ad02 100644 --- a/PDIndexer/FormProfileSetting.Designer.cs +++ b/PDIndexer/FormProfileSetting.Designer.cs @@ -324,16 +324,15 @@ private void InitializeComponent() resources.ApplyResources(this.colorControlLineColor, "colorControlLineColor"); this.colorControlLineColor.Blue = 240; this.colorControlLineColor.BlueF = 0.9411765F; + this.colorControlLineColor.BoxSize = new System.Drawing.Size(20, 20); this.colorControlLineColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); - this.colorControlLineColor.FooterFont = new System.Drawing.Font("Segoe UI Symbol", 9.75F); - this.colorControlLineColor.FooterText = ""; + this.colorControlLineColor.FlowDirection = System.Windows.Forms.FlowDirection.LeftToRight; this.colorControlLineColor.Green = 240; this.colorControlLineColor.GreenF = 0.9411765F; this.colorControlLineColor.Name = "colorControlLineColor"; this.colorControlLineColor.Red = 240; this.colorControlLineColor.RedF = 0.9411765F; - this.colorControlLineColor.ToolTip = ""; - this.colorControlLineColor.ColorChanged += new EventHandler(this.colorControlLineColor_ColorChanged); + this.colorControlLineColor.ColorChanged += new System.EventHandler(this.colorControlLineColor_ColorChanged); // // numericUpDownLineWidth // @@ -681,30 +680,13 @@ private void InitializeComponent() // resources.ApplyResources(this.numericalTextBoxExposureTime, "numericalTextBoxExposureTime"); this.numericalTextBoxExposureTime.BackColor = System.Drawing.SystemColors.Control; - this.numericalTextBoxExposureTime.DecimalPlaces = -1; this.numericalTextBoxExposureTime.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericalTextBoxExposureTime.FooterForeColor = System.Drawing.SystemColors.ControlText; this.numericalTextBoxExposureTime.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericalTextBoxExposureTime.HeaderForeColor = System.Drawing.SystemColors.ControlText; - this.numericalTextBoxExposureTime.Maximum = double.PositiveInfinity; - this.numericalTextBoxExposureTime.Minimum = double.NegativeInfinity; - this.numericalTextBoxExposureTime.Multiline = false; this.numericalTextBoxExposureTime.Name = "numericalTextBoxExposureTime"; - this.numericalTextBoxExposureTime.RadianValue = 0D; - this.numericalTextBoxExposureTime.ReadOnly = false; - this.numericalTextBoxExposureTime.RestrictLimitValue = true; - this.numericalTextBoxExposureTime.ShowFraction = false; - this.numericalTextBoxExposureTime.ShowPositiveSign = false; - this.numericalTextBoxExposureTime.ShowUpDown = false; this.numericalTextBoxExposureTime.SkipEventDuringInput = false; this.numericalTextBoxExposureTime.SmartIncrement = true; - this.numericalTextBoxExposureTime.TextBoxBackColor = System.Drawing.SystemColors.Window; - this.numericalTextBoxExposureTime.TextBoxForeColor = System.Drawing.SystemColors.WindowText; this.numericalTextBoxExposureTime.TextFont = new System.Drawing.Font("メイリオ", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.numericalTextBoxExposureTime.ThonsandsSeparator = true; - this.numericalTextBoxExposureTime.UpDown_Increment = 1D; - this.numericalTextBoxExposureTime.Value = 0D; - this.numericalTextBoxExposureTime.WordWrap = true; // // label24 // @@ -856,28 +838,11 @@ private void InitializeComponent() this.numericBoxTwhoThetaOffsetCoeff2.BackColor = System.Drawing.SystemColors.Control; this.numericBoxTwhoThetaOffsetCoeff2.DecimalPlaces = 5; this.numericBoxTwhoThetaOffsetCoeff2.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxTwhoThetaOffsetCoeff2.FooterForeColor = System.Drawing.SystemColors.ControlText; this.numericBoxTwhoThetaOffsetCoeff2.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxTwhoThetaOffsetCoeff2.HeaderForeColor = System.Drawing.SystemColors.ControlText; - this.numericBoxTwhoThetaOffsetCoeff2.Maximum = double.PositiveInfinity; - this.numericBoxTwhoThetaOffsetCoeff2.Minimum = double.NegativeInfinity; - this.numericBoxTwhoThetaOffsetCoeff2.Multiline = false; this.numericBoxTwhoThetaOffsetCoeff2.Name = "numericBoxTwhoThetaOffsetCoeff2"; - this.numericBoxTwhoThetaOffsetCoeff2.RadianValue = 0D; - this.numericBoxTwhoThetaOffsetCoeff2.ReadOnly = false; - this.numericBoxTwhoThetaOffsetCoeff2.RestrictLimitValue = true; - this.numericBoxTwhoThetaOffsetCoeff2.ShowFraction = false; - this.numericBoxTwhoThetaOffsetCoeff2.ShowPositiveSign = false; - this.numericBoxTwhoThetaOffsetCoeff2.ShowUpDown = false; this.numericBoxTwhoThetaOffsetCoeff2.SkipEventDuringInput = false; this.numericBoxTwhoThetaOffsetCoeff2.SmartIncrement = true; - this.numericBoxTwhoThetaOffsetCoeff2.TextBoxBackColor = System.Drawing.SystemColors.Window; - this.numericBoxTwhoThetaOffsetCoeff2.TextBoxForeColor = System.Drawing.SystemColors.WindowText; - this.numericBoxTwhoThetaOffsetCoeff2.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9.75F); this.numericBoxTwhoThetaOffsetCoeff2.ThonsandsSeparator = true; - this.numericBoxTwhoThetaOffsetCoeff2.UpDown_Increment = 1D; - this.numericBoxTwhoThetaOffsetCoeff2.Value = 0D; - this.numericBoxTwhoThetaOffsetCoeff2.WordWrap = true; this.numericBoxTwhoThetaOffsetCoeff2.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.checkBoxTwoThetaOffset_CheckedChanged); // // numericBoxTwhoThetaOffsetCoeff0 @@ -886,28 +851,11 @@ private void InitializeComponent() this.numericBoxTwhoThetaOffsetCoeff0.BackColor = System.Drawing.SystemColors.Control; this.numericBoxTwhoThetaOffsetCoeff0.DecimalPlaces = 5; this.numericBoxTwhoThetaOffsetCoeff0.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxTwhoThetaOffsetCoeff0.FooterForeColor = System.Drawing.SystemColors.ControlText; this.numericBoxTwhoThetaOffsetCoeff0.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxTwhoThetaOffsetCoeff0.HeaderForeColor = System.Drawing.SystemColors.ControlText; - this.numericBoxTwhoThetaOffsetCoeff0.Maximum = double.PositiveInfinity; - this.numericBoxTwhoThetaOffsetCoeff0.Minimum = double.NegativeInfinity; - this.numericBoxTwhoThetaOffsetCoeff0.Multiline = false; this.numericBoxTwhoThetaOffsetCoeff0.Name = "numericBoxTwhoThetaOffsetCoeff0"; - this.numericBoxTwhoThetaOffsetCoeff0.RadianValue = 0D; - this.numericBoxTwhoThetaOffsetCoeff0.ReadOnly = false; - this.numericBoxTwhoThetaOffsetCoeff0.RestrictLimitValue = true; - this.numericBoxTwhoThetaOffsetCoeff0.ShowFraction = false; - this.numericBoxTwhoThetaOffsetCoeff0.ShowPositiveSign = false; - this.numericBoxTwhoThetaOffsetCoeff0.ShowUpDown = false; this.numericBoxTwhoThetaOffsetCoeff0.SkipEventDuringInput = false; this.numericBoxTwhoThetaOffsetCoeff0.SmartIncrement = true; - this.numericBoxTwhoThetaOffsetCoeff0.TextBoxBackColor = System.Drawing.SystemColors.Window; - this.numericBoxTwhoThetaOffsetCoeff0.TextBoxForeColor = System.Drawing.SystemColors.WindowText; - this.numericBoxTwhoThetaOffsetCoeff0.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9.75F); this.numericBoxTwhoThetaOffsetCoeff0.ThonsandsSeparator = true; - this.numericBoxTwhoThetaOffsetCoeff0.UpDown_Increment = 1D; - this.numericBoxTwhoThetaOffsetCoeff0.Value = 0D; - this.numericBoxTwhoThetaOffsetCoeff0.WordWrap = true; this.numericBoxTwhoThetaOffsetCoeff0.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.checkBoxTwoThetaOffset_CheckedChanged); // // buttonTwoThetaOffsetReset @@ -930,28 +878,11 @@ private void InitializeComponent() this.numericBoxTwhoThetaOffsetCoeff1.BackColor = System.Drawing.SystemColors.Control; this.numericBoxTwhoThetaOffsetCoeff1.DecimalPlaces = 5; this.numericBoxTwhoThetaOffsetCoeff1.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxTwhoThetaOffsetCoeff1.FooterForeColor = System.Drawing.SystemColors.ControlText; this.numericBoxTwhoThetaOffsetCoeff1.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxTwhoThetaOffsetCoeff1.HeaderForeColor = System.Drawing.SystemColors.ControlText; - this.numericBoxTwhoThetaOffsetCoeff1.Maximum = double.PositiveInfinity; - this.numericBoxTwhoThetaOffsetCoeff1.Minimum = double.NegativeInfinity; - this.numericBoxTwhoThetaOffsetCoeff1.Multiline = false; this.numericBoxTwhoThetaOffsetCoeff1.Name = "numericBoxTwhoThetaOffsetCoeff1"; - this.numericBoxTwhoThetaOffsetCoeff1.RadianValue = 0D; - this.numericBoxTwhoThetaOffsetCoeff1.ReadOnly = false; - this.numericBoxTwhoThetaOffsetCoeff1.RestrictLimitValue = true; - this.numericBoxTwhoThetaOffsetCoeff1.ShowFraction = false; - this.numericBoxTwhoThetaOffsetCoeff1.ShowPositiveSign = false; - this.numericBoxTwhoThetaOffsetCoeff1.ShowUpDown = false; this.numericBoxTwhoThetaOffsetCoeff1.SkipEventDuringInput = false; this.numericBoxTwhoThetaOffsetCoeff1.SmartIncrement = true; - this.numericBoxTwhoThetaOffsetCoeff1.TextBoxBackColor = System.Drawing.SystemColors.Window; - this.numericBoxTwhoThetaOffsetCoeff1.TextBoxForeColor = System.Drawing.SystemColors.WindowText; - this.numericBoxTwhoThetaOffsetCoeff1.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9.75F); this.numericBoxTwhoThetaOffsetCoeff1.ThonsandsSeparator = true; - this.numericBoxTwhoThetaOffsetCoeff1.UpDown_Increment = 1D; - this.numericBoxTwhoThetaOffsetCoeff1.Value = 0D; - this.numericBoxTwhoThetaOffsetCoeff1.WordWrap = true; this.numericBoxTwhoThetaOffsetCoeff1.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.checkBoxTwoThetaOffset_CheckedChanged); // // label25 @@ -1302,30 +1233,13 @@ private void InitializeComponent() // resources.ApplyResources(this.numericalTextBoxTargetValue, "numericalTextBoxTargetValue"); this.numericalTextBoxTargetValue.BackColor = System.Drawing.SystemColors.Control; - this.numericalTextBoxTargetValue.DecimalPlaces = -1; this.numericalTextBoxTargetValue.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericalTextBoxTargetValue.FooterForeColor = System.Drawing.SystemColors.ControlText; this.numericalTextBoxTargetValue.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericalTextBoxTargetValue.HeaderForeColor = System.Drawing.SystemColors.ControlText; - this.numericalTextBoxTargetValue.Maximum = double.PositiveInfinity; - this.numericalTextBoxTargetValue.Minimum = double.NegativeInfinity; - this.numericalTextBoxTargetValue.Multiline = false; this.numericalTextBoxTargetValue.Name = "numericalTextBoxTargetValue"; - this.numericalTextBoxTargetValue.RadianValue = 0D; - this.numericalTextBoxTargetValue.ReadOnly = false; - this.numericalTextBoxTargetValue.RestrictLimitValue = true; - this.numericalTextBoxTargetValue.ShowFraction = false; - this.numericalTextBoxTargetValue.ShowPositiveSign = false; - this.numericalTextBoxTargetValue.ShowUpDown = false; this.numericalTextBoxTargetValue.SkipEventDuringInput = false; this.numericalTextBoxTargetValue.SmartIncrement = true; - this.numericalTextBoxTargetValue.TextBoxBackColor = System.Drawing.SystemColors.Window; - this.numericalTextBoxTargetValue.TextBoxForeColor = System.Drawing.SystemColors.WindowText; this.numericalTextBoxTargetValue.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.numericalTextBoxTargetValue.ThonsandsSeparator = true; - this.numericalTextBoxTargetValue.UpDown_Increment = 1D; - this.numericalTextBoxTargetValue.Value = 0D; - this.numericalTextBoxTargetValue.WordWrap = true; // // listBoxTwoProfiles2 // diff --git a/PDIndexer/FormProfileSetting.resx b/PDIndexer/FormProfileSetting.resx index e28991f..0143783 100644 --- a/PDIndexer/FormProfileSetting.resx +++ b/PDIndexer/FormProfileSetting.resx @@ -261,6 +261,24 @@ Segoe UI Symbol, 9.75pt + + Segoe UI Symbol, 9.75pt + + + 0, 0, 0, 0 + + + + + + Segoe UI Symbol, 9.75pt + + + 0, 0, 0, 0 + + + + 74, 20 @@ -268,16 +286,19 @@ 0, 0, 0, 0 - 18, 18 + 20, 20 87 + + + colorControlLineColor - Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.5.1.707, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null groupBox3 @@ -1315,7 +1336,7 @@ xAxisUserControl - Crystallography.Controls.HorizontalAxisUserControl, Crystallography.Controls, Version=2020.5.1.707, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.HorizontalAxisUserControl, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null groupBox1 @@ -1449,18 +1470,6 @@ Segoe UI Symbol, 9.75pt - - Segoe UI Symbol, 9.75pt - - - - - - Segoe UI Symbol, 9.75pt - - - - 112, 26 @@ -1482,14 +1491,11 @@ 15 - - - numericalTextBoxExposureTime - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.5.1.707, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null groupBox2 @@ -1938,9 +1944,6 @@ Segoe UI Symbol, 9pt - - - 223, 5 @@ -1962,14 +1965,11 @@ 78 - - - numericBoxTwhoThetaOffsetCoeff2 - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.5.1.707, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null panelTwoThetaOffset @@ -1992,9 +1992,6 @@ Segoe UI Symbol, 9pt - - - 50, 5 @@ -2016,14 +2013,11 @@ 78 - - - numericBoxTwhoThetaOffsetCoeff0 - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.5.1.707, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null panelTwoThetaOffset @@ -2118,9 +2112,6 @@ Segoe UI Symbol, 9pt - - - 121, 5 @@ -2142,14 +2133,11 @@ 78 - - - numericBoxTwhoThetaOffsetCoeff1 - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.5.1.707, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null panelTwoThetaOffset @@ -2350,7 +2338,7 @@ 2 - 523, 22 + 431, 19 189, 22 @@ -2365,7 +2353,7 @@ Read Masking Ranges - 190, 48 + 190, 70 contextMenuStripMaskRange @@ -3321,18 +3309,6 @@ Segoe UI Symbol, 9.75pt - - Segoe UI Symbol, 9.75pt - - - - - - Segoe UI Symbol, 9.75pt - - - - 177, 1 @@ -3354,14 +3330,11 @@ 4 - - - numericalTextBoxTargetValue - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.5.1.707, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.10.16.836, Culture=neutral, PublicKeyToken=null flowLayoutPanelFourCalculator diff --git a/PDIndexer/Properties/AssemblyInfo.cs b/PDIndexer/Properties/AssemblyInfo.cs index 47a70c2..f8f81bb 100644 --- a/PDIndexer/Properties/AssemblyInfo.cs +++ b/PDIndexer/Properties/AssemblyInfo.cs @@ -27,7 +27,7 @@ // ɂ悤ɁA'*' gāAׂĂ̒lw肷邩A // rhуrWԍlɂ邱Ƃł܂B -[assembly: AssemblyVersion("2020.10.16.0833")] +[assembly: AssemblyVersion("2020.10.16.0943")] // // AZuɏɂ́AgpL[w肵Ȃ΂Ȃ܂B @@ -57,6 +57,6 @@ [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile("")] [assembly: AssemblyKeyName("")] -[assembly: AssemblyFileVersion("2020.10.16.0833")] +[assembly: AssemblyFileVersion("2020.10.16.0943")] [assembly: ComVisible(false)] diff --git a/PDIndexer/Version.cs b/PDIndexer/Version.cs index 6a904c0..28f05e2 100644 --- a/PDIndexer/Version.cs +++ b/PDIndexer/Version.cs @@ -27,7 +27,7 @@ static public string RecentHistory /// static public string History = "History" + - "\r\n ver4.389(2020/10/16) Improved: Speed up drawing profiles. Added: New macro functions." + + "\r\n ver4.390(2020/10/16) Improved: Speed up drawing profiles. Added: New macro functions." + "\r\n ver4.388(2020/10/15) Added new EOS foumulae (4th BM, AP2, Keane)." + "\r\n ver4.387(2020/10/14) Added three EOS for Re (Thank you, Dr. Sakai), and fixed minor bugs." + "\r\n ver4.386(2020/09/04) Fixed minor bugs. Thank you, Dr. Farla!" +