diff --git a/Crystallography.Controls/Properties/AssemblyInfo.cs b/Crystallography.Controls/Properties/AssemblyInfo.cs index 3f907e8..d79e52e 100644 --- a/Crystallography.Controls/Properties/AssemblyInfo.cs +++ b/Crystallography.Controls/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2020.7.28.1404")] -[assembly: AssemblyFileVersion("2020.7.28.1404")] \ No newline at end of file +[assembly: AssemblyVersion("2020.7.29.1125")] +[assembly: AssemblyFileVersion("2020.7.29.1125")] \ No newline at end of file diff --git a/Crystallography/Properties/AssemblyInfo.cs b/Crystallography/Properties/AssemblyInfo.cs index 68ea515..2f3b12c 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.7.28.1404")] +[assembly: AssemblyVersion("2020.7.29.1125")] // // AZuɏɂ́AgpL[w肵Ȃ΂Ȃ܂B @@ -57,5 +57,5 @@ [assembly: AssemblyKeyFile("")] [assembly: AssemblyKeyName("")] [assembly: ComVisibleAttribute(true)] -[assembly: AssemblyFileVersion("2020.7.28.1404")] +[assembly: AssemblyFileVersion("2020.7.29.1125")] diff --git a/PDIndexer/FormCrystal.Designer.cs b/PDIndexer/FormCrystal.Designer.cs index 9a248a8..7470931 100644 --- a/PDIndexer/FormCrystal.Designer.cs +++ b/PDIndexer/FormCrystal.Designer.cs @@ -43,6 +43,11 @@ private void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormCrystal)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.crystalControl = new Crystallography.Controls.CrystalControl(); + this.panel2 = new System.Windows.Forms.Panel(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.buttonChange = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.dataGridViewCrystal = new System.Windows.Forms.DataGridView(); this.checkDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); @@ -55,14 +60,7 @@ private void InitializeComponent() this.buttonLower = new System.Windows.Forms.Button(); this.buttonDelete = new System.Windows.Forms.Button(); this.buttonAllClear = new System.Windows.Forms.Button(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.crystalControl = new Crystallography.Controls.CrystalControl(); - this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); - this.buttonAdd = new System.Windows.Forms.Button(); - this.buttonChange = new System.Windows.Forms.Button(); - this.toolTip = new System.Windows.Forms.ToolTip(this.components); - this.checkBoxVariableRatioOfIntensity = new System.Windows.Forms.CheckBox(); - this.checkBoxCalculateIntensity = new System.Windows.Forms.CheckBox(); + this.panel3 = new System.Windows.Forms.Panel(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.radioButtonAngleThreshold = new System.Windows.Forms.RadioButton(); @@ -82,8 +80,16 @@ private void InitializeComponent() this.checkBoxShowPeakOverProfiles = new System.Windows.Forms.CheckBox(); this.checkBoxShowPeakIndices = new System.Windows.Forms.CheckBox(); this.checkBoxInvisibleWeakPeak = new System.Windows.Forms.CheckBox(); + this.checkBoxVariableRatioOfIntensity = new System.Windows.Forms.CheckBox(); + this.checkBoxCalculateIntensity = new System.Windows.Forms.CheckBox(); this.label6 = new System.Windows.Forms.Label(); this.checkBoxShowPeakUnderProfile = new System.Windows.Forms.CheckBox(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.crystalDatabaseControl = new Crystallography.Controls.CrystalDatabaseControl(); + this.panel1 = new System.Windows.Forms.Panel(); + this.searchCrystalControl = new Crystallography.Controls.SearchCrystalControl(); + this.buttonSearch = new System.Windows.Forms.Button(); + this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -93,13 +99,13 @@ private void InitializeComponent() this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.panel2.SuspendLayout(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewCrystal)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataSet)).BeginInit(); this.flowLayoutPanel3.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.flowLayoutPanel2.SuspendLayout(); this.groupBox2.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAngleThreshold)).BeginInit(); @@ -107,21 +113,92 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.numericUpDownEnergyThreshold)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownThresholdIntesity)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownHeightOfBottomPeak)).BeginInit(); + this.groupBox4.SuspendLayout(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // splitContainer1 // resources.ApplyResources(this.splitContainer1, "splitContainer1"); + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; this.splitContainer1.Name = "splitContainer1"; // // splitContainer1.Panel1 // + resources.ApplyResources(this.splitContainer1.Panel1, "splitContainer1.Panel1"); + this.splitContainer1.Panel1.Controls.Add(this.groupBox3); + this.splitContainer1.Panel1.Controls.Add(this.panel2); this.splitContainer1.Panel1.Controls.Add(this.groupBox1); + this.splitContainer1.Panel1.Controls.Add(this.panel3); + this.splitContainer1.Panel1.Controls.Add(this.groupBox2); + this.toolTip.SetToolTip(this.splitContainer1.Panel1, resources.GetString("splitContainer1.Panel1.ToolTip")); // // splitContainer1.Panel2 // - this.splitContainer1.Panel2.Controls.Add(this.groupBox3); - this.splitContainer1.Panel2.Controls.Add(this.flowLayoutPanel2); + resources.ApplyResources(this.splitContainer1.Panel2, "splitContainer1.Panel2"); + this.splitContainer1.Panel2.Controls.Add(this.groupBox4); + this.toolTip.SetToolTip(this.splitContainer1.Panel2, resources.GetString("splitContainer1.Panel2.ToolTip")); + this.toolTip.SetToolTip(this.splitContainer1, resources.GetString("splitContainer1.ToolTip")); + // + // groupBox3 + // + resources.ApplyResources(this.groupBox3, "groupBox3"); + this.groupBox3.Controls.Add(this.crystalControl); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.TabStop = false; + this.toolTip.SetToolTip(this.groupBox3, resources.GetString("groupBox3.ToolTip")); + // + // crystalControl + // + resources.ApplyResources(this.crystalControl, "crystalControl"); + this.crystalControl.AllowDrop = true; + this.crystalControl.CellConstants = ((System.ValueTuple)(resources.GetObject("crystalControl.CellConstants"))); + this.crystalControl.Crystal = ((Crystallography.Crystal)(resources.GetObject("crystalControl.Crystal"))); + this.crystalControl.DefaultTabNumber = 0; + this.crystalControl.Name = "crystalControl"; + this.crystalControl.ScatteringFactorVisible = false; + this.crystalControl.SkipEvent = false; + this.crystalControl.SymmetryInformationVisible = false; + this.crystalControl.SymmetrySeriesNumber = 0; + this.toolTip.SetToolTip(this.crystalControl, resources.GetString("crystalControl.ToolTip")); + this.crystalControl.VisibleAtomTab = true; + this.crystalControl.VisibleBasicInfoTab = true; + this.crystalControl.VisibleBondsPolyhedraTab = false; + this.crystalControl.VisibleBoundTab = false; + this.crystalControl.VisibleElasticityTab = false; + this.crystalControl.VisibleEOSTab = true; + this.crystalControl.VisibleLatticePlaneTab = false; + this.crystalControl.VisiblePolycrystallineTab = false; + this.crystalControl.VisibleReferenceTab = true; + this.crystalControl.VisibleStressStrainTab = false; + // + // panel2 + // + resources.ApplyResources(this.panel2, "panel2"); + this.panel2.Controls.Add(this.buttonAdd); + this.panel2.Controls.Add(this.buttonChange); + this.panel2.Name = "panel2"; + this.toolTip.SetToolTip(this.panel2, resources.GetString("panel2.ToolTip")); + // + // buttonAdd + // + resources.ApplyResources(this.buttonAdd, "buttonAdd"); + this.buttonAdd.BackColor = System.Drawing.Color.SteelBlue; + this.buttonAdd.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.buttonAdd.Name = "buttonAdd"; + this.toolTip.SetToolTip(this.buttonAdd, resources.GetString("buttonAdd.ToolTip")); + this.buttonAdd.UseVisualStyleBackColor = false; + this.buttonAdd.Click += new System.EventHandler(this.buttonAddCrystal_Click); + // + // buttonChange + // + resources.ApplyResources(this.buttonChange, "buttonChange"); + this.buttonChange.BackColor = System.Drawing.Color.SteelBlue; + this.buttonChange.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.buttonChange.Name = "buttonChange"; + this.toolTip.SetToolTip(this.buttonChange, resources.GetString("buttonChange.ToolTip")); + this.buttonChange.UseVisualStyleBackColor = false; + this.buttonChange.Click += new System.EventHandler(this.buttonChangeCrystal_Click); // // groupBox1 // @@ -131,9 +208,11 @@ private void InitializeComponent() this.groupBox1.Controls.Add(this.flowLayoutPanel3); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; + this.toolTip.SetToolTip(this.groupBox1, resources.GetString("groupBox1.ToolTip")); // // dataGridViewCrystal // + resources.ApplyResources(this.dataGridViewCrystal, "dataGridViewCrystal"); this.dataGridViewCrystal.AllowUserToAddRows = false; this.dataGridViewCrystal.AllowUserToDeleteRows = false; this.dataGridViewCrystal.AllowUserToResizeColumns = false; @@ -141,7 +220,6 @@ private void InitializeComponent() this.dataGridViewCrystal.AutoGenerateColumns = false; this.dataGridViewCrystal.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dataGridViewCrystal.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - resources.ApplyResources(this.dataGridViewCrystal, "dataGridViewCrystal"); this.dataGridViewCrystal.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dataGridViewCrystal.ColumnHeadersVisible = false; this.dataGridViewCrystal.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -151,7 +229,7 @@ private void InitializeComponent() this.dataGridViewCrystal.DataSource = this.bindingSource; dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("Segoe UI Symbol", 9.75F); + dataGridViewCellStyle1.Font = new System.Drawing.Font("CI", 10F, System.Drawing.FontStyle.Bold); dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.Blue; dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; @@ -165,6 +243,7 @@ private void InitializeComponent() this.dataGridViewCrystal.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.dataGridViewCrystal.RowTemplate.Height = 21; this.dataGridViewCrystal.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.toolTip.SetToolTip(this.dataGridViewCrystal, resources.GetString("dataGridViewCrystal.ToolTip")); this.dataGridViewCrystal.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridViewCrystal_CellMouseClick); this.dataGridViewCrystal.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridViewCrystal_CellMouseClick); // @@ -213,25 +292,29 @@ private void InitializeComponent() this.flowLayoutPanel3.Controls.Add(this.buttonDelete); this.flowLayoutPanel3.Controls.Add(this.buttonAllClear); this.flowLayoutPanel3.Name = "flowLayoutPanel3"; + this.toolTip.SetToolTip(this.flowLayoutPanel3, resources.GetString("flowLayoutPanel3.ToolTip")); // // buttonUpper // resources.ApplyResources(this.buttonUpper, "buttonUpper"); this.buttonUpper.Name = "buttonUpper"; + this.toolTip.SetToolTip(this.buttonUpper, resources.GetString("buttonUpper.ToolTip")); this.buttonUpper.Click += new System.EventHandler(this.buttonUpper_Click); // // buttonLower // resources.ApplyResources(this.buttonLower, "buttonLower"); this.buttonLower.Name = "buttonLower"; + this.toolTip.SetToolTip(this.buttonLower, resources.GetString("buttonLower.ToolTip")); this.buttonLower.Click += new System.EventHandler(this.buttonLower_Click); // // buttonDelete // - this.buttonDelete.BackColor = System.Drawing.Color.IndianRed; resources.ApplyResources(this.buttonDelete, "buttonDelete"); + this.buttonDelete.BackColor = System.Drawing.Color.IndianRed; this.buttonDelete.ForeColor = System.Drawing.Color.White; this.buttonDelete.Name = "buttonDelete"; + this.toolTip.SetToolTip(this.buttonDelete, resources.GetString("buttonDelete.ToolTip")); this.buttonDelete.UseVisualStyleBackColor = false; this.buttonDelete.Click += new System.EventHandler(this.buttonDeleteCrystal_Click); // @@ -241,85 +324,19 @@ private void InitializeComponent() this.buttonAllClear.BackColor = System.Drawing.Color.DarkRed; this.buttonAllClear.ForeColor = System.Drawing.Color.White; this.buttonAllClear.Name = "buttonAllClear"; + this.toolTip.SetToolTip(this.buttonAllClear, resources.GetString("buttonAllClear.ToolTip")); this.buttonAllClear.UseVisualStyleBackColor = false; this.buttonAllClear.Click += new System.EventHandler(this.buttonAllClear_Click); // - // groupBox3 - // - this.groupBox3.Controls.Add(this.crystalControl); - resources.ApplyResources(this.groupBox3, "groupBox3"); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.TabStop = false; - // - // crystalControl - // - this.crystalControl.AllowDrop = true; - resources.ApplyResources(this.crystalControl, "crystalControl"); - this.crystalControl.Crystal = null; - this.crystalControl.DefaultTabNumber = 0; - this.crystalControl.Name = "crystalControl"; - this.crystalControl.ScatteringFactorVisible = false; - this.crystalControl.SymmetryInformationVisible = false; - this.crystalControl.SymmetrySeriesNumber = 0; - this.crystalControl.VisibleAtomTab = true; - this.crystalControl.VisibleBasicInfoTab = true; - this.crystalControl.VisibleBondsPolyhedraTab = false; - this.crystalControl.VisibleBoundTab = false; - this.crystalControl.VisibleElasticityTab = false; - this.crystalControl.VisibleEOSTab = true; - this.crystalControl.VisibleLatticePlaneTab = false; - this.crystalControl.VisiblePolycrystallineTab = false; - this.crystalControl.VisibleReferenceTab = true; - this.crystalControl.VisibleStressStrainTab = false; - // - // flowLayoutPanel2 - // - resources.ApplyResources(this.flowLayoutPanel2, "flowLayoutPanel2"); - this.flowLayoutPanel2.Controls.Add(this.buttonAdd); - this.flowLayoutPanel2.Controls.Add(this.buttonChange); - this.flowLayoutPanel2.Name = "flowLayoutPanel2"; - // - // buttonAdd - // - resources.ApplyResources(this.buttonAdd, "buttonAdd"); - this.buttonAdd.BackColor = System.Drawing.Color.SteelBlue; - this.buttonAdd.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.buttonAdd.Name = "buttonAdd"; - this.buttonAdd.UseVisualStyleBackColor = false; - this.buttonAdd.Click += new System.EventHandler(this.buttonAddCrystal_Click); - // - // buttonChange - // - resources.ApplyResources(this.buttonChange, "buttonChange"); - this.buttonChange.BackColor = System.Drawing.Color.SteelBlue; - this.buttonChange.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.buttonChange.Name = "buttonChange"; - this.buttonChange.UseVisualStyleBackColor = false; - this.buttonChange.Click += new System.EventHandler(this.buttonChangeCrystal_Click); - // - // toolTip - // - this.toolTip.IsBalloon = true; - // - // checkBoxVariableRatioOfIntensity - // - resources.ApplyResources(this.checkBoxVariableRatioOfIntensity, "checkBoxVariableRatioOfIntensity"); - this.checkBoxVariableRatioOfIntensity.Name = "checkBoxVariableRatioOfIntensity"; - this.toolTip.SetToolTip(this.checkBoxVariableRatioOfIntensity, resources.GetString("checkBoxVariableRatioOfIntensity.ToolTip")); - this.checkBoxVariableRatioOfIntensity.UseVisualStyleBackColor = true; + // panel3 // - // checkBoxCalculateIntensity - // - resources.ApplyResources(this.checkBoxCalculateIntensity, "checkBoxCalculateIntensity"); - this.checkBoxCalculateIntensity.Checked = true; - this.checkBoxCalculateIntensity.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBoxCalculateIntensity.Name = "checkBoxCalculateIntensity"; - this.toolTip.SetToolTip(this.checkBoxCalculateIntensity, resources.GetString("checkBoxCalculateIntensity.ToolTip")); - this.checkBoxCalculateIntensity.UseVisualStyleBackColor = true; - this.checkBoxCalculateIntensity.CheckedChanged += new System.EventHandler(this.checkBoxCalculateIntensity_CheckedChanged); + resources.ApplyResources(this.panel3, "panel3"); + this.panel3.Name = "panel3"; + this.toolTip.SetToolTip(this.panel3, resources.GetString("panel3.ToolTip")); // // groupBox2 // + resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.BackColor = System.Drawing.SystemColors.Control; this.groupBox2.Controls.Add(this.flowLayoutPanel1); this.groupBox2.Controls.Add(this.checkBoxCombineSameDspacingPeaks); @@ -335,20 +352,21 @@ private void InitializeComponent() this.groupBox2.Controls.Add(this.checkBoxCalculateIntensity); this.groupBox2.Controls.Add(this.label6); this.groupBox2.Controls.Add(this.checkBoxShowPeakUnderProfile); - resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Name = "groupBox2"; this.groupBox2.TabStop = false; + this.toolTip.SetToolTip(this.groupBox2, resources.GetString("groupBox2.ToolTip")); // // flowLayoutPanel1 // + resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1"); this.flowLayoutPanel1.Controls.Add(this.radioButtonAngleThreshold); this.flowLayoutPanel1.Controls.Add(this.numericUpDownAngleThreshold); this.flowLayoutPanel1.Controls.Add(this.label5); this.flowLayoutPanel1.Controls.Add(this.radioButtonEnergyThreshold); this.flowLayoutPanel1.Controls.Add(this.numericUpDownEnergyThreshold); this.flowLayoutPanel1.Controls.Add(this.label1); - resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1"); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + this.toolTip.SetToolTip(this.flowLayoutPanel1, resources.GetString("flowLayoutPanel1.ToolTip")); // // radioButtonAngleThreshold // @@ -356,13 +374,14 @@ private void InitializeComponent() this.radioButtonAngleThreshold.Checked = true; this.radioButtonAngleThreshold.Name = "radioButtonAngleThreshold"; this.radioButtonAngleThreshold.TabStop = true; + this.toolTip.SetToolTip(this.radioButtonAngleThreshold, resources.GetString("radioButtonAngleThreshold.ToolTip")); this.radioButtonAngleThreshold.UseVisualStyleBackColor = true; // // numericUpDownAngleThreshold // + resources.ApplyResources(this.numericUpDownAngleThreshold, "numericUpDownAngleThreshold"); this.numericUpDownAngleThreshold.ContextMenuStrip = this.contextMenuStrip1; this.numericUpDownAngleThreshold.DecimalPlaces = 3; - resources.ApplyResources(this.numericUpDownAngleThreshold, "numericUpDownAngleThreshold"); this.numericUpDownAngleThreshold.Increment = new decimal(new int[] { 1, 0, @@ -374,6 +393,7 @@ private void InitializeComponent() 0, 0}); this.numericUpDownAngleThreshold.Name = "numericUpDownAngleThreshold"; + this.toolTip.SetToolTip(this.numericUpDownAngleThreshold, resources.GetString("numericUpDownAngleThreshold.ToolTip")); this.numericUpDownAngleThreshold.Value = new decimal(new int[] { 1, 0, @@ -384,39 +404,43 @@ private void InitializeComponent() // // contextMenuStrip1 // + resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1"); this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(32, 32); this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.incrementToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.ShowImageMargin = false; - resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1"); + this.toolTip.SetToolTip(this.contextMenuStrip1, resources.GetString("contextMenuStrip1.ToolTip")); // // incrementToolStripMenuItem // - this.incrementToolStripMenuItem.Name = "incrementToolStripMenuItem"; resources.ApplyResources(this.incrementToolStripMenuItem, "incrementToolStripMenuItem"); + this.incrementToolStripMenuItem.Name = "incrementToolStripMenuItem"; // // label5 // resources.ApplyResources(this.label5, "label5"); this.label5.Name = "label5"; + this.toolTip.SetToolTip(this.label5, resources.GetString("label5.ToolTip")); // // radioButtonEnergyThreshold // resources.ApplyResources(this.radioButtonEnergyThreshold, "radioButtonEnergyThreshold"); this.radioButtonEnergyThreshold.Name = "radioButtonEnergyThreshold"; + this.toolTip.SetToolTip(this.radioButtonEnergyThreshold, resources.GetString("radioButtonEnergyThreshold.ToolTip")); this.radioButtonEnergyThreshold.UseVisualStyleBackColor = true; // // numericUpDownEnergyThreshold // - this.numericUpDownEnergyThreshold.DecimalPlaces = 1; resources.ApplyResources(this.numericUpDownEnergyThreshold, "numericUpDownEnergyThreshold"); + this.numericUpDownEnergyThreshold.DecimalPlaces = 1; this.numericUpDownEnergyThreshold.Maximum = new decimal(new int[] { 1000, 0, 0, 0}); this.numericUpDownEnergyThreshold.Name = "numericUpDownEnergyThreshold"; + this.toolTip.SetToolTip(this.numericUpDownEnergyThreshold, resources.GetString("numericUpDownEnergyThreshold.ToolTip")); this.numericUpDownEnergyThreshold.Value = new decimal(new int[] { 5, 0, @@ -429,6 +453,7 @@ private void InitializeComponent() // resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; + this.toolTip.SetToolTip(this.label1, resources.GetString("label1.ToolTip")); // // checkBoxCombineSameDspacingPeaks // @@ -436,6 +461,7 @@ private void InitializeComponent() this.checkBoxCombineSameDspacingPeaks.Checked = true; this.checkBoxCombineSameDspacingPeaks.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxCombineSameDspacingPeaks.Name = "checkBoxCombineSameDspacingPeaks"; + this.toolTip.SetToolTip(this.checkBoxCombineSameDspacingPeaks, resources.GetString("checkBoxCombineSameDspacingPeaks.ToolTip")); this.checkBoxCombineSameDspacingPeaks.UseVisualStyleBackColor = true; this.checkBoxCombineSameDspacingPeaks.CheckedChanged += new System.EventHandler(this.checkBoxCombineSameDspacingPeaks_CheckedChanged); // @@ -443,6 +469,7 @@ private void InitializeComponent() // resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; + this.toolTip.SetToolTip(this.label3, resources.GetString("label3.ToolTip")); // // radioButtonAllCheckedCrystals // @@ -450,20 +477,23 @@ private void InitializeComponent() this.radioButtonAllCheckedCrystals.Checked = true; this.radioButtonAllCheckedCrystals.Name = "radioButtonAllCheckedCrystals"; this.radioButtonAllCheckedCrystals.TabStop = true; + this.toolTip.SetToolTip(this.radioButtonAllCheckedCrystals, resources.GetString("radioButtonAllCheckedCrystals.ToolTip")); this.radioButtonAllCheckedCrystals.UseVisualStyleBackColor = true; // // radioButtonOnlySelectedCrystal // resources.ApplyResources(this.radioButtonOnlySelectedCrystal, "radioButtonOnlySelectedCrystal"); this.radioButtonOnlySelectedCrystal.Name = "radioButtonOnlySelectedCrystal"; + this.toolTip.SetToolTip(this.radioButtonOnlySelectedCrystal, resources.GetString("radioButtonOnlySelectedCrystal.ToolTip")); this.radioButtonOnlySelectedCrystal.UseVisualStyleBackColor = true; this.radioButtonOnlySelectedCrystal.CheckedChanged += new System.EventHandler(this.radioButtonOnlySelectedCrystal_CheckedChanged); // // numericUpDownThresholdIntesity // - this.numericUpDownThresholdIntesity.DecimalPlaces = 1; resources.ApplyResources(this.numericUpDownThresholdIntesity, "numericUpDownThresholdIntesity"); + this.numericUpDownThresholdIntesity.DecimalPlaces = 1; this.numericUpDownThresholdIntesity.Name = "numericUpDownThresholdIntesity"; + this.toolTip.SetToolTip(this.numericUpDownThresholdIntesity, resources.GetString("numericUpDownThresholdIntesity.ToolTip")); this.numericUpDownThresholdIntesity.Value = new decimal(new int[] { 1, 0, @@ -476,6 +506,7 @@ private void InitializeComponent() // resources.ApplyResources(this.numericUpDownHeightOfBottomPeak, "numericUpDownHeightOfBottomPeak"); this.numericUpDownHeightOfBottomPeak.Name = "numericUpDownHeightOfBottomPeak"; + this.toolTip.SetToolTip(this.numericUpDownHeightOfBottomPeak, resources.GetString("numericUpDownHeightOfBottomPeak.ToolTip")); this.numericUpDownHeightOfBottomPeak.Value = new decimal(new int[] { 5, 0, @@ -490,15 +521,17 @@ private void InitializeComponent() this.checkBoxShowPeakOverProfiles.Checked = true; this.checkBoxShowPeakOverProfiles.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxShowPeakOverProfiles.Name = "checkBoxShowPeakOverProfiles"; + this.toolTip.SetToolTip(this.checkBoxShowPeakOverProfiles, resources.GetString("checkBoxShowPeakOverProfiles.ToolTip")); this.checkBoxShowPeakOverProfiles.UseVisualStyleBackColor = true; this.checkBoxShowPeakOverProfiles.CheckedChanged += new System.EventHandler(this.checkBoxShowPeakOverProfiles_CheckedChanged); // // checkBoxShowPeakIndices // + resources.ApplyResources(this.checkBoxShowPeakIndices, "checkBoxShowPeakIndices"); this.checkBoxShowPeakIndices.Checked = true; this.checkBoxShowPeakIndices.CheckState = System.Windows.Forms.CheckState.Checked; - resources.ApplyResources(this.checkBoxShowPeakIndices, "checkBoxShowPeakIndices"); this.checkBoxShowPeakIndices.Name = "checkBoxShowPeakIndices"; + this.toolTip.SetToolTip(this.checkBoxShowPeakIndices, resources.GetString("checkBoxShowPeakIndices.ToolTip")); this.checkBoxShowPeakIndices.UseVisualStyleBackColor = true; this.checkBoxShowPeakIndices.CheckedChanged += new System.EventHandler(this.checkBoxCombineSameDspacingPeaks_CheckedChanged); // @@ -506,21 +539,87 @@ private void InitializeComponent() // resources.ApplyResources(this.checkBoxInvisibleWeakPeak, "checkBoxInvisibleWeakPeak"); this.checkBoxInvisibleWeakPeak.Name = "checkBoxInvisibleWeakPeak"; + this.toolTip.SetToolTip(this.checkBoxInvisibleWeakPeak, resources.GetString("checkBoxInvisibleWeakPeak.ToolTip")); this.checkBoxInvisibleWeakPeak.UseVisualStyleBackColor = true; this.checkBoxInvisibleWeakPeak.CheckedChanged += new System.EventHandler(this.checkBoxInvisibleWeakPeak_CheckedChanged); // + // checkBoxVariableRatioOfIntensity + // + resources.ApplyResources(this.checkBoxVariableRatioOfIntensity, "checkBoxVariableRatioOfIntensity"); + this.checkBoxVariableRatioOfIntensity.Name = "checkBoxVariableRatioOfIntensity"; + this.toolTip.SetToolTip(this.checkBoxVariableRatioOfIntensity, resources.GetString("checkBoxVariableRatioOfIntensity.ToolTip")); + this.checkBoxVariableRatioOfIntensity.UseVisualStyleBackColor = true; + // + // checkBoxCalculateIntensity + // + resources.ApplyResources(this.checkBoxCalculateIntensity, "checkBoxCalculateIntensity"); + this.checkBoxCalculateIntensity.Checked = true; + this.checkBoxCalculateIntensity.CheckState = System.Windows.Forms.CheckState.Checked; + this.checkBoxCalculateIntensity.Name = "checkBoxCalculateIntensity"; + this.toolTip.SetToolTip(this.checkBoxCalculateIntensity, resources.GetString("checkBoxCalculateIntensity.ToolTip")); + this.checkBoxCalculateIntensity.UseVisualStyleBackColor = true; + this.checkBoxCalculateIntensity.CheckedChanged += new System.EventHandler(this.checkBoxCalculateIntensity_CheckedChanged); + // // label6 // resources.ApplyResources(this.label6, "label6"); this.label6.Name = "label6"; + this.toolTip.SetToolTip(this.label6, resources.GetString("label6.ToolTip")); // // checkBoxShowPeakUnderProfile // resources.ApplyResources(this.checkBoxShowPeakUnderProfile, "checkBoxShowPeakUnderProfile"); this.checkBoxShowPeakUnderProfile.Name = "checkBoxShowPeakUnderProfile"; + this.toolTip.SetToolTip(this.checkBoxShowPeakUnderProfile, resources.GetString("checkBoxShowPeakUnderProfile.ToolTip")); this.checkBoxShowPeakUnderProfile.UseVisualStyleBackColor = true; this.checkBoxShowPeakUnderProfile.CheckedChanged += new System.EventHandler(this.checkBoxShowPeakUnderProfile_CheckedChanged); // + // groupBox4 + // + resources.ApplyResources(this.groupBox4, "groupBox4"); + this.groupBox4.Controls.Add(this.crystalDatabaseControl); + this.groupBox4.Controls.Add(this.panel1); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.TabStop = false; + this.toolTip.SetToolTip(this.groupBox4, resources.GetString("groupBox4.ToolTip")); + // + // crystalDatabaseControl + // + resources.ApplyResources(this.crystalDatabaseControl, "crystalDatabaseControl"); + this.crystalDatabaseControl.Filter = null; + this.crystalDatabaseControl.FontSize = 9.75F; + this.crystalDatabaseControl.Name = "crystalDatabaseControl"; + this.toolTip.SetToolTip(this.crystalDatabaseControl, resources.GetString("crystalDatabaseControl.ToolTip")); + this.crystalDatabaseControl.CrystalChanged += new System.EventHandler(this.crystalDatabaseControl_CrystalChanged); + // + // panel1 + // + resources.ApplyResources(this.panel1, "panel1"); + this.panel1.Controls.Add(this.searchCrystalControl); + this.panel1.Controls.Add(this.buttonSearch); + this.panel1.Name = "panel1"; + this.toolTip.SetToolTip(this.panel1, resources.GetString("panel1.ToolTip")); + // + // searchCrystalControl + // + resources.ApplyResources(this.searchCrystalControl, "searchCrystalControl"); + this.searchCrystalControl.Name = "searchCrystalControl"; + this.toolTip.SetToolTip(this.searchCrystalControl, resources.GetString("searchCrystalControl.ToolTip")); + // + // buttonSearch + // + resources.ApplyResources(this.buttonSearch, "buttonSearch"); + this.buttonSearch.BackColor = System.Drawing.Color.Chocolate; + this.buttonSearch.ForeColor = System.Drawing.Color.White; + this.buttonSearch.Name = "buttonSearch"; + this.toolTip.SetToolTip(this.buttonSearch, resources.GetString("buttonSearch.ToolTip")); + this.buttonSearch.UseVisualStyleBackColor = false; + this.buttonSearch.Click += new System.EventHandler(this.buttonSearch_Click); + // + // toolTip + // + this.toolTip.IsBalloon = true; + // // dataGridViewImageColumn1 // this.dataGridViewImageColumn1.DataPropertyName = "PeakColor"; @@ -568,22 +667,24 @@ private void InitializeComponent() // FormCrystal // resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.splitContainer1); - this.Controls.Add(this.groupBox2); this.KeyPreview = true; this.MaximizeBox = false; this.Name = "FormCrystal"; + this.toolTip.SetToolTip(this, resources.GetString("$this.ToolTip")); this.Closed += new System.EventHandler(this.FormCrystal_Closed); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormCrystal_FormClosing); + this.Load += new System.EventHandler(this.FormCrystal_Load); this.VisibleChanged += new System.EventHandler(this.FormCrystal_VisibleChanged); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FormCrystal_KeyDown); this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel1.PerformLayout(); this.splitContainer1.Panel2.ResumeLayout(false); - this.splitContainer1.Panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + this.groupBox3.ResumeLayout(false); + this.panel2.ResumeLayout(false); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewCrystal)).EndInit(); @@ -591,8 +692,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.dataSet)).EndInit(); this.flowLayoutPanel3.ResumeLayout(false); this.flowLayoutPanel3.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.flowLayoutPanel2.ResumeLayout(false); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); this.flowLayoutPanel1.ResumeLayout(false); @@ -602,6 +701,9 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.numericUpDownEnergyThreshold)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownThresholdIntesity)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownHeightOfBottomPeak)).EndInit(); + this.groupBox4.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.ResumeLayout(false); } @@ -637,7 +739,6 @@ private void InitializeComponent() public Button buttonDelete; public Button buttonChange; public CrystalControl crystalControl; - private SplitContainer splitContainer1; public DataSet dataSet; public BindingSource bindingSource; public DataGridView dataGridViewCrystal; @@ -645,7 +746,6 @@ private void InitializeComponent() private ToolStripMenuItem incrementToolStripMenuItem; private FlowLayoutPanel flowLayoutPanel1; private FlowLayoutPanel flowLayoutPanel3; - private FlowLayoutPanel flowLayoutPanel2; public Button buttonAdd; private DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; private DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; @@ -655,6 +755,14 @@ private void InitializeComponent() private DataGridViewImageColumn dataGridViewImageColumn1; private DataGridViewImageColumn dataGridViewImageColumn2; private DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; + private CrystalDatabaseControl crystalDatabaseControl; + private SearchCrystalControl searchCrystalControl; + private GroupBox groupBox4; + private Panel panel1; + private Button buttonSearch; + private SplitContainer splitContainer1; + private Panel panel2; + private Panel panel3; } diff --git a/PDIndexer/FormCrystal.cs b/PDIndexer/FormCrystal.cs index 4581835..a1ac3b2 100644 --- a/PDIndexer/FormCrystal.cs +++ b/PDIndexer/FormCrystal.cs @@ -8,6 +8,7 @@ using Crystallography; using Crystallography.Controls; using System.Collections.Generic; +using System.IO; namespace PDIndexer{ /// @@ -27,6 +28,12 @@ public FormCrystal() } + private void FormCrystal_Load(object sender, EventArgs e) + { + if (File.Exists(formMain.UserAppDataPath + "StdDB.cdb3")) + crystalDatabaseControl.ReadDatabase(formMain.UserAppDataPath + "StdDB.cdb3"); + } + void crystalControl_CrystalChanged(object sender, EventArgs e) { formMain.InitializeCrystalPlane(); @@ -241,8 +248,11 @@ private void dataGridViewCrystal_CellMouseClick(object sender, DataGridViewCellM formMain.dataGridViewCrystals_CellMouseClick(sender, e); } - + private void buttonSearch_Click(object sender, EventArgs e) + => crystalDatabaseControl.Filter = searchCrystalControl.Filter; + private void crystalDatabaseControl_CrystalChanged(object sender, EventArgs e) + => crystalControl.Crystal = crystalDatabaseControl.Crystal; } } diff --git a/PDIndexer/FormCrystal.ja.resx b/PDIndexer/FormCrystal.ja.resx index 5c95f14..d5cfed8 100644 --- a/PDIndexer/FormCrystal.ja.resx +++ b/PDIndexer/FormCrystal.ja.resx @@ -117,71 +117,104 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3, 50 - - - 250, 299 - - - メイリオ, 9.75pt - - - メイリオ, 9.75pt - - - - Top, Right - - - メイリオ, 9.75pt - - - 59, 27 - - - 削除 - - - - False - - - メイリオ, 9.75pt - - - 157, 0 - - - 全削除 - - - 3, 23 - - - メイリオ, 10pt, style=Bold - - - 256, 352 - - - 結晶リスト + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE1DcnlzdGFsbG9ncmFwaHksIFZlcnNpb249MjAyMC43LjI5LjEx + MjUsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAUBAAAAF0NyeXN0YWxsb2dyYXBo + eS5DcnlzdGFsLAAAAAhSZXNpZHVhbAZCb3VuZHMNTGF0dGljZVBsYW5lcwFBAUIBQwVBbHBoYQRCZXRh + BUdhbW1hBUFfZXJyBUJfZXJyBUNfZXJyCUFscGhhX2VycghCZXRhX2VycglHYW1tYV9lcnIOUm90YXRp + b25NYXRyaXgEQXJnYghSZXNlcnZlZAROYW1lBE5vdGUOUHVibEF1dGhvck5hbWUQUHVibFNlY3Rpb25U + aXRsZRRTeW1tZXRyeVNlcmllc051bWJlcgdKb3VybmFsC0pvdXJuYWxOYW1lDUpvdXJuYWxWb2x1bWUM + Sm91cm5hbElzc3VlC0pvdXJuYWxZZWFyEEpvdXJuYWxQYWdlRmlyc3QPSm91cm5hbFBhZ2VMYXN0CFN5 + bW1ldHJ5BUF0b21zBUJvbmRzBlN0cmFpbgZTdHJlc3MPSGlsbENvZWZmaWNpZW50FUVsYXN0aWNTdGlm + Zm5lc3NBcnJheQxFT1NDb25kaXRpb24KRG9lc1VzZUVPUwxDcnlzdGFsbGl0ZXMPQW5nbGVSZXNvbHV0 + aW9uC1N1YkRpdmlzaW9uCUdyYWluU2l6ZQJpZAAEBAAAAAAAAAAAAAAAAAQAAAEBAQEAAQEBAQEBAQQE + BAQEAAcEAAQAAAAABhdDcnlzdGFsbG9ncmFwaHkuQm91bmRbXQIAAAAeQ3J5c3RhbGxvZ3JhcGh5Lkxh + dHRpY2VQbGFuZVtdAgAAAAYGBgYGBgYGBgYGBhhDcnlzdGFsbG9ncmFwaHkuTWF0cml4M0QCAAAACAEI + GENyeXN0YWxsb2dyYXBoeS5TeW1tZXRyeQIAAAAXQ3J5c3RhbGxvZ3JhcGh5LkF0b21zW10CAAAAF0Ny + eXN0YWxsb2dyYXBoeS5Cb25kc1tdAgAAABhDcnlzdGFsbG9ncmFwaHkuTWF0cml4M0QCAAAAGENyeXN0 + YWxsb2dyYXBoeS5NYXRyaXgzRAIAAAAGBhNDcnlzdGFsbG9ncmFwaHkuRU9TAgAAAAEbQ3J5c3RhbGxv + Z3JhcGh5LkNyeXN0YWxsaXRlAgAAAAYIBggCAAAAAAAAAAAAAAAJAwAAAAkEAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQUAAADw8PD/AAYGAAAAAAkGAAAACQYAAAAJBgAAAAAAAAAJ + BgAAAAkGAAAACQYAAAAJBgAAAAkGAAAACQYAAAAJBgAAAAkHAAAACQgAAAAJCQAAAAkKAAAACQsAAAAA + AAAAAAAAAAkMAAAACQ0AAAAACgAAAAAAAABABAAAAAAAAAAAAFlAAAAAAAcDAAAAAAEAAAAAAAAABBVD + cnlzdGFsbG9ncmFwaHkuQm91bmQCAAAABwQAAAAAAQAAAAAAAAAEHENyeXN0YWxsb2dyYXBoeS5MYXR0 + aWNlUGxhbmUCAAAABQUAAAAYQ3J5c3RhbGxvZ3JhcGh5Lk1hdHJpeDNECQAAAANFMTEDRTEyA0UxMwNF + MjEDRTIyA0UyMwNFMzEDRTMyA0UzMwAAAAAAAAAAAAYGBgYGBgYGBgIAAAAAAAAAAADwPwAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8D8MDgAA + AP4DbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tl + bj1iNzdhNWM1NjE5MzRlMDg5XSxbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0u + SW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5 + VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TdHJpbmcsIG1zY29ybGliLCBWZXJzaW9uPTQu + MC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dLCBt + c2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3 + N2E1YzU2MTkzNGUwODldXSwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFs + LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQcAAAAYQ3J5c3RhbGxvZ3JhcGh5LlN5bW1l + dHJ5GQAAABJTcGFjZUdyb3VwSE1zdWJTdHIPU3BhY2VHcm91cFNGU3RyEVNwYWNlR3JvdXBIYWxsU3Ry + D1NwYWNlR3JvdXBITVN0chNTcGFjZUdyb3VwSE1mdWxsU3RyCE1haW5BeGlzDkxhdHRpY2VUeXBlU3Ry + B1N0clNFMXAHU3RyU0UxdgdTdHJTRTJwB1N0clNFMnYHU3RyU0UzcAdTdHJTRTN2D1BvaW50R3JvdXBI + TVN0cg9Qb2ludEdyb3VwU0ZTdHIMTGF1ZUdyb3VwU3RyEENyeXN0YWxTeXN0ZW1TdHIMU2VyaWVzTnVt + YmVyEFNwYWNlR3JvdXBOdW1iZXITU3BhY2VHcm91cFN1Yk51bWJlchBQb2ludEdyb3VwTnVtYmVyD0xh + dWVHcm91cE51bWJlchNDcnlzdGFsU3lzdGVtTnVtYmVyEUV4dGluY3Rpb25SdWxlU3RyE0NoZWNrRXh0 + aW5jdGlvbkZ1bmMBAQEBAQEBAQEBAQEBAQEBAQAAAAAAAAYECAgICAgIPlN5c3RlbS5Db2xsZWN0aW9u + cy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLkZ1bmNgNFtbU3lzdGVtLkludDMyDgAAAAIAAAAJBgAAAAYQ + AAAAB1Vua25vd24JEAAAAAkQAAAACRAAAAAJBgAAAAkQAAAACRAAAAAJEAAAAAkQAAAACRAAAAAJEAAA + AAkQAAAACRAAAAAJEAAAAAkQAAAACRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJEwAAAAkUAAAA + BwgAAAAAAQAAAAAAAAAEFUNyeXN0YWxsb2dyYXBoeS5BdG9tcwIAAAAHCQAAAAABAAAAAAAAAAQVQ3J5 + c3RhbGxvZ3JhcGh5LkJvbmRzAgAAAAEKAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAELAAAABQAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAA8MAAAAFQAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAFDQAAABNDcnlzdGFsbG9ncmFwaHkuRU9TEQAAAAtDZWxsVm9sdW1lMAJUMAJLMAdLcHJpbWUwBkdh + bW1hMAZUaGV0YTABUQVLcGVyVAFBAUIBQxdUaGVybWFsUHJlc3N1cmVBcHByb2FjaBpJc290aGVybWFs + UHJlc3N1cmVBcHByb2FjaAFaAU4ETm90ZQtUZW1wZXJhdHVyZQAAAAAAAAAAAAAABAQAAAEABgYGBgYG + BgYGBgYfQ3J5c3RhbGxvZ3JhcGh5LlRoZXJtYWxQcmVzc3VyZQIAAAAiQ3J5c3RhbGxvZ3JhcGh5Lklz + b3RoZXJtYWxQcmVzc3VyZQIAAAAGCAYCAAAAAAAAAADAckAAAAAAAMByQAAAAAAAAAAAAAAAAAAAEEAA + AAAAAAAAAAAAAAAAwHJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXr//// + H0NyeXN0YWxsb2dyYXBoeS5UaGVybWFsUHJlc3N1cmUBAAAAB3ZhbHVlX18ACAIAAAAAAAAABer///8i + Q3J5c3RhbGxvZ3JhcGh5Lklzb3RoZXJtYWxQcmVzc3VyZQEAAAAHdmFsdWVfXwAIAgAAAAAAAAAAAAAA + AAAAAAAAAAAJBgAAAAAAAAAAwHJAERMAAAAAAAAABRQAAAA+U3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVy + aWMuTGlzdGAxW1tTeXN0ZW0uRnVuY2A0W1tTeXN0ZW0uSW50MzIDAAAABl9pdGVtcwVfc2l6ZQhfdmVy + c2lvbgMAAIEDU3lzdGVtLkZ1bmNgNFtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAu + MC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0 + ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGlj + S2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5JbnQzMiwgbXNjb3JsaWIsIFZlcnNpb249 + NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XSxb + U3lzdGVtLlN0cmluZywgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQ + dWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV1bXQgIDgAAAAkYAAAAAAAAAAAAAAAMGQAAAK8D + bXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1i + NzdhNWM1NjE5MzRlMDg5XSxbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBD + dWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50 + MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9r + ZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TdHJpbmcsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4w + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dLCBtc2Nv + cmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1 + YzU2MTkzNGUwODkHGAAAAAABAAAAAAAAAAQbU3lzdGVtLkZ1bmNgNFtbU3lzdGVtLkludDMyGQAAAAs= + + 3, 23 + + + 0, 0, 0, 0 + - 551, 326 + 543, 297 メイリオ, 10pt, style=Bold - 48, 0 + 526, 0 - 557, 352 + 549, 323 結晶情報 @@ -201,7 +234,7 @@ メイリオ, 9.75pt - 0, 88 + 2, 96 46, 68 @@ -211,35 +244,83 @@ 更新 ← - - 48, 352 + + 475, 0 - - 865, 352 + + 51, 323 - - メイリオ, 9pt + + 3, 53 - - 51, 67 + + 250, 267 - - 99, 22 + + メイリオ, 9.75pt - - 強度を変更可 + + 32, 30 - - メイリオ, 9pt + + メイリオ, 9.75pt - - 30, 48 + + 32, 0 - - 99, 22 + + 32, 30 - - 強度比を計算 + + Top, Right + + + メイリオ, 9.75pt + + + 74, 0 + + + 45, 30 + + + 削除 + + + メイリオ, 9.75pt + + + 119, 0 + + + 58, 30 + + + 全削除 + + + 3, 23 + + + 250, 30 + + + メイリオ, 10pt, style=Bold + + + 219, 0 + + + 256, 323 + + + 結晶リスト + + + 216, 0 + + + 3, 323 メイリオ, 9pt @@ -254,7 +335,7 @@ 74, 0 - 138, 0 + 130, 0 メイリオ, 9pt @@ -269,7 +350,7 @@ 110, 23 - 170, 23 + 154, 23 10, 184 @@ -331,9 +412,6 @@ 回折線を重ねて表示 - - True - メイリオ, 9pt @@ -358,6 +436,30 @@ 弱いピークを非表示 + + メイリオ, 9pt + + + 51, 67 + + + 99, 22 + + + 強度を変更可 + + + メイリオ, 9pt + + + 30, 48 + + + 99, 22 + + + 強度比を計算 + 179, 132 @@ -377,25 +479,38 @@ メイリオ, 10pt, style=Bold - 216, 352 + 216, 323 回折線オプション - - PeakColor + + 869, 313 + + + 200, 283 + + + 872, 21 - - 30 + + 200, 313 - - Crystal + + 1075, 337 + + + 1075, 664 + + + + 323 10 - 1081, 352 + 1081, 670 diff --git a/PDIndexer/FormCrystal.resx b/PDIndexer/FormCrystal.resx index 9da936a..e8f919e 100644 --- a/PDIndexer/FormCrystal.resx +++ b/PDIndexer/FormCrystal.resx @@ -117,1398 +117,1812 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill + + - - - 216, 0 + + Show peaks over profiles + + + 3 - - True + + 80 - - 46 + + + Segoe UI Symbol, 9.75pt - - Check + + 3 - - 10 + + 12 - - 20 + + 2 - - True - - - PeakColor + + 1 - - 30 + + Segoe UI Symbol, 9.75pt - - Crystal + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE1DcnlzdGFsbG9ncmFwaHksIFZlcnNpb249MjAyMC43LjI5LjEx + MjUsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAUBAAAAF0NyeXN0YWxsb2dyYXBo + eS5DcnlzdGFsLAAAAAhSZXNpZHVhbAZCb3VuZHMNTGF0dGljZVBsYW5lcwFBAUIBQwVBbHBoYQRCZXRh + BUdhbW1hBUFfZXJyBUJfZXJyBUNfZXJyCUFscGhhX2VycghCZXRhX2VycglHYW1tYV9lcnIOUm90YXRp + b25NYXRyaXgEQXJnYghSZXNlcnZlZAROYW1lBE5vdGUOUHVibEF1dGhvck5hbWUQUHVibFNlY3Rpb25U + aXRsZRRTeW1tZXRyeVNlcmllc051bWJlcgdKb3VybmFsC0pvdXJuYWxOYW1lDUpvdXJuYWxWb2x1bWUM + Sm91cm5hbElzc3VlC0pvdXJuYWxZZWFyEEpvdXJuYWxQYWdlRmlyc3QPSm91cm5hbFBhZ2VMYXN0CFN5 + bW1ldHJ5BUF0b21zBUJvbmRzBlN0cmFpbgZTdHJlc3MPSGlsbENvZWZmaWNpZW50FUVsYXN0aWNTdGlm + Zm5lc3NBcnJheQxFT1NDb25kaXRpb24KRG9lc1VzZUVPUwxDcnlzdGFsbGl0ZXMPQW5nbGVSZXNvbHV0 + aW9uC1N1YkRpdmlzaW9uCUdyYWluU2l6ZQJpZAAEBAAAAAAAAAAAAAAAAAQAAAEBAQEAAQEBAQEBAQQE + BAQEAAcEAAQAAAAABhdDcnlzdGFsbG9ncmFwaHkuQm91bmRbXQIAAAAeQ3J5c3RhbGxvZ3JhcGh5Lkxh + dHRpY2VQbGFuZVtdAgAAAAYGBgYGBgYGBgYGBhhDcnlzdGFsbG9ncmFwaHkuTWF0cml4M0QCAAAACAEI + GENyeXN0YWxsb2dyYXBoeS5TeW1tZXRyeQIAAAAXQ3J5c3RhbGxvZ3JhcGh5LkF0b21zW10CAAAAF0Ny + eXN0YWxsb2dyYXBoeS5Cb25kc1tdAgAAABhDcnlzdGFsbG9ncmFwaHkuTWF0cml4M0QCAAAAGENyeXN0 + YWxsb2dyYXBoeS5NYXRyaXgzRAIAAAAGBhNDcnlzdGFsbG9ncmFwaHkuRU9TAgAAAAEbQ3J5c3RhbGxv + Z3JhcGh5LkNyeXN0YWxsaXRlAgAAAAYIBggCAAAAAAAAAAAAAAAJAwAAAAkEAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQUAAADw8PD/AAYGAAAAAAkGAAAACQYAAAAJBgAAAAAAAAAJ + BgAAAAkGAAAACQYAAAAJBgAAAAkGAAAACQYAAAAJBgAAAAkHAAAACQgAAAAJCQAAAAkKAAAACQsAAAAA + AAAAAAAAAAkMAAAACQ0AAAAACgAAAAAAAABABAAAAAAAAAAAAFlAAAAAAAcDAAAAAAEAAAAAAAAABBVD + cnlzdGFsbG9ncmFwaHkuQm91bmQCAAAABwQAAAAAAQAAAAAAAAAEHENyeXN0YWxsb2dyYXBoeS5MYXR0 + aWNlUGxhbmUCAAAABQUAAAAYQ3J5c3RhbGxvZ3JhcGh5Lk1hdHJpeDNECQAAAANFMTEDRTEyA0UxMwNF + MjEDRTIyA0UyMwNFMzEDRTMyA0UzMwAAAAAAAAAAAAYGBgYGBgYGBgIAAAAAAAAAAADwPwAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8D8MDgAA + AP4DbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tl + bj1iNzdhNWM1NjE5MzRlMDg5XSxbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0u + SW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5 + VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TdHJpbmcsIG1zY29ybGliLCBWZXJzaW9uPTQu + MC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dLCBt + c2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3 + N2E1YzU2MTkzNGUwODldXSwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFs + LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQcAAAAYQ3J5c3RhbGxvZ3JhcGh5LlN5bW1l + dHJ5GQAAABJTcGFjZUdyb3VwSE1zdWJTdHIPU3BhY2VHcm91cFNGU3RyEVNwYWNlR3JvdXBIYWxsU3Ry + D1NwYWNlR3JvdXBITVN0chNTcGFjZUdyb3VwSE1mdWxsU3RyCE1haW5BeGlzDkxhdHRpY2VUeXBlU3Ry + B1N0clNFMXAHU3RyU0UxdgdTdHJTRTJwB1N0clNFMnYHU3RyU0UzcAdTdHJTRTN2D1BvaW50R3JvdXBI + TVN0cg9Qb2ludEdyb3VwU0ZTdHIMTGF1ZUdyb3VwU3RyEENyeXN0YWxTeXN0ZW1TdHIMU2VyaWVzTnVt + YmVyEFNwYWNlR3JvdXBOdW1iZXITU3BhY2VHcm91cFN1Yk51bWJlchBQb2ludEdyb3VwTnVtYmVyD0xh + dWVHcm91cE51bWJlchNDcnlzdGFsU3lzdGVtTnVtYmVyEUV4dGluY3Rpb25SdWxlU3RyE0NoZWNrRXh0 + aW5jdGlvbkZ1bmMBAQEBAQEBAQEBAQEBAQEBAQAAAAAAAAYECAgICAgIPlN5c3RlbS5Db2xsZWN0aW9u + cy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLkZ1bmNgNFtbU3lzdGVtLkludDMyDgAAAAIAAAAJBgAAAAYQ + AAAAB1Vua25vd24JEAAAAAkQAAAACRAAAAAJBgAAAAkQAAAACRAAAAAJEAAAAAkQAAAACRAAAAAJEAAA + AAkQAAAACRAAAAAJEAAAAAkQAAAACRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJEwAAAAkUAAAA + BwgAAAAAAQAAAAAAAAAEFUNyeXN0YWxsb2dyYXBoeS5BdG9tcwIAAAAHCQAAAAABAAAAAAAAAAQVQ3J5 + c3RhbGxvZ3JhcGh5LkJvbmRzAgAAAAEKAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAELAAAABQAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAA8MAAAAFQAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAFDQAAABNDcnlzdGFsbG9ncmFwaHkuRU9TEQAAAAtDZWxsVm9sdW1lMAJUMAJLMAdLcHJpbWUwBkdh + bW1hMAZUaGV0YTABUQVLcGVyVAFBAUIBQxdUaGVybWFsUHJlc3N1cmVBcHByb2FjaBpJc290aGVybWFs + UHJlc3N1cmVBcHByb2FjaAFaAU4ETm90ZQtUZW1wZXJhdHVyZQAAAAAAAAAAAAAABAQAAAEABgYGBgYG + BgYGBgYfQ3J5c3RhbGxvZ3JhcGh5LlRoZXJtYWxQcmVzc3VyZQIAAAAiQ3J5c3RhbGxvZ3JhcGh5Lklz + b3RoZXJtYWxQcmVzc3VyZQIAAAAGCAYCAAAAAAAAAADAckAAAAAAAMByQAAAAAAAAAAAAAAAAAAAEEAA + AAAAAAAAAAAAAAAAwHJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXr//// + H0NyeXN0YWxsb2dyYXBoeS5UaGVybWFsUHJlc3N1cmUBAAAAB3ZhbHVlX18ACAIAAAAAAAAABer///8i + Q3J5c3RhbGxvZ3JhcGh5Lklzb3RoZXJtYWxQcmVzc3VyZQEAAAAHdmFsdWVfXwAIAgAAAAAAAAAAAAAA + AAAAAAAAAAAJBgAAAAAAAAAAwHJAERMAAAAAAAAABRQAAAA+U3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVy + aWMuTGlzdGAxW1tTeXN0ZW0uRnVuY2A0W1tTeXN0ZW0uSW50MzIDAAAABl9pdGVtcwVfc2l6ZQhfdmVy + c2lvbgMAAIEDU3lzdGVtLkZ1bmNgNFtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAu + MC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0 + ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGlj + S2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5JbnQzMiwgbXNjb3JsaWIsIFZlcnNpb249 + NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XSxb + U3lzdGVtLlN0cmluZywgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQ + dWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV1bXQgIDgAAAAkYAAAAAAAAAAAAAAAMGQAAAK8D + bXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1i + NzdhNWM1NjE5MzRlMDg5XSxbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBD + dWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50 + MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9r + ZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TdHJpbmcsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4w + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dLCBtc2Nv + cmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1 + YzU2MTkzNGUwODkHGAAAAAABAAAAAAAAAAQbU3lzdGVtLkZ1bmNgNFtbU3lzdGVtLkludDMyGQAAAAs= + - - 10 + + - - 105, 15 - - - 246, 15 - - - Fill + + - - 3, 48 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 22 + + 200, 30 - - 250, 287 + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 78 + + Arial, 9.75pt - - dataGridViewCrystal + + ↑ - - System.Windows.Forms.DataGridView, 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 - - groupBox1 + + 49, 61 - - 0 + + 492, 0 - - True + + 100 - - GrowAndShrink + + + NoControl - - Top, Right + + Segoe UI Symbol, 9.75pt - - Arial, 9.75pt + + 72 - - NoControl + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0, 0, 0 + + 2 - - 44, 27 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 76 + + NoControl - - ↑ + + - - TopCenter + + 186, 48 - - buttonUpper + + Segoe UI Symbol, 9.75pt, style=Bold - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - flowLayoutPanel3 + + groupBox2 - - 0 + + 2 - - Top, Right + + dataGridViewImageColumn1 - - Arial, 9.75pt + + groupBox2 - - NoControl + + 10 - - 44, 0 + + - - 0, 0, 0, 0 + + 0 - - 44, 27 + + - - 77 + + groupBox2 - - ↓ + + dataGridViewCrystal - - TopCenter + + - - buttonLower + + Angle Threshold - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 137, 21 - - flowLayoutPanel3 + + 0, 0 - - 1 + + 81 - - Segoe UI Symbol, 9.75pt + + panel2 - + NoControl - - 98, 0 + + - - 10, 0, 0, 0 + + Left - - 75, 27 + + label5 - - 59 + + 25, 0 - - Delete + + 235, 365 - - buttonDelete + + 156, 100 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 20 - - flowLayoutPanel3 + + Horizontal - - 2 + + 0, 0, 0, 0 - - Top, Right + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + groupBox3 + + True - - Segoe UI Symbol, 9.75pt + + 11, 276 - - NoControl + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 173, 0 + + True - - 0, 0, 0, 0 + + splitContainer1 - - 74, 27 + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 59 + + 114, 0 - - Delete all + + 153, 134 - - buttonAllClear + + System.Windows.Forms.GroupBox, 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 + + 37, 17 - - flowLayoutPanel3 + + 200, 365 - - 3 - - - Top - - - 3, 21 - - - 250, 27 - - + 79 - - flowLayoutPanel3 + + flowLayoutPanel1 - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 55, 27 - - groupBox1 + + Top, Right - - 1 + + Crystal Parameter - - Fill + + 8, 258 - - Segoe UI Symbol, 9.75pt, style=Bold + + 0 - - 0, 0 + + NoControl - - 256, 338 + + Arial, 9.75pt - - 72 + + Left - - Crystal List + + True - - groupBox1 + + Fill - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 76 - - splitContainer1.Panel1 + + 115, 0 - - 0 + + NoControl - - splitContainer1.Panel1 + + flowLayoutPanel1 - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 196, 22 - - splitContainer1 + + 174, 21 - - 0 + + Segoe UI Symbol, 9.75pt, style=Bold - - GrowAndShrink + + checkBoxInvisibleWeakPeak - - Fill + + 170, 0 - - 3, 21 + + numericUpDownEnergyThreshold - - 0, 0, 0, 0 + + 30, 43 - - 529, 314 + + 8, 127 - - 77 + + True crystalControl - - Crystallography.Controls.CrystalControl, Crystallography.Controls, Version=2020.5.1.707, Culture=neutral, PublicKeyToken=null + + Segoe UI Symbol, 9.75pt, style=Bold - - groupBox3 + + - - 0 + + flowLayoutPanel1 - - Fill + + checkBoxCalculateIntensity - - Segoe UI Symbol, 9.75pt, style=Bold + + panel3 - - 66, 0 + + Left - - 535, 338 + + Delete all - - 79 + + Re- +place - - Crystal Information + + True - - groupBox3 + + Fill - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Calculate intensity ratio - - splitContainer1.Panel2 + + 979, 285 - - 0 + + - - True + + Crystallography.Controls.CrystalDatabaseControl, Crystallography.Controls, Version=2020.7.29.1125, Culture=neutral, PublicKeyToken=null - - GrowAndShrink + + panel2 - - GrowAndShrink + + splitContainer1.Panel1 - - Segoe UI Symbol, 9.75pt + + 1 - - NoControl + + panel1 - - 0, 20 + + GrowAndShrink - + + groupBox2 + + 0, 0, 0, 0 - - 64, 61 + + 80 - - 59 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - -Add - - + + 54, 365 - - buttonAdd + + 0, 0, 0, 0 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5 - - flowLayoutPanel2 + + Show peak indices - - 0 + + 2, 88 - - GrowAndShrink + + 7, 17 - - Segoe UI Symbol, 9.75pt + + buttonDelete - - NoControl + + Fill - - 0, 81 + + 10, 10, 10, 10 - - 0, 0, 0, 0 + + flowLayoutPanel3 - - 64, 61 + + - - 59 + + 200, 231 - + + Segoe UI Symbol, 9.75pt + + -Replace - + AAEAAAD/////AQAAAAAAAAAMAgAAAOsEbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u + ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XSxbU3lzdGVtLkRvdWJsZSwgbXNj + b3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdh + NWM1NjE5MzRlMDg5XSxbU3lzdGVtLkRvdWJsZSwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3Vs + dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XSxbU3lzdGVtLkRvdWJs + ZSwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tl + bj1iNzdhNWM1NjE5MzRlMDg5XSxbU3lzdGVtLkRvdWJsZSwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAu + MCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XSxbU3lzdGVt + LkRvdWJsZSwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNL + ZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1 + cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUBAAAAIlN5c3RlbS5WYWx1 + ZVR1cGxlYDZbW1N5c3RlbS5Eb3VibGUGAAAABUl0ZW0xBUl0ZW0yBUl0ZW0zBUl0ZW00BUl0ZW01BUl0 + ZW02AAAAAAAABgYGBgYGAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAs= - - buttonChange + + 5 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6 - - flowLayoutPanel2 + + groupBox2 - - 1 + + buttonSearch - - Left + + 773, 261 - - TopDown + + Segoe UI Symbol, 9.75pt - - 0, 0 + + $this - - 0, 20, 2, 0 + + Fill - - 66, 338 + + 1 - - 80 + + 1 - - flowLayoutPanel2 + + System.Windows.Forms.Form, 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 + + 30 - - splitContainer1.Panel2 + + NoControl - - 1 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - splitContainer1.Panel2 + + buttonChange - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 49, 61 - - splitContainer1 + + PDIndexer.DataSet, DataSet.Designer.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - 1 + + Segoe UI Symbol, 9.75pt - - 861, 338 + + numericUpDownThresholdIntesity - - 256 + + contextMenuStrip1 - - 78 + + - - splitContainer1 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox2 - - $this + + 114, 132 - - 1 + + - - 16, 15 - - - True + + groupBox2 - - Segoe UI Symbol, 9.75pt + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl + + 40, 25 - - 51, 62 + + 82 - - 126, 21 + + 114, 98 - - 0 + + searchCrystalControl - - Scalable intensity + + True + + + 76 + + + GrowAndShrink + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Check if you want to change diffraction peak height by mouse drag. (relative intensity ratio is always reserved) - - checkBoxVariableRatioOfIntensity - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 + + 92, 38 - - 10 + + False - - True + + 0 - + Segoe UI Symbol, 9.75pt - - NoControl - - - 30, 43 - - - 161, 21 + + flowLayoutPanel1 - - 0 + + 0, 0 - - Calculate intensity ratio + + 11, 296 - - Check if you want to calculate intensity ratios -of diffraction peaks based on crystal structures + + 985, 660 - - checkBoxCalculateIntensity + + 0 - - System.Windows.Forms.CheckBox, 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 - + groupBox2 - - 11 + + 0, 0, 0, 0 - - True + + Segoe UI Symbol, 9.75pt - - Tahoma, 9pt + + 44, 22 - - NoControl + + - - 0, 0 + + - - 0, 0, 0, 0 + + GrowAndShrink - - 114, 18 + + dataSet - - 2 + + 25, 26 - - Angle Threshold + + Segoe UI Symbol, 9.75pt - - radioButtonAngleThreshold + + System.Windows.Forms.GroupBox, 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 + + Segoe UI Symbol, 9.75pt - - flowLayoutPanel1 + + panel1 - - 0 + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 344, 15 - - - 196, 22 + + dataGridViewImageColumn2 - - Increment && Decimal Places + + 20, 13 - - 197, 26 + + 3, 3, 3, 3 - - contextMenuStrip1 + + groupBox2 System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Tahoma, 9pt + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 114, 0 + + - - 0, 0, 0, 0 + + NoControl - - 64, 22 + + bindingSource 1 - - numericUpDownAngleThreshold + + Delete - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - flowLayoutPanel1 + + 3, 3, 3, 3 - - 1 + + splitContainer1.Panel1 - - True + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Microsoft Sans Serif, 8.25pt + + Crystal - - NoControl + + crystalDatabaseControl - - 178, 0 + + 40, 25 0, 0, 0, 0 - - 11, 13 + + 197, 26 - - 3 + + 0 - - ° + + 0, 30 - - label5 + + True - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - flowLayoutPanel1 + + groupBox1 + + + 30 + + + 1 2 - - True - - - Tahoma, 9pt + + 200, 0 - - NoControl + + 161, 21 - - 0, 23 + + 3 - - 0, 1, 0, 0 + + flowLayoutPanel3 - - 118, 18 + + flowLayoutPanel3 - - 2 + + GrowAndShrink - - Energy threshold + + only selected crystal - - radioButtonEnergyThreshold - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 3 - - - Tahoma, 9pt + + 107, 38 - - 118, 23 + + 78 - + 0, 1, 0, 0 - - 60, 22 + + groupBox2 - - 1 + + splitContainer1.Panel1 - - numericUpDownEnergyThreshold + + 203, 0 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 - - flowLayoutPanel1 + + +Add + + - - 4 + + 481, 341 - + True - - Microsoft Sans Serif, 8.25pt - - - NoControl - - - 178, 23 - - - 0, 1, 0, 0 - - - 20, 13 - - - 3 - - - eV - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanel1 - - - 5 - - - Segoe UI Symbol, 9.75pt - - - 10, 178 - - - 0, 0, 0, 0 - - - 204, 51 - - - 5 - - - flowLayoutPanel1 - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 + + GrowAndShrink - - 0 + + 79 - - True + + checkBoxShowPeakIndices - - Segoe UI Symbol, 9.75pt + + label3 - + NoControl - - 8, 153 - - - 173, 21 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 0 - - Combine adjacent peaks: - - - checkBoxCombineSameDspacingPeaks - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 + + 0 - + 1 - - True + + 143, 21 - - Segoe UI Symbol, 9.75pt + + GrowAndShrink - - NoControl + + flowLayoutPanel3 - - 159, 97 + + 8, 22 + + + label6 35, 17 - - 3 - - - pixel - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 + + flowLayoutPanel3 - - 2 + + dataGridViewTextBoxColumn1 - - True + + groupBox1 - + Segoe UI Symbol, 9.75pt - - NoControl - - - 52, 250 - - - 137, 21 - - - 2 - - - all checked crystals + + 0, 0 - - radioButtonAllCheckedCrystals + + 22 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Hide peaks + below - - groupBox2 + + splitContainer1.Panel2 - - 3 + + System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + 59 - - Segoe UI Symbol, 9.75pt + + 0, 1, 0, 0 - - NoControl + + Left - - 52, 268 + + groupBox4 - - 143, 21 + + GrowAndShrink - - 2 + + radioButtonAllCheckedCrystals - - only selected crystal + + 229, 314 - - radioButtonOnlySelectedCrystal + + groupBox3 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 118, 23 - - groupBox2 + + 3, 21 - - 4 + + - - False + + 13 - - Segoe UI Symbol, 9.75pt + + 3, 21 - - 137, 130 - - - 40, 25 + + + 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 + AAD+HwAA//8AAA== + - - 1 + + Tahoma, 9pt - - numericUpDownThresholdIntesity + + Top - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 10 - - groupBox2 + + 51, 62 - - 5 + + checkBoxVariableRatioOfIntensity - - False + + 82 - - Segoe UI Symbol, 9.75pt + + 83 - - 117, 95 + + True - - 40, 25 + + 59 - - 1 + + buttonAllClear - - numericUpDownHeightOfBottomPeak + + Fill - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + dataGridViewTextBoxColumn2 - - groupBox2 + + True - - 6 + + 979, 654 - - True + + 3 - - Segoe UI Symbol, 9.75pt + + 0 - + NoControl - - 8, 22 - - - 174, 21 + + - - 0 + + Segoe UI Symbol, 9.75pt - - Show peaks over profiles + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - checkBoxShowPeakOverProfiles + + splitContainer1.Panel1 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Search - - groupBox2 + + 0, 0, 0, 0 - - 7 + + toolTip - - Segoe UI Symbol, 9.75pt + + Increment && Decimal Places - - NoControl + + splitContainer1.Panel1 - - 8, 232 + + TopCenter - 170, 22 + 134, 21 - - 0 + + - - Show peak indices + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - checkBoxShowPeakIndices + + - + + Fill + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox2 + + label1 - - 8 + + 4 - - True + + TopCenter - + + System.Windows.Forms.Label, 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 + + + 11, 13 + + + Microsoft Sans Serif, 8.25pt + + + 229, 27 + + + 200, 261 + + + 100 + + Segoe UI Symbol, 9.75pt - - NoControl + + Segoe UI Symbol, 9.75pt, style=Bold - - 7, 130 + + - - 131, 21 + + 2 + + + 162, 23 0 - - Hide peaks below + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - checkBoxInvisibleWeakPeak + + - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 10, 0, 0, 0 - + groupBox2 - - 9 + + groupBox2 - - True + + Right - - Segoe UI Symbol, 9.75pt + + 0 - - NoControl + + Crystal List - - 176, 135 + + - - 37, 17 + + ° - - 3 - - - rel.% - - - label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top, Right - - groupBox2 + + 4 - - 12 + + dataGridViewTextBoxColumn3 - + True - - Segoe UI Symbol, 9.75pt - - - NoControl + + FormCrystal - - 7, 86 + + incrementToolStripMenuItem - - 107, 38 + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + 4, 0, 4, 0 Show peaks under profile - - checkBoxShowPeakUnderProfile - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Microsoft Sans Serif, 8.25pt - + groupBox2 - - 13 + + 1 - - Left + + 2 - - Segoe UI Symbol, 9.75pt, style=Bold + + NoControl - - 0, 0 + + - - 216, 338 + + 0, 1, 0, 0 - - 76 + + GrowAndShrink - - Diffraction Peak Option + + checkBoxCombineSameDspacingPeaks - - groupBox2 + + - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 83 - - $this + + 118, 18 - - 2 + + buttonLower - - PeakColor + + 0, 23 - - PeakColor + + True - - Crystal + + 77 - - 10 + + System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - PeakColor + + True - - 30 + + 0 - - Crystal + + Tahoma, 9pt - - True - - - 45 - - - 96, 96 + + 3, 48 - - None + + 3 - - 1077, 338 + + Diffraction Peak Option - - Arial, 8.25pt + + buttonAdd - - - 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 - AAD+HwAA//8AAA== - + + Scalable intensity - - Crystal Parameter + + Crystallography.Controls.CrystalControl, Crystallography.Controls, Version=2020.7.29.1125, Culture=neutral, PublicKeyToken=null - - checkDataGridViewCheckBoxColumn + + True - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 59 - - PeakColor + + 59 - - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - crystalDataGridViewTextBoxColumn + + - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + radioButtonOnlySelectedCrystal - - bindingSource + + 1 - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9.75pt - - dataSet + + 0 - - PDIndexer.DataSet, DataSet.Designer.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + 5 - - toolTip + + 438, 0 - - System.Windows.Forms.ToolTip, 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 - - incrementToolStripMenuItem + + 1 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox1 - - dataGridViewImageColumn1 + + 8 - - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 487, 365 - - dataGridViewTextBoxColumn1 + + Top + + + True + + + 1 + + + Crystallography.Controls.SearchCrystalControl, Crystallography.Controls, Version=2020.7.29.1125, Culture=neutral, PublicKeyToken=null + + + NoControl + + + rel.% + + + splitContainer1 + + + 10 + + + groupBox4 + + + PeakColor + + + 25, 26 + + + + + + 8, 171 + + + panel2 + + + groupBox2 + + + panel1 + + + Top, Right + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + radioButtonAngleThreshold + + + 173, 21 + + + 3, 365 + + + 9 + + + + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanel1 + + + 0, 0 + + + NoControl + + + Combine adjacent peaks: + + + NoControl + + + Crystal + + + Crystal database + + + NoControl + + + True + + + numericUpDownAngleThreshold + + + pixel + + + splitContainer1.Panel1 + + + PeakColor System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - dataGridViewTextBoxColumn2 + + System.Windows.Forms.Button, 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 + + groupBox4 - - dataGridViewImageColumn2 + + 56, 22 - + + NoControl + + + Tahoma, 9pt + + + + + + PeakColor + + + Segoe UI Symbol, 9.75pt + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + True + + System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - dataGridViewTextBoxColumn3 + + 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 - - FormCrystal + + checkBoxShowPeakUnderProfile - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + Segoe UI Symbol, 9.75pt + + + 0 + + + Crystal + + + 7 + + + 114, 18 + + + PeakColor + + + 2 + + + 2, 27 + + + checkBoxShowPeakOverProfiles + + + 3, 3 + + + 1 + + + + + + buttonUpper + + + flowLayoutPanel1 + + + + + + Fill + + + Segoe UI Symbol, 9.75pt + + + 0 + + + Segoe UI Symbol, 9.75pt + + + 11 + + + False + + 72, 27 + + + 365 + + + True + + + all checked crystals + + + + + + splitContainer1 + + + + + + 3, 21 + + + crystalDataGridViewTextBoxColumn + + + groupBox2 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + NoControl + + + 0, 0 + + + 8, 89 + + + Check if you want to calculate intensity ratios +of diffraction peaks based on crystal structures + + + ↓ + + + 3, 0, 3, 0 + + + flowLayoutPanel1 + + + radioButtonEnergyThreshold + + + eV + + + 1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 126, 21 + + + + + + + + + 0 + + + 10 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0, 0, 0, 0 + + + splitContainer1.Panel2 + + + True + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 78 + + + 10, 196 + + + 60, 0 + + + 77 + + + + + + 46 + + + 3 + + + 776, 21 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 4 + + + PeakColor + + + NoControl + + + Energy threshold + + + Segoe UI Symbol, 9.75pt + + + + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Segoe UI Symbol, 9.75pt + + + System.Windows.Forms.Label, 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 + + + + + + Segoe UI Symbol, 9.75pt + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3 + + + NoControl + + + None + + + Check + + + 0 + + + NoControl + + + numericUpDownHeightOfBottomPeak + + + Crystal Information + + + 3 + + + checkDataGridViewCheckBoxColumn + + + + + + Tahoma, 9pt + + + + + + 1 + + + True + + + 105, 15 + + + True + + + 45 + + + 16, 15 + + + 246, 15 + + + 344, 15 + \ No newline at end of file diff --git a/PDIndexer/FormMain.Designer.cs b/PDIndexer/FormMain.Designer.cs index ff4b13d..28c76a8 100644 --- a/PDIndexer/FormMain.Designer.cs +++ b/PDIndexer/FormMain.Designer.cs @@ -54,7 +54,6 @@ private void InitializeComponent() System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -117,6 +116,10 @@ private void InitializeComponent() System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle67 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle68 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle69 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle70 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle71 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle72 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripProgressBar = new System.Windows.Forms.ToolStripProgressBar(); @@ -126,7 +129,6 @@ private void InitializeComponent() this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.tabControl = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); - this.horizontalAxisUserControl = new Crystallography.Controls.HorizontalAxisUserControl(); this.flowLayoutPanel4 = new System.Windows.Forms.FlowLayoutPanel(); this.checkBoxChangeHorizontalAppearance = new System.Windows.Forms.CheckBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); @@ -138,7 +140,6 @@ private void InitializeComponent() this.radioButtonRawCounts = new System.Windows.Forms.RadioButton(); this.radioButtonCountsPerStep = new System.Windows.Forms.RadioButton(); this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.numericalTextBoxIncreasingPixels = new Crystallography.Controls.NumericBox(); this.numericUpDownIncreasingPixels = new System.Windows.Forms.NumericUpDown(); this.radioButtonMultiProfileMode = new System.Windows.Forms.RadioButton(); this.checkBoxChangeColor = new System.Windows.Forms.CheckBox(); @@ -146,9 +147,6 @@ private void InitializeComponent() this.label6 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.colorControlScaleText = new Crystallography.Controls.ColorControl(); - this.colorControlScaleLine = new Crystallography.Controls.ColorControl(); - this.colorControlBack = new Crystallography.Controls.ColorControl(); this.label5 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); @@ -167,17 +165,12 @@ private void InitializeComponent() this.comboBoxGradient = new System.Windows.Forms.ComboBox(); this.comboBoxScale2 = new System.Windows.Forms.ComboBox(); this.comboBoxScale1 = new System.Windows.Forms.ComboBox(); - this.graphControlFrequency = new Crystallography.Controls.GraphControl(); this.pictureBoxMain = new System.Windows.Forms.PictureBox(); this.panel1 = new System.Windows.Forms.Panel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.numericBoxUpperY = new Crystallography.Controls.NumericBox(); this.labelIntensity = new System.Windows.Forms.Label(); - this.numericBoxLowerY = new Crystallography.Controls.NumericBox(); this.labelD = new System.Windows.Forms.Label(); - this.numericBoxUpperX = new Crystallography.Controls.NumericBox(); this.labelTwoTheta = new System.Windows.Forms.Label(); - this.numericBoxLowerX = new Crystallography.Controls.NumericBox(); this.label11 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); this.labelX = new System.Windows.Forms.Label(); @@ -185,19 +178,10 @@ private void InitializeComponent() this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.dataGridViewProfiles = new System.Windows.Forms.DataGridView(); - this.checkDataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colorDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewImageColumn(); - this.profileDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bindingSourceProfile = new System.Windows.Forms.BindingSource(this.components); - this.dataSet = new PDIndexer.DataSet(); this.checkBoxProfileParameter = new System.Windows.Forms.CheckBox(); this.checkBoxAll = new System.Windows.Forms.CheckBox(); this.groupBoxCrystalData = new System.Windows.Forms.GroupBox(); this.dataGridViewCrystals = new System.Windows.Forms.DataGridView(); - this.checkDataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.PeakColor = new System.Windows.Forms.DataGridViewImageColumn(); - this.Crystal = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bindingSourceCrystal = new System.Windows.Forms.BindingSource(this.components); this.checkBoxCrystalParameter = new System.Windows.Forms.CheckBox(); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -454,6 +438,31 @@ private void InitializeComponent() this.dataGridViewTextBoxColumn104 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewImageColumn80 = new System.Windows.Forms.DataGridViewImageColumn(); this.dataGridViewTextBoxColumn105 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.checkDataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.checkDataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.dataGridViewImageColumn82 = new System.Windows.Forms.DataGridViewImageColumn(); + this.dataGridViewTextBoxColumn107 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bindingSourceProfile = new System.Windows.Forms.BindingSource(this.components); + this.dataSet = new PDIndexer.DataSet(); + this.bindingSourceCrystal = new System.Windows.Forms.BindingSource(this.components); + this.dataGridViewImageColumn81 = new System.Windows.Forms.DataGridViewImageColumn(); + this.dataGridViewTextBoxColumn106 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewImageColumn83 = new System.Windows.Forms.DataGridViewImageColumn(); + this.dataGridViewTextBoxColumn108 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.horizontalAxisUserControl = new Crystallography.Controls.HorizontalAxisUserControl(); + this.numericalTextBoxIncreasingPixels = new Crystallography.Controls.NumericBox(); + this.colorControlScaleText = new Crystallography.Controls.ColorControl(); + this.colorControlScaleLine = new Crystallography.Controls.ColorControl(); + this.colorControlBack = new Crystallography.Controls.ColorControl(); + this.graphControlFrequency = new Crystallography.Controls.GraphControl(); + this.numericBoxUpperY = new Crystallography.Controls.NumericBox(); + this.numericBoxLowerY = new Crystallography.Controls.NumericBox(); + this.numericBoxUpperX = new Crystallography.Controls.NumericBox(); + this.numericBoxLowerX = new Crystallography.Controls.NumericBox(); + this.colorDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewImageColumn(); + this.profileDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.PeakColor = new System.Windows.Forms.DataGridViewImageColumn(); + this.Crystal = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.toolStripContainer1.BottomToolStripPanel.SuspendLayout(); this.toolStripContainer1.ContentPanel.SuspendLayout(); this.toolStripContainer1.TopToolStripPanel.SuspendLayout(); @@ -486,13 +495,13 @@ private void InitializeComponent() this.splitContainer2.SuspendLayout(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewProfiles)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSourceProfile)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataSet)).BeginInit(); this.groupBoxCrystalData.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewCrystals)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSourceCrystal)).BeginInit(); this.menuStrip.SuspendLayout(); this.toolStrip2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSourceProfile)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataSet)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSourceCrystal)).BeginInit(); this.SuspendLayout(); // // toolStripContainer1 @@ -581,27 +590,6 @@ private void InitializeComponent() this.tabPage1.Name = "tabPage1"; this.tabPage1.UseVisualStyleBackColor = true; // - // horizontalAxisUserControl - // - resources.ApplyResources(this.horizontalAxisUserControl, "horizontalAxisUserControl"); - this.horizontalAxisUserControl.AxisMode = Crystallography.HorizontalAxis.Angle; - this.horizontalAxisUserControl.ElectronAccVoltage = 8.04114721308336D; - this.horizontalAxisUserControl.ElectronAccVoltageText = "8.04114721308336"; - this.horizontalAxisUserControl.EnergyUnit = Crystallography.EnergyUnitEnum.eV; - this.horizontalAxisUserControl.Name = "horizontalAxisUserControl"; - this.horizontalAxisUserControl.TakeoffAngle = 0D; - this.horizontalAxisUserControl.TakeoffAngleText = "0"; - this.horizontalAxisUserControl.TofAngle = 1.5707963267948966D; - this.horizontalAxisUserControl.TofAngleText = "90"; - this.horizontalAxisUserControl.TofLength = 90D; - this.horizontalAxisUserControl.WaveColor = Crystallography.WaveColor.Monochrome; - this.horizontalAxisUserControl.WaveLength = 0.15418710666666666D; - this.horizontalAxisUserControl.WaveLengthText = "1.54187106666667"; - this.horizontalAxisUserControl.WaveSource = Crystallography.WaveSource.Xray; - this.horizontalAxisUserControl.XrayWaveSourceElementNumber = 29; - this.horizontalAxisUserControl.XrayWaveSourceLine = Crystallography.XrayLine.Ka; - this.horizontalAxisUserControl.AxisPropertyChanged += new Crystallography.Controls.HorizontalAxisUserControl.MyEventHandler(this.horizontalAxisUserControl_AxisPropertyChanged); - // // flowLayoutPanel4 // resources.ApplyResources(this.flowLayoutPanel4, "flowLayoutPanel4"); @@ -698,20 +686,6 @@ private void InitializeComponent() this.groupBox3.Name = "groupBox3"; this.groupBox3.TabStop = false; // - // numericalTextBoxIncreasingPixels - // - resources.ApplyResources(this.numericalTextBoxIncreasingPixels, "numericalTextBoxIncreasingPixels"); - this.numericalTextBoxIncreasingPixels.BackColor = System.Drawing.SystemColors.Control; - this.numericalTextBoxIncreasingPixels.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericalTextBoxIncreasingPixels.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericalTextBoxIncreasingPixels.Name = "numericalTextBoxIncreasingPixels"; - this.numericalTextBoxIncreasingPixels.RadianValue = 17.872171540421935D; - this.numericalTextBoxIncreasingPixels.RestrictLimitValue = false; - this.numericalTextBoxIncreasingPixels.SkipEventDuringInput = false; - this.numericalTextBoxIncreasingPixels.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.numericalTextBoxIncreasingPixels.Value = 1024D; - this.numericalTextBoxIncreasingPixels.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.radioButtonMultiProfileMode_CheckChanged); - // // numericUpDownIncreasingPixels // resources.ApplyResources(this.numericUpDownIncreasingPixels, "numericUpDownIncreasingPixels"); @@ -779,57 +753,6 @@ private void InitializeComponent() this.groupBox2.Name = "groupBox2"; this.groupBox2.TabStop = false; // - // colorControlScaleText - // - this.colorControlScaleText.Argb = -16777216; - resources.ApplyResources(this.colorControlScaleText, "colorControlScaleText"); - this.colorControlScaleText.Blue = 0; - this.colorControlScaleText.BlueF = 0F; - this.colorControlScaleText.BoxSize = new System.Drawing.Size(20, 20); - this.colorControlScaleText.Color = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.colorControlScaleText.FlowDirection = System.Windows.Forms.FlowDirection.LeftToRight; - this.colorControlScaleText.Green = 0; - this.colorControlScaleText.GreenF = 0F; - this.colorControlScaleText.Name = "colorControlScaleText"; - this.colorControlScaleText.Red = 0; - this.colorControlScaleText.RedF = 0F; - this.toolTip.SetToolTip(this.colorControlScaleText, resources.GetString("colorControlScaleText.ToolTip")); - this.colorControlScaleText.ColorChanged += new System.EventHandler(this.Draw); - // - // colorControlScaleLine - // - this.colorControlScaleLine.Argb = -2894893; - resources.ApplyResources(this.colorControlScaleLine, "colorControlScaleLine"); - this.colorControlScaleLine.Blue = 211; - this.colorControlScaleLine.BlueF = 0.827451F; - this.colorControlScaleLine.BoxSize = new System.Drawing.Size(20, 20); - this.colorControlScaleLine.Color = System.Drawing.Color.FromArgb(((int)(((byte)(211)))), ((int)(((byte)(211)))), ((int)(((byte)(211))))); - this.colorControlScaleLine.FlowDirection = System.Windows.Forms.FlowDirection.LeftToRight; - this.colorControlScaleLine.Green = 211; - this.colorControlScaleLine.GreenF = 0.827451F; - this.colorControlScaleLine.Name = "colorControlScaleLine"; - this.colorControlScaleLine.Red = 211; - this.colorControlScaleLine.RedF = 0.827451F; - this.toolTip.SetToolTip(this.colorControlScaleLine, resources.GetString("colorControlScaleLine.ToolTip")); - this.colorControlScaleLine.ColorChanged += new System.EventHandler(this.Draw); - // - // colorControlBack - // - this.colorControlBack.Argb = -1; - resources.ApplyResources(this.colorControlBack, "colorControlBack"); - this.colorControlBack.Blue = 255; - this.colorControlBack.BlueF = 1F; - this.colorControlBack.BoxSize = new System.Drawing.Size(20, 20); - this.colorControlBack.Color = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.colorControlBack.FlowDirection = System.Windows.Forms.FlowDirection.LeftToRight; - this.colorControlBack.Green = 255; - this.colorControlBack.GreenF = 1F; - this.colorControlBack.Name = "colorControlBack"; - this.colorControlBack.Red = 255; - this.colorControlBack.RedF = 1F; - this.toolTip.SetToolTip(this.colorControlBack, resources.GetString("colorControlBack.ToolTip")); - this.colorControlBack.ColorChanged += new System.EventHandler(this.Draw); - // // label5 // resources.ApplyResources(this.label5, "label5"); @@ -1001,52 +924,6 @@ private void InitializeComponent() this.comboBoxScale1.Name = "comboBoxScale1"; this.comboBoxScale1.SelectedIndexChanged += new System.EventHandler(this.toolStripComboBoxScale_SelectedIndexChanged); // - // graphControlFrequency - // - this.graphControlFrequency.AllowMouseOperation = true; - resources.ApplyResources(this.graphControlFrequency, "graphControlFrequency"); - this.graphControlFrequency.BackgroundColor = System.Drawing.Color.White; - this.graphControlFrequency.BottomMargin = 0D; - this.graphControlFrequency.DivisionLineColor = System.Drawing.Color.Gray; - this.graphControlFrequency.DivisionSubLineColor = System.Drawing.Color.LightGray; - this.graphControlFrequency.FixRangeHorizontal = false; - this.graphControlFrequency.FixRangeVertical = false; - this.graphControlFrequency.GraphName = ""; - this.graphControlFrequency.HorizontalGradiationTextVisivle = true; - this.graphControlFrequency.Interpolation = false; - this.graphControlFrequency.IsIntegerX = true; - this.graphControlFrequency.IsIntegerY = true; - this.graphControlFrequency.LabelX = "X:"; - this.graphControlFrequency.LabelY = "Y:"; - this.graphControlFrequency.LeftMargin = 0F; - this.graphControlFrequency.LineColor = System.Drawing.Color.Red; - this.graphControlFrequency.LineWidth = 1F; - this.graphControlFrequency.LowerX = 0D; - this.graphControlFrequency.LowerY = 0D; - this.graphControlFrequency.MaximalX = 1D; - this.graphControlFrequency.MaximalY = 1D; - this.graphControlFrequency.MinimalX = 0D; - this.graphControlFrequency.MinimalY = 0D; - this.graphControlFrequency.Mode = Crystallography.Controls.GraphControl.DrawingMode.Line; - this.graphControlFrequency.MousePositionVisible = true; - this.graphControlFrequency.Name = "graphControlFrequency"; - this.graphControlFrequency.OriginPosition = new System.Drawing.Point(40, 20); - this.graphControlFrequency.Smoothing = false; - this.graphControlFrequency.TextFont = new System.Drawing.Font("Arial", 9F); - this.graphControlFrequency.UnitX = ""; - this.graphControlFrequency.UnitY = ""; - this.graphControlFrequency.UpperText = ""; - this.graphControlFrequency.UpperTextVisible = true; - this.graphControlFrequency.UpperX = 1D; - this.graphControlFrequency.UpperY = 1D; - this.graphControlFrequency.UseLineWidth = true; - this.graphControlFrequency.VerticalGradiationTextVisivle = true; - this.graphControlFrequency.XLog = true; - this.graphControlFrequency.XScaleLineVisible = true; - this.graphControlFrequency.YLog = true; - this.graphControlFrequency.YScaleLineVisible = true; - this.graphControlFrequency.LinePositionChanged += new Crystallography.Controls.GraphControl.LinePositionChengedEventHandler(this.graphControlFrequency_LinePositionChanged); - // // pictureBoxMain // this.pictureBoxMain.BackColor = System.Drawing.Color.White; @@ -1082,95 +959,21 @@ private void InitializeComponent() this.tableLayoutPanel2.Controls.Add(this.label9, 4, 0); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; // - // numericBoxUpperY - // - resources.ApplyResources(this.numericBoxUpperY, "numericBoxUpperY"); - this.numericBoxUpperY.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxUpperY.DecimalPlaces = 2; - this.numericBoxUpperY.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxUpperY.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxUpperY.Maximum = 1000D; - this.numericBoxUpperY.Minimum = 0D; - this.numericBoxUpperY.Name = "numericBoxUpperY"; - this.numericBoxUpperY.RadianValue = 17.453292519943293D; - this.numericBoxUpperY.ShowUpDown = true; - this.numericBoxUpperY.SmartIncrement = true; - this.numericBoxUpperY.ThonsandsSeparator = true; - this.numericBoxUpperY.Value = 1000D; - this.numericBoxUpperY.WordWrap = false; - this.numericBoxUpperY.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBox_ValueChanged); - this.numericBoxUpperY.MouseDown += new System.Windows.Forms.MouseEventHandler(this.numericUpDownLimitChange_MouseDown); - // // labelIntensity // resources.ApplyResources(this.labelIntensity, "labelIntensity"); this.labelIntensity.Name = "labelIntensity"; // - // numericBoxLowerY - // - resources.ApplyResources(this.numericBoxLowerY, "numericBoxLowerY"); - this.numericBoxLowerY.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxLowerY.DecimalPlaces = 2; - this.numericBoxLowerY.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxLowerY.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxLowerY.Maximum = 1000D; - this.numericBoxLowerY.Minimum = 0D; - this.numericBoxLowerY.Name = "numericBoxLowerY"; - this.numericBoxLowerY.ShowUpDown = true; - this.numericBoxLowerY.SmartIncrement = true; - this.numericBoxLowerY.ThonsandsSeparator = true; - this.numericBoxLowerY.WordWrap = false; - this.numericBoxLowerY.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBox_ValueChanged); - this.numericBoxLowerY.MouseDown += new System.Windows.Forms.MouseEventHandler(this.numericUpDownLimitChange_MouseDown); - // // labelD // resources.ApplyResources(this.labelD, "labelD"); this.labelD.Name = "labelD"; // - // numericBoxUpperX - // - resources.ApplyResources(this.numericBoxUpperX, "numericBoxUpperX"); - this.numericBoxUpperX.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxUpperX.DecimalPlaces = 2; - this.numericBoxUpperX.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxUpperX.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxUpperX.Maximum = 30D; - this.numericBoxUpperX.Minimum = 0D; - this.numericBoxUpperX.Name = "numericBoxUpperX"; - this.numericBoxUpperX.RadianValue = 0.52359877559829882D; - this.numericBoxUpperX.ShowUpDown = true; - this.numericBoxUpperX.SmartIncrement = true; - this.numericBoxUpperX.ThonsandsSeparator = true; - this.numericBoxUpperX.Value = 30D; - this.numericBoxUpperX.WordWrap = false; - this.numericBoxUpperX.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBox_ValueChanged); - this.numericBoxUpperX.LimitChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxUpperX_LimitChanged); - this.numericBoxUpperX.MouseDown += new System.Windows.Forms.MouseEventHandler(this.numericUpDownLimitChange_MouseDown); - // // labelTwoTheta // resources.ApplyResources(this.labelTwoTheta, "labelTwoTheta"); this.labelTwoTheta.Name = "labelTwoTheta"; // - // numericBoxLowerX - // - resources.ApplyResources(this.numericBoxLowerX, "numericBoxLowerX"); - this.numericBoxLowerX.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxLowerX.DecimalPlaces = 2; - this.numericBoxLowerX.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxLowerX.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxLowerX.Maximum = 30D; - this.numericBoxLowerX.Minimum = 0D; - this.numericBoxLowerX.Name = "numericBoxLowerX"; - this.numericBoxLowerX.ShowUpDown = true; - this.numericBoxLowerX.SmartIncrement = true; - this.numericBoxLowerX.ThonsandsSeparator = true; - this.numericBoxLowerX.WordWrap = false; - this.numericBoxLowerX.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBox_ValueChanged); - this.numericBoxLowerX.LimitChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxUpperX_LimitChanged); - this.numericBoxLowerX.MouseDown += new System.Windows.Forms.MouseEventHandler(this.numericUpDownLimitChange_MouseDown); - // // label11 // resources.ApplyResources(this.label11, "label11"); @@ -1262,42 +1065,7 @@ private void InitializeComponent() this.dataGridViewProfiles.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewProfiles_CellClick); this.dataGridViewProfiles.KeyUp += new System.Windows.Forms.KeyEventHandler(this.dataGridViewCrystals_KeyUp); // - // checkDataGridViewCheckBoxColumn2 - // - this.checkDataGridViewCheckBoxColumn2.DataPropertyName = "Check"; - resources.ApplyResources(this.checkDataGridViewCheckBoxColumn2, "checkDataGridViewCheckBoxColumn2"); - this.checkDataGridViewCheckBoxColumn2.Name = "checkDataGridViewCheckBoxColumn2"; - this.checkDataGridViewCheckBoxColumn2.ReadOnly = true; - // - // colorDataGridViewTextBoxColumn - // - this.colorDataGridViewTextBoxColumn.DataPropertyName = "Color"; - resources.ApplyResources(this.colorDataGridViewTextBoxColumn, "colorDataGridViewTextBoxColumn"); - this.colorDataGridViewTextBoxColumn.Name = "colorDataGridViewTextBoxColumn"; - this.colorDataGridViewTextBoxColumn.ReadOnly = true; - this.colorDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colorDataGridViewTextBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // profileDataGridViewTextBoxColumn - // - this.profileDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.profileDataGridViewTextBoxColumn.DataPropertyName = "Profile"; - resources.ApplyResources(this.profileDataGridViewTextBoxColumn, "profileDataGridViewTextBoxColumn"); - this.profileDataGridViewTextBoxColumn.Name = "profileDataGridViewTextBoxColumn"; - this.profileDataGridViewTextBoxColumn.ReadOnly = true; - // - // bindingSourceProfile - // - this.bindingSourceProfile.DataMember = "DataTableProfile"; - this.bindingSourceProfile.DataSource = this.dataSet; - // - // dataSet - // - this.dataSet.DataSetName = "DataSet1"; - this.dataSet.Locale = new System.Globalization.CultureInfo("ja"); - this.dataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // checkBoxProfileParameter + // checkBoxProfileParameter // resources.ApplyResources(this.checkBoxProfileParameter, "checkBoxProfileParameter"); this.checkBoxProfileParameter.Name = "checkBoxProfileParameter"; @@ -1371,39 +1139,6 @@ private void InitializeComponent() this.dataGridViewCrystals.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridViewCrystals_CellMouseClick); this.dataGridViewCrystals.KeyUp += new System.Windows.Forms.KeyEventHandler(this.dataGridViewCrystals_KeyUp); // - // checkDataGridViewCheckBoxColumn1 - // - this.checkDataGridViewCheckBoxColumn1.DataPropertyName = "Check"; - resources.ApplyResources(this.checkDataGridViewCheckBoxColumn1, "checkDataGridViewCheckBoxColumn1"); - this.checkDataGridViewCheckBoxColumn1.Name = "checkDataGridViewCheckBoxColumn1"; - this.checkDataGridViewCheckBoxColumn1.ReadOnly = true; - this.checkDataGridViewCheckBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False; - // - // 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.False; - this.PeakColor.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // Crystal - // - this.Crystal.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.Crystal.DataPropertyName = "Crystal"; - dataGridViewCellStyle6.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Crystal.DefaultCellStyle = dataGridViewCellStyle6; - resources.ApplyResources(this.Crystal, "Crystal"); - this.Crystal.Name = "Crystal"; - this.Crystal.ReadOnly = true; - this.Crystal.Resizable = System.Windows.Forms.DataGridViewTriState.False; - // - // bindingSourceCrystal - // - this.bindingSourceCrystal.DataMember = "DataTableCrystal"; - this.bindingSourceCrystal.DataSource = this.dataSet; - // // checkBoxCrystalParameter // resources.ApplyResources(this.checkBoxCrystalParameter, "checkBoxCrystalParameter"); @@ -3549,6 +3284,338 @@ private void InitializeComponent() this.dataGridViewTextBoxColumn105.Name = "dataGridViewTextBoxColumn105"; this.dataGridViewTextBoxColumn105.Resizable = System.Windows.Forms.DataGridViewTriState.False; // + // checkDataGridViewCheckBoxColumn2 + // + this.checkDataGridViewCheckBoxColumn2.DataPropertyName = "Check"; + resources.ApplyResources(this.checkDataGridViewCheckBoxColumn2, "checkDataGridViewCheckBoxColumn2"); + this.checkDataGridViewCheckBoxColumn2.Name = "checkDataGridViewCheckBoxColumn2"; + this.checkDataGridViewCheckBoxColumn2.ReadOnly = true; + // + // checkDataGridViewCheckBoxColumn1 + // + this.checkDataGridViewCheckBoxColumn1.DataPropertyName = "Check"; + resources.ApplyResources(this.checkDataGridViewCheckBoxColumn1, "checkDataGridViewCheckBoxColumn1"); + this.checkDataGridViewCheckBoxColumn1.Name = "checkDataGridViewCheckBoxColumn1"; + this.checkDataGridViewCheckBoxColumn1.ReadOnly = true; + this.checkDataGridViewCheckBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False; + // + // dataGridViewImageColumn82 + // + this.dataGridViewImageColumn82.DataPropertyName = "PeakColor"; + resources.ApplyResources(this.dataGridViewImageColumn82, "dataGridViewImageColumn82"); + this.dataGridViewImageColumn82.Name = "dataGridViewImageColumn82"; + this.dataGridViewImageColumn82.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewImageColumn82.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // dataGridViewTextBoxColumn107 + // + this.dataGridViewTextBoxColumn107.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dataGridViewTextBoxColumn107.DataPropertyName = "Crystal"; + dataGridViewCellStyle70.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dataGridViewTextBoxColumn107.DefaultCellStyle = dataGridViewCellStyle70; + resources.ApplyResources(this.dataGridViewTextBoxColumn107, "dataGridViewTextBoxColumn107"); + this.dataGridViewTextBoxColumn107.Name = "dataGridViewTextBoxColumn107"; + this.dataGridViewTextBoxColumn107.Resizable = System.Windows.Forms.DataGridViewTriState.False; + // + // bindingSourceProfile + // + this.bindingSourceProfile.DataMember = "DataTableProfile"; + this.bindingSourceProfile.DataSource = this.dataSet; + // + // dataSet + // + this.dataSet.DataSetName = "DataSet1"; + this.dataSet.Locale = new System.Globalization.CultureInfo("ja"); + this.dataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // bindingSourceCrystal + // + this.bindingSourceCrystal.DataMember = "DataTableCrystal"; + this.bindingSourceCrystal.DataSource = this.dataSet; + // + // dataGridViewImageColumn81 + // + this.dataGridViewImageColumn81.DataPropertyName = "Color"; + resources.ApplyResources(this.dataGridViewImageColumn81, "dataGridViewImageColumn81"); + this.dataGridViewImageColumn81.Name = "dataGridViewImageColumn81"; + this.dataGridViewImageColumn81.ReadOnly = true; + this.dataGridViewImageColumn81.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewImageColumn81.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // dataGridViewTextBoxColumn106 + // + this.dataGridViewTextBoxColumn106.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dataGridViewTextBoxColumn106.DataPropertyName = "Profile"; + dataGridViewCellStyle71.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dataGridViewTextBoxColumn106.DefaultCellStyle = dataGridViewCellStyle71; + resources.ApplyResources(this.dataGridViewTextBoxColumn106, "dataGridViewTextBoxColumn106"); + this.dataGridViewTextBoxColumn106.Name = "dataGridViewTextBoxColumn106"; + this.dataGridViewTextBoxColumn106.ReadOnly = true; + this.dataGridViewTextBoxColumn106.Resizable = System.Windows.Forms.DataGridViewTriState.False; + // + // dataGridViewImageColumn83 + // + this.dataGridViewImageColumn83.DataPropertyName = "PeakColor"; + resources.ApplyResources(this.dataGridViewImageColumn83, "dataGridViewImageColumn83"); + this.dataGridViewImageColumn83.Name = "dataGridViewImageColumn83"; + this.dataGridViewImageColumn83.ReadOnly = true; + this.dataGridViewImageColumn83.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewImageColumn83.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // dataGridViewTextBoxColumn108 + // + this.dataGridViewTextBoxColumn108.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dataGridViewTextBoxColumn108.DataPropertyName = "Crystal"; + dataGridViewCellStyle72.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dataGridViewTextBoxColumn108.DefaultCellStyle = dataGridViewCellStyle72; + resources.ApplyResources(this.dataGridViewTextBoxColumn108, "dataGridViewTextBoxColumn108"); + this.dataGridViewTextBoxColumn108.Name = "dataGridViewTextBoxColumn108"; + this.dataGridViewTextBoxColumn108.ReadOnly = true; + this.dataGridViewTextBoxColumn108.Resizable = System.Windows.Forms.DataGridViewTriState.False; + // + // horizontalAxisUserControl + // + resources.ApplyResources(this.horizontalAxisUserControl, "horizontalAxisUserControl"); + this.horizontalAxisUserControl.AxisMode = Crystallography.HorizontalAxis.Angle; + this.horizontalAxisUserControl.ElectronAccVoltage = 8.04114721308336D; + this.horizontalAxisUserControl.ElectronAccVoltageText = "8.04114721308336"; + this.horizontalAxisUserControl.EnergyUnit = Crystallography.EnergyUnitEnum.eV; + this.horizontalAxisUserControl.Name = "horizontalAxisUserControl"; + this.horizontalAxisUserControl.TakeoffAngle = 0D; + this.horizontalAxisUserControl.TakeoffAngleText = "0"; + this.horizontalAxisUserControl.TofAngle = 1.5707963267948966D; + this.horizontalAxisUserControl.TofAngleText = "90"; + this.horizontalAxisUserControl.TofLength = 90D; + this.horizontalAxisUserControl.WaveColor = Crystallography.WaveColor.Monochrome; + this.horizontalAxisUserControl.WaveLength = 0.15418710666666666D; + this.horizontalAxisUserControl.WaveLengthText = "1.54187106666667"; + this.horizontalAxisUserControl.WaveSource = Crystallography.WaveSource.Xray; + this.horizontalAxisUserControl.XrayWaveSourceElementNumber = 29; + this.horizontalAxisUserControl.XrayWaveSourceLine = Crystallography.XrayLine.Ka; + this.horizontalAxisUserControl.AxisPropertyChanged += new Crystallography.Controls.HorizontalAxisUserControl.MyEventHandler(this.horizontalAxisUserControl_AxisPropertyChanged); + // + // numericalTextBoxIncreasingPixels + // + resources.ApplyResources(this.numericalTextBoxIncreasingPixels, "numericalTextBoxIncreasingPixels"); + this.numericalTextBoxIncreasingPixels.BackColor = System.Drawing.SystemColors.Control; + this.numericalTextBoxIncreasingPixels.FooterBackColor = System.Drawing.SystemColors.Control; + this.numericalTextBoxIncreasingPixels.HeaderBackColor = System.Drawing.SystemColors.Control; + this.numericalTextBoxIncreasingPixels.Name = "numericalTextBoxIncreasingPixels"; + this.numericalTextBoxIncreasingPixels.RadianValue = 17.872171540421935D; + this.numericalTextBoxIncreasingPixels.RestrictLimitValue = false; + this.numericalTextBoxIncreasingPixels.SkipEventDuringInput = false; + this.numericalTextBoxIncreasingPixels.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.numericalTextBoxIncreasingPixels.Value = 1024D; + this.numericalTextBoxIncreasingPixels.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.radioButtonMultiProfileMode_CheckChanged); + // + // colorControlScaleText + // + this.colorControlScaleText.Argb = -16777216; + resources.ApplyResources(this.colorControlScaleText, "colorControlScaleText"); + this.colorControlScaleText.Blue = 0; + this.colorControlScaleText.BlueF = 0F; + this.colorControlScaleText.BoxSize = new System.Drawing.Size(20, 20); + this.colorControlScaleText.Color = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.colorControlScaleText.FlowDirection = System.Windows.Forms.FlowDirection.LeftToRight; + this.colorControlScaleText.Green = 0; + this.colorControlScaleText.GreenF = 0F; + this.colorControlScaleText.Name = "colorControlScaleText"; + this.colorControlScaleText.Red = 0; + this.colorControlScaleText.RedF = 0F; + this.toolTip.SetToolTip(this.colorControlScaleText, resources.GetString("colorControlScaleText.ToolTip")); + this.colorControlScaleText.ColorChanged += new System.EventHandler(this.Draw); + // + // colorControlScaleLine + // + this.colorControlScaleLine.Argb = -2894893; + resources.ApplyResources(this.colorControlScaleLine, "colorControlScaleLine"); + this.colorControlScaleLine.Blue = 211; + this.colorControlScaleLine.BlueF = 0.827451F; + this.colorControlScaleLine.BoxSize = new System.Drawing.Size(20, 20); + this.colorControlScaleLine.Color = System.Drawing.Color.FromArgb(((int)(((byte)(211)))), ((int)(((byte)(211)))), ((int)(((byte)(211))))); + this.colorControlScaleLine.FlowDirection = System.Windows.Forms.FlowDirection.LeftToRight; + this.colorControlScaleLine.Green = 211; + this.colorControlScaleLine.GreenF = 0.827451F; + this.colorControlScaleLine.Name = "colorControlScaleLine"; + this.colorControlScaleLine.Red = 211; + this.colorControlScaleLine.RedF = 0.827451F; + this.toolTip.SetToolTip(this.colorControlScaleLine, resources.GetString("colorControlScaleLine.ToolTip")); + this.colorControlScaleLine.ColorChanged += new System.EventHandler(this.Draw); + // + // colorControlBack + // + this.colorControlBack.Argb = -1; + resources.ApplyResources(this.colorControlBack, "colorControlBack"); + this.colorControlBack.Blue = 255; + this.colorControlBack.BlueF = 1F; + this.colorControlBack.BoxSize = new System.Drawing.Size(20, 20); + this.colorControlBack.Color = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.colorControlBack.FlowDirection = System.Windows.Forms.FlowDirection.LeftToRight; + this.colorControlBack.Green = 255; + this.colorControlBack.GreenF = 1F; + this.colorControlBack.Name = "colorControlBack"; + this.colorControlBack.Red = 255; + this.colorControlBack.RedF = 1F; + this.toolTip.SetToolTip(this.colorControlBack, resources.GetString("colorControlBack.ToolTip")); + this.colorControlBack.ColorChanged += new System.EventHandler(this.Draw); + // + // graphControlFrequency + // + this.graphControlFrequency.AllowMouseOperation = true; + resources.ApplyResources(this.graphControlFrequency, "graphControlFrequency"); + this.graphControlFrequency.BackgroundColor = System.Drawing.Color.White; + this.graphControlFrequency.BottomMargin = 0D; + this.graphControlFrequency.DivisionLineColor = System.Drawing.Color.Gray; + this.graphControlFrequency.DivisionSubLineColor = System.Drawing.Color.LightGray; + this.graphControlFrequency.FixRangeHorizontal = false; + this.graphControlFrequency.FixRangeVertical = false; + this.graphControlFrequency.GraphName = ""; + this.graphControlFrequency.HorizontalGradiationTextVisivle = true; + this.graphControlFrequency.Interpolation = false; + this.graphControlFrequency.IsIntegerX = true; + this.graphControlFrequency.IsIntegerY = true; + this.graphControlFrequency.LabelX = "X:"; + this.graphControlFrequency.LabelY = "Y:"; + this.graphControlFrequency.LeftMargin = 0F; + this.graphControlFrequency.LineColor = System.Drawing.Color.Red; + this.graphControlFrequency.LineWidth = 1F; + this.graphControlFrequency.LowerX = 0D; + this.graphControlFrequency.LowerY = 0D; + this.graphControlFrequency.MaximalX = 1D; + this.graphControlFrequency.MaximalY = 1D; + this.graphControlFrequency.MinimalX = 0D; + this.graphControlFrequency.MinimalY = 0D; + this.graphControlFrequency.Mode = Crystallography.Controls.GraphControl.DrawingMode.Line; + this.graphControlFrequency.MousePositionVisible = true; + this.graphControlFrequency.Name = "graphControlFrequency"; + this.graphControlFrequency.OriginPosition = new System.Drawing.Point(40, 20); + this.graphControlFrequency.Smoothing = false; + this.graphControlFrequency.TextFont = new System.Drawing.Font("Arial", 9F); + this.graphControlFrequency.UnitX = ""; + this.graphControlFrequency.UnitY = ""; + this.graphControlFrequency.UpperText = ""; + this.graphControlFrequency.UpperTextVisible = true; + this.graphControlFrequency.UpperX = 1D; + this.graphControlFrequency.UpperY = 1D; + this.graphControlFrequency.UseLineWidth = true; + this.graphControlFrequency.VerticalGradiationTextVisivle = true; + this.graphControlFrequency.XLog = true; + this.graphControlFrequency.XScaleLineVisible = true; + this.graphControlFrequency.YLog = true; + this.graphControlFrequency.YScaleLineVisible = true; + this.graphControlFrequency.LinePositionChanged += new Crystallography.Controls.GraphControl.LinePositionChengedEventHandler(this.graphControlFrequency_LinePositionChanged); + // + // numericBoxUpperY + // + resources.ApplyResources(this.numericBoxUpperY, "numericBoxUpperY"); + this.numericBoxUpperY.BackColor = System.Drawing.SystemColors.Control; + this.numericBoxUpperY.DecimalPlaces = 2; + this.numericBoxUpperY.FooterBackColor = System.Drawing.SystemColors.Control; + this.numericBoxUpperY.HeaderBackColor = System.Drawing.SystemColors.Control; + this.numericBoxUpperY.Maximum = 1000D; + this.numericBoxUpperY.Minimum = 0D; + this.numericBoxUpperY.Name = "numericBoxUpperY"; + this.numericBoxUpperY.RadianValue = 17.453292519943293D; + this.numericBoxUpperY.ShowUpDown = true; + this.numericBoxUpperY.SmartIncrement = true; + this.numericBoxUpperY.ThonsandsSeparator = true; + this.numericBoxUpperY.Value = 1000D; + this.numericBoxUpperY.WordWrap = false; + this.numericBoxUpperY.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBox_ValueChanged); + this.numericBoxUpperY.MouseDown += new System.Windows.Forms.MouseEventHandler(this.numericUpDownLimitChange_MouseDown); + // + // numericBoxLowerY + // + resources.ApplyResources(this.numericBoxLowerY, "numericBoxLowerY"); + this.numericBoxLowerY.BackColor = System.Drawing.SystemColors.Control; + this.numericBoxLowerY.DecimalPlaces = 2; + this.numericBoxLowerY.FooterBackColor = System.Drawing.SystemColors.Control; + this.numericBoxLowerY.HeaderBackColor = System.Drawing.SystemColors.Control; + this.numericBoxLowerY.Maximum = 1000D; + this.numericBoxLowerY.Minimum = 0D; + this.numericBoxLowerY.Name = "numericBoxLowerY"; + this.numericBoxLowerY.ShowUpDown = true; + this.numericBoxLowerY.SmartIncrement = true; + this.numericBoxLowerY.ThonsandsSeparator = true; + this.numericBoxLowerY.WordWrap = false; + this.numericBoxLowerY.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBox_ValueChanged); + this.numericBoxLowerY.MouseDown += new System.Windows.Forms.MouseEventHandler(this.numericUpDownLimitChange_MouseDown); + // + // numericBoxUpperX + // + resources.ApplyResources(this.numericBoxUpperX, "numericBoxUpperX"); + this.numericBoxUpperX.BackColor = System.Drawing.SystemColors.Control; + this.numericBoxUpperX.DecimalPlaces = 2; + this.numericBoxUpperX.FooterBackColor = System.Drawing.SystemColors.Control; + this.numericBoxUpperX.HeaderBackColor = System.Drawing.SystemColors.Control; + this.numericBoxUpperX.Maximum = 30D; + this.numericBoxUpperX.Minimum = 0D; + this.numericBoxUpperX.Name = "numericBoxUpperX"; + this.numericBoxUpperX.RadianValue = 0.52359877559829882D; + this.numericBoxUpperX.ShowUpDown = true; + this.numericBoxUpperX.SmartIncrement = true; + this.numericBoxUpperX.ThonsandsSeparator = true; + this.numericBoxUpperX.Value = 30D; + this.numericBoxUpperX.WordWrap = false; + this.numericBoxUpperX.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBox_ValueChanged); + this.numericBoxUpperX.LimitChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxUpperX_LimitChanged); + this.numericBoxUpperX.MouseDown += new System.Windows.Forms.MouseEventHandler(this.numericUpDownLimitChange_MouseDown); + // + // numericBoxLowerX + // + resources.ApplyResources(this.numericBoxLowerX, "numericBoxLowerX"); + this.numericBoxLowerX.BackColor = System.Drawing.SystemColors.Control; + this.numericBoxLowerX.DecimalPlaces = 2; + this.numericBoxLowerX.FooterBackColor = System.Drawing.SystemColors.Control; + this.numericBoxLowerX.HeaderBackColor = System.Drawing.SystemColors.Control; + this.numericBoxLowerX.Maximum = 30D; + this.numericBoxLowerX.Minimum = 0D; + this.numericBoxLowerX.Name = "numericBoxLowerX"; + this.numericBoxLowerX.ShowUpDown = true; + this.numericBoxLowerX.SmartIncrement = true; + this.numericBoxLowerX.ThonsandsSeparator = true; + this.numericBoxLowerX.WordWrap = false; + this.numericBoxLowerX.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBox_ValueChanged); + this.numericBoxLowerX.LimitChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxUpperX_LimitChanged); + this.numericBoxLowerX.MouseDown += new System.Windows.Forms.MouseEventHandler(this.numericUpDownLimitChange_MouseDown); + // + // colorDataGridViewTextBoxColumn + // + this.colorDataGridViewTextBoxColumn.DataPropertyName = "Color"; + resources.ApplyResources(this.colorDataGridViewTextBoxColumn, "colorDataGridViewTextBoxColumn"); + this.colorDataGridViewTextBoxColumn.Name = "colorDataGridViewTextBoxColumn"; + this.colorDataGridViewTextBoxColumn.ReadOnly = true; + this.colorDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colorDataGridViewTextBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // profileDataGridViewTextBoxColumn + // + this.profileDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.profileDataGridViewTextBoxColumn.DataPropertyName = "Profile"; + resources.ApplyResources(this.profileDataGridViewTextBoxColumn, "profileDataGridViewTextBoxColumn"); + this.profileDataGridViewTextBoxColumn.Name = "profileDataGridViewTextBoxColumn"; + this.profileDataGridViewTextBoxColumn.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.False; + this.PeakColor.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // Crystal + // + this.Crystal.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.Crystal.DataPropertyName = "Crystal"; + dataGridViewCellStyle6.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Crystal.DefaultCellStyle = dataGridViewCellStyle6; + resources.ApplyResources(this.Crystal, "Crystal"); + this.Crystal.Name = "Crystal"; + this.Crystal.ReadOnly = true; + this.Crystal.Resizable = System.Windows.Forms.DataGridViewTriState.False; + // // FormMain // this.AllowDrop = true; @@ -3609,15 +3676,15 @@ private void InitializeComponent() this.splitContainer2.ResumeLayout(false); this.groupBox1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewProfiles)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSourceProfile)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataSet)).EndInit(); this.groupBoxCrystalData.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewCrystals)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSourceCrystal)).EndInit(); this.menuStrip.ResumeLayout(false); this.menuStrip.PerformLayout(); this.toolStrip2.ResumeLayout(false); this.toolStrip2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSourceProfile)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataSet)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSourceCrystal)).EndInit(); this.ResumeLayout(false); } @@ -3961,5 +4028,11 @@ private void InitializeComponent() private DataGridViewImageColumn dataGridViewImageColumn80; private DataGridViewTextBoxColumn dataGridViewTextBoxColumn105; private ToolStripProgressBar toolStripProgressBar; + private DataGridViewImageColumn dataGridViewImageColumn82; + private DataGridViewTextBoxColumn dataGridViewTextBoxColumn107; + private DataGridViewImageColumn dataGridViewImageColumn81; + private DataGridViewTextBoxColumn dataGridViewTextBoxColumn106; + private DataGridViewImageColumn dataGridViewImageColumn83; + private DataGridViewTextBoxColumn dataGridViewTextBoxColumn108; } } \ No newline at end of file diff --git a/PDIndexer/FormMain.resx b/PDIndexer/FormMain.resx index a278e8d..f5f7674 100644 --- a/PDIndexer/FormMain.resx +++ b/PDIndexer/FormMain.resx @@ -154,10 +154,10 @@ False - Arial, 8.25pt + Tahoma, 8.25pt - 629, 26 + 660, 26 Ctrl+Shift+E: Equation of States; Ctrl+Shift+F: Fitting Parameter; Ctrl+Shift+C: Crystal Parameter; Ctrl+Shift+D: change peak mode @@ -238,7 +238,7 @@ horizontalAxisUserControl - Crystallography.Controls.HorizontalAxisUserControl, Crystallography.Controls, Version=2020.7.28.916, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.HorizontalAxisUserControl, Crystallography.Controls, Version=2020.7.29.1123, Culture=neutral, PublicKeyToken=null tabPage1 @@ -572,7 +572,7 @@ 3, 4, 3, 4 - 1000, 27 + 1000, 25 1, 25 @@ -581,7 +581,7 @@ 1, 1, 1, 1 - 74, 27 + 74, 25 4 @@ -590,7 +590,7 @@ numericalTextBoxIncreasingPixels - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.7.28.916, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.7.29.1123, Culture=neutral, PublicKeyToken=null groupBox3 @@ -836,7 +836,7 @@ colorControlScaleText - Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.7.28.916, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.7.29.1123, Culture=neutral, PublicKeyToken=null groupBox2 @@ -893,7 +893,7 @@ colorControlScaleLine - Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.7.28.916, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.7.29.1123, Culture=neutral, PublicKeyToken=null groupBox2 @@ -950,7 +950,7 @@ colorControlBack - Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.7.28.916, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.ColorControl, Crystallography.Controls, Version=2020.7.29.1123, Culture=neutral, PublicKeyToken=null groupBox2 @@ -1562,7 +1562,7 @@ graphControlFrequency - Crystallography.Controls.GraphControl, Crystallography.Controls, Version=2020.7.28.916, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.GraphControl, Crystallography.Controls, Version=2020.7.29.1123, Culture=neutral, PublicKeyToken=null tabPage3 @@ -1698,7 +1698,7 @@ numericBoxUpperY - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.7.28.916, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.7.29.1123, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1776,7 +1776,7 @@ numericBoxLowerY - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.7.28.916, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.7.29.1123, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1854,7 +1854,7 @@ numericBoxUpperX - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.7.28.916, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.7.29.1123, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -1932,7 +1932,7 @@ numericBoxLowerX - Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.7.28.916, Culture=neutral, PublicKeyToken=null + Crystallography.Controls.NumericBox, Crystallography.Controls, Version=2020.7.29.1123, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -4712,6 +4712,51 @@ 10 + + PeakColor + + + 10 + + + 20 + + + Crystal + + + 10 + + + Color + + + 10 + + + 22 + + + Profile + + + 10 + + + PeakColor + + + 10 + + + 20 + + + Crystal + + + 10 + True @@ -4749,6 +4794,9 @@ AABtbQAAq20AAKurAACrqwAAx6sAAMerAADvqwAA76sAAP/HAAD/xwAA/8cAAP/HAAD/7wAA/+8AAA== + + NoControl + 795, 482 @@ -4779,60 +4827,6 @@ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - checkDataGridViewCheckBoxColumn2 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - colorDataGridViewTextBoxColumn - - - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - profileDataGridViewTextBoxColumn - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - bindingSourceProfile - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - dataSet - - - PDIndexer.DataSet, DataSet.Designer.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - checkDataGridViewCheckBoxColumn1 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PeakColor - - - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Crystal - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - bindingSourceCrystal - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - fileToolStripMenuItem @@ -6333,6 +6327,96 @@ System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + checkDataGridViewCheckBoxColumn2 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + checkDataGridViewCheckBoxColumn1 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dataGridViewImageColumn82 + + + System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dataGridViewTextBoxColumn107 + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + bindingSourceProfile + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dataSet + + + PDIndexer.DataSet, DataSet.Designer.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + bindingSourceCrystal + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dataGridViewImageColumn81 + + + System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dataGridViewTextBoxColumn106 + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dataGridViewImageColumn83 + + + System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dataGridViewTextBoxColumn108 + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + colorDataGridViewTextBoxColumn + + + System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + profileDataGridViewTextBoxColumn + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PeakColor + + + System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Crystal + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + FormMain diff --git a/PDIndexer/PDIndexer.csproj b/PDIndexer/PDIndexer.csproj index 77332c0..6f73d7d 100644 --- a/PDIndexer/PDIndexer.csproj +++ b/PDIndexer/PDIndexer.csproj @@ -478,6 +478,9 @@ SettingsSingleFileGenerator Settings.Designer.cs + + PreserveNewest + diff --git a/PDIndexer/Properties/AssemblyInfo.cs b/PDIndexer/Properties/AssemblyInfo.cs index 944956d..44bfdd9 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.5.23.1221")] +[assembly: AssemblyVersion("2020.7.30.0301")] // // AZuɏɂ́AgpL[w肵Ȃ΂Ȃ܂B @@ -57,6 +57,6 @@ [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile("")] [assembly: AssemblyKeyName("")] -[assembly: AssemblyFileVersion("2020.5.23.1221")] +[assembly: AssemblyFileVersion("2020.7.30.0301")] [assembly: ComVisible(false)] diff --git a/PDIndexer/StdDb.cdb3 b/PDIndexer/StdDb.cdb3 new file mode 100644 index 0000000..46c6ead Binary files /dev/null and b/PDIndexer/StdDb.cdb3 differ diff --git a/PDIndexer/Version.cs b/PDIndexer/Version.cs index 3c00b58..b15c699 100644 --- a/PDIndexer/Version.cs +++ b/PDIndexer/Version.cs @@ -28,6 +28,7 @@ static public string RecentHistory /// static public string History = "History" + + "\r\n ver4.384(2020/07/30) Added the AMCSD crystal database to 'Crystal Parameter' window." + "\r\n ver4.383(2020/05/01) Fixed GUIs." + "\r\n ver4.382(2020/04/26) Fixed a problem on loading Neutron TOF data." + "\r\n ver4.381(2020/03/27) Refixed a bug on loading multiple profiles." + diff --git a/PDIndexer/image/Database.png b/PDIndexer/image/Database.png new file mode 100644 index 0000000..8f11c27 Binary files /dev/null and b/PDIndexer/image/Database.png differ