diff --git a/Crystallography.Controls/Crystal/AtomControl.cs b/Crystallography.Controls/Crystal/AtomControl.cs index f364235..c0c27e5 100644 --- a/Crystallography.Controls/Crystal/AtomControl.cs +++ b/Crystallography.Controls/Crystal/AtomControl.cs @@ -589,7 +589,7 @@ private Atoms GetFromInterface() double[] aniso = UseTypeU ? [Aniso11 / 100, Aniso22 / 100, Aniso33 / 100, Aniso12 / 100, Aniso23 / 100, Aniso13 / 100] : - new[] { Aniso11, Aniso22, Aniso33, Aniso12, Aniso23, Aniso13 }; + [Aniso11, Aniso22, Aniso33, Aniso12, Aniso23, Aniso13]; double[] anisoErr = UseTypeU ? [Aniso11Err / 100, Aniso22Err / 100, Aniso33Err / 100, Aniso12Err / 100, Aniso23Err / 100, Aniso13Err / 100] : diff --git a/Crystallography.Controls/Crystal/CrystalControl.Designer.cs b/Crystallography.Controls/Crystal/CrystalControl.Designer.cs index 96d1e65..a9dae41 100644 --- a/Crystallography.Controls/Crystal/CrystalControl.Designer.cs +++ b/Crystallography.Controls/Crystal/CrystalControl.Designer.cs @@ -28,1245 +28,1245 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); + components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CrystalControl)); - this.tabControl = new System.Windows.Forms.TabControl(); - this.tabPageBasicInfo = new System.Windows.Forms.TabPage(); - this.panel5 = new System.Windows.Forms.Panel(); - this.flowLayoutPanel4 = new System.Windows.Forms.FlowLayoutPanel(); - this.numericBoxVolume = new Crystallography.Controls.NumericBox(); - this.numericBoxCellMass = new Crystallography.Controls.NumericBox(); - this.numericBoxMolarVolume = new Crystallography.Controls.NumericBox(); - this.numericBoxMolarMass = new Crystallography.Controls.NumericBox(); - this.numericBoxDensity = new Crystallography.Controls.NumericBox(); - this.colorControl = new Crystallography.Controls.ColorControl(); - this.symmetryControl = new Crystallography.Controls.SymmetryControl(); - this.tabPageAtom = new System.Windows.Forms.TabPage(); - this.atomControl = new Crystallography.Controls.AtomControl(); - this.panelAtom = new System.Windows.Forms.Panel(); - this.panel3 = new System.Windows.Forms.Panel(); - this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tabPageBondsPolyhedra = new System.Windows.Forms.TabPage(); - this.bondControl = new Crystallography.Controls.BondInputControl(); - this.tabPageReference = new System.Windows.Forms.TabPage(); - this.groupBox8 = new System.Windows.Forms.GroupBox(); - this.textBoxTitle = new System.Windows.Forms.TextBox(); - this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.textBoxAuthor = new System.Windows.Forms.TextBox(); - this.groupBox7 = new System.Windows.Forms.GroupBox(); - this.textBoxJournal = new System.Windows.Forms.TextBox(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.textBoxMemo = new System.Windows.Forms.TextBox(); - this.tabPageEOS = new System.Windows.Forms.TabPage(); - this.eosControl = new Crystallography.Controls.EOSControl(); - this.tabPageElasticity = new System.Windows.Forms.TabPage(); - this.elasticityControl1 = new Crystallography.Controls.ElasticityControl(); - this.tabPageStrainStress = new System.Windows.Forms.TabPage(); - this.buttonStressSet = new System.Windows.Forms.Button(); - this.numericBoxStrain33 = new Crystallography.Controls.NumericBox(); - this.numericBoxHill = new Crystallography.Controls.NumericBox(); - this.label116 = new System.Windows.Forms.Label(); - this.label117 = new System.Windows.Forms.Label(); - this.label109 = new System.Windows.Forms.Label(); - this.label110 = new System.Windows.Forms.Label(); - this.label111 = new System.Windows.Forms.Label(); - this.label112 = new System.Windows.Forms.Label(); - this.label113 = new System.Windows.Forms.Label(); - this.label114 = new System.Windows.Forms.Label(); - this.label115 = new System.Windows.Forms.Label(); - this.label102 = new System.Windows.Forms.Label(); - this.label103 = new System.Windows.Forms.Label(); - this.label104 = new System.Windows.Forms.Label(); - this.label105 = new System.Windows.Forms.Label(); - this.label106 = new System.Windows.Forms.Label(); - this.label107 = new System.Windows.Forms.Label(); - this.label108 = new System.Windows.Forms.Label(); - this.numericBoxStress33 = new Crystallography.Controls.NumericBox(); - this.numericBoxStress22 = new Crystallography.Controls.NumericBox(); - this.numericBoxStress11 = new Crystallography.Controls.NumericBox(); - this.numericBoxStress23 = new Crystallography.Controls.NumericBox(); - this.numericBoxStress13 = new Crystallography.Controls.NumericBox(); - this.numericBoxStress12 = new Crystallography.Controls.NumericBox(); - this.numericBoxStrain11 = new Crystallography.Controls.NumericBox(); - this.numericBoxStrain22 = new Crystallography.Controls.NumericBox(); - this.numericBoxStrain12 = new Crystallography.Controls.NumericBox(); - this.numericBoxStrain23 = new Crystallography.Controls.NumericBox(); - this.numericBoxStrain13 = new Crystallography.Controls.NumericBox(); - this.tabPagePolycrystalline = new System.Windows.Forms.TabPage(); - this.contextMenuStripPoleFigure = new System.Windows.Forms.ContextMenuStrip(this.components); - this.readToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.asTXTFileAllEulerAngleAndDensityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.poleFigureControl = new Crystallography.Controls.PoleFigureControl(); - this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel(); - this.buttonGenerateRandomOrientations = new System.Windows.Forms.Button(); - this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); - this.label5 = new System.Windows.Forms.Label(); - this.numericUpDownAngleResolution = new System.Windows.Forms.NumericUpDown(); - this.label29 = new System.Windows.Forms.Label(); - this.numericUpDownAngleSubDivision = new System.Windows.Forms.NumericUpDown(); - this.label101 = new System.Windows.Forms.Label(); - this.numericUpDownCrystallineSize = new System.Windows.Forms.NumericUpDown(); - this.label99 = new System.Windows.Forms.Label(); - this.tabPageBounds = new System.Windows.Forms.TabPage(); - this.boundControl = new Crystallography.Controls.BoundControl(); - this.tabPageLatticePlane = new System.Windows.Forms.TabPage(); - this.latticePlaneControl = new Crystallography.Controls.LatticePlaneControl(); - this.panel1 = new System.Windows.Forms.Panel(); - this.textBoxFormula = new System.Windows.Forms.TextBox(); - this.numericBoxZnumber = new Crystallography.Controls.NumericBox(); - this.label90 = new System.Windows.Forms.Label(); - this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); - this.scatteringFactorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.symmetryInformationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.importCrystalFromCIFAMCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.exportThisCrystalAsCIFToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.sendThisCrystalToOtherSoftwareToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.revertCellConstantsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.strainControlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.convertToP1SymmetryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.convertToSuperstructureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.convertToAnotherSpacegroupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.textBoxName = new System.Windows.Forms.TextBox(); - this.label22 = new System.Windows.Forms.Label(); - this.toolTip = new System.Windows.Forms.ToolTip(this.components); - this.buttonScatteringFactor = new System.Windows.Forms.Button(); - this.buttonSymmetryInfo = new System.Windows.Forms.Button(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.panel4 = new System.Windows.Forms.Panel(); - this.tabControl.SuspendLayout(); - this.tabPageBasicInfo.SuspendLayout(); - this.panel5.SuspendLayout(); - this.flowLayoutPanel4.SuspendLayout(); - this.tabPageAtom.SuspendLayout(); - this.panelAtom.SuspendLayout(); - this.contextMenuStrip2.SuspendLayout(); - this.tabPageBondsPolyhedra.SuspendLayout(); - this.tabPageReference.SuspendLayout(); - this.groupBox8.SuspendLayout(); - this.groupBox6.SuspendLayout(); - this.groupBox7.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.tabPageEOS.SuspendLayout(); - this.tabPageElasticity.SuspendLayout(); - this.tabPageStrainStress.SuspendLayout(); - this.tabPagePolycrystalline.SuspendLayout(); - this.contextMenuStripPoleFigure.SuspendLayout(); - this.flowLayoutPanel3.SuspendLayout(); - this.flowLayoutPanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAngleResolution)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAngleSubDivision)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCrystallineSize)).BeginInit(); - this.tabPageBounds.SuspendLayout(); - this.tabPageLatticePlane.SuspendLayout(); - this.panel1.SuspendLayout(); - this.contextMenuStrip.SuspendLayout(); - this.panel4.SuspendLayout(); - this.SuspendLayout(); + tabControl = new System.Windows.Forms.TabControl(); + tabPageBasicInfo = new System.Windows.Forms.TabPage(); + panel5 = new System.Windows.Forms.Panel(); + flowLayoutPanel4 = new System.Windows.Forms.FlowLayoutPanel(); + numericBoxVolume = new NumericBox(); + numericBoxCellMass = new NumericBox(); + numericBoxMolarVolume = new NumericBox(); + numericBoxMolarMass = new NumericBox(); + numericBoxDensity = new NumericBox(); + colorControl = new ColorControl(); + symmetryControl = new SymmetryControl(); + tabPageAtom = new System.Windows.Forms.TabPage(); + atomControl = new AtomControl(); + panelAtom = new System.Windows.Forms.Panel(); + panel3 = new System.Windows.Forms.Panel(); + contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(components); + resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + tabPageBondsPolyhedra = new System.Windows.Forms.TabPage(); + bondControl = new BondInputControl(); + tabPageReference = new System.Windows.Forms.TabPage(); + groupBox8 = new System.Windows.Forms.GroupBox(); + textBoxTitle = new System.Windows.Forms.TextBox(); + groupBox6 = new System.Windows.Forms.GroupBox(); + textBoxAuthor = new System.Windows.Forms.TextBox(); + groupBox7 = new System.Windows.Forms.GroupBox(); + textBoxJournal = new System.Windows.Forms.TextBox(); + groupBox5 = new System.Windows.Forms.GroupBox(); + textBoxMemo = new System.Windows.Forms.TextBox(); + tabPageEOS = new System.Windows.Forms.TabPage(); + eosControl = new EOSControl(); + tabPageElasticity = new System.Windows.Forms.TabPage(); + elasticityControl1 = new ElasticityControl(); + tabPageStrainStress = new System.Windows.Forms.TabPage(); + buttonStressSet = new System.Windows.Forms.Button(); + numericBoxStrain33 = new NumericBox(); + numericBoxHill = new NumericBox(); + label116 = new System.Windows.Forms.Label(); + label117 = new System.Windows.Forms.Label(); + label109 = new System.Windows.Forms.Label(); + label110 = new System.Windows.Forms.Label(); + label111 = new System.Windows.Forms.Label(); + label112 = new System.Windows.Forms.Label(); + label113 = new System.Windows.Forms.Label(); + label114 = new System.Windows.Forms.Label(); + label115 = new System.Windows.Forms.Label(); + label102 = new System.Windows.Forms.Label(); + label103 = new System.Windows.Forms.Label(); + label104 = new System.Windows.Forms.Label(); + label105 = new System.Windows.Forms.Label(); + label106 = new System.Windows.Forms.Label(); + label107 = new System.Windows.Forms.Label(); + label108 = new System.Windows.Forms.Label(); + numericBoxStress33 = new NumericBox(); + numericBoxStress22 = new NumericBox(); + numericBoxStress11 = new NumericBox(); + numericBoxStress23 = new NumericBox(); + numericBoxStress13 = new NumericBox(); + numericBoxStress12 = new NumericBox(); + numericBoxStrain11 = new NumericBox(); + numericBoxStrain22 = new NumericBox(); + numericBoxStrain12 = new NumericBox(); + numericBoxStrain23 = new NumericBox(); + numericBoxStrain13 = new NumericBox(); + tabPagePolycrystalline = new System.Windows.Forms.TabPage(); + contextMenuStripPoleFigure = new System.Windows.Forms.ContextMenuStrip(components); + readToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + asTXTFileAllEulerAngleAndDensityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + poleFigureControl = new PoleFigureControl(); + flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel(); + buttonGenerateRandomOrientations = new System.Windows.Forms.Button(); + flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); + label5 = new System.Windows.Forms.Label(); + numericUpDownAngleResolution = new System.Windows.Forms.NumericUpDown(); + label29 = new System.Windows.Forms.Label(); + numericUpDownAngleSubDivision = new System.Windows.Forms.NumericUpDown(); + label101 = new System.Windows.Forms.Label(); + numericUpDownCrystallineSize = new System.Windows.Forms.NumericUpDown(); + label99 = new System.Windows.Forms.Label(); + tabPageBounds = new System.Windows.Forms.TabPage(); + boundControl = new BoundControl(); + tabPageLatticePlane = new System.Windows.Forms.TabPage(); + latticePlaneControl = new LatticePlaneControl(); + panel1 = new System.Windows.Forms.Panel(); + textBoxFormula = new System.Windows.Forms.TextBox(); + numericBoxZnumber = new NumericBox(); + label90 = new System.Windows.Forms.Label(); + contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(components); + scatteringFactorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + symmetryInformationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + importCrystalFromCIFAMCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + exportThisCrystalAsCIFToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + sendThisCrystalToOtherSoftwareToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + revertCellConstantsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + strainControlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + convertToP1SymmetryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + convertToSuperstructureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + convertToAnotherSpacegroupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + textBoxName = new System.Windows.Forms.TextBox(); + label22 = new System.Windows.Forms.Label(); + toolTip = new System.Windows.Forms.ToolTip(components); + buttonScatteringFactor = new System.Windows.Forms.Button(); + buttonSymmetryInfo = new System.Windows.Forms.Button(); + flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + panel4 = new System.Windows.Forms.Panel(); + tabControl.SuspendLayout(); + tabPageBasicInfo.SuspendLayout(); + panel5.SuspendLayout(); + flowLayoutPanel4.SuspendLayout(); + tabPageAtom.SuspendLayout(); + panelAtom.SuspendLayout(); + contextMenuStrip2.SuspendLayout(); + tabPageBondsPolyhedra.SuspendLayout(); + tabPageReference.SuspendLayout(); + groupBox8.SuspendLayout(); + groupBox6.SuspendLayout(); + groupBox7.SuspendLayout(); + groupBox5.SuspendLayout(); + tabPageEOS.SuspendLayout(); + tabPageElasticity.SuspendLayout(); + tabPageStrainStress.SuspendLayout(); + tabPagePolycrystalline.SuspendLayout(); + contextMenuStripPoleFigure.SuspendLayout(); + flowLayoutPanel3.SuspendLayout(); + flowLayoutPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownAngleResolution).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownAngleSubDivision).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownCrystallineSize).BeginInit(); + tabPageBounds.SuspendLayout(); + tabPageLatticePlane.SuspendLayout(); + panel1.SuspendLayout(); + contextMenuStrip.SuspendLayout(); + panel4.SuspendLayout(); + SuspendLayout(); // // tabControl // - this.tabControl.AllowDrop = true; - this.tabControl.Controls.Add(this.tabPageBasicInfo); - this.tabControl.Controls.Add(this.tabPageAtom); - this.tabControl.Controls.Add(this.tabPageBondsPolyhedra); - this.tabControl.Controls.Add(this.tabPageReference); - this.tabControl.Controls.Add(this.tabPageEOS); - this.tabControl.Controls.Add(this.tabPageElasticity); - this.tabControl.Controls.Add(this.tabPageStrainStress); - this.tabControl.Controls.Add(this.tabPagePolycrystalline); - this.tabControl.Controls.Add(this.tabPageBounds); - this.tabControl.Controls.Add(this.tabPageLatticePlane); - resources.ApplyResources(this.tabControl, "tabControl"); - this.tabControl.HotTrack = true; - this.tabControl.Name = "tabControl"; - this.tabControl.SelectedIndex = 0; - this.tabControl.DragDrop += new System.Windows.Forms.DragEventHandler(this.FormCrystal_DragDrop); - this.tabControl.DragEnter += new System.Windows.Forms.DragEventHandler(this.FormCrystal_DragEnter); + resources.ApplyResources(tabControl, "tabControl"); + tabControl.AllowDrop = true; + tabControl.Controls.Add(tabPageBasicInfo); + tabControl.Controls.Add(tabPageAtom); + tabControl.Controls.Add(tabPageBondsPolyhedra); + tabControl.Controls.Add(tabPageReference); + tabControl.Controls.Add(tabPageEOS); + tabControl.Controls.Add(tabPageElasticity); + tabControl.Controls.Add(tabPageStrainStress); + tabControl.Controls.Add(tabPagePolycrystalline); + tabControl.Controls.Add(tabPageBounds); + tabControl.Controls.Add(tabPageLatticePlane); + tabControl.HotTrack = true; + tabControl.Name = "tabControl"; + tabControl.SelectedIndex = 0; + toolTip.SetToolTip(tabControl, resources.GetString("tabControl.ToolTip")); + tabControl.DragDrop += FormCrystal_DragDrop; + tabControl.DragEnter += FormCrystal_DragEnter; // // tabPageBasicInfo // - this.tabPageBasicInfo.BackColor = System.Drawing.SystemColors.Control; - this.tabPageBasicInfo.Controls.Add(this.panel5); - resources.ApplyResources(this.tabPageBasicInfo, "tabPageBasicInfo"); - this.tabPageBasicInfo.Name = "tabPageBasicInfo"; - this.toolTip.SetToolTip(this.tabPageBasicInfo, resources.GetString("tabPageBasicInfo.ToolTip")); + resources.ApplyResources(tabPageBasicInfo, "tabPageBasicInfo"); + tabPageBasicInfo.BackColor = System.Drawing.SystemColors.Control; + tabPageBasicInfo.Controls.Add(panel5); + tabPageBasicInfo.Name = "tabPageBasicInfo"; + toolTip.SetToolTip(tabPageBasicInfo, resources.GetString("tabPageBasicInfo.ToolTip")); // // panel5 // - this.panel5.Controls.Add(this.flowLayoutPanel4); - this.panel5.Controls.Add(this.symmetryControl); - resources.ApplyResources(this.panel5, "panel5"); - this.panel5.Name = "panel5"; + resources.ApplyResources(panel5, "panel5"); + panel5.Controls.Add(flowLayoutPanel4); + panel5.Controls.Add(symmetryControl); + panel5.Name = "panel5"; + toolTip.SetToolTip(panel5, resources.GetString("panel5.ToolTip")); // // flowLayoutPanel4 // - resources.ApplyResources(this.flowLayoutPanel4, "flowLayoutPanel4"); - this.flowLayoutPanel4.Controls.Add(this.numericBoxVolume); - this.flowLayoutPanel4.Controls.Add(this.numericBoxCellMass); - this.flowLayoutPanel4.Controls.Add(this.numericBoxMolarVolume); - this.flowLayoutPanel4.Controls.Add(this.numericBoxMolarMass); - this.flowLayoutPanel4.Controls.Add(this.numericBoxDensity); - this.flowLayoutPanel4.Controls.Add(this.colorControl); - this.flowLayoutPanel4.Name = "flowLayoutPanel4"; + resources.ApplyResources(flowLayoutPanel4, "flowLayoutPanel4"); + flowLayoutPanel4.Controls.Add(numericBoxVolume); + flowLayoutPanel4.Controls.Add(numericBoxCellMass); + flowLayoutPanel4.Controls.Add(numericBoxMolarVolume); + flowLayoutPanel4.Controls.Add(numericBoxMolarMass); + flowLayoutPanel4.Controls.Add(numericBoxDensity); + flowLayoutPanel4.Controls.Add(colorControl); + flowLayoutPanel4.Name = "flowLayoutPanel4"; + toolTip.SetToolTip(flowLayoutPanel4, resources.GetString("flowLayoutPanel4.ToolTip")); // // numericBoxVolume // - resources.ApplyResources(this.numericBoxVolume, "numericBoxVolume"); - this.numericBoxVolume.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxVolume.DecimalPlaces = 4; - this.numericBoxVolume.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxVolume.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxVolume.Name = "numericBoxVolume"; - this.numericBoxVolume.ReadOnly = true; - this.numericBoxVolume.RestrictLimitValue = false; - this.numericBoxVolume.RoundErrorAccuracy = -1; - this.numericBoxVolume.SkipEventDuringInput = false; - this.numericBoxVolume.SmartIncrement = true; - this.numericBoxVolume.TextBoxBackColor = System.Drawing.SystemColors.Control; - this.numericBoxVolume.TextFont = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.toolTip.SetToolTip(this.numericBoxVolume, resources.GetString("numericBoxVolume.ToolTip")); + resources.ApplyResources(numericBoxVolume, "numericBoxVolume"); + numericBoxVolume.BackColor = System.Drawing.SystemColors.Control; + numericBoxVolume.DecimalPlaces = 4; + numericBoxVolume.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxVolume.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxVolume.Name = "numericBoxVolume"; + numericBoxVolume.ReadOnly = true; + numericBoxVolume.RestrictLimitValue = false; + numericBoxVolume.RoundErrorAccuracy = -1; + numericBoxVolume.SkipEventDuringInput = false; + numericBoxVolume.SmartIncrement = true; + numericBoxVolume.TabStop = false; + numericBoxVolume.TextBoxBackColor = System.Drawing.SystemColors.Control; + toolTip.SetToolTip(numericBoxVolume, resources.GetString("numericBoxVolume.ToolTip")); // // numericBoxCellMass // - resources.ApplyResources(this.numericBoxCellMass, "numericBoxCellMass"); - this.numericBoxCellMass.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxCellMass.DecimalPlaces = 4; - this.numericBoxCellMass.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxCellMass.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxCellMass.Name = "numericBoxCellMass"; - this.numericBoxCellMass.ReadOnly = true; - this.numericBoxCellMass.RestrictLimitValue = false; - this.numericBoxCellMass.RoundErrorAccuracy = -1; - this.numericBoxCellMass.SkipEventDuringInput = false; - this.numericBoxCellMass.SmartIncrement = true; - this.numericBoxCellMass.TextBoxBackColor = System.Drawing.SystemColors.Control; - this.numericBoxCellMass.TextFont = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.toolTip.SetToolTip(this.numericBoxCellMass, resources.GetString("numericBoxCellMass.ToolTip")); + resources.ApplyResources(numericBoxCellMass, "numericBoxCellMass"); + numericBoxCellMass.BackColor = System.Drawing.SystemColors.Control; + numericBoxCellMass.DecimalPlaces = 4; + numericBoxCellMass.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxCellMass.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxCellMass.Name = "numericBoxCellMass"; + numericBoxCellMass.ReadOnly = true; + numericBoxCellMass.RestrictLimitValue = false; + numericBoxCellMass.RoundErrorAccuracy = -1; + numericBoxCellMass.SkipEventDuringInput = false; + numericBoxCellMass.SmartIncrement = true; + numericBoxCellMass.TabStop = false; + numericBoxCellMass.TextBoxBackColor = System.Drawing.SystemColors.Control; + toolTip.SetToolTip(numericBoxCellMass, resources.GetString("numericBoxCellMass.ToolTip")); // // numericBoxMolarVolume // - resources.ApplyResources(this.numericBoxMolarVolume, "numericBoxMolarVolume"); - this.numericBoxMolarVolume.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxMolarVolume.DecimalPlaces = 4; - this.numericBoxMolarVolume.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxMolarVolume.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxMolarVolume.Name = "numericBoxMolarVolume"; - this.numericBoxMolarVolume.ReadOnly = true; - this.numericBoxMolarVolume.RestrictLimitValue = false; - this.numericBoxMolarVolume.RoundErrorAccuracy = -1; - this.numericBoxMolarVolume.SkipEventDuringInput = false; - this.numericBoxMolarVolume.SmartIncrement = true; - this.numericBoxMolarVolume.TextBoxBackColor = System.Drawing.SystemColors.Control; - this.numericBoxMolarVolume.TextFont = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.toolTip.SetToolTip(this.numericBoxMolarVolume, resources.GetString("numericBoxMolarVolume.ToolTip")); + resources.ApplyResources(numericBoxMolarVolume, "numericBoxMolarVolume"); + numericBoxMolarVolume.BackColor = System.Drawing.SystemColors.Control; + numericBoxMolarVolume.DecimalPlaces = 4; + numericBoxMolarVolume.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxMolarVolume.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxMolarVolume.Name = "numericBoxMolarVolume"; + numericBoxMolarVolume.ReadOnly = true; + numericBoxMolarVolume.RestrictLimitValue = false; + numericBoxMolarVolume.RoundErrorAccuracy = -1; + numericBoxMolarVolume.SkipEventDuringInput = false; + numericBoxMolarVolume.SmartIncrement = true; + numericBoxMolarVolume.TabStop = false; + numericBoxMolarVolume.TextBoxBackColor = System.Drawing.SystemColors.Control; + toolTip.SetToolTip(numericBoxMolarVolume, resources.GetString("numericBoxMolarVolume.ToolTip")); // // numericBoxMolarMass // - resources.ApplyResources(this.numericBoxMolarMass, "numericBoxMolarMass"); - this.numericBoxMolarMass.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxMolarMass.DecimalPlaces = 4; - this.numericBoxMolarMass.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxMolarMass.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxMolarMass.Name = "numericBoxMolarMass"; - this.numericBoxMolarMass.ReadOnly = true; - this.numericBoxMolarMass.RestrictLimitValue = false; - this.numericBoxMolarMass.RoundErrorAccuracy = -1; - this.numericBoxMolarMass.SkipEventDuringInput = false; - this.numericBoxMolarMass.SmartIncrement = true; - this.numericBoxMolarMass.TextBoxBackColor = System.Drawing.SystemColors.Control; - this.numericBoxMolarMass.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.toolTip.SetToolTip(this.numericBoxMolarMass, resources.GetString("numericBoxMolarMass.ToolTip")); + resources.ApplyResources(numericBoxMolarMass, "numericBoxMolarMass"); + numericBoxMolarMass.BackColor = System.Drawing.SystemColors.Control; + numericBoxMolarMass.DecimalPlaces = 4; + numericBoxMolarMass.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxMolarMass.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxMolarMass.Name = "numericBoxMolarMass"; + numericBoxMolarMass.ReadOnly = true; + numericBoxMolarMass.RestrictLimitValue = false; + numericBoxMolarMass.RoundErrorAccuracy = -1; + numericBoxMolarMass.SkipEventDuringInput = false; + numericBoxMolarMass.SmartIncrement = true; + numericBoxMolarMass.TabStop = false; + numericBoxMolarMass.TextBoxBackColor = System.Drawing.SystemColors.Control; + toolTip.SetToolTip(numericBoxMolarMass, resources.GetString("numericBoxMolarMass.ToolTip")); // // numericBoxDensity // - resources.ApplyResources(this.numericBoxDensity, "numericBoxDensity"); - this.numericBoxDensity.BackColor = System.Drawing.Color.Transparent; - this.numericBoxDensity.DecimalPlaces = 4; - this.numericBoxDensity.Name = "numericBoxDensity"; - this.numericBoxDensity.ReadOnly = true; - this.numericBoxDensity.RoundErrorAccuracy = -1; - this.numericBoxDensity.SkipEventDuringInput = false; - this.numericBoxDensity.SmartIncrement = true; - this.numericBoxDensity.TextBoxBackColor = System.Drawing.SystemColors.Control; - this.numericBoxDensity.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.numericBoxDensity.ThonsandsSeparator = true; - this.toolTip.SetToolTip(this.numericBoxDensity, resources.GetString("numericBoxDensity.ToolTip")); + resources.ApplyResources(numericBoxDensity, "numericBoxDensity"); + numericBoxDensity.BackColor = System.Drawing.Color.Transparent; + numericBoxDensity.DecimalPlaces = 4; + numericBoxDensity.Name = "numericBoxDensity"; + numericBoxDensity.ReadOnly = true; + numericBoxDensity.RoundErrorAccuracy = -1; + numericBoxDensity.SkipEventDuringInput = false; + numericBoxDensity.SmartIncrement = true; + numericBoxDensity.TabStop = false; + numericBoxDensity.TextBoxBackColor = System.Drawing.SystemColors.Control; + numericBoxDensity.ThonsandsSeparator = true; + toolTip.SetToolTip(numericBoxDensity, resources.GetString("numericBoxDensity.ToolTip")); // // colorControl // - this.colorControl.Argb = -986896; - resources.ApplyResources(this.colorControl, "colorControl"); - this.colorControl.Blue = 240; - this.colorControl.BlueF = 0.9411765F; - this.colorControl.BoxSize = new System.Drawing.Size(20, 20); - this.colorControl.Color = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); - this.colorControl.FlowDirection = System.Windows.Forms.FlowDirection.LeftToRight; - this.colorControl.Green = 240; - this.colorControl.GreenF = 0.9411765F; - this.colorControl.Name = "colorControl"; - this.colorControl.Red = 240; - this.colorControl.RedF = 0.9411765F; - this.toolTip.SetToolTip(this.colorControl, resources.GetString("colorControl.ToolTip1")); + resources.ApplyResources(colorControl, "colorControl"); + colorControl.Argb = -986896; + colorControl.Blue = 240; + colorControl.BlueF = 0.9411765F; + colorControl.BoxSize = new System.Drawing.Size(20, 20); + colorControl.Color = System.Drawing.Color.FromArgb(240, 240, 240); + colorControl.FlowDirection = System.Windows.Forms.FlowDirection.LeftToRight; + colorControl.Green = 240; + colorControl.GreenF = 0.9411765F; + colorControl.Name = "colorControl"; + colorControl.Red = 240; + colorControl.RedF = 0.9411765F; + toolTip.SetToolTip(colorControl, resources.GetString("colorControl.ToolTip1")); // // symmetryControl // - this.symmetryControl.A = 0D; - this.symmetryControl.Alpha = 0D; - this.symmetryControl.B = 0D; - this.symmetryControl.Beta = 0D; - this.symmetryControl.C = 0D; - resources.ApplyResources(this.symmetryControl, "symmetryControl"); - this.symmetryControl.Gamma = 0D; - this.symmetryControl.Name = "symmetryControl"; - this.symmetryControl.ShowError = false; - this.symmetryControl.SkipEvent = false; - this.symmetryControl.SymmetrySeriesNumber = 0; - this.symmetryControl.ItemChanged += new System.EventHandler(this.symmetryControl_ItemChanged); + symmetryControl.A = 0D; + resources.ApplyResources(symmetryControl, "symmetryControl"); + symmetryControl.Alpha = 0D; + symmetryControl.B = 0D; + symmetryControl.Beta = 0D; + symmetryControl.C = 0D; + symmetryControl.Gamma = 0D; + symmetryControl.Name = "symmetryControl"; + symmetryControl.ShowError = false; + symmetryControl.SkipEvent = false; + symmetryControl.SymmetrySeriesNumber = 0; + toolTip.SetToolTip(symmetryControl, resources.GetString("symmetryControl.ToolTip")); + symmetryControl.ItemChanged += symmetryControl_ItemChanged; // // tabPageAtom // - this.tabPageAtom.BackColor = System.Drawing.SystemColors.Control; - this.tabPageAtom.Controls.Add(this.atomControl); - this.tabPageAtom.Controls.Add(this.panelAtom); - resources.ApplyResources(this.tabPageAtom, "tabPageAtom"); - this.tabPageAtom.Name = "tabPageAtom"; - this.toolTip.SetToolTip(this.tabPageAtom, resources.GetString("tabPageAtom.ToolTip")); + resources.ApplyResources(tabPageAtom, "tabPageAtom"); + tabPageAtom.BackColor = System.Drawing.SystemColors.Control; + tabPageAtom.Controls.Add(atomControl); + tabPageAtom.Controls.Add(panelAtom); + tabPageAtom.Name = "tabPageAtom"; + toolTip.SetToolTip(tabPageAtom, resources.GetString("tabPageAtom.ToolTip")); // // atomControl // - this.atomControl.Alpha = 0F; - this.atomControl.Ambient = 0F; - this.atomControl.Aniso11 = 0D; - this.atomControl.Aniso11Err = 0D; - this.atomControl.Aniso12 = 0D; - this.atomControl.Aniso12Err = 0D; - this.atomControl.Aniso13 = 0D; - this.atomControl.Aniso13Err = 0D; - this.atomControl.Aniso22 = 0D; - this.atomControl.Aniso22Err = 0D; - this.atomControl.Aniso23 = 0D; - this.atomControl.Aniso23Err = 0D; - this.atomControl.Aniso33 = 0D; - this.atomControl.Aniso33Err = 0D; - this.atomControl.AppearanceTabVisible = false; - this.atomControl.AtomColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); - this.atomControl.AtomicPositionError = false; - this.atomControl.AtomNo = 0; - this.atomControl.AtomSubNoElectron = -1; - this.atomControl.AtomSubNoXray = -1; - resources.ApplyResources(this.atomControl, "atomControl"); - this.atomControl.Crystal = null; - this.atomControl.DebyeWallerError = false; - this.atomControl.DebyeWallerTabVisible = true; - this.atomControl.Diffusion = 0F; - this.atomControl.ElementAndPositionTabVisible = true; - this.atomControl.Emission = 0F; - this.atomControl.Iso = 0D; - this.atomControl.IsoErr = 0D; - this.atomControl.IsotopicComposition = null; - this.atomControl.Label = ""; - this.atomControl.Name = "atomControl"; - this.atomControl.Occ = 0D; - this.atomControl.OccErr = 0D; - this.atomControl.OriginShiftVisible = true; - this.atomControl.Radius = 0D; - this.atomControl.ScatteringFactorTabVisible = true; - this.atomControl.SelectedTabIndex = 0; - this.atomControl.Shininess = 0F; - this.atomControl.ShowLabel = false; - this.atomControl.SkipEvent = false; - this.atomControl.Specular = 0F; - this.atomControl.UseIsotropy = false; - this.atomControl.UseTypeU = false; - this.atomControl.X = 0D; - this.atomControl.XErr = 0D; - this.atomControl.Y = 0D; - this.atomControl.YErr = 0D; - this.atomControl.Z = 0D; - this.atomControl.ZErr = 0D; - this.atomControl.ItemsChanged += new System.EventHandler(this.atomControl_AtomsChanged); + resources.ApplyResources(atomControl, "atomControl"); + atomControl.Alpha = 0F; + atomControl.Ambient = 0F; + atomControl.Aniso11 = 0D; + atomControl.Aniso11Err = 0D; + atomControl.Aniso12 = 0D; + atomControl.Aniso12Err = 0D; + atomControl.Aniso13 = 0D; + atomControl.Aniso13Err = 0D; + atomControl.Aniso22 = 0D; + atomControl.Aniso22Err = 0D; + atomControl.Aniso23 = 0D; + atomControl.Aniso23Err = 0D; + atomControl.Aniso33 = 0D; + atomControl.Aniso33Err = 0D; + atomControl.AppearanceTabVisible = false; + atomControl.AtomColor = System.Drawing.Color.FromArgb(240, 240, 240); + atomControl.AtomicPositionError = false; + atomControl.AtomNo = 0; + atomControl.AtomSubNoElectron = -1; + atomControl.AtomSubNoXray = -1; + atomControl.Crystal = null; + atomControl.DebyeWallerError = false; + atomControl.DebyeWallerTabVisible = true; + atomControl.Diffusion = 0F; + atomControl.ElementAndPositionTabVisible = true; + atomControl.Emission = 0F; + atomControl.Iso = 0D; + atomControl.IsoErr = 0D; + atomControl.IsotopicComposition = null; + atomControl.Label = ""; + atomControl.Name = "atomControl"; + atomControl.Occ = 0D; + atomControl.OccErr = 0D; + atomControl.OriginShiftVisible = true; + atomControl.Radius = 0D; + atomControl.ScatteringFactorTabVisible = true; + atomControl.SelectedTabIndex = 0; + atomControl.Shininess = 0F; + atomControl.ShowLabel = false; + atomControl.SkipEvent = false; + atomControl.Specular = 0F; + toolTip.SetToolTip(atomControl, resources.GetString("atomControl.ToolTip")); + atomControl.UseIsotropy = false; + atomControl.UseTypeU = false; + atomControl.X = 0D; + atomControl.XErr = 0D; + atomControl.Y = 0D; + atomControl.YErr = 0D; + atomControl.Z = 0D; + atomControl.ZErr = 0D; + atomControl.ItemsChanged += atomControl_AtomsChanged; // // panelAtom // - resources.ApplyResources(this.panelAtom, "panelAtom"); - this.panelAtom.Controls.Add(this.panel3); - this.panelAtom.Name = "panelAtom"; + resources.ApplyResources(panelAtom, "panelAtom"); + panelAtom.Controls.Add(panel3); + panelAtom.Name = "panelAtom"; + toolTip.SetToolTip(panelAtom, resources.GetString("panelAtom.ToolTip")); // // panel3 // - resources.ApplyResources(this.panel3, "panel3"); - this.panel3.ContextMenuStrip = this.contextMenuStrip2; - this.panel3.Name = "panel3"; + resources.ApplyResources(panel3, "panel3"); + panel3.ContextMenuStrip = contextMenuStrip2; + panel3.Name = "panel3"; + toolTip.SetToolTip(panel3, resources.GetString("panel3.ToolTip")); // // contextMenuStrip2 // - resources.ApplyResources(this.contextMenuStrip2, "contextMenuStrip2"); - this.contextMenuStrip2.ImageScalingSize = new System.Drawing.Size(20, 20); - this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.resetToolStripMenuItem}); - this.contextMenuStrip2.Name = "contextMenuStrip2"; + resources.ApplyResources(contextMenuStrip2, "contextMenuStrip2"); + contextMenuStrip2.ImageScalingSize = new System.Drawing.Size(20, 20); + contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { resetToolStripMenuItem }); + contextMenuStrip2.Name = "contextMenuStrip2"; + toolTip.SetToolTip(contextMenuStrip2, resources.GetString("contextMenuStrip2.ToolTip")); // // resetToolStripMenuItem // - this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - resources.ApplyResources(this.resetToolStripMenuItem, "resetToolStripMenuItem"); - this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); + resources.ApplyResources(resetToolStripMenuItem, "resetToolStripMenuItem"); + resetToolStripMenuItem.Name = "resetToolStripMenuItem"; + resetToolStripMenuItem.Click += resetToolStripMenuItem_Click; // // tabPageBondsPolyhedra // - this.tabPageBondsPolyhedra.BackColor = System.Drawing.SystemColors.Control; - this.tabPageBondsPolyhedra.Controls.Add(this.bondControl); - resources.ApplyResources(this.tabPageBondsPolyhedra, "tabPageBondsPolyhedra"); - this.tabPageBondsPolyhedra.Name = "tabPageBondsPolyhedra"; + resources.ApplyResources(tabPageBondsPolyhedra, "tabPageBondsPolyhedra"); + tabPageBondsPolyhedra.BackColor = System.Drawing.SystemColors.Control; + tabPageBondsPolyhedra.Controls.Add(bondControl); + tabPageBondsPolyhedra.Name = "tabPageBondsPolyhedra"; + toolTip.SetToolTip(tabPageBondsPolyhedra, resources.GetString("tabPageBondsPolyhedra.ToolTip")); // // bondControl // - resources.ApplyResources(this.bondControl, "bondControl"); - this.bondControl.Crystal = null; - this.bondControl.ElementList = null; - this.bondControl.Name = "bondControl"; - this.bondControl.SkipEvent = false; + resources.ApplyResources(bondControl, "bondControl"); + bondControl.Crystal = null; + bondControl.ElementList = null; + bondControl.Name = "bondControl"; + bondControl.SkipEvent = false; + toolTip.SetToolTip(bondControl, resources.GetString("bondControl.ToolTip")); // // tabPageReference // - this.tabPageReference.BackColor = System.Drawing.SystemColors.Control; - this.tabPageReference.Controls.Add(this.groupBox8); - this.tabPageReference.Controls.Add(this.groupBox6); - this.tabPageReference.Controls.Add(this.groupBox7); - this.tabPageReference.Controls.Add(this.groupBox5); - resources.ApplyResources(this.tabPageReference, "tabPageReference"); - this.tabPageReference.Name = "tabPageReference"; + resources.ApplyResources(tabPageReference, "tabPageReference"); + tabPageReference.BackColor = System.Drawing.SystemColors.Control; + tabPageReference.Controls.Add(groupBox8); + tabPageReference.Controls.Add(groupBox6); + tabPageReference.Controls.Add(groupBox7); + tabPageReference.Controls.Add(groupBox5); + tabPageReference.Name = "tabPageReference"; + toolTip.SetToolTip(tabPageReference, resources.GetString("tabPageReference.ToolTip")); // // groupBox8 // - this.groupBox8.Controls.Add(this.textBoxTitle); - resources.ApplyResources(this.groupBox8, "groupBox8"); - this.groupBox8.Name = "groupBox8"; - this.groupBox8.TabStop = false; + resources.ApplyResources(groupBox8, "groupBox8"); + groupBox8.Controls.Add(textBoxTitle); + groupBox8.Name = "groupBox8"; + groupBox8.TabStop = false; + toolTip.SetToolTip(groupBox8, resources.GetString("groupBox8.ToolTip")); // // textBoxTitle // - this.textBoxTitle.AcceptsReturn = true; - resources.ApplyResources(this.textBoxTitle, "textBoxTitle"); - this.textBoxTitle.Name = "textBoxTitle"; + textBoxTitle.AcceptsReturn = true; + resources.ApplyResources(textBoxTitle, "textBoxTitle"); + textBoxTitle.Name = "textBoxTitle"; + toolTip.SetToolTip(textBoxTitle, resources.GetString("textBoxTitle.ToolTip")); // // groupBox6 // - this.groupBox6.Controls.Add(this.textBoxAuthor); - resources.ApplyResources(this.groupBox6, "groupBox6"); - this.groupBox6.Name = "groupBox6"; - this.groupBox6.TabStop = false; + resources.ApplyResources(groupBox6, "groupBox6"); + groupBox6.Controls.Add(textBoxAuthor); + groupBox6.Name = "groupBox6"; + groupBox6.TabStop = false; + toolTip.SetToolTip(groupBox6, resources.GetString("groupBox6.ToolTip")); // // textBoxAuthor // - this.textBoxAuthor.AcceptsReturn = true; - resources.ApplyResources(this.textBoxAuthor, "textBoxAuthor"); - this.textBoxAuthor.Name = "textBoxAuthor"; + textBoxAuthor.AcceptsReturn = true; + resources.ApplyResources(textBoxAuthor, "textBoxAuthor"); + textBoxAuthor.Name = "textBoxAuthor"; + toolTip.SetToolTip(textBoxAuthor, resources.GetString("textBoxAuthor.ToolTip")); // // groupBox7 // - this.groupBox7.Controls.Add(this.textBoxJournal); - resources.ApplyResources(this.groupBox7, "groupBox7"); - this.groupBox7.Name = "groupBox7"; - this.groupBox7.TabStop = false; + resources.ApplyResources(groupBox7, "groupBox7"); + groupBox7.Controls.Add(textBoxJournal); + groupBox7.Name = "groupBox7"; + groupBox7.TabStop = false; + toolTip.SetToolTip(groupBox7, resources.GetString("groupBox7.ToolTip")); // // textBoxJournal // - this.textBoxJournal.AcceptsReturn = true; - resources.ApplyResources(this.textBoxJournal, "textBoxJournal"); - this.textBoxJournal.Name = "textBoxJournal"; + textBoxJournal.AcceptsReturn = true; + resources.ApplyResources(textBoxJournal, "textBoxJournal"); + textBoxJournal.Name = "textBoxJournal"; + toolTip.SetToolTip(textBoxJournal, resources.GetString("textBoxJournal.ToolTip")); // // groupBox5 // - this.groupBox5.Controls.Add(this.textBoxMemo); - resources.ApplyResources(this.groupBox5, "groupBox5"); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.TabStop = false; + resources.ApplyResources(groupBox5, "groupBox5"); + groupBox5.Controls.Add(textBoxMemo); + groupBox5.Name = "groupBox5"; + groupBox5.TabStop = false; + toolTip.SetToolTip(groupBox5, resources.GetString("groupBox5.ToolTip")); // // textBoxMemo // - resources.ApplyResources(this.textBoxMemo, "textBoxMemo"); - this.textBoxMemo.Name = "textBoxMemo"; + resources.ApplyResources(textBoxMemo, "textBoxMemo"); + textBoxMemo.Name = "textBoxMemo"; + toolTip.SetToolTip(textBoxMemo, resources.GetString("textBoxMemo.ToolTip")); // // tabPageEOS // - this.tabPageEOS.BackColor = System.Drawing.SystemColors.Control; - this.tabPageEOS.Controls.Add(this.eosControl); - resources.ApplyResources(this.tabPageEOS, "tabPageEOS"); - this.tabPageEOS.Name = "tabPageEOS"; + resources.ApplyResources(tabPageEOS, "tabPageEOS"); + tabPageEOS.BackColor = System.Drawing.SystemColors.Control; + tabPageEOS.Controls.Add(eosControl); + tabPageEOS.Name = "tabPageEOS"; + toolTip.SetToolTip(tabPageEOS, resources.GetString("tabPageEOS.ToolTip")); // // eosControl // - this.eosControl.Crystal = null; - resources.ApplyResources(this.eosControl, "eosControl"); - this.eosControl.Name = "eosControl"; - this.eosControl.SkipEvent = false; + resources.ApplyResources(eosControl, "eosControl"); + eosControl.Crystal = null; + eosControl.Name = "eosControl"; + eosControl.SkipEvent = false; + toolTip.SetToolTip(eosControl, resources.GetString("eosControl.ToolTip")); // // tabPageElasticity // - this.tabPageElasticity.BackColor = System.Drawing.SystemColors.Control; - this.tabPageElasticity.Controls.Add(this.elasticityControl1); - resources.ApplyResources(this.tabPageElasticity, "tabPageElasticity"); - this.tabPageElasticity.Name = "tabPageElasticity"; + resources.ApplyResources(tabPageElasticity, "tabPageElasticity"); + tabPageElasticity.BackColor = System.Drawing.SystemColors.Control; + tabPageElasticity.Controls.Add(elasticityControl1); + tabPageElasticity.Name = "tabPageElasticity"; + toolTip.SetToolTip(tabPageElasticity, resources.GetString("tabPageElasticity.ToolTip")); // // elasticityControl1 // - resources.ApplyResources(this.elasticityControl1, "elasticityControl1"); - this.elasticityControl1.Mode = Crystallography.Elasticity.Mode.Stiffness; - this.elasticityControl1.Name = "elasticityControl1"; - this.elasticityControl1.SymmetrySeriesNumber = 1; - this.elasticityControl1.ValueChanged += new Crystallography.Controls.ElasticityControl.MyEventHandler(this.elasticityControl1_ValueChanged); + resources.ApplyResources(elasticityControl1, "elasticityControl1"); + elasticityControl1.Mode = Elasticity.Mode.Stiffness; + elasticityControl1.Name = "elasticityControl1"; + elasticityControl1.SymmetrySeriesNumber = 1; + toolTip.SetToolTip(elasticityControl1, resources.GetString("elasticityControl1.ToolTip")); + elasticityControl1.ValueChanged += elasticityControl1_ValueChanged; // // tabPageStrainStress // - this.tabPageStrainStress.BackColor = System.Drawing.SystemColors.Control; - this.tabPageStrainStress.Controls.Add(this.buttonStressSet); - this.tabPageStrainStress.Controls.Add(this.numericBoxStrain33); - this.tabPageStrainStress.Controls.Add(this.numericBoxHill); - this.tabPageStrainStress.Controls.Add(this.label116); - this.tabPageStrainStress.Controls.Add(this.label117); - this.tabPageStrainStress.Controls.Add(this.label109); - this.tabPageStrainStress.Controls.Add(this.label110); - this.tabPageStrainStress.Controls.Add(this.label111); - this.tabPageStrainStress.Controls.Add(this.label112); - this.tabPageStrainStress.Controls.Add(this.label113); - this.tabPageStrainStress.Controls.Add(this.label114); - this.tabPageStrainStress.Controls.Add(this.label115); - this.tabPageStrainStress.Controls.Add(this.label102); - this.tabPageStrainStress.Controls.Add(this.label103); - this.tabPageStrainStress.Controls.Add(this.label104); - this.tabPageStrainStress.Controls.Add(this.label105); - this.tabPageStrainStress.Controls.Add(this.label106); - this.tabPageStrainStress.Controls.Add(this.label107); - this.tabPageStrainStress.Controls.Add(this.label108); - this.tabPageStrainStress.Controls.Add(this.numericBoxStress33); - this.tabPageStrainStress.Controls.Add(this.numericBoxStress22); - this.tabPageStrainStress.Controls.Add(this.numericBoxStress11); - this.tabPageStrainStress.Controls.Add(this.numericBoxStress23); - this.tabPageStrainStress.Controls.Add(this.numericBoxStress13); - this.tabPageStrainStress.Controls.Add(this.numericBoxStress12); - this.tabPageStrainStress.Controls.Add(this.numericBoxStrain11); - this.tabPageStrainStress.Controls.Add(this.numericBoxStrain22); - this.tabPageStrainStress.Controls.Add(this.numericBoxStrain12); - this.tabPageStrainStress.Controls.Add(this.numericBoxStrain23); - this.tabPageStrainStress.Controls.Add(this.numericBoxStrain13); - resources.ApplyResources(this.tabPageStrainStress, "tabPageStrainStress"); - this.tabPageStrainStress.Name = "tabPageStrainStress"; + resources.ApplyResources(tabPageStrainStress, "tabPageStrainStress"); + tabPageStrainStress.BackColor = System.Drawing.SystemColors.Control; + tabPageStrainStress.Controls.Add(buttonStressSet); + tabPageStrainStress.Controls.Add(numericBoxStrain33); + tabPageStrainStress.Controls.Add(numericBoxHill); + tabPageStrainStress.Controls.Add(label116); + tabPageStrainStress.Controls.Add(label117); + tabPageStrainStress.Controls.Add(label109); + tabPageStrainStress.Controls.Add(label110); + tabPageStrainStress.Controls.Add(label111); + tabPageStrainStress.Controls.Add(label112); + tabPageStrainStress.Controls.Add(label113); + tabPageStrainStress.Controls.Add(label114); + tabPageStrainStress.Controls.Add(label115); + tabPageStrainStress.Controls.Add(label102); + tabPageStrainStress.Controls.Add(label103); + tabPageStrainStress.Controls.Add(label104); + tabPageStrainStress.Controls.Add(label105); + tabPageStrainStress.Controls.Add(label106); + tabPageStrainStress.Controls.Add(label107); + tabPageStrainStress.Controls.Add(label108); + tabPageStrainStress.Controls.Add(numericBoxStress33); + tabPageStrainStress.Controls.Add(numericBoxStress22); + tabPageStrainStress.Controls.Add(numericBoxStress11); + tabPageStrainStress.Controls.Add(numericBoxStress23); + tabPageStrainStress.Controls.Add(numericBoxStress13); + tabPageStrainStress.Controls.Add(numericBoxStress12); + tabPageStrainStress.Controls.Add(numericBoxStrain11); + tabPageStrainStress.Controls.Add(numericBoxStrain22); + tabPageStrainStress.Controls.Add(numericBoxStrain12); + tabPageStrainStress.Controls.Add(numericBoxStrain23); + tabPageStrainStress.Controls.Add(numericBoxStrain13); + tabPageStrainStress.Name = "tabPageStrainStress"; + toolTip.SetToolTip(tabPageStrainStress, resources.GetString("tabPageStrainStress.ToolTip")); // // buttonStressSet // - resources.ApplyResources(this.buttonStressSet, "buttonStressSet"); - this.buttonStressSet.Name = "buttonStressSet"; - this.buttonStressSet.UseVisualStyleBackColor = true; - this.buttonStressSet.Click += new System.EventHandler(this.buttonStressSet_Click); + resources.ApplyResources(buttonStressSet, "buttonStressSet"); + buttonStressSet.Name = "buttonStressSet"; + toolTip.SetToolTip(buttonStressSet, resources.GetString("buttonStressSet.ToolTip")); + buttonStressSet.UseVisualStyleBackColor = true; + buttonStressSet.Click += buttonStressSet_Click; // // numericBoxStrain33 // - resources.ApplyResources(this.numericBoxStrain33, "numericBoxStrain33"); - this.numericBoxStrain33.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain33.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain33.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain33.Name = "numericBoxStrain33"; - this.numericBoxStrain33.RestrictLimitValue = false; - this.numericBoxStrain33.RoundErrorAccuracy = -1; - this.numericBoxStrain33.SkipEventDuringInput = false; - this.numericBoxStrain33.SmartIncrement = true; - this.numericBoxStrain33.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + resources.ApplyResources(numericBoxStrain33, "numericBoxStrain33"); + numericBoxStrain33.BackColor = System.Drawing.SystemColors.Control; + numericBoxStrain33.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxStrain33.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxStrain33.Name = "numericBoxStrain33"; + numericBoxStrain33.RestrictLimitValue = false; + numericBoxStrain33.RoundErrorAccuracy = -1; + numericBoxStrain33.SkipEventDuringInput = false; + numericBoxStrain33.SmartIncrement = true; + toolTip.SetToolTip(numericBoxStrain33, resources.GetString("numericBoxStrain33.ToolTip")); // // numericBoxHill // - resources.ApplyResources(this.numericBoxHill, "numericBoxHill"); - this.numericBoxHill.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxHill.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxHill.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxHill.Name = "numericBoxHill"; - this.numericBoxHill.RadianValue = 0.017453292519943295D; - this.numericBoxHill.RestrictLimitValue = false; - this.numericBoxHill.RoundErrorAccuracy = -1; - this.numericBoxHill.SkipEventDuringInput = false; - this.numericBoxHill.SmartIncrement = true; - this.numericBoxHill.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.numericBoxHill.Value = 1D; + resources.ApplyResources(numericBoxHill, "numericBoxHill"); + numericBoxHill.BackColor = System.Drawing.SystemColors.Control; + numericBoxHill.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxHill.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxHill.Name = "numericBoxHill"; + numericBoxHill.RadianValue = 0.017453292519943295D; + numericBoxHill.RestrictLimitValue = false; + numericBoxHill.RoundErrorAccuracy = -1; + numericBoxHill.SkipEventDuringInput = false; + numericBoxHill.SmartIncrement = true; + toolTip.SetToolTip(numericBoxHill, resources.GetString("numericBoxHill.ToolTip")); + numericBoxHill.Value = 1D; // // label116 // - resources.ApplyResources(this.label116, "label116"); - this.label116.Name = "label116"; + resources.ApplyResources(label116, "label116"); + label116.Name = "label116"; + toolTip.SetToolTip(label116, resources.GetString("label116.ToolTip")); // // label117 // - resources.ApplyResources(this.label117, "label117"); - this.label117.Name = "label117"; + resources.ApplyResources(label117, "label117"); + label117.Name = "label117"; + toolTip.SetToolTip(label117, resources.GetString("label117.ToolTip")); // // label109 // - resources.ApplyResources(this.label109, "label109"); - this.label109.Name = "label109"; + resources.ApplyResources(label109, "label109"); + label109.Name = "label109"; + toolTip.SetToolTip(label109, resources.GetString("label109.ToolTip")); // // label110 // - resources.ApplyResources(this.label110, "label110"); - this.label110.Name = "label110"; + resources.ApplyResources(label110, "label110"); + label110.Name = "label110"; + toolTip.SetToolTip(label110, resources.GetString("label110.ToolTip")); // // label111 // - resources.ApplyResources(this.label111, "label111"); - this.label111.Name = "label111"; + resources.ApplyResources(label111, "label111"); + label111.Name = "label111"; + toolTip.SetToolTip(label111, resources.GetString("label111.ToolTip")); // // label112 // - resources.ApplyResources(this.label112, "label112"); - this.label112.Name = "label112"; + resources.ApplyResources(label112, "label112"); + label112.Name = "label112"; + toolTip.SetToolTip(label112, resources.GetString("label112.ToolTip")); // // label113 // - resources.ApplyResources(this.label113, "label113"); - this.label113.Name = "label113"; + resources.ApplyResources(label113, "label113"); + label113.Name = "label113"; + toolTip.SetToolTip(label113, resources.GetString("label113.ToolTip")); // // label114 // - resources.ApplyResources(this.label114, "label114"); - this.label114.Name = "label114"; + resources.ApplyResources(label114, "label114"); + label114.Name = "label114"; + toolTip.SetToolTip(label114, resources.GetString("label114.ToolTip")); // // label115 // - resources.ApplyResources(this.label115, "label115"); - this.label115.Name = "label115"; + resources.ApplyResources(label115, "label115"); + label115.Name = "label115"; + toolTip.SetToolTip(label115, resources.GetString("label115.ToolTip")); // // label102 // - resources.ApplyResources(this.label102, "label102"); - this.label102.Name = "label102"; + resources.ApplyResources(label102, "label102"); + label102.Name = "label102"; + toolTip.SetToolTip(label102, resources.GetString("label102.ToolTip")); // // label103 // - resources.ApplyResources(this.label103, "label103"); - this.label103.Name = "label103"; + resources.ApplyResources(label103, "label103"); + label103.Name = "label103"; + toolTip.SetToolTip(label103, resources.GetString("label103.ToolTip")); // // label104 // - resources.ApplyResources(this.label104, "label104"); - this.label104.Name = "label104"; + resources.ApplyResources(label104, "label104"); + label104.Name = "label104"; + toolTip.SetToolTip(label104, resources.GetString("label104.ToolTip")); // // label105 // - resources.ApplyResources(this.label105, "label105"); - this.label105.Name = "label105"; + resources.ApplyResources(label105, "label105"); + label105.Name = "label105"; + toolTip.SetToolTip(label105, resources.GetString("label105.ToolTip")); // // label106 // - resources.ApplyResources(this.label106, "label106"); - this.label106.Name = "label106"; + resources.ApplyResources(label106, "label106"); + label106.Name = "label106"; + toolTip.SetToolTip(label106, resources.GetString("label106.ToolTip")); // // label107 // - resources.ApplyResources(this.label107, "label107"); - this.label107.Name = "label107"; + resources.ApplyResources(label107, "label107"); + label107.Name = "label107"; + toolTip.SetToolTip(label107, resources.GetString("label107.ToolTip")); // // label108 // - resources.ApplyResources(this.label108, "label108"); - this.label108.Name = "label108"; + resources.ApplyResources(label108, "label108"); + label108.Name = "label108"; + toolTip.SetToolTip(label108, resources.GetString("label108.ToolTip")); // // numericBoxStress33 // - resources.ApplyResources(this.numericBoxStress33, "numericBoxStress33"); - this.numericBoxStress33.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress33.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress33.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress33.Name = "numericBoxStress33"; - this.numericBoxStress33.RestrictLimitValue = false; - this.numericBoxStress33.RoundErrorAccuracy = -1; - this.numericBoxStress33.SkipEventDuringInput = false; - this.numericBoxStress33.SmartIncrement = true; - this.numericBoxStress33.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + resources.ApplyResources(numericBoxStress33, "numericBoxStress33"); + numericBoxStress33.BackColor = System.Drawing.SystemColors.Control; + numericBoxStress33.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxStress33.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxStress33.Name = "numericBoxStress33"; + numericBoxStress33.RestrictLimitValue = false; + numericBoxStress33.RoundErrorAccuracy = -1; + numericBoxStress33.SkipEventDuringInput = false; + numericBoxStress33.SmartIncrement = true; + toolTip.SetToolTip(numericBoxStress33, resources.GetString("numericBoxStress33.ToolTip")); // // numericBoxStress22 // - resources.ApplyResources(this.numericBoxStress22, "numericBoxStress22"); - this.numericBoxStress22.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress22.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress22.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress22.Name = "numericBoxStress22"; - this.numericBoxStress22.RestrictLimitValue = false; - this.numericBoxStress22.RoundErrorAccuracy = -1; - this.numericBoxStress22.SkipEventDuringInput = false; - this.numericBoxStress22.SmartIncrement = true; - this.numericBoxStress22.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + resources.ApplyResources(numericBoxStress22, "numericBoxStress22"); + numericBoxStress22.BackColor = System.Drawing.SystemColors.Control; + numericBoxStress22.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxStress22.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxStress22.Name = "numericBoxStress22"; + numericBoxStress22.RestrictLimitValue = false; + numericBoxStress22.RoundErrorAccuracy = -1; + numericBoxStress22.SkipEventDuringInput = false; + numericBoxStress22.SmartIncrement = true; + toolTip.SetToolTip(numericBoxStress22, resources.GetString("numericBoxStress22.ToolTip")); // // numericBoxStress11 // - resources.ApplyResources(this.numericBoxStress11, "numericBoxStress11"); - this.numericBoxStress11.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress11.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress11.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress11.Name = "numericBoxStress11"; - this.numericBoxStress11.RestrictLimitValue = false; - this.numericBoxStress11.RoundErrorAccuracy = -1; - this.numericBoxStress11.SkipEventDuringInput = false; - this.numericBoxStress11.SmartIncrement = true; - this.numericBoxStress11.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + resources.ApplyResources(numericBoxStress11, "numericBoxStress11"); + numericBoxStress11.BackColor = System.Drawing.SystemColors.Control; + numericBoxStress11.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxStress11.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxStress11.Name = "numericBoxStress11"; + numericBoxStress11.RestrictLimitValue = false; + numericBoxStress11.RoundErrorAccuracy = -1; + numericBoxStress11.SkipEventDuringInput = false; + numericBoxStress11.SmartIncrement = true; + toolTip.SetToolTip(numericBoxStress11, resources.GetString("numericBoxStress11.ToolTip")); // // numericBoxStress23 // - resources.ApplyResources(this.numericBoxStress23, "numericBoxStress23"); - this.numericBoxStress23.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress23.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress23.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress23.Name = "numericBoxStress23"; - this.numericBoxStress23.RestrictLimitValue = false; - this.numericBoxStress23.RoundErrorAccuracy = -1; - this.numericBoxStress23.SkipEventDuringInput = false; - this.numericBoxStress23.SmartIncrement = true; - this.numericBoxStress23.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + resources.ApplyResources(numericBoxStress23, "numericBoxStress23"); + numericBoxStress23.BackColor = System.Drawing.SystemColors.Control; + numericBoxStress23.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxStress23.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxStress23.Name = "numericBoxStress23"; + numericBoxStress23.RestrictLimitValue = false; + numericBoxStress23.RoundErrorAccuracy = -1; + numericBoxStress23.SkipEventDuringInput = false; + numericBoxStress23.SmartIncrement = true; + toolTip.SetToolTip(numericBoxStress23, resources.GetString("numericBoxStress23.ToolTip")); // // numericBoxStress13 // - resources.ApplyResources(this.numericBoxStress13, "numericBoxStress13"); - this.numericBoxStress13.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress13.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress13.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress13.Name = "numericBoxStress13"; - this.numericBoxStress13.RestrictLimitValue = false; - this.numericBoxStress13.RoundErrorAccuracy = -1; - this.numericBoxStress13.SkipEventDuringInput = false; - this.numericBoxStress13.SmartIncrement = true; - this.numericBoxStress13.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + resources.ApplyResources(numericBoxStress13, "numericBoxStress13"); + numericBoxStress13.BackColor = System.Drawing.SystemColors.Control; + numericBoxStress13.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxStress13.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxStress13.Name = "numericBoxStress13"; + numericBoxStress13.RestrictLimitValue = false; + numericBoxStress13.RoundErrorAccuracy = -1; + numericBoxStress13.SkipEventDuringInput = false; + numericBoxStress13.SmartIncrement = true; + toolTip.SetToolTip(numericBoxStress13, resources.GetString("numericBoxStress13.ToolTip")); // // numericBoxStress12 // - resources.ApplyResources(this.numericBoxStress12, "numericBoxStress12"); - this.numericBoxStress12.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress12.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress12.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStress12.Name = "numericBoxStress12"; - this.numericBoxStress12.RestrictLimitValue = false; - this.numericBoxStress12.RoundErrorAccuracy = -1; - this.numericBoxStress12.SkipEventDuringInput = false; - this.numericBoxStress12.SmartIncrement = true; - this.numericBoxStress12.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + resources.ApplyResources(numericBoxStress12, "numericBoxStress12"); + numericBoxStress12.BackColor = System.Drawing.SystemColors.Control; + numericBoxStress12.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxStress12.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxStress12.Name = "numericBoxStress12"; + numericBoxStress12.RestrictLimitValue = false; + numericBoxStress12.RoundErrorAccuracy = -1; + numericBoxStress12.SkipEventDuringInput = false; + numericBoxStress12.SmartIncrement = true; + toolTip.SetToolTip(numericBoxStress12, resources.GetString("numericBoxStress12.ToolTip")); // // numericBoxStrain11 // - resources.ApplyResources(this.numericBoxStrain11, "numericBoxStrain11"); - this.numericBoxStrain11.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain11.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain11.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain11.Name = "numericBoxStrain11"; - this.numericBoxStrain11.RestrictLimitValue = false; - this.numericBoxStrain11.RoundErrorAccuracy = -1; - this.numericBoxStrain11.SkipEventDuringInput = false; - this.numericBoxStrain11.SmartIncrement = true; - this.numericBoxStrain11.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + resources.ApplyResources(numericBoxStrain11, "numericBoxStrain11"); + numericBoxStrain11.BackColor = System.Drawing.SystemColors.Control; + numericBoxStrain11.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxStrain11.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxStrain11.Name = "numericBoxStrain11"; + numericBoxStrain11.RestrictLimitValue = false; + numericBoxStrain11.RoundErrorAccuracy = -1; + numericBoxStrain11.SkipEventDuringInput = false; + numericBoxStrain11.SmartIncrement = true; + toolTip.SetToolTip(numericBoxStrain11, resources.GetString("numericBoxStrain11.ToolTip")); // // numericBoxStrain22 // - resources.ApplyResources(this.numericBoxStrain22, "numericBoxStrain22"); - this.numericBoxStrain22.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain22.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain22.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain22.Name = "numericBoxStrain22"; - this.numericBoxStrain22.RestrictLimitValue = false; - this.numericBoxStrain22.RoundErrorAccuracy = -1; - this.numericBoxStrain22.SkipEventDuringInput = false; - this.numericBoxStrain22.SmartIncrement = true; - this.numericBoxStrain22.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + resources.ApplyResources(numericBoxStrain22, "numericBoxStrain22"); + numericBoxStrain22.BackColor = System.Drawing.SystemColors.Control; + numericBoxStrain22.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxStrain22.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxStrain22.Name = "numericBoxStrain22"; + numericBoxStrain22.RestrictLimitValue = false; + numericBoxStrain22.RoundErrorAccuracy = -1; + numericBoxStrain22.SkipEventDuringInput = false; + numericBoxStrain22.SmartIncrement = true; + toolTip.SetToolTip(numericBoxStrain22, resources.GetString("numericBoxStrain22.ToolTip")); // // numericBoxStrain12 // - resources.ApplyResources(this.numericBoxStrain12, "numericBoxStrain12"); - this.numericBoxStrain12.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain12.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain12.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain12.Name = "numericBoxStrain12"; - this.numericBoxStrain12.RestrictLimitValue = false; - this.numericBoxStrain12.RoundErrorAccuracy = -1; - this.numericBoxStrain12.SkipEventDuringInput = false; - this.numericBoxStrain12.SmartIncrement = true; - this.numericBoxStrain12.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + resources.ApplyResources(numericBoxStrain12, "numericBoxStrain12"); + numericBoxStrain12.BackColor = System.Drawing.SystemColors.Control; + numericBoxStrain12.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxStrain12.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxStrain12.Name = "numericBoxStrain12"; + numericBoxStrain12.RestrictLimitValue = false; + numericBoxStrain12.RoundErrorAccuracy = -1; + numericBoxStrain12.SkipEventDuringInput = false; + numericBoxStrain12.SmartIncrement = true; + toolTip.SetToolTip(numericBoxStrain12, resources.GetString("numericBoxStrain12.ToolTip")); // // numericBoxStrain23 // - resources.ApplyResources(this.numericBoxStrain23, "numericBoxStrain23"); - this.numericBoxStrain23.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain23.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain23.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain23.Name = "numericBoxStrain23"; - this.numericBoxStrain23.RestrictLimitValue = false; - this.numericBoxStrain23.RoundErrorAccuracy = -1; - this.numericBoxStrain23.SkipEventDuringInput = false; - this.numericBoxStrain23.SmartIncrement = true; - this.numericBoxStrain23.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + resources.ApplyResources(numericBoxStrain23, "numericBoxStrain23"); + numericBoxStrain23.BackColor = System.Drawing.SystemColors.Control; + numericBoxStrain23.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxStrain23.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxStrain23.Name = "numericBoxStrain23"; + numericBoxStrain23.RestrictLimitValue = false; + numericBoxStrain23.RoundErrorAccuracy = -1; + numericBoxStrain23.SkipEventDuringInput = false; + numericBoxStrain23.SmartIncrement = true; + toolTip.SetToolTip(numericBoxStrain23, resources.GetString("numericBoxStrain23.ToolTip")); // // numericBoxStrain13 // - resources.ApplyResources(this.numericBoxStrain13, "numericBoxStrain13"); - this.numericBoxStrain13.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain13.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain13.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxStrain13.Name = "numericBoxStrain13"; - this.numericBoxStrain13.RestrictLimitValue = false; - this.numericBoxStrain13.RoundErrorAccuracy = -1; - this.numericBoxStrain13.SkipEventDuringInput = false; - this.numericBoxStrain13.SmartIncrement = true; - this.numericBoxStrain13.TextFont = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + resources.ApplyResources(numericBoxStrain13, "numericBoxStrain13"); + numericBoxStrain13.BackColor = System.Drawing.SystemColors.Control; + numericBoxStrain13.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxStrain13.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxStrain13.Name = "numericBoxStrain13"; + numericBoxStrain13.RestrictLimitValue = false; + numericBoxStrain13.RoundErrorAccuracy = -1; + numericBoxStrain13.SkipEventDuringInput = false; + numericBoxStrain13.SmartIncrement = true; + toolTip.SetToolTip(numericBoxStrain13, resources.GetString("numericBoxStrain13.ToolTip")); // // tabPagePolycrystalline // - this.tabPagePolycrystalline.BackColor = System.Drawing.SystemColors.Control; - this.tabPagePolycrystalline.ContextMenuStrip = this.contextMenuStripPoleFigure; - this.tabPagePolycrystalline.Controls.Add(this.poleFigureControl); - this.tabPagePolycrystalline.Controls.Add(this.flowLayoutPanel3); - this.tabPagePolycrystalline.Controls.Add(this.flowLayoutPanel2); - resources.ApplyResources(this.tabPagePolycrystalline, "tabPagePolycrystalline"); - this.tabPagePolycrystalline.Name = "tabPagePolycrystalline"; + resources.ApplyResources(tabPagePolycrystalline, "tabPagePolycrystalline"); + tabPagePolycrystalline.BackColor = System.Drawing.SystemColors.Control; + tabPagePolycrystalline.ContextMenuStrip = contextMenuStripPoleFigure; + tabPagePolycrystalline.Controls.Add(poleFigureControl); + tabPagePolycrystalline.Controls.Add(flowLayoutPanel3); + tabPagePolycrystalline.Controls.Add(flowLayoutPanel2); + tabPagePolycrystalline.Name = "tabPagePolycrystalline"; + toolTip.SetToolTip(tabPagePolycrystalline, resources.GetString("tabPagePolycrystalline.ToolTip")); // // contextMenuStripPoleFigure // - this.contextMenuStripPoleFigure.ImageScalingSize = new System.Drawing.Size(20, 20); - this.contextMenuStripPoleFigure.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.readToolStripMenuItem, - this.saveToolStripMenuItem, - this.exportToolStripMenuItem}); - this.contextMenuStripPoleFigure.Name = "contextMenuStripPoleFigure"; - resources.ApplyResources(this.contextMenuStripPoleFigure, "contextMenuStripPoleFigure"); + resources.ApplyResources(contextMenuStripPoleFigure, "contextMenuStripPoleFigure"); + contextMenuStripPoleFigure.ImageScalingSize = new System.Drawing.Size(20, 20); + contextMenuStripPoleFigure.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { readToolStripMenuItem, saveToolStripMenuItem, exportToolStripMenuItem }); + contextMenuStripPoleFigure.Name = "contextMenuStripPoleFigure"; + toolTip.SetToolTip(contextMenuStripPoleFigure, resources.GetString("contextMenuStripPoleFigure.ToolTip")); // // readToolStripMenuItem // - this.readToolStripMenuItem.Name = "readToolStripMenuItem"; - resources.ApplyResources(this.readToolStripMenuItem, "readToolStripMenuItem"); - this.readToolStripMenuItem.Click += new System.EventHandler(this.readToolStripMenuItem_Click); + resources.ApplyResources(readToolStripMenuItem, "readToolStripMenuItem"); + readToolStripMenuItem.Name = "readToolStripMenuItem"; + readToolStripMenuItem.Click += readToolStripMenuItem_Click; // // saveToolStripMenuItem // - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - resources.ApplyResources(this.saveToolStripMenuItem, "saveToolStripMenuItem"); - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); + resources.ApplyResources(saveToolStripMenuItem, "saveToolStripMenuItem"); + saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + saveToolStripMenuItem.Click += saveToolStripMenuItem_Click; // // exportToolStripMenuItem // - this.exportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem, - this.asTXTFileAllEulerAngleAndDensityToolStripMenuItem, - this.asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem}); - this.exportToolStripMenuItem.Name = "exportToolStripMenuItem"; - resources.ApplyResources(this.exportToolStripMenuItem, "exportToolStripMenuItem"); + resources.ApplyResources(exportToolStripMenuItem, "exportToolStripMenuItem"); + exportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem, asTXTFileAllEulerAngleAndDensityToolStripMenuItem, asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem }); + exportToolStripMenuItem.Name = "exportToolStripMenuItem"; // // asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem // - this.asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem.Name = "asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem"; - resources.ApplyResources(this.asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem, "asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem"); - this.asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem.Click += new System.EventHandler(this.asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem_Click); + resources.ApplyResources(asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem, "asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem"); + asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem.Name = "asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem"; + asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem.Click += asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem_Click; // // asTXTFileAllEulerAngleAndDensityToolStripMenuItem // - this.asTXTFileAllEulerAngleAndDensityToolStripMenuItem.Name = "asTXTFileAllEulerAngleAndDensityToolStripMenuItem"; - resources.ApplyResources(this.asTXTFileAllEulerAngleAndDensityToolStripMenuItem, "asTXTFileAllEulerAngleAndDensityToolStripMenuItem"); - this.asTXTFileAllEulerAngleAndDensityToolStripMenuItem.Click += new System.EventHandler(this.asTXTFileAllEulerAngleAndDensityToolStripMenuItem_Click); + resources.ApplyResources(asTXTFileAllEulerAngleAndDensityToolStripMenuItem, "asTXTFileAllEulerAngleAndDensityToolStripMenuItem"); + asTXTFileAllEulerAngleAndDensityToolStripMenuItem.Name = "asTXTFileAllEulerAngleAndDensityToolStripMenuItem"; + asTXTFileAllEulerAngleAndDensityToolStripMenuItem.Click += asTXTFileAllEulerAngleAndDensityToolStripMenuItem_Click; // // asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem // - this.asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem.Name = "asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem"; - resources.ApplyResources(this.asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem, "asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem"); - this.asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem.Click += new System.EventHandler(this.asTXTFileAllEulerAngleAndDensityToolStripMenuItem_Click); + resources.ApplyResources(asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem, "asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem"); + asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem.Name = "asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem"; + asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem.Click += asTXTFileAllEulerAngleAndDensityToolStripMenuItem_Click; // // poleFigureControl // - this.poleFigureControl.Crystal = null; - resources.ApplyResources(this.poleFigureControl, "poleFigureControl"); - this.poleFigureControl.Name = "poleFigureControl"; + resources.ApplyResources(poleFigureControl, "poleFigureControl"); + poleFigureControl.Crystal = null; + poleFigureControl.Name = "poleFigureControl"; + toolTip.SetToolTip(poleFigureControl, resources.GetString("poleFigureControl.ToolTip")); // // flowLayoutPanel3 // - resources.ApplyResources(this.flowLayoutPanel3, "flowLayoutPanel3"); - this.flowLayoutPanel3.Controls.Add(this.buttonGenerateRandomOrientations); - this.flowLayoutPanel3.Name = "flowLayoutPanel3"; + resources.ApplyResources(flowLayoutPanel3, "flowLayoutPanel3"); + flowLayoutPanel3.Controls.Add(buttonGenerateRandomOrientations); + flowLayoutPanel3.Name = "flowLayoutPanel3"; + toolTip.SetToolTip(flowLayoutPanel3, resources.GetString("flowLayoutPanel3.ToolTip")); // // buttonGenerateRandomOrientations // - resources.ApplyResources(this.buttonGenerateRandomOrientations, "buttonGenerateRandomOrientations"); - this.buttonGenerateRandomOrientations.Name = "buttonGenerateRandomOrientations"; - this.buttonGenerateRandomOrientations.UseVisualStyleBackColor = true; - this.buttonGenerateRandomOrientations.Click += new System.EventHandler(this.buttonGenerateRandomOrientations_Click); + resources.ApplyResources(buttonGenerateRandomOrientations, "buttonGenerateRandomOrientations"); + buttonGenerateRandomOrientations.Name = "buttonGenerateRandomOrientations"; + toolTip.SetToolTip(buttonGenerateRandomOrientations, resources.GetString("buttonGenerateRandomOrientations.ToolTip")); + buttonGenerateRandomOrientations.UseVisualStyleBackColor = true; + buttonGenerateRandomOrientations.Click += buttonGenerateRandomOrientations_Click; // // flowLayoutPanel2 // - resources.ApplyResources(this.flowLayoutPanel2, "flowLayoutPanel2"); - this.flowLayoutPanel2.Controls.Add(this.label5); - this.flowLayoutPanel2.Controls.Add(this.numericUpDownAngleResolution); - this.flowLayoutPanel2.Controls.Add(this.label29); - this.flowLayoutPanel2.Controls.Add(this.numericUpDownAngleSubDivision); - this.flowLayoutPanel2.Controls.Add(this.label101); - this.flowLayoutPanel2.Controls.Add(this.numericUpDownCrystallineSize); - this.flowLayoutPanel2.Controls.Add(this.label99); - this.flowLayoutPanel2.Name = "flowLayoutPanel2"; + resources.ApplyResources(flowLayoutPanel2, "flowLayoutPanel2"); + flowLayoutPanel2.Controls.Add(label5); + flowLayoutPanel2.Controls.Add(numericUpDownAngleResolution); + flowLayoutPanel2.Controls.Add(label29); + flowLayoutPanel2.Controls.Add(numericUpDownAngleSubDivision); + flowLayoutPanel2.Controls.Add(label101); + flowLayoutPanel2.Controls.Add(numericUpDownCrystallineSize); + flowLayoutPanel2.Controls.Add(label99); + flowLayoutPanel2.Name = "flowLayoutPanel2"; + toolTip.SetToolTip(flowLayoutPanel2, resources.GetString("flowLayoutPanel2.ToolTip")); // // label5 // - resources.ApplyResources(this.label5, "label5"); - this.label5.Name = "label5"; + resources.ApplyResources(label5, "label5"); + label5.Name = "label5"; + toolTip.SetToolTip(label5, resources.GetString("label5.ToolTip")); // // numericUpDownAngleResolution // - this.numericUpDownAngleResolution.DecimalPlaces = 1; - resources.ApplyResources(this.numericUpDownAngleResolution, "numericUpDownAngleResolution"); - this.numericUpDownAngleResolution.Increment = new decimal(new int[] { - 5, - 0, - 0, - 65536}); - this.numericUpDownAngleResolution.Maximum = new decimal(new int[] { - 45, - 0, - 0, - 0}); - this.numericUpDownAngleResolution.Minimum = new decimal(new int[] { - 5, - 0, - 0, - 65536}); - this.numericUpDownAngleResolution.Name = "numericUpDownAngleResolution"; - this.numericUpDownAngleResolution.Value = new decimal(new int[] { - 2, - 0, - 0, - 0}); - this.numericUpDownAngleResolution.ValueChanged += new System.EventHandler(this.numericUpDownAngleResolution_ValueChanged); + resources.ApplyResources(numericUpDownAngleResolution, "numericUpDownAngleResolution"); + numericUpDownAngleResolution.DecimalPlaces = 1; + numericUpDownAngleResolution.Increment = new decimal(new int[] { 5, 0, 0, 65536 }); + numericUpDownAngleResolution.Maximum = new decimal(new int[] { 45, 0, 0, 0 }); + numericUpDownAngleResolution.Minimum = new decimal(new int[] { 5, 0, 0, 65536 }); + numericUpDownAngleResolution.Name = "numericUpDownAngleResolution"; + toolTip.SetToolTip(numericUpDownAngleResolution, resources.GetString("numericUpDownAngleResolution.ToolTip")); + numericUpDownAngleResolution.Value = new decimal(new int[] { 2, 0, 0, 0 }); + numericUpDownAngleResolution.ValueChanged += numericUpDownAngleResolution_ValueChanged; // // label29 // - resources.ApplyResources(this.label29, "label29"); - this.label29.Name = "label29"; + resources.ApplyResources(label29, "label29"); + label29.Name = "label29"; + toolTip.SetToolTip(label29, resources.GetString("label29.ToolTip")); // // numericUpDownAngleSubDivision // - resources.ApplyResources(this.numericUpDownAngleSubDivision, "numericUpDownAngleSubDivision"); - this.numericUpDownAngleSubDivision.Maximum = new decimal(new int[] { - 45, - 0, - 0, - 0}); - this.numericUpDownAngleSubDivision.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDownAngleSubDivision.Name = "numericUpDownAngleSubDivision"; - this.numericUpDownAngleSubDivision.Value = new decimal(new int[] { - 4, - 0, - 0, - 0}); - this.numericUpDownAngleSubDivision.ValueChanged += new System.EventHandler(this.numericUpDownAngleResolution_ValueChanged); + resources.ApplyResources(numericUpDownAngleSubDivision, "numericUpDownAngleSubDivision"); + numericUpDownAngleSubDivision.Maximum = new decimal(new int[] { 45, 0, 0, 0 }); + numericUpDownAngleSubDivision.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + numericUpDownAngleSubDivision.Name = "numericUpDownAngleSubDivision"; + toolTip.SetToolTip(numericUpDownAngleSubDivision, resources.GetString("numericUpDownAngleSubDivision.ToolTip")); + numericUpDownAngleSubDivision.Value = new decimal(new int[] { 4, 0, 0, 0 }); + numericUpDownAngleSubDivision.ValueChanged += numericUpDownAngleResolution_ValueChanged; // // label101 // - resources.ApplyResources(this.label101, "label101"); - this.label101.Name = "label101"; + resources.ApplyResources(label101, "label101"); + label101.Name = "label101"; + toolTip.SetToolTip(label101, resources.GetString("label101.ToolTip")); // // numericUpDownCrystallineSize // - resources.ApplyResources(this.numericUpDownCrystallineSize, "numericUpDownCrystallineSize"); - this.numericUpDownCrystallineSize.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.numericUpDownCrystallineSize.Maximum = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - this.numericUpDownCrystallineSize.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.numericUpDownCrystallineSize.Name = "numericUpDownCrystallineSize"; - this.numericUpDownCrystallineSize.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.numericUpDownCrystallineSize.ValueChanged += new System.EventHandler(this.numericUpDownAngleResolution_ValueChanged); + resources.ApplyResources(numericUpDownCrystallineSize, "numericUpDownCrystallineSize"); + numericUpDownCrystallineSize.Increment = new decimal(new int[] { 10, 0, 0, 0 }); + numericUpDownCrystallineSize.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownCrystallineSize.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + numericUpDownCrystallineSize.Name = "numericUpDownCrystallineSize"; + toolTip.SetToolTip(numericUpDownCrystallineSize, resources.GetString("numericUpDownCrystallineSize.ToolTip")); + numericUpDownCrystallineSize.Value = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownCrystallineSize.ValueChanged += numericUpDownAngleResolution_ValueChanged; // // label99 // - resources.ApplyResources(this.label99, "label99"); - this.label99.Name = "label99"; + resources.ApplyResources(label99, "label99"); + label99.Name = "label99"; + toolTip.SetToolTip(label99, resources.GetString("label99.ToolTip")); // // tabPageBounds // - this.tabPageBounds.Controls.Add(this.boundControl); - resources.ApplyResources(this.tabPageBounds, "tabPageBounds"); - this.tabPageBounds.Name = "tabPageBounds"; + resources.ApplyResources(tabPageBounds, "tabPageBounds"); + tabPageBounds.Controls.Add(boundControl); + tabPageBounds.Name = "tabPageBounds"; + toolTip.SetToolTip(tabPageBounds, resources.GetString("tabPageBounds.ToolTip")); // // boundControl // - this.boundControl.Crystal = null; - resources.ApplyResources(this.boundControl, "boundControl"); - this.boundControl.Name = "boundControl"; - this.boundControl.SkipEvent = false; + resources.ApplyResources(boundControl, "boundControl"); + boundControl.Crystal = null; + boundControl.Name = "boundControl"; + boundControl.SkipEvent = false; + toolTip.SetToolTip(boundControl, resources.GetString("boundControl.ToolTip")); // // tabPageLatticePlane // - this.tabPageLatticePlane.Controls.Add(this.latticePlaneControl); - resources.ApplyResources(this.tabPageLatticePlane, "tabPageLatticePlane"); - this.tabPageLatticePlane.Name = "tabPageLatticePlane"; + resources.ApplyResources(tabPageLatticePlane, "tabPageLatticePlane"); + tabPageLatticePlane.Controls.Add(latticePlaneControl); + tabPageLatticePlane.Name = "tabPageLatticePlane"; + toolTip.SetToolTip(tabPageLatticePlane, resources.GetString("tabPageLatticePlane.ToolTip")); // // latticePlaneControl // - this.latticePlaneControl.Crystal = null; - resources.ApplyResources(this.latticePlaneControl, "latticePlaneControl"); - this.latticePlaneControl.Name = "latticePlaneControl"; - this.latticePlaneControl.SkipEvent = false; + resources.ApplyResources(latticePlaneControl, "latticePlaneControl"); + latticePlaneControl.Crystal = null; + latticePlaneControl.Name = "latticePlaneControl"; + latticePlaneControl.SkipEvent = false; + toolTip.SetToolTip(latticePlaneControl, resources.GetString("latticePlaneControl.ToolTip")); // // panel1 // - this.panel1.Controls.Add(this.textBoxFormula); - this.panel1.Controls.Add(this.numericBoxZnumber); - this.panel1.Controls.Add(this.label90); - resources.ApplyResources(this.panel1, "panel1"); - this.panel1.Name = "panel1"; + resources.ApplyResources(panel1, "panel1"); + panel1.Controls.Add(textBoxFormula); + panel1.Controls.Add(numericBoxZnumber); + panel1.Controls.Add(label90); + panel1.Name = "panel1"; + toolTip.SetToolTip(panel1, resources.GetString("panel1.ToolTip")); // // textBoxFormula // - resources.ApplyResources(this.textBoxFormula, "textBoxFormula"); - this.textBoxFormula.Name = "textBoxFormula"; - this.textBoxFormula.ReadOnly = true; - this.toolTip.SetToolTip(this.textBoxFormula, resources.GetString("textBoxFormula.ToolTip")); + resources.ApplyResources(textBoxFormula, "textBoxFormula"); + textBoxFormula.Name = "textBoxFormula"; + textBoxFormula.ReadOnly = true; + textBoxFormula.TabStop = false; + toolTip.SetToolTip(textBoxFormula, resources.GetString("textBoxFormula.ToolTip")); // // numericBoxZnumber // - resources.ApplyResources(this.numericBoxZnumber, "numericBoxZnumber"); - this.numericBoxZnumber.BackColor = System.Drawing.Color.Transparent; - this.numericBoxZnumber.Name = "numericBoxZnumber"; - this.numericBoxZnumber.ReadOnly = true; - this.numericBoxZnumber.RoundErrorAccuracy = -1; - this.numericBoxZnumber.SkipEventDuringInput = false; - this.numericBoxZnumber.SmartIncrement = true; - this.numericBoxZnumber.TextBoxBackColor = System.Drawing.SystemColors.Control; - this.numericBoxZnumber.TextFont = new System.Drawing.Font("繝｡繧､繝ｪ繧ｪ", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.numericBoxZnumber.ThonsandsSeparator = true; - this.toolTip.SetToolTip(this.numericBoxZnumber, resources.GetString("numericBoxZnumber.ToolTip")); + resources.ApplyResources(numericBoxZnumber, "numericBoxZnumber"); + numericBoxZnumber.BackColor = System.Drawing.Color.Transparent; + numericBoxZnumber.Name = "numericBoxZnumber"; + numericBoxZnumber.ReadOnly = true; + numericBoxZnumber.RoundErrorAccuracy = -1; + numericBoxZnumber.SkipEventDuringInput = false; + numericBoxZnumber.SmartIncrement = true; + numericBoxZnumber.TabStop = false; + numericBoxZnumber.TextBoxBackColor = System.Drawing.SystemColors.Control; + numericBoxZnumber.ThonsandsSeparator = true; + toolTip.SetToolTip(numericBoxZnumber, resources.GetString("numericBoxZnumber.ToolTip")); // // label90 // - resources.ApplyResources(this.label90, "label90"); - this.label90.Name = "label90"; - this.toolTip.SetToolTip(this.label90, resources.GetString("label90.ToolTip")); + resources.ApplyResources(label90, "label90"); + label90.Name = "label90"; + toolTip.SetToolTip(label90, resources.GetString("label90.ToolTip")); // // contextMenuStrip // - this.contextMenuStrip.ImageScalingSize = new System.Drawing.Size(20, 20); - this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.scatteringFactorToolStripMenuItem, - this.symmetryInformationToolStripMenuItem, - this.toolStripSeparator2, - this.importCrystalFromCIFAMCToolStripMenuItem, - this.exportThisCrystalAsCIFToolStripMenuItem, - this.sendThisCrystalToOtherSoftwareToolStripMenuItem, - this.toolStripSeparator1, - this.revertCellConstantsToolStripMenuItem, - this.toolStripSeparator3, - this.strainControlToolStripMenuItem, - this.convertToP1SymmetryToolStripMenuItem, - this.convertToSuperstructureToolStripMenuItem, - this.convertToAnotherSpacegroupToolStripMenuItem}); - this.contextMenuStrip.Name = "contextMenuStrip1"; - resources.ApplyResources(this.contextMenuStrip, "contextMenuStrip"); + resources.ApplyResources(contextMenuStrip, "contextMenuStrip"); + contextMenuStrip.ImageScalingSize = new System.Drawing.Size(20, 20); + contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { scatteringFactorToolStripMenuItem, symmetryInformationToolStripMenuItem, toolStripSeparator2, importCrystalFromCIFAMCToolStripMenuItem, exportThisCrystalAsCIFToolStripMenuItem, sendThisCrystalToOtherSoftwareToolStripMenuItem, toolStripSeparator1, revertCellConstantsToolStripMenuItem, toolStripSeparator3, strainControlToolStripMenuItem, convertToP1SymmetryToolStripMenuItem, convertToSuperstructureToolStripMenuItem, convertToAnotherSpacegroupToolStripMenuItem }); + contextMenuStrip.Name = "contextMenuStrip1"; + toolTip.SetToolTip(contextMenuStrip, resources.GetString("contextMenuStrip.ToolTip")); // // scatteringFactorToolStripMenuItem // - this.scatteringFactorToolStripMenuItem.Name = "scatteringFactorToolStripMenuItem"; - resources.ApplyResources(this.scatteringFactorToolStripMenuItem, "scatteringFactorToolStripMenuItem"); - this.scatteringFactorToolStripMenuItem.Click += new System.EventHandler(this.scatteringFactorToolStripMenuItem_Click); + resources.ApplyResources(scatteringFactorToolStripMenuItem, "scatteringFactorToolStripMenuItem"); + scatteringFactorToolStripMenuItem.Name = "scatteringFactorToolStripMenuItem"; + scatteringFactorToolStripMenuItem.Click += scatteringFactorToolStripMenuItem_Click; // // symmetryInformationToolStripMenuItem // - this.symmetryInformationToolStripMenuItem.Name = "symmetryInformationToolStripMenuItem"; - resources.ApplyResources(this.symmetryInformationToolStripMenuItem, "symmetryInformationToolStripMenuItem"); - this.symmetryInformationToolStripMenuItem.Click += new System.EventHandler(this.symmetryInformationToolStripMenuItem_Click); + resources.ApplyResources(symmetryInformationToolStripMenuItem, "symmetryInformationToolStripMenuItem"); + symmetryInformationToolStripMenuItem.Name = "symmetryInformationToolStripMenuItem"; + symmetryInformationToolStripMenuItem.Click += symmetryInformationToolStripMenuItem_Click; // // toolStripSeparator2 // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2"); + resources.ApplyResources(toolStripSeparator2, "toolStripSeparator2"); + toolStripSeparator2.Name = "toolStripSeparator2"; // // importCrystalFromCIFAMCToolStripMenuItem // - this.importCrystalFromCIFAMCToolStripMenuItem.Name = "importCrystalFromCIFAMCToolStripMenuItem"; - resources.ApplyResources(this.importCrystalFromCIFAMCToolStripMenuItem, "importCrystalFromCIFAMCToolStripMenuItem"); - this.importCrystalFromCIFAMCToolStripMenuItem.Click += new System.EventHandler(this.importCrystalFromCIFAMCToolStripMenuItem_Click); + resources.ApplyResources(importCrystalFromCIFAMCToolStripMenuItem, "importCrystalFromCIFAMCToolStripMenuItem"); + importCrystalFromCIFAMCToolStripMenuItem.Name = "importCrystalFromCIFAMCToolStripMenuItem"; + importCrystalFromCIFAMCToolStripMenuItem.Click += importCrystalFromCIFAMCToolStripMenuItem_Click; // // exportThisCrystalAsCIFToolStripMenuItem // - this.exportThisCrystalAsCIFToolStripMenuItem.Name = "exportThisCrystalAsCIFToolStripMenuItem"; - resources.ApplyResources(this.exportThisCrystalAsCIFToolStripMenuItem, "exportThisCrystalAsCIFToolStripMenuItem"); - this.exportThisCrystalAsCIFToolStripMenuItem.Click += new System.EventHandler(this.exportThisCrystalAsCIFToolStripMenuItem_Click); + resources.ApplyResources(exportThisCrystalAsCIFToolStripMenuItem, "exportThisCrystalAsCIFToolStripMenuItem"); + exportThisCrystalAsCIFToolStripMenuItem.Name = "exportThisCrystalAsCIFToolStripMenuItem"; + exportThisCrystalAsCIFToolStripMenuItem.Click += exportThisCrystalAsCIFToolStripMenuItem_Click; // // sendThisCrystalToOtherSoftwareToolStripMenuItem // - this.sendThisCrystalToOtherSoftwareToolStripMenuItem.Name = "sendThisCrystalToOtherSoftwareToolStripMenuItem"; - resources.ApplyResources(this.sendThisCrystalToOtherSoftwareToolStripMenuItem, "sendThisCrystalToOtherSoftwareToolStripMenuItem"); - this.sendThisCrystalToOtherSoftwareToolStripMenuItem.Click += new System.EventHandler(this.sendThisCrystalToOtherSoftwareToolStripMenuItem_Click); + resources.ApplyResources(sendThisCrystalToOtherSoftwareToolStripMenuItem, "sendThisCrystalToOtherSoftwareToolStripMenuItem"); + sendThisCrystalToOtherSoftwareToolStripMenuItem.Name = "sendThisCrystalToOtherSoftwareToolStripMenuItem"; + sendThisCrystalToOtherSoftwareToolStripMenuItem.Click += sendThisCrystalToOtherSoftwareToolStripMenuItem_Click; // // toolStripSeparator1 // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1"); + resources.ApplyResources(toolStripSeparator1, "toolStripSeparator1"); + toolStripSeparator1.Name = "toolStripSeparator1"; // // revertCellConstantsToolStripMenuItem // - this.revertCellConstantsToolStripMenuItem.Name = "revertCellConstantsToolStripMenuItem"; - resources.ApplyResources(this.revertCellConstantsToolStripMenuItem, "revertCellConstantsToolStripMenuItem"); - this.revertCellConstantsToolStripMenuItem.Click += new System.EventHandler(this.revertCellConstantsToolStripMenuItem_Click); + resources.ApplyResources(revertCellConstantsToolStripMenuItem, "revertCellConstantsToolStripMenuItem"); + revertCellConstantsToolStripMenuItem.Name = "revertCellConstantsToolStripMenuItem"; + revertCellConstantsToolStripMenuItem.Click += revertCellConstantsToolStripMenuItem_Click; // // toolStripSeparator3 // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3"); + resources.ApplyResources(toolStripSeparator3, "toolStripSeparator3"); + toolStripSeparator3.Name = "toolStripSeparator3"; // // strainControlToolStripMenuItem // - this.strainControlToolStripMenuItem.Name = "strainControlToolStripMenuItem"; - resources.ApplyResources(this.strainControlToolStripMenuItem, "strainControlToolStripMenuItem"); - this.strainControlToolStripMenuItem.Click += new System.EventHandler(this.strainControlToolStripMenuItem_Click); + resources.ApplyResources(strainControlToolStripMenuItem, "strainControlToolStripMenuItem"); + strainControlToolStripMenuItem.Name = "strainControlToolStripMenuItem"; + strainControlToolStripMenuItem.Click += strainControlToolStripMenuItem_Click; // // convertToP1SymmetryToolStripMenuItem // - this.convertToP1SymmetryToolStripMenuItem.Name = "convertToP1SymmetryToolStripMenuItem"; - resources.ApplyResources(this.convertToP1SymmetryToolStripMenuItem, "convertToP1SymmetryToolStripMenuItem"); - this.convertToP1SymmetryToolStripMenuItem.Click += new System.EventHandler(this.convertToP1ToolStripMenuItem_Click); + resources.ApplyResources(convertToP1SymmetryToolStripMenuItem, "convertToP1SymmetryToolStripMenuItem"); + convertToP1SymmetryToolStripMenuItem.Name = "convertToP1SymmetryToolStripMenuItem"; + convertToP1SymmetryToolStripMenuItem.Click += convertToP1ToolStripMenuItem_Click; // // convertToSuperstructureToolStripMenuItem // - this.convertToSuperstructureToolStripMenuItem.Name = "convertToSuperstructureToolStripMenuItem"; - resources.ApplyResources(this.convertToSuperstructureToolStripMenuItem, "convertToSuperstructureToolStripMenuItem"); - this.convertToSuperstructureToolStripMenuItem.Click += new System.EventHandler(this.convertToSuperstructureToolStripMenuItem_Click); + resources.ApplyResources(convertToSuperstructureToolStripMenuItem, "convertToSuperstructureToolStripMenuItem"); + convertToSuperstructureToolStripMenuItem.Name = "convertToSuperstructureToolStripMenuItem"; + convertToSuperstructureToolStripMenuItem.Click += convertToSuperstructureToolStripMenuItem_Click; // // convertToAnotherSpacegroupToolStripMenuItem // - this.convertToAnotherSpacegroupToolStripMenuItem.Name = "convertToAnotherSpacegroupToolStripMenuItem"; - resources.ApplyResources(this.convertToAnotherSpacegroupToolStripMenuItem, "convertToAnotherSpacegroupToolStripMenuItem"); - this.convertToAnotherSpacegroupToolStripMenuItem.Click += new System.EventHandler(this.convertToAnotherSpacegroupToolStripMenuItem_Click); + resources.ApplyResources(convertToAnotherSpacegroupToolStripMenuItem, "convertToAnotherSpacegroupToolStripMenuItem"); + convertToAnotherSpacegroupToolStripMenuItem.Name = "convertToAnotherSpacegroupToolStripMenuItem"; + convertToAnotherSpacegroupToolStripMenuItem.Click += convertToAnotherSpacegroupToolStripMenuItem_Click; // // textBoxName // - resources.ApplyResources(this.textBoxName, "textBoxName"); - this.textBoxName.Name = "textBoxName"; - this.toolTip.SetToolTip(this.textBoxName, resources.GetString("textBoxName.ToolTip")); + resources.ApplyResources(textBoxName, "textBoxName"); + textBoxName.Name = "textBoxName"; + toolTip.SetToolTip(textBoxName, resources.GetString("textBoxName.ToolTip")); // // label22 // - resources.ApplyResources(this.label22, "label22"); - this.label22.Name = "label22"; + resources.ApplyResources(label22, "label22"); + label22.Name = "label22"; + toolTip.SetToolTip(label22, resources.GetString("label22.ToolTip")); // // buttonScatteringFactor // - resources.ApplyResources(this.buttonScatteringFactor, "buttonScatteringFactor"); - this.buttonScatteringFactor.BackColor = System.Drawing.Color.SteelBlue; - this.buttonScatteringFactor.ForeColor = System.Drawing.Color.White; - this.buttonScatteringFactor.Name = "buttonScatteringFactor"; - this.toolTip.SetToolTip(this.buttonScatteringFactor, resources.GetString("buttonScatteringFactor.ToolTip")); - this.buttonScatteringFactor.UseVisualStyleBackColor = false; - this.buttonScatteringFactor.Click += new System.EventHandler(this.buttonScatteringFactor_Click); + resources.ApplyResources(buttonScatteringFactor, "buttonScatteringFactor"); + buttonScatteringFactor.BackColor = System.Drawing.Color.SteelBlue; + buttonScatteringFactor.ForeColor = System.Drawing.Color.White; + buttonScatteringFactor.Name = "buttonScatteringFactor"; + toolTip.SetToolTip(buttonScatteringFactor, resources.GetString("buttonScatteringFactor.ToolTip")); + buttonScatteringFactor.UseVisualStyleBackColor = false; + buttonScatteringFactor.Click += buttonScatteringFactor_Click; // // buttonSymmetryInfo // - resources.ApplyResources(this.buttonSymmetryInfo, "buttonSymmetryInfo"); - this.buttonSymmetryInfo.BackColor = System.Drawing.Color.SteelBlue; - this.buttonSymmetryInfo.ForeColor = System.Drawing.Color.White; - this.buttonSymmetryInfo.Name = "buttonSymmetryInfo"; - this.toolTip.SetToolTip(this.buttonSymmetryInfo, resources.GetString("buttonSymmetryInfo.ToolTip")); - this.buttonSymmetryInfo.UseVisualStyleBackColor = false; - this.buttonSymmetryInfo.Click += new System.EventHandler(this.buttonSymmetryInfo_Click); + resources.ApplyResources(buttonSymmetryInfo, "buttonSymmetryInfo"); + buttonSymmetryInfo.BackColor = System.Drawing.Color.SteelBlue; + buttonSymmetryInfo.ForeColor = System.Drawing.Color.White; + buttonSymmetryInfo.Name = "buttonSymmetryInfo"; + toolTip.SetToolTip(buttonSymmetryInfo, resources.GetString("buttonSymmetryInfo.ToolTip")); + buttonSymmetryInfo.UseVisualStyleBackColor = false; + buttonSymmetryInfo.Click += buttonSymmetryInfo_Click; // // flowLayoutPanel1 // - resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1"); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + resources.ApplyResources(flowLayoutPanel1, "flowLayoutPanel1"); + flowLayoutPanel1.Name = "flowLayoutPanel1"; + toolTip.SetToolTip(flowLayoutPanel1, resources.GetString("flowLayoutPanel1.ToolTip")); // // panel4 // - this.panel4.Controls.Add(this.textBoxName); - this.panel4.Controls.Add(this.buttonSymmetryInfo); - this.panel4.Controls.Add(this.buttonScatteringFactor); - this.panel4.Controls.Add(this.label22); - resources.ApplyResources(this.panel4, "panel4"); - this.panel4.Name = "panel4"; + resources.ApplyResources(panel4, "panel4"); + panel4.Controls.Add(textBoxName); + panel4.Controls.Add(buttonSymmetryInfo); + panel4.Controls.Add(buttonScatteringFactor); + panel4.Controls.Add(label22); + panel4.Name = "panel4"; + toolTip.SetToolTip(panel4, resources.GetString("panel4.ToolTip")); // // CrystalControl // - this.AllowDrop = true; resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.ContextMenuStrip = this.contextMenuStrip; - this.Controls.Add(this.tabControl); - this.Controls.Add(this.panel1); - this.Controls.Add(this.panel4); - this.Controls.Add(this.flowLayoutPanel1); - this.DoubleBuffered = true; - this.Name = "CrystalControl"; - this.Load += new System.EventHandler(this.CrystalForm_Load); - this.DragDrop += new System.Windows.Forms.DragEventHandler(this.FormCrystal_DragDrop); - this.DragEnter += new System.Windows.Forms.DragEventHandler(this.FormCrystal_DragEnter); - this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.CrystalControl_KeyDown); - this.Resize += new System.EventHandler(this.CrystalControl_Resize_1); - this.tabControl.ResumeLayout(false); - this.tabPageBasicInfo.ResumeLayout(false); - this.panel5.ResumeLayout(false); - this.flowLayoutPanel4.ResumeLayout(false); - this.flowLayoutPanel4.PerformLayout(); - this.tabPageAtom.ResumeLayout(false); - this.tabPageAtom.PerformLayout(); - this.panelAtom.ResumeLayout(false); - this.panelAtom.PerformLayout(); - this.contextMenuStrip2.ResumeLayout(false); - this.tabPageBondsPolyhedra.ResumeLayout(false); - this.tabPageBondsPolyhedra.PerformLayout(); - this.tabPageReference.ResumeLayout(false); - this.groupBox8.ResumeLayout(false); - this.groupBox8.PerformLayout(); - this.groupBox6.ResumeLayout(false); - this.groupBox6.PerformLayout(); - this.groupBox7.ResumeLayout(false); - this.groupBox7.PerformLayout(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - this.tabPageEOS.ResumeLayout(false); - this.tabPageElasticity.ResumeLayout(false); - this.tabPageElasticity.PerformLayout(); - this.tabPageStrainStress.ResumeLayout(false); - this.tabPageStrainStress.PerformLayout(); - this.tabPagePolycrystalline.ResumeLayout(false); - this.tabPagePolycrystalline.PerformLayout(); - this.contextMenuStripPoleFigure.ResumeLayout(false); - this.flowLayoutPanel3.ResumeLayout(false); - this.flowLayoutPanel3.PerformLayout(); - this.flowLayoutPanel2.ResumeLayout(false); - this.flowLayoutPanel2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAngleResolution)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAngleSubDivision)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCrystallineSize)).EndInit(); - this.tabPageBounds.ResumeLayout(false); - this.tabPageLatticePlane.ResumeLayout(false); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.contextMenuStrip.ResumeLayout(false); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - + AllowDrop = true; + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + ContextMenuStrip = contextMenuStrip; + Controls.Add(tabControl); + Controls.Add(panel1); + Controls.Add(panel4); + Controls.Add(flowLayoutPanel1); + DoubleBuffered = true; + Name = "CrystalControl"; + toolTip.SetToolTip(this, resources.GetString("$this.ToolTip")); + Load += CrystalForm_Load; + DragDrop += FormCrystal_DragDrop; + DragEnter += FormCrystal_DragEnter; + KeyDown += CrystalControl_KeyDown; + Resize += CrystalControl_Resize_1; + tabControl.ResumeLayout(false); + tabPageBasicInfo.ResumeLayout(false); + panel5.ResumeLayout(false); + flowLayoutPanel4.ResumeLayout(false); + flowLayoutPanel4.PerformLayout(); + tabPageAtom.ResumeLayout(false); + tabPageAtom.PerformLayout(); + panelAtom.ResumeLayout(false); + panelAtom.PerformLayout(); + contextMenuStrip2.ResumeLayout(false); + tabPageBondsPolyhedra.ResumeLayout(false); + tabPageBondsPolyhedra.PerformLayout(); + tabPageReference.ResumeLayout(false); + groupBox8.ResumeLayout(false); + groupBox8.PerformLayout(); + groupBox6.ResumeLayout(false); + groupBox6.PerformLayout(); + groupBox7.ResumeLayout(false); + groupBox7.PerformLayout(); + groupBox5.ResumeLayout(false); + groupBox5.PerformLayout(); + tabPageEOS.ResumeLayout(false); + tabPageElasticity.ResumeLayout(false); + tabPageElasticity.PerformLayout(); + tabPageStrainStress.ResumeLayout(false); + tabPageStrainStress.PerformLayout(); + tabPagePolycrystalline.ResumeLayout(false); + tabPagePolycrystalline.PerformLayout(); + contextMenuStripPoleFigure.ResumeLayout(false); + flowLayoutPanel3.ResumeLayout(false); + flowLayoutPanel3.PerformLayout(); + flowLayoutPanel2.ResumeLayout(false); + flowLayoutPanel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownAngleResolution).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownAngleSubDivision).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownCrystallineSize).EndInit(); + tabPageBounds.ResumeLayout(false); + tabPageLatticePlane.ResumeLayout(false); + panel1.ResumeLayout(false); + panel1.PerformLayout(); + contextMenuStrip.ResumeLayout(false); + panel4.ResumeLayout(false); + panel4.PerformLayout(); + ResumeLayout(false); + PerformLayout(); } #endregion diff --git a/Crystallography.Controls/Crystal/CrystalControl.cs b/Crystallography.Controls/Crystal/CrystalControl.cs index b9f118a..3a77552 100644 --- a/Crystallography.Controls/Crystal/CrystalControl.cs +++ b/Crystallography.Controls/Crystal/CrystalControl.cs @@ -554,7 +554,7 @@ public void toAnotherSpaceGroup(int destNum) cry.SymmetrySeriesNumber = destNum; cry.SetAxis(); - Vector3D srcA = cry.A_Axis, srcB = cry.B_Axis, srcC = cry.C_Axis, dstA, dstB, dstC; + Vector3DBase srcA = cry.A_Axis, srcB = cry.B_Axis, srcC = cry.C_Axis, dstA, dstB, dstC; if (srcExtra == "H") {//H繧坦縺ｫ螟画鋤 @@ -637,7 +637,7 @@ public void toAnotherSpaceGroup(int destNum) _ => (x, y, z), }; - static (Vector3D A, Vector3D B, Vector3D C) convertAxisMonoclinic(Vector3D a, Vector3D b, Vector3D c, string setting, bool forward = true) + static (Vector3DBase A, Vector3DBase B, Vector3DBase C) convertAxisMonoclinic(Vector3DBase a, Vector3DBase b, Vector3DBase c, string setting, bool forward = true) => setting switch { "b2" => forward ? (-c - a, b, a) : (c, b, -c - a), diff --git a/Crystallography.Controls/Crystal/CrystalControl.ja.resx b/Crystallography.Controls/Crystal/CrystalControl.ja.resx index 8ade4dd..f0c91e4 100644 --- a/Crystallography.Controls/Crystal/CrystalControl.ja.resx +++ b/Crystallography.Controls/Crystal/CrystalControl.ja.resx @@ -1,4 +1,64 @@ -ｻｿ +ｻｿ + + @@ -58,139 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 462, 280 - - - 譬ｼ蟄/蟇ｾ遘ｰ諤ｧ - - - 繝｡繧､繝ｪ繧ｪ, 9pt - - - - 2, 2, 2, 2 - - - 462, 280 - - - 蜴溷ｭ先ュ蝣ｱ - - - 2, 2, 2, 2 - - - 462, 280 - - - 螟夐擇菴/邨仙粋謠冗判險ｭ螳 - - - - - - 462, 280 - - - 蠑慕畑譁迪ｮ - - - - - - 462, 280 - - - 迥ｶ諷区婿遞句ｼ - - - - - - 462, 280 - - - 蠑ｾ諤ｧ螳壽焚 - - - - - - 462, 280 - - - - - - - - - 462, 226 - - - - - - 462, 27 - - - - - - 462, 27 - - - - - - 462, 280 - - - - - - 462, 280 - - - - - - 462, 280 - - - - - - 繝｡繧､繝ｪ繧ｪ, 9pt - - - 0, 22 - - - 3, 1 - - - 470, 310 - - - - - - 456, 274 - - - - - - 0, 136 - - - 456, 138 - - - - 繝｡繧､繝ｪ繧ｪ, 9pt @@ -231,7 +158,7 @@ 繝｡繧､繝ｪ繧ｪ, 9pt - 繝｢繝ｫ菴鍋ｩ + 繝｢繝ｫ雉ｪ驥 202, 29 @@ -263,11 +190,23 @@ 124, 20 + + 0, 136 + + + 456, 138 + 456, 136 - - + + 456, 274 + + + 462, 280 + + + 譬ｼ蟄/蟇ｾ遘ｰ諤ｧ 2, 2 @@ -275,29 +214,30 @@ 458, 276 - - - - - 2, 2 + + 210, 22 - - + + 繝繝舌う繝ｯ繝ｩ繝ｼ蝗蟄舌ｒ繧ｼ繝ｭ縺ｫ縺吶ｋ 211, 26 - - + + 2, 2 - - + + 繝｡繧､繝ｪ繧ｪ, 9pt - - 210, 22 + + + 2, 2, 2, 2 - - 繝繝舌う繝ｯ繝ｩ繝ｼ蝗蟄舌ｒ繧ｼ繝ｭ縺ｫ縺吶ｋ + + 462, 280 + + + 蜴溷ｭ先ュ蝣ｱ 2, 2 @@ -305,17 +245,14 @@ 458, 276 - - - - - 350, 162 + + 2, 2, 2, 2 - - 繧ｿ繧､繝医Ν + + 462, 280 - - + + 螟夐擇菴/邨仙粋謠冗判險ｭ螳 繝｡繧､繝ｪ繧ｪ, 9pt @@ -323,8 +260,14 @@ 344, 138 - - + + 350, 162 + + + 繧ｿ繧､繝医Ν + + + 100, 138 106, 162 @@ -332,14 +275,8 @@ 闡苓 - - - - - 100, 138 - - - + + 450, 31 456, 55 @@ -347,137 +284,44 @@ 髮題ｪ悟錐 - - - - - 450, 31 - - - + + 450, 33 456, 57 - - - - - 450, 33 + + 462, 280 - - + + 蠑慕畑譁迪ｮ 456, 274 - - + + 462, 280 - - + + 迥ｶ諷区婿遞句ｼ + + + 462, 280 - - + + 蠑ｾ諤ｧ螳壽焚 120, 123 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 462, 280 - - + + 462, 226 - - + + 462, 27 繝｡繧､繝ｪ繧ｪ, 9pt @@ -488,53 +332,47 @@ Division - - - 219, 2 - - - 275, 4 - - - 310, 2 - - - 358, 4 - - + + 462, 27 + + + 462, 280 456, 274 - - + + 462, 280 456, 274 - - + + 462, 280 - - 0, 28 + + 繝｡繧､繝ｪ繧ｪ, 9pt - - 470, 24 + + 0, 22 + + + 3, 1 - - + + 470, 310 61, 0 @@ -555,7 +393,7 @@ 420, 0 - 50, 25 + 50, 24 繝｡繧､繝ｪ繧ｪ, 9.75pt @@ -566,11 +404,11 @@ 蛹門ｭｦ邨謌 - - 279, 242 + + 0, 28 - - + + 470, 24 278, 22 @@ -638,6 +476,9 @@ 逡ｰ縺ｪ繧玖ｻｸ繝ｻ蜴溽せ繧ｻ繝繝繧｣繝ｳ繧ｰ縺ｮ遨ｺ髢鍋ｾ､縺ｫ螟画鋤 + + 279, 242 + 48, 0 @@ -653,9 +494,6 @@ 邨先匕蜷 - - - 繝｡繧､繝ｪ繧ｪ, 9pt @@ -683,19 +521,10 @@ 470, 0 - - - 470, 28 - - - 470, 362 - - - \ No newline at end of file diff --git a/Crystallography.Controls/Crystal/CrystalControl.resx b/Crystallography.Controls/Crystal/CrystalControl.resx index e530c19..8c7efeb 100644 --- a/Crystallography.Controls/Crystal/CrystalControl.resx +++ b/Crystallography.Controls/Crystal/CrystalControl.resx @@ -1,4 +1,64 @@ + + @@ -57,3397 +117,3688 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True + + + 0, 54 - - - GrowAndShrink + + + 0, 2, 0, 0 - - - Segoe UI Symbol, 9.75pt + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Segoe UI, 9pt + + 1, 1, 1, 1 - - 邃ｫﾂｳ + + tabPageStrainStress - - Segoe UI, 9pt + + + 5 - - Cell Volume + + 3, 3, 3, 3 - - 10, 4 + + 91, 20 - - - 10, 0, 0, 0 + + bondControl - - 1000, 25 + + 52, 17 - - 1, 23 + + 3, 21 - - 0, 0, 1, 0 + + Segoe UI Symbol, 9.75pt - - 156, 25 + + 4 - - 90 + + 309, 22 - - 17, 17 - - - Cell volume in 邃ｫﾂｳ + + 235 - - Cell volume in 邃ｫﾂｳ + + 1, 1, 1, 1 - - numericBoxVolume + + True - + + 3, 3, 3, 3 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - flowLayoutPanel4 + + label115 - - 0 + + 250 - - GrowAndShrink + + Revert cell constants - - Segoe UI Symbol, 9.75pt + + 4, 26 - - Segoe UI, 9pt + + Arial Narrow, 9.75pt - - ﾃ 10竅ｻﾂｲ竅ｴ g + + 0, 2, 0, 0 - - Segoe UI, 9pt + + True - - Cell Mass + + Convert to P1 spacegroup - - 176, 4 + + - - 10, 0, 0, 0 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1000, 25 + + 8 - - 1, 23 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0, 1, 0 + + 1, 1, 1, 1 - - 175, 25 + + 459, 298 - - 90 + + True - - Cell mass in 10竅ｻﾂｲ竅ｴ g + + + Left - - Cell mass in 10竅ｻﾂｲ竅ｴ g + + 1000, 27 - - numericBoxCellMass + + 25, 15 - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + - - flowLayoutPanel4 + + 0 - - 1 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + GrowAndShrink - - Segoe UI Symbol, 9.75pt + + Times New Roman, 9pt - - Segoe UI Symbol, 9pt + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - cmﾂｳ/mol + + 1000, 27 - + Segoe UI Symbol, 9pt - - Molar Volume + + 1, 1, 1, 1 - - 10, 29 + + Times New Roman, 10pt - - 10, 0, 0, 0 + + tabPageStrainStress - - 1000, 25 + + 307, 84 - - 1, 23 + + strainControlToolStripMenuItem - - 0, 0, 1, 0 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 199, 25 + + 1, 17 - - 90 + + flowLayoutPanel4 - - Molar Volume in cmﾂｳ/mol + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Molar Volume in cmﾂｳ/mol + + 0 - - numericBoxMolarVolume + + - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + 47, 24 - - flowLayoutPanel4 + + Segoe UI Symbol, 9.75pt - - 2 + + True - - GrowAndShrink + + 453, 292 - - Segoe UI Symbol, 9.75pt + + NoControl - - Segoe UI Symbol, 9pt + + 7 - - g/mol + + 109, 70 - - Segoe UI Symbol, 9pt + + convertToAnotherSpacegroupToolStripMenuItem - - Molar Mass + + 5 - - 219, 29 + + 258, 46 - - 10, 0, 0, 0 - - - 1000, 25 - - - 1, 23 - - - 0, 0, 1, 0 + + 繝｡繧､繝ｪ繧ｪ, 9pt - - 171, 25 + + Top - - 90 + + Export - - Molar Mass in g/mol + + Tahoma, 9pt - - Molar Mass in g/mol + + 71, 46 - - numericBoxMolarMass + + tabPageStrainStress - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + convertToP1SymmetryToolStripMenuItem - - flowLayoutPanel4 + + NoControl - - 3 + + Density in g/cmﾂｳ - - GrowAndShrink + + 4, 0, 0, 0 - + Segoe UI Symbol, 9.75pt - - Segoe UI Symbol, 9pt - - - g/cmﾂｳ - - - Segoe UI Symbol, 9pt + + False - - Density + + True - - 10, 54 + + 1 - - 10, 0, 0, 0 + + label101 - - 1000, 25 + + NoControl - - 1, 23 + + True - - 0, 0, 1, 0 + + Microsoft Sans Serif, 9pt - - 147, 25 + + - - 95 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Density in g/cmﾂｳ + + tabPageStrainStress - - Density in g/cmﾂｳ + + 341, 156 - - numericBoxDensity + + flowLayoutPanel2 - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - flowLayoutPanel4 + + 0 - - 4 + + 268, 22 - - True + + groupBox7 - - GrowAndShrink + + 0, 0, 0, 0 - - Segoe UI Symbol, 9.75pt + + Polycrystalline Property - - Segoe UI Symbol, 9pt + + Fill - - 0, 0, 0, 0 + + 1000, 27 - - + + 1, 1, 1, 1 - - Segoe UI Symbol, 9pt + + tabPageStrainStress - - 0, 0, 0, 0 + + 0, 0, 1, 0 - - Profile color + + Microsoft Sans Serif, 9pt - - 167, 57 + + Cell constants, symmetry, and other basic informaton - - 10, 3, 3, 3 + + 76 - - 91, 20 + + 3 - - 89 + + groupBox6 - + - - Profile color - + + label102 - - colorControl + + 2, 3, 2, 3 - - Crystallography.Controls.ColorControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - flowLayoutPanel4 + + GrowAndShrink - - 5 + + Segoe UI Symbol, 9pt - - Fill + + 453, 292 - - 0, 133 + + ﾏ11 - - 4, 4, 4, 4 + + 109, 115 - - 0, 4, 0, 0 + + 238 - - 453, 159 + + 574, 177 - - 94 + + 1, 17 - - flowLayoutPanel4 + + panel4 - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - panel5 + + 3, 3 - - 0 + + Crystallography.Controls.ElasticityControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - Top + + buttonGenerateRandomOrientations - - 0, 0 + + 1 - - 3, 11, 3, 11 + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 453, 133 + + 29 - - 93 + + tabPageStrainStress - - symmetryControl + + Segoe UI Symbol, 9.75pt - - Crystallography.Controls.SymmetryControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + - - panel5 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + Arial Narrow, 9.75pt - - Fill + + Arial Narrow, 9.75pt - - 3, 3 + + label112 - - 2, 2, 2, 2 + + 126, 27 - - 453, 292 + + 0 - - 93 + + 27 - - panel5 + + 0 - - System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 25, 15 - - tabPageBasicInfo + + Lattice Plane - - 0 + + Import from CIF, AMC... - - 4, 26 + + 459, 27 - - 3, 3, 3, 3 + + Cell volume in 邃ｫﾂｳ - - 459, 298 + + Segoe UI Symbol, 9.75pt - - 4 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - Basic Info. + + tabPageStrainStress - - Cell constants, symmetry, and other basic informaton + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Cell constants, symmetry, and other basic informaton + + numericUpDownCrystallineSize - - tabPageBasicInfo + + groupBox6 - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 3 - + tabControl - + + 459, 298 + + 0 - + + Segoe UI Symbol, 9.75pt + + + 0, 0, 1, 0 + + True - - Fill + + NoControl - - Microsoft Sans Serif, 9pt + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0, 0, 0 + + CrystalControl - - 446, 108 + + 0, 0 - - 459, 298 + + tabControl - + 0 - - atomControl + + 47, 24 - - Crystallography.Controls.AtomControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + 55, 19 - - tabPageAtom + + 269, 242 - - 0 + + 22 - - True + + 5 - - GrowAndShrink + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - - 249, 22 - - - Arial, 9pt + + Segoe UI Symbol, 9.75pt - - 217, 22 + + 136 - - Reset Debye-Waller factor + + TopCenter - - 218, 26 + + 301, 69 - - contextMenuStrip2 + + 100, 156 - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 255, 29 - - Bottom + + Convert to a superstructure - - 0, 0 + + System.Windows.Forms.UserControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + Segoe UI Symbol, 9pt - - 65 + + 7 - - panel3 + + Segoe UI Symbol, 9.75pt - - System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 3, 3, 0 - - panelAtom + + 6 - - 0 + + NoControl - - Microsoft Sans Serif, 9pt + + - - 0, 0 + + 1000, 30 - - 0, 0, 0, 0 + + 47, 24 - - 0, 0 + + - - 65 + + 9 - - panelAtom + + 199, 25 - - System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - tabPageAtom + + 1000, 27 - - 1 + + - - Tahoma, 8.25pt + + - - 4, 26 + + ﾏ33 - - 0, 0, 0, 0 + + scatteringFactorToolStripMenuItem - - 459, 298 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - 0 + + Scattering Factor - - Atom Info. + + flowLayoutPanel2 - - Atom positions and species + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Atom positions and species + + 5 - - tabPageAtom - - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 1 + + 24, 15 - + True - + GrowAndShrink - - Fill - - - Segoe UI Symbol, 9pt - - - 0, 0 + + GrowAndShrink - - 0, 0, 0, 0 + + Segoe UI Symbol, 9.75pt - - 459, 298 + + 19 - - 0 + + 4, 26 - - bondControl + + Authors - - Crystallography.Controls.BondInputControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + Right - - tabPageBondsPolyhedra + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4, 26 + + Segoe UI Symbol, 9pt - - 459, 298 + + label22 - - 3 + + 10, 0, 0, 0 - - Bonds ( & Polyhedra) + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - tabPageBondsPolyhedra + + numericBoxZnumber - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + set - - tabControl + + - - 2 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill + + 265, 6 - - Segoe UI Symbol, 9.75pt + + 0 - - 3, 21 + + Molar Volume - - True + + 10, 0, 0, 0 - - Vertical + + 4, 26 - - 341, 156 + + Times New Roman, 9pt - - 0 + + tabPageStrainStress - - textBoxTitle + + toolTip - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + as CTF file (comatible to CHANNEL 5 file) - - groupBox8 + + 167, 57 - - 0 + + Strain / Stress - - Fill + + 6 - - 109, 115 + + 218, 26 - - 347, 180 + + nm - - 3 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Title + + 194, 12 - - groupBox8 + + 87 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 2, 0, 0 - - tabPageReference + + flowLayoutPanel4 - - 0 + + tabPageStrainStress - - Fill + + 148 - - Segoe UI Symbol, 9.75pt + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3, 21 + + 110, 2 - - True + + 1 - + Vertical - - 100, 156 + + 248 - - 0 + + tabPageBasicInfo - - textBoxAuthor + + 1, 1, 1, 1 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2, 2, 2, 2 - - groupBox6 + + - - 0 + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Left + + True - - 3, 115 + + 4, 26 - - 106, 180 + + 10, 0, 0, 0 - - 2 + + poleFigureControl - - Authors + + 1, 17 - - groupBox6 + + resetToolStripMenuItem - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPageStrainStress - - tabPageReference + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - 1 + + numericBoxStress13 - - Fill + + 2 - - Segoe UI Symbol, 9.75pt + + 6 - - 3, 21 + + 249 - - True + + numericBoxStrain22 - - Vertical - - - 447, 31 + + tabPageElasticity - - 0 + + 24, 15 - - textBoxJournal + + Z (Number of formula in the unit cell) - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9pt - - groupBox7 + + 13 - + 0 - - Top + + 4, 0, 4, 0 - - 3, 60 + + 1000, 27 - - 453, 55 + + 305, 125 - - 1 + + 95 - - Journal + + Segoe UI Symbol, 9.75pt - - groupBox7 + + Arial Narrow, 9.75pt - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 21 - - tabPageReference + + - - 2 + + - - Fill + + 114, 30 - + + GrowAndShrink + + + 3, 3, 3, 3 + + Segoe UI Symbol, 9.75pt - - 3, 21 + + textBoxTitle - - True + + 1, 1, 1, 1 - - 447, 33 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + EOS - - textBoxMemo + + Fill - + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox5 + + Arial Narrow, 9.75pt - - 0 + + - - Top + + Arial Narrow, 9.75pt - - 3, 3 + + 0, 0 - - 453, 57 + + tabPageStrainStress - - 0 + + label116 - - Note + + - - groupBox5 + + Crystallography.Controls.AtomControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + numericBoxHill - - tabPageReference + + Molar Mass in g/mol - - 3 + + tabPageStrainStress - - 4, 26 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3, 3, 3, 3 + + 1 - - 459, 298 + + - - 1 + + 9 - - Ref. + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageReference + + Title - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1, 17 - - tabControl + + 87 - - 3 + + 459, 298 - - Fill + + 133 - - Segoe UI Symbol, 9pt + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3, 3 + + 47, 24 - - 2, 3, 2, 3 + + 1, 18 - - 453, 292 + + 4, 12 - - 0 + + 4, 0, 4, 0 - - eosControl + + Arial Narrow, 9.75pt - - Crystallography.Controls.EOSControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + textBoxMemo - - tabPageEOS + + 1 - - 0 + + flowLayoutPanel2 - - 4, 26 + + Segoe UI Symbol, 9.75pt - - 3, 3, 3, 3 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 459, 298 + + 447, 33 - - 5 + + 16 - - EOS + + GrowAndShrink - - tabPageEOS + + - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 47, 24 - - tabControl + + 47, 24 - - 4 + + 12 - - True + + 4, 2, 4, 2 + + + flowLayoutPanel3 + + + + + + 1 0, 6 - - 4, 4, 4, 4 - - - 574, 177 + + 3, 5, 3, 0 - - 0 + + - - elasticityControl1 + + Symmetry info. - - Crystallography.Controls.ElasticityControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + 240 - - tabPageElasticity + + 1, 1, 1, 1 - - 0 + + Segoe UI Symbol, 9pt - - 4, 26 + + - - 3, 3, 3, 3 + + - - 459, 298 + + Atom positions and species - - 6 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Elasticity + + 96, 96 - - tabPageElasticity + + 1 - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 43, 0 - - tabControl + + 0, 0, 0, 0 - - 5 + + Segoe UI, 9pt - - 282, 196 + + Crystallography.Controls.BoundControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - 75, 23 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - 263 + + 3, 3, 3, 3 - - set + + GrowAndShrink - - buttonStressSet + + tabControl - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPageAtom - - tabPageStrainStress + + 0, 0 - + + 146 + + + Tahoma, 8.25pt + + 0 - + + ﾎｵ13 + + + contextMenuStrip + + GrowAndShrink - + Segoe UI Symbol, 9.75pt - - 120, 121 - - - 1, 1, 1, 1 + + saveToolStripMenuItem - - 1000, 24 + + Hill coefficient - - 1, 22 + + - - 0, 0, 1, 0 + + 80 - - 47, 24 + + 206, 25 - - 5 + + 114, 69 - - numericBoxStrain33 + + contextMenuStrip2 - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + 453, 133 - + tabPageStrainStress - - 1 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - GrowAndShrink + + 0, 0, 1, 0 - - Segoe UI Symbol, 9.75pt + + NoControl - - 306, 159 + + 0 - - 1, 1, 1, 1 + + 268, 22 - - 1000, 24 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1, 22 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - 0, 0, 1, 0 + + True - - 47, 24 + + 3, 21 - - 13 + + label99 - - numericBoxHill + + - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + 453, 292 - - tabPageStrainStress + + tabControl - - 2 + + 1, 17 - - True + + Fill - - Times New Roman, 10pt + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl + + - - 282, 162 + + 249, 0 - - 4, 0, 4, 0 + + Segoe UI Symbol, 9.75pt - - 14, 16 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 262 + + Fill - - ﾎｱ + + Z - - label116 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - tabPageStrainStress + + tabPageBounds - - 3 + + textBoxAuthor - - True + + Segoe UI Symbol, 9pt - - Tahoma, 9pt + + tabPageStrainStress - - NoControl + + tabPageStrainStress - - 192, 162 + + 1000, 27 - - 4, 0, 4, 0 + + 86 - - 82, 14 + + 26, 17 - - 12 + + 90 - - Hill coefficient + + textBoxName - - label117 + + 71, 84 - + + + + + Times New Roman, 9pt + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageStrainStress + + GrowAndShrink - - 4 + + asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem - - True + + label111 - - Tahoma, 9pt + + ﾎｵ33 - - NoControl + + eosControl - - 194, 12 + + True 4, 0, 4, 0 - - 122, 14 + + 2 - - 253 + + ﾏ13 - - Stress (Reuss model) - + + flowLayoutPanel4 - - label109 + + 0 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - tabPageStrainStress + + - - 5 + + 0, 0, 1, 0 - - True + + 0 - - Times New Roman, 9pt + + 1, 17 - - NoControl + + - - 251, 69 + + 254 - - 4, 0, 4, 0 + + groupBox7 - - 25, 15 + + 108, 22 - - 249 + + 4, 26 - - ﾏ22 + + 459, 298 - - label110 + + 192, 162 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox8 - - tabPageStrainStress + + - - 6 + + Left - - True + + - - Times New Roman, 9pt + + 5 - - NoControl + + Top - - 255, 29 + + 4, 4, 4, 4 - - 4, 0, 4, 0 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - 25, 15 + + 88 - - 250 + + Segoe UI Symbol, 9.75pt - - ﾏ12 + + NoControl - - label111 + + Segoe UI Symbol, 9.75pt - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill - - tabPageStrainStress + + panel4 - - 7 + + 1000, 27 - - True + + 306, 159 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageStrainStress + + + tabPageStrainStress Times New Roman, 9pt - - NoControl + + 22, 46 - - 301, 109 + + 6 - - 4, 0, 4, 0 + + 136 - - 25, 15 + + Fill - - 251 + + 14, 16 - - ﾏ33 + + 85 - - label112 + + 3, 4, 3, 4 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0, 4, 0 - - tabPageStrainStress + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8 + + 239 - - True + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Times New Roman, 9pt + + Segoe UI Symbol, 9.75pt - - NoControl + + GrowAndShrink - - 206, 28 + + Open another window with the structure factors - - 4, 0, 4, 0 + + 459, 298 - - 25, 15 + + flowLayoutPanel3 - - 254 + + 24, 15 - - ﾏ11 + + 43, 19 - - label113 + + 114, 107 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - tabPageStrainStress + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - 9 - - - True - - - Times New Roman, 9pt + + 0 - - NoControl + + 0, 0 - - 301, 69 + + 10 - - 4, 0, 4, 0 + + - - 25, 15 + + 1 - - 252 + + 20 - - ﾏ23 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label114 + + NoControl - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - tabPageStrainStress + + 1, 18 - - 10 + + asTXTFileAllEulerAngleAndDensityToolStripMenuItem - + True - - Times New Roman, 9pt + + - - NoControl + + 0, 0, 0, 0 - - 304, 29 + + - - 4, 0, 4, 0 + + 55, 0 - - 25, 15 + + 0, 0 - - 248 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - ﾏ13 + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label115 + + panel5 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 - - tabPageStrainStress + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 11 + + Fill - - True + + importCrystalFromCIFAMCToolStripMenuItem - - Tahoma, 9pt + + Vertical - - NoControl + + tabPageStrainStress - - 4, 12 + + - + 4, 0, 4, 0 - - 118, 14 + + 446, 108 - - 240 + + True - - Strain (Voigt model) + + 459, 244 - - label102 + + True - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabControl - - tabPageStrainStress + + g/cmﾂｳ - - 12 + + 301, 109 - + True - - Times New Roman, 9pt + + 0, 4, 0, 0 - - NoControl + + - - 64, 69 + + 28 - - 4, 0, 4, 0 + + 3 - - 24, 15 + + panelAtom - - 235 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ﾎｵ22 + + 108, 22 - - label103 + + 0, 0, 0, 0 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Cell constants, symmetry, and other basic informaton - - tabPageStrainStress + + GrowAndShrink - - 13 + + Strain (Voigt model) - - True + + 118, 14 - - Times New Roman, 9pt + + numericBoxStrain11 - - NoControl + + toolStripSeparator2 - - 64, 30 + + 1, 17 - - 4, 0, 4, 0 + + True - - 24, 15 + + panel1 - - 236 + + 1, 18 - - ﾎｵ12 + + 0, 0, 0, 2 - - label104 + + tabPageLatticePlane - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 467, 27 - - tabPageStrainStress + + Top - - 14 + + Segoe UI Symbol, 9.75pt - + True - - Times New Roman, 9pt + + 0, 0, 1, 0 - - NoControl + + 47, 24 - - 114, 107 + + Molar Volume in cmﾂｳ/mol - - 4, 0, 4, 0 + + - - 24, 15 + + Angle Resolution - - 237 + + 4, 26 - - ﾎｵ33 + + Ref. - - label105 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageStrainStress - - - 15 + + panel1 - + True - - Times New Roman, 9pt + + 0, 0, 1, 0 - + NoControl - - 114, 69 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4, 0, 4, 0 + + 0, 0 - - 24, 15 + + 467, 380 - - 238 + + 82, 14 - - ﾎｵ23 + + revertCellConstantsToolStripMenuItem - - label106 + + Times New Roman, 9pt - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Profile color - - tabPageStrainStress + + tabPageAtom - - 16 + + 4 - + True - - Times New Roman, 9pt + + 1, 17 - - NoControl + + Fill - - 18, 30 + + 426, 0 - + 4, 0, 4, 0 - - 24, 15 - - - 241 + + label110 - - ﾎｵ11 + + flowLayoutPanel4 - - label107 + + 106, 180 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Export to CIF - - tabPageStrainStress + + label114 - - 17 + + tabPageBondsPolyhedra - - True + + 0, 0, 0, 0 - - Times New Roman, 9pt + + 282, 196 - - NoControl + + Segoe UI Symbol, 9.75pt - - 114, 30 + + - - 4, 0, 4, 0 + + 1000, 27 - - 24, 15 + + - - 239 + + 93 - - ﾎｵ13 + + Segoe UI Symbol, 9.75pt - - label108 + + 4, 0, 4, 0 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Cell Volume - - tabPageStrainStress + + - - 18 + + True - - GrowAndShrink + + 64, 30 - - Segoe UI Symbol, 9.75pt + + 3, 11, 3, 11 - - 305, 125 + + tabPagePolycrystalline - - 1, 1, 1, 1 + + 219, 29 - - 1000, 24 + + groupBox8 - - 1, 22 + + 209, 46 - - 0, 0, 1, 0 + + Bounds - - 47, 24 + + boundControl - - 11 + + panel3 - - numericBoxStress33 + + - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + 459, 27 - - tabPageStrainStress + + 1000, 28 - - 19 + + 459, 298 - - GrowAndShrink + + $this - - Segoe UI Symbol, 9.75pt + + - - 257, 84 + + 10 - - 1, 1, 1, 1 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1000, 24 + + 262 - - 1, 22 + + sendThisCrystalToOtherSoftwareToolStripMenuItem - - 0, 0, 1, 0 + + 3, 3, 3, 3 - - 47, 24 + + $this - - 9 + + 309, 22 - - numericBoxStress22 + + Top - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageStrainStress + + 4, 26 - - 20 + + 95 - - GrowAndShrink + + Journal - - Segoe UI Symbol, 9.75pt + + tabPagePolycrystalline - - 209, 46 + + 2 - - 1, 1, 1, 1 + + 4, 26 - - 1000, 24 + + numericBoxMolarMass - - 1, 22 + + contextMenuStripPoleFigure - - 0, 0, 1, 0 + + 8 - - 47, 24 + + 邃ｫﾂｳ - - 6 + + g/mol - - numericBoxStress11 + + 90 - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageStrainStress + + Z (Number of formula in the unit cell) - - 21 + + Fill - - GrowAndShrink + + toolStripSeparator3 - - Segoe UI Symbol, 9.75pt + + - - 307, 84 + + 1000, 28 - - 1, 1, 1, 1 + + - - 1000, 24 + + Times New Roman, 9pt - - 1, 22 + + buttonSymmetryInfo - - 0, 0, 1, 0 + + - - 47, 24 + + 0, 2, 0, 0 - - 10 + + NoControl - - numericBoxStress23 + + 0 - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageStrainStress + + 257, 84 - - 22 + + 4 - - GrowAndShrink + + NoControl - - Segoe UI Symbol, 9.75pt + + Right - - 307, 46 + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1, 1, 1, 1 + + 98 - - 1000, 24 + + Vertical - - 1, 22 + + - - 0, 0, 1, 0 + + 4, 0, 4, 0 - - 47, 24 + + 459, 298 - - 8 + + GrowAndShrink - - numericBoxStress13 + + 252 - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageStrainStress + + Arial Narrow, 9.75pt - - 23 + + Crystallography.Controls.PoleFigureControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - + + 0, 0, 0, 0 + + GrowAndShrink - - Segoe UI Symbol, 9.75pt + + 2 - - 258, 46 + + panel5 - - 1, 1, 1, 1 + + 3, 3, 3, 3 - - 1000, 24 + + - - 1, 22 + + Fill - - 0, 0, 1, 0 + + Chemical formula - - 47, 24 + + numericBoxDensity - - 7 + + GrowAndShrink - - numericBoxStress12 + + Density - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + tabControl - - tabPageStrainStress + + 14 - - 24 + + 64, 69 - - GrowAndShrink + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Segoe UI Symbol, 9.75pt + + 0 - - 22, 46 + + 135 - - 1, 1, 1, 1 + + 0, 0, 1, 0 - - 1000, 24 + + NoControl - - 1, 22 + + colorControl - - 0, 0, 1, 0 + + Fill - - 47, 24 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + - - numericBoxStrain11 + + 4, 0, 4, 0 - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + 9 - + + 1, 18 + + tabPageStrainStress - - 25 + + numericBoxStress33 - - GrowAndShrink + + buttonStressSet - - Segoe UI Symbol, 9.75pt + + 7 - - 71, 84 + + Tahoma, 9pt - - 1, 1, 1, 1 + + ﾎｵ11 - - 1000, 24 + + Tahoma, 9pt - - 1, 22 + + 24, 15 - - 0, 0, 1, 0 + + 467, 328 - - 47, 24 + + tabPageStrainStress - - 3 + + 1 - - numericBoxStrain22 + + Molar Mass in g/mol - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPageStrainStress + + Segoe UI Symbol, 9pt - - 26 + + 25, 15 - - GrowAndShrink + + 11 - + + Molar Volume in cmﾂｳ/mol + + Segoe UI Symbol, 9.75pt - - 71, 46 + + True - - 1, 1, 1, 1 + + Save - - 1000, 24 + + 4, 0, 4, 0 - - 1, 22 + + True - - 0, 0, 1, 0 + + Send this crystal to other software - - 47, 24 + + GrowAndShrink - - 1 + + numericBoxStrain23 - - numericBoxStrain12 + + 89 - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + 176, 4 - - tabPageStrainStress + + 24, 15 - - 27 + + flowLayoutPanel2 - - GrowAndShrink + + 3 - - Segoe UI Symbol, 9.75pt + + - - 120, 84 + + - - 1, 1, 1, 1 + + 18, 30 - - 1000, 24 + + panel4 - - 1, 22 + + - - 0, 0, 1, 0 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 47, 24 + + Atom positions and species - - 4 + + 11 - - numericBoxStrain23 + + False - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + Segoe UI Symbol, 9.75pt - - tabPageStrainStress + + 0, 27 - - 28 + + 10, 0, 0, 0 - - GrowAndShrink + + label29 - - Segoe UI Symbol, 9.75pt + + 149 - - 120, 46 + + 304, 29 - - 1, 1, 1, 1 + + 265, 6 - - 1000, 24 + + toolStripSeparator1 - - 1, 22 + + True - - 0, 0, 1, 0 + + panel1 - - 47, 24 + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 2 - - numericBoxStrain13 + + 10 - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + - - tabPageStrainStress + + 0, 0, 1, 0 - - 29 + + Segoe UI Symbol, 9.75pt - - 4, 26 + + 1000, 27 - - 3, 3, 3, 3 + + 206, 28 - - 459, 298 + + numericBoxStrain13 - - 7 + + tabPageBasicInfo - - Strain / Stress + + 10, 54 - - tabPageStrainStress + + ﾎｵ22 - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - tabControl + + 1000, 27 - - 6 + + 0 - - 414, 22 - - - 108, 22 + + 0 - - Read + + flowLayoutPanel2 - - 108, 22 + + tabPageReference - - Save + + tabPageStrainStress - - 309, 22 + + Strain Control - - as CTF file (comatible to CHANNEL 5 file) + + 48, 25 - - 309, 22 + + 265, 6 - - as TXT file (all Euler angle and density) + + Density in g/cmﾂｳ - - 309, 22 + + 18 - - as TXT file (all Euler angle and density) sorted + + 24 - - 108, 22 + + 156, 25 - - Export + + 0, 2, 0, 0 - - 109, 70 + + NoControl - - contextMenuStripPoleFigure + + Crystallography.Controls.LatticePlaneControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill + + flowLayoutPanel2 - - Segoe UI Symbol, 9.75pt + + 0 - - 0, 54 + + Size - - 4, 2, 4, 2 + + 93 - - 459, 244 + + 4 - - 133 + + 166, 4 - - poleFigureControl + + Segoe UI Symbol, 9.75pt - - Crystallography.Controls.PoleFigureControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + tabPageStrainStress - - tabPagePolycrystalline + + GrowAndShrink - - 0 + + Segoe UI, 9pt - + True - + True - - GrowAndShrink - - - Segoe UI Symbol, 9.75pt - - - NoControl + + 353, 0 - - 0, 0 + + Segoe UI, 9pt - - 0, 0, 0, 0 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 126, 27 + + True - - 146 + + True - - Random Rotations + + 1, 18 - - buttonGenerateRandomOrientations + + tabPageStrainStress - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9pt - - flowLayoutPanel3 + + ﾏ23 - - 0 + + tabControl - - Top + + panelAtom - - 0, 27 + + - - 459, 27 + + 4 - - 149 + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - flowLayoutPanel3 + + Fill - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI, 9pt - - tabPagePolycrystalline + + True - - 1 + + Crystallography.Controls.ColorControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - True + + 0 - - True + + - - Segoe UI Symbol, 9.75pt + + tabPageStrainStress - - NoControl + + 24, 15 - - 4, 4 + + - - 4, 2, 0, 0 + + panel4 - - 106, 17 + + numericBoxStress11 - - 137 + + 0, 0, 1, 0 - - Angle Resolution + + Symmetry Information - - label5 + + Top - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1, 17 - - flowLayoutPanel2 + + 268, 22 - - 0 + + 114, 25 - + Segoe UI Symbol, 9.75pt - - 110, 2 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - 0, 0, 4, 0 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - 48, 25 + + 1 - - 136 + + buttonScatteringFactor - - True + + flowLayoutPanel4 - - numericUpDownAngleResolution + + 0 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - flowLayoutPanel2 + + tabPageElasticity - - 1 + + 4, 0, 4, 0 - + True - - Segoe UI Symbol, 9.75pt + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl + + Segoe UI, 9pt - - 166, 4 + + True - - 4, 2, 0, 0 + + 0, 0, 1, 0 - - 52, 17 + + Segoe UI Symbol, 9pt - - 138 + + 41, 25 - - division + + 47, 24 - - label29 + + Arial Narrow, 9.75pt - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 94 - - flowLayoutPanel2 + + Molar Mass - - 2 + + 357, 4 - - Segoe UI Symbol, 9.75pt + + 0 - - 218, 2 + + 268, 22 - - 0, 0, 4, 0 + + label104 - - 48, 25 + + 4, 0, 4, 0 - - 136 + + Convert to an equivalent spacegroup - - True + + Random Rotations - - numericUpDownAngleSubDivision + + tabPageAtom - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPageStrainStress - - flowLayoutPanel2 + + 0, 0, 0, 0 - - 3 + + flowLayoutPanel2 - - True + + 47, 24 - - Segoe UI Symbol, 9.75pt + + readToolStripMenuItem - - NoControl + + numericBoxStress12 - - 274, 4 + + flowLayoutPanel2 - - 4, 2, 4, 0 + + Arial, 9pt - - 31, 17 + + 137 - - 138 + + 139 - - Size + + 21 - - label101 + + tabControl - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + label90 - - flowLayoutPanel2 + + 459, 298 - - 4 + + - - Segoe UI Symbol, 9.75pt + + atomControl - - 309, 2 + + 4, 2, 0, 0 - - 0, 0, 0, 0 + + 371, 25 - - 44, 25 + + tabControl - - 135 + + numericBoxStress22 - - numericUpDownCrystallineSize + + 90 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - flowLayoutPanel2 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 5 + + Times New Roman, 9pt - - True + + tabPageStrainStress - - Segoe UI Symbol, 9.75pt + + 1, 1, 1, 1 - - NoControl + + 3 - - 357, 4 + + numericBoxStrain33 - - 4, 2, 4, 0 + + 5 - - 26, 17 + + - - 139 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - nm + + symmetryInformationToolStripMenuItem - - label99 + + exportThisCrystalAsCIFToolStripMenuItem - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1, 1, 1, 1 - - flowLayoutPanel2 + + 459, 298 - - 6 + + NoControl - - Top + + 10, 4 - - 0, 0 + + Cell volume in 邃ｫﾂｳ - - 0, 2, 0, 0 + + 31, 17 - - 459, 27 + + label105 - - 148 + + 268, 22 - - False + + NoControl - - flowLayoutPanel2 + + 467, 25 - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 138 - - tabPagePolycrystalline + + 251, 69 - - 2 + + Segoe UI Symbol, 9.75pt - - 4, 26 + + 108, 22 - + 459, 298 - - 8 - - - Polycrystalline Property + + GrowAndShrink - + tabPagePolycrystalline - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Arial Narrow, 9.75pt - - tabControl + + tabPageStrainStress - - 7 + + Times New Roman, 9pt - - Fill + + Bonds ( & Polyhedra) - - Segoe UI Symbol, 9pt + + - - 3, 3 + + ﾎｵ12 - - 3, 4, 3, 4 + + 3 - - 453, 292 + + Formula - - 0 + + flowLayoutPanel1 - - boundControl + + 47, 24 - - Crystallography.Controls.BoundControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + 347, 180 - - tabPageBounds + + 44, 25 - - 0 + + numericBoxVolume - - 4, 26 + + True - - 3, 3, 3, 3 + + Scattering factor - - 459, 298 + + tabControl - - 9 + + 0 - - Bounds + + Segoe UI Symbol, 9.75pt - - tabPageBounds + + 25, 15 - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9.75pt - - tabControl + + division - - 8 + + 241 - - Fill + + 3, 3 - + + 120, 121 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9pt - - 3, 3 + + 23 - - 3, 4, 3, 4 + + Times New Roman, 9pt - - 453, 292 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - 0 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - latticePlaneControl + + 1, 17 - - Crystallography.Controls.LatticePlaneControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + - - tabPageLatticePlane + + 453, 55 - - 0 + + Segoe UI Symbol, 9.75pt - + + True + + + Open another window with the detailed symmetry information + + 4, 26 - - 3, 3, 3, 3 + + 1, 20 - - 459, 298 + + label113 - - 10 + + 0, 0, 1, 0 - - Lattice Plane + + 17 - - tabPageLatticePlane + + Crystallography.Controls.EOSControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9.75pt - - tabControl + + 3, 3 - - 9 + + ﾃ 10竅ｻﾂｲ竅ｴ g - - Fill + + groupBox5 - - Segoe UI Symbol, 9.75pt + + Segoe UI Symbol, 9pt - - 0, 52 + + 4, 0, 4, 0 - - 0, 2, 0, 0 + + 1000, 28 - + True - - 467, 328 - - - 0 + + 9 - - tabControl + + 0, 0, 1, 0 - - System.Windows.Forms.TabControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 10, 3, 3, 3 - - $this + + - - 3 + + True - - Fill + + 0 - + Segoe UI Symbol, 9.75pt - - 55, 0 - - - 0, 3, 3, 0 + + 0, 52 - + True - - Vertical + + NoControl - - 371, 25 + + GrowAndShrink - - 76 + + 1, 1, 1, 1 - - Chemical formula + + NoControl - - textBoxFormula + + 3 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Stress (Reuss model) + - - panel1 + + exportToolStripMenuItem - - 0 + + 104, 25 - - GrowAndShrink + + Segoe UI Symbol, 9pt - - Right + + panel5 - - Segoe UI Symbol, 9.75pt + + 3, 4, 3, 4 - - Z + + NoControl - - 426, 0 + + Name - - 4, 0, 0, 0 + + 237 - - 1000, 25 + + 1, 1, 1, 1 - - 1, 25 + + tabPageReference - - 0, 0, 1, 0 + + 0, 0, 0, 0 - - 41, 25 - - - 95 - - - Z (Number of formula in the unit cell) - - - Z (Number of formula in the unit cell) + + 147, 25 - - numericBoxZnumber + + label103 - - Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + 0, 0, 1, 0 - - panel1 + + tabPagePolycrystalline - - 1 + + panel4 - - True + + 7 - - Left + + 0, 0 - - Segoe UI Symbol, 9.75pt + + 10, 29 - - NoControl + + 1, 17 - - 0, 0 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0, 0, 0 + + tabPageBondsPolyhedra - - 0, 2, 0, 0 + + 0 - - 55, 19 + + 268, 22 - - 85 + + 25 - - Formula + + 0, 27 - - Chemical formula + + - - label90 + + - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - panel1 + + Times New Roman, 9pt - - 2 + + 8 - - Top + + True - - 0, 27 + + tabPageBounds - - 467, 25 + + 268, 22 - - 98 + + label107 - - panel1 + + False - - System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Cell mass in 10竅ｻﾂｲ竅ｴ g - - $this + + as TXT file (all Euler angle and density) sorted - - 4 + + GrowAndShrink - - 96, 22 - - - 268, 22 + + 120, 84 - - Scattering Factor + + GrowAndShrink - - 268, 22 + + 0, 0, 1, 0 - - Symmetry Information + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 265, 6 + + 0, 133 - - 268, 22 + + Top - - Import from CIF, AMC... + + numericBoxStrain12 - - 268, 22 + + 1, 1, 1, 1 - - Export to CIF + + Times New Roman, 9pt - - 268, 22 + + Fill - - Send this crystal to other software + + 4 - - False + + GrowAndShrink - - 265, 6 + + numericBoxCellMass - - 268, 22 + + 253 - - Revert cell constants + + Right - - 265, 6 + + 251 - - 268, 22 + + textBoxFormula - - Strain Control + + Bottom - - False + + Arial Narrow, 9.75pt - - 268, 22 + + 0, 0, 0, 0 - - Convert to P1 spacegroup + + flowLayoutPanel4 - - 268, 22 + + Fill - - Convert to a superstructure + + 0, 0, 1, 0 - - 268, 22 + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - - Convert to an equivalent spacegroup + + Segoe UI Symbol, 9.75pt - - 269, 242 + + Cell mass in 10竅ｻﾂｲ竅ｴ g - - contextMenuStrip + + $this - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - Fill + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Segoe UI Symbol, 9.75pt + + 0 - - 43, 0 + + numericUpDownAngleResolution 0, 3, 0, 0 - - 206, 25 + + GrowAndShrink - - 0 + + 1000, 28 - - Name of the crystal + + tabPageStrainStress - - textBoxName + + 3 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 + + 0, 0, 1, 0 - - 0 + + 0, 0, 4, 0 - - True + + 1 - - Left + + 65 - - Segoe UI Symbol, 9.75pt + + tabPageReference - - NoControl + + 3 - - 0, 0 + + 282, 162 - - 3, 5, 3, 0 + + $this - - 0, 2, 0, 0 + + 268, 22 - - 43, 19 + + Left - - 80 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Name + + Basic Info. - - label22 + + tabControl - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - panel4 + + tabPageEOS - - 3 + + ﾏ22 - - True + + Arial Narrow, 9.75pt - - GrowAndShrink + + 0, 0 - - Right + + asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem - - Segoe UI Symbol, 9.75pt + + 3, 60 - - TopCenter + + - - NoControl + + - - 353, 0 + + 122, 14 - - 0, 0, 0, 0 + + 1000, 28 - - 114, 25 + + 0 - - 87 + + 25, 15 - - Scattering factor + + 3, 3 - - Open another window with the structure factors + + Segoe UI Symbol, 9.75pt - - buttonScatteringFactor + + 2 - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + as TXT file (all Euler angle and density) - - panel4 + + - - 2 + + Chemical formula - - True + + Elasticity - - GrowAndShrink + + 75, 23 - - Right + + 4 - - Segoe UI Symbol, 9.75pt + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TopCenter + + GrowAndShrink - + NoControl - - 249, 0 + + - - 104, 25 + + tabPageReference - - 88 + + 459, 298 - - Symmetry info. + + symmetryControl - - Open another window with the detailed symmetry information + + 3, 115 - - buttonSymmetryInfo + + 467, 0 - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Atom Info. - - panel4 + + panel1 - - 1 + + 0, 0, 1, 0 - + + + + True - - GrowAndShrink + + 0, 0 - + Top - - 0, 0 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 467, 0 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 86 + + 15 - - flowLayoutPanel1 + + 268, 22 - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 309, 22 - - $this + + 453, 292 - - 6 + + 2 - - Top + + Note - - 0, 0 + + NoControl - - 0, 0, 0, 2 + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 467, 27 + + Top - - 87 + + 217, 22 - - panel4 + + - - System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Vertical - - $this + + 3, 21 - - 5 + + 0, 0, 1, 0 - - True - - - 50 - - - 96, 96 + + - + + Read + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 13 + + + 0, 0 + + + 218, 2 + + + Segoe UI Symbol, 9pt + + + 4, 0, 4, 0 + + + + + + 0 + + + 4, 2, 4, 0 + + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + + tabPageStrainStress + + + 90 + + + 1000, 27 + + + 4, 2, 4, 0 + + + 2 + + + convertToSuperstructureToolStripMenuItem + + + label5 + + + Segoe UI Symbol, 9.75pt + + + Segoe UI Symbol, 9.75pt + + + 0 + + + Segoe UI Symbol, 9.75pt + + + 47, 24 + + + numericBoxStress23 + + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + + 309, 2 + + GrowAndShrink - + + + + + Name of the crystal + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 138 + + + NoControl + + + 0 + + + GrowAndShrink + + + 106, 17 + + + label108 + + + 4, 4, 4, 4 + + 0, 0, 0, 0 - - 467, 380 + + numericBoxMolarVolume - - resetToolStripMenuItem + + 453, 159 - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - readToolStripMenuItem + + 4, 4 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - saveToolStripMenuItem + + Profile color + - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPageEOS - - exportToolStripMenuItem + + 25, 15 + + + 5 + + + 2 + + + cmﾂｳ/mol + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + label117 + + + 1, 17 + + + Segoe UI Symbol, 9.75pt + + + 48, 25 + + + 4, 0, 4, 0 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + numericUpDownAngleSubDivision + + + tabPageReference + + + 171, 25 + + + 453, 57 + + + 307, 46 + + + 0 + + + 3, 3, 3, 3 + + + TopCenter System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem + + 0, 0, 0, 0 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - asTXTFileAllEulerAngleAndDensityToolStripMenuItem + + 263 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Arial Narrow, 9.75pt - - asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem + + Fill - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 0, 4, 0 - - scatteringFactorToolStripMenuItem + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPageStrainStress - - symmetryInformationToolStripMenuItem + + GrowAndShrink - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - toolStripSeparator2 + + Segoe UI, 9pt - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - importCrystalFromCIFAMCToolStripMenuItem + + 4, 26 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI Symbol, 9.75pt - - exportThisCrystalAsCIFToolStripMenuItem + + - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 47, 24 - - sendThisCrystalToOtherSoftwareToolStripMenuItem + + Segoe UI Symbol, 9.75pt - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + - - toolStripSeparator1 + + 4, 0, 4, 0 - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1000, 27 - - revertCellConstantsToolStripMenuItem + + tabPageLatticePlane - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolStripSeparator3 + + 8 - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 268, 22 - - strainControlToolStripMenuItem + + flowLayoutPanel4 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - convertToP1SymmetryToolStripMenuItem + + Segoe UI, 9pt - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 - - convertToSuperstructureToolStripMenuItem + + NoControl - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - - convertToAnotherSpacegroupToolStripMenuItem + + - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + label106 - - toolTip + + 0 - - System.Windows.Forms.ToolTip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Times New Roman, 9pt - - CrystalControl + + elasticityControl1 - - System.Windows.Forms.UserControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 447, 31 + + + 0 + + + groupBox5 + + + Reset Debye-Waller factor + + + 65 + + + 3 + + + + + + Segoe UI Symbol, 9.75pt + + + System.Windows.Forms.TabControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Cell Mass + + 12 + + + latticePlaneControl + + + 236 + + + 47, 24 + + + Crystallography.Controls.SymmetryControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + + GrowAndShrink + + + 459, 298 + + + 0, 0, 1, 0 + + + NoControl + + + tabPageStrainStress + + + 6 + + + 0 + + + 10, 0, 0, 0 + + + 0, 0 + + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + + 6 + + + 120, 46 + + + 274, 4 + + + NoControl + + + 1000, 27 + + + ﾎｵ23 + + + textBoxJournal + + + ﾎｱ + + + True + + + Crystallography.Controls.BondInputControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + + label109 + + + True + + + 2 + + + Fill + + + 1, 17 + + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ﾏ12 + + + 26 + + + 175, 25 + + + 96, 22 + + + 17, 17 + + + 50 + + + ja + + + True + + + 414, 22 + + + 249, 22 + \ No newline at end of file diff --git a/Crystallography.Controls/Crystal/FormSymmetryInformation.cs b/Crystallography.Controls/Crystal/FormSymmetryInformation.cs index d0bffd9..e8b4963 100644 --- a/Crystallography.Controls/Crystal/FormSymmetryInformation.cs +++ b/Crystallography.Controls/Crystal/FormSymmetryInformation.cs @@ -2,271 +2,270 @@ using System.Drawing; using System.Windows.Forms; -namespace Crystallography.Controls +namespace Crystallography.Controls; + +public partial class FormSymmetryInformation : Form { - public partial class FormSymmetryInformation : Form + public Crystal Crystal => CrystalControl.Crystal; + public CrystalControl CrystalControl; + + public FormSymmetryInformation() { - public Crystal Crystal => CrystalControl.Crystal; - public CrystalControl CrystalControl; + InitializeComponent(); + } - public FormSymmetryInformation() - { - InitializeComponent(); - } + private void crystalControl_CrystalChanged(object sender, EventArgs e) + { + ChangeCrystal(); + } - private void crystalControl_CrystalChanged(object sender, EventArgs e) - { - ChangeCrystal(); - } + private static void ConvertRichTextBox1(ref RichTextBox rTB) + { + ConvertRichTextBoxOffsetSub(ref rTB, "sub1", 12); ConvertRichTextBoxOffsetSub(ref rTB, "sub2", 12); ConvertRichTextBoxOffsetSub(ref rTB, "sub3", 12); + ConvertRichTextBoxOffsetSub(ref rTB, "sub4", 12); ConvertRichTextBoxOffsetSub(ref rTB, "sub5", 12); + + ConvertRichTextBoxItalic(ref rTB, "P", 14); ConvertRichTextBoxItalic(ref rTB, "A", 14); ConvertRichTextBoxItalic(ref rTB, "B", 14); + ConvertRichTextBoxItalic(ref rTB, "C", 14); ConvertRichTextBoxItalic(ref rTB, "F", 14); ConvertRichTextBoxItalic(ref rTB, "I", 14); + ConvertRichTextBoxItalic(ref rTB, "a", 14); ConvertRichTextBoxItalic(ref rTB, "b", 14); ConvertRichTextBoxItalic(ref rTB, "c", 14); + ConvertRichTextBoxItalic(ref rTB, "n", 14); ConvertRichTextBoxItalic(ref rTB, "d", 14); ConvertRichTextBoxItalic(ref rTB, "m", 14); + ConvertRichTextBoxItalic(ref rTB, "u", 14); ConvertRichTextBoxItalic(ref rTB, "v", 14); ConvertRichTextBoxItalic(ref rTB, "w", 14); + ConvertRichTextBoxItalic(ref rTB, "x", 14); ConvertRichTextBoxItalic(ref rTB, "y", 14); ConvertRichTextBoxItalic(ref rTB, "z", 14); + } - private static void ConvertRichTextBox1(ref RichTextBox rTB) - { - ConvertRichTextBoxOffsetSub(ref rTB, "sub1", 12); ConvertRichTextBoxOffsetSub(ref rTB, "sub2", 12); ConvertRichTextBoxOffsetSub(ref rTB, "sub3", 12); - ConvertRichTextBoxOffsetSub(ref rTB, "sub4", 12); ConvertRichTextBoxOffsetSub(ref rTB, "sub5", 12); - - ConvertRichTextBoxItalic(ref rTB, "P", 14); ConvertRichTextBoxItalic(ref rTB, "A", 14); ConvertRichTextBoxItalic(ref rTB, "B", 14); - ConvertRichTextBoxItalic(ref rTB, "C", 14); ConvertRichTextBoxItalic(ref rTB, "F", 14); ConvertRichTextBoxItalic(ref rTB, "I", 14); - ConvertRichTextBoxItalic(ref rTB, "a", 14); ConvertRichTextBoxItalic(ref rTB, "b", 14); ConvertRichTextBoxItalic(ref rTB, "c", 14); - ConvertRichTextBoxItalic(ref rTB, "n", 14); ConvertRichTextBoxItalic(ref rTB, "d", 14); ConvertRichTextBoxItalic(ref rTB, "m", 14); - ConvertRichTextBoxItalic(ref rTB, "u", 14); ConvertRichTextBoxItalic(ref rTB, "v", 14); ConvertRichTextBoxItalic(ref rTB, "w", 14); - ConvertRichTextBoxItalic(ref rTB, "x", 14); ConvertRichTextBoxItalic(ref rTB, "y", 14); ConvertRichTextBoxItalic(ref rTB, "z", 14); - } + private static void ConvertRichTextBox2(ref RichTextBox rTB) + { + rTB.SelectAll(); + rTB.SelectionFont = new Font("Times New Roman", 12, FontStyle.Regular); + rTB.SelectionCharOffset = -3; + + ConvertRichTextBoxItalic(ref rTB, "C", 12); ConvertRichTextBoxItalic(ref rTB, "D", 12); ConvertRichTextBoxItalic(ref rTB, "S", 12); + ConvertRichTextBoxItalic(ref rTB, "T", 12); ConvertRichTextBoxItalic(ref rTB, "O", 12); - private static void ConvertRichTextBox2(ref RichTextBox rTB) + ConvertRichTextBoxItalicSub(ref rTB, "i", 12); ConvertRichTextBoxItalicSub(ref rTB, "s", 12); ConvertRichTextBoxItalicSub(ref rTB, "h", 12); + ConvertRichTextBoxItalicSub(ref rTB, "v", 12); ConvertRichTextBoxItalicSub(ref rTB, "d", 12); + for (int n = 30; n > 0; n--) { - rTB.SelectAll(); - rTB.SelectionFont = new Font("Times New Roman", 12, FontStyle.Regular); - rTB.SelectionCharOffset = -3; + string s = "^" + n.ToString(); + ConvertRichTextBoxOffsetSup(ref rTB, s, 12); + } + } - ConvertRichTextBoxItalic(ref rTB, "C", 12); ConvertRichTextBoxItalic(ref rTB, "D", 12); ConvertRichTextBoxItalic(ref rTB, "S", 12); - ConvertRichTextBoxItalic(ref rTB, "T", 12); ConvertRichTextBoxItalic(ref rTB, "O", 12); + private static void ConvertRichTextBox3(ref RichTextBox rTB) + { + rTB.SelectAll(); + rTB.SelectionFont = new Font("Times New Roman", 13, FontStyle.Regular); + if (rTB.Text == "No Condition") return; + ConvertRichTextBoxOffsetSub(ref rTB, "sub1", 10); ConvertRichTextBoxOffsetSub(ref rTB, "sub2", 10); ConvertRichTextBoxOffsetSub(ref rTB, "sub3", 10); + ConvertRichTextBoxOffsetSub(ref rTB, "sub4", 10); ConvertRichTextBoxOffsetSub(ref rTB, "sub5", 10); + + ConvertRichTextBoxItalic(ref rTB, "A", 12); ConvertRichTextBoxItalic(ref rTB, "B", 12); ConvertRichTextBoxItalic(ref rTB, "C", 12); + ConvertRichTextBoxItalic(ref rTB, "I", 12); ConvertRichTextBoxItalic(ref rTB, "F", 12); ConvertRichTextBoxItalic(ref rTB, "R", 12); + ConvertRichTextBoxItalic(ref rTB, "h", 12); ConvertRichTextBoxItalic(ref rTB, "k", 12); ConvertRichTextBoxItalic(ref rTB, "l", 12); + ConvertRichTextBoxItalic(ref rTB, "a", 12); ConvertRichTextBoxItalic(ref rTB, "b", 12); ConvertRichTextBoxItalic(ref rTB, "c", 12); + ConvertRichTextBoxItalic(ref rTB, "d", 12); ConvertRichTextBoxItalic(ref rTB, " n", 12); + } - ConvertRichTextBoxItalicSub(ref rTB, "i", 12); ConvertRichTextBoxItalicSub(ref rTB, "s", 12); ConvertRichTextBoxItalicSub(ref rTB, "h", 12); - ConvertRichTextBoxItalicSub(ref rTB, "v", 12); ConvertRichTextBoxItalicSub(ref rTB, "d", 12); - for (int n = 30; n > 0; n--) - { - string s = "^" + n.ToString(); - ConvertRichTextBoxOffsetSup(ref rTB, s, 12); - } + private static void ConvertRichTextBoxItalic(ref RichTextBox rTB, string s, int size) + { + int n = -1; + while (rTB.Find(s, n + 1, RichTextBoxFinds.MatchCase) > n) + { + rTB.SelectionCharOffset = 0; + rTB.SelectionFont = new Font("Times New Roman", size, FontStyle.Italic); + n = rTB.Find(s, n + 1, RichTextBoxFinds.MatchCase); } + } - private static void ConvertRichTextBox3(ref RichTextBox rTB) + private static void ConvertRichTextBoxItalicSub(ref RichTextBox rTB, string s, int size) + { + int n = -1; + while (rTB.Find(s, n + 1, RichTextBoxFinds.MatchCase) > n) { - rTB.SelectAll(); - rTB.SelectionFont = new Font("Times New Roman", 13, FontStyle.Regular); - if (rTB.Text == "No Condition") return; - ConvertRichTextBoxOffsetSub(ref rTB, "sub1", 10); ConvertRichTextBoxOffsetSub(ref rTB, "sub2", 10); ConvertRichTextBoxOffsetSub(ref rTB, "sub3", 10); - ConvertRichTextBoxOffsetSub(ref rTB, "sub4", 10); ConvertRichTextBoxOffsetSub(ref rTB, "sub5", 10); - - ConvertRichTextBoxItalic(ref rTB, "A", 12); ConvertRichTextBoxItalic(ref rTB, "B", 12); ConvertRichTextBoxItalic(ref rTB, "C", 12); - ConvertRichTextBoxItalic(ref rTB, "I", 12); ConvertRichTextBoxItalic(ref rTB, "F", 12); ConvertRichTextBoxItalic(ref rTB, "R", 12); - ConvertRichTextBoxItalic(ref rTB, "h", 12); ConvertRichTextBoxItalic(ref rTB, "k", 12); ConvertRichTextBoxItalic(ref rTB, "l", 12); - ConvertRichTextBoxItalic(ref rTB, "a", 12); ConvertRichTextBoxItalic(ref rTB, "b", 12); ConvertRichTextBoxItalic(ref rTB, "c", 12); - ConvertRichTextBoxItalic(ref rTB, "d", 12); ConvertRichTextBoxItalic(ref rTB, " n", 12); + rTB.SelectionCharOffset = -3; + rTB.SelectionFont = new Font("Times New Roman", size, FontStyle.Italic); + n = rTB.Find(s, n + 1, RichTextBoxFinds.MatchCase); } + } - private static void ConvertRichTextBoxItalic(ref RichTextBox rTB, string s, int size) + private static void ConvertRichTextBoxOffsetSub(ref RichTextBox rTB, string s, int size) + { + if (rTB.Find(s, 0, RichTextBoxFinds.MatchCase) > -1) { int n = -1; while (rTB.Find(s, n + 1, RichTextBoxFinds.MatchCase) > n) { - rTB.SelectionCharOffset = 0; - rTB.SelectionFont = new Font("Times New Roman", size, FontStyle.Italic); + rTB.SelectionFont = new Font("Times New Roman", size, FontStyle.Regular); + rTB.SelectionCharOffset = -3; n = rTB.Find(s, n + 1, RichTextBoxFinds.MatchCase); + rTB.Rtf = rTB.Rtf.Remove(rTB.Rtf.IndexOf(s), 3); } } + } - private static void ConvertRichTextBoxItalicSub(ref RichTextBox rTB, string s, int size) + private static void ConvertRichTextBoxOffsetSup(ref RichTextBox rTB, string s, int size) + { + if (rTB.Find(s, 0, RichTextBoxFinds.MatchCase) > -1) { int n = -1; while (rTB.Find(s, n + 1, RichTextBoxFinds.MatchCase) > n) { - rTB.SelectionCharOffset = -3; - rTB.SelectionFont = new Font("Times New Roman", size, FontStyle.Italic); + rTB.SelectionFont = new Font("Times New Roman", size, FontStyle.Regular); + rTB.SelectionCharOffset = +3; n = rTB.Find(s, n + 1, RichTextBoxFinds.MatchCase); + rTB.Rtf = rTB.Rtf.Remove(rTB.Rtf.IndexOf('^'), 1); } } + } - private static void ConvertRichTextBoxOffsetSub(ref RichTextBox rTB, string s, int size) - { - if (rTB.Find(s, 0, RichTextBoxFinds.MatchCase) > -1) - { - int n = -1; - while (rTB.Find(s, n + 1, RichTextBoxFinds.MatchCase) > n) - { - rTB.SelectionFont = new Font("Times New Roman", size, FontStyle.Regular); - rTB.SelectionCharOffset = -3; - n = rTB.Find(s, n + 1, RichTextBoxFinds.MatchCase); - rTB.Rtf = rTB.Rtf.Remove(rTB.Rtf.IndexOf(s), 3); - } - } - } - - private static void ConvertRichTextBoxOffsetSup(ref RichTextBox rTB, string s, int size) - { - if (rTB.Find(s, 0, RichTextBoxFinds.MatchCase) > -1) - { - int n = -1; - while (rTB.Find(s, n + 1, RichTextBoxFinds.MatchCase) > n) - { - rTB.SelectionFont = new Font("Times New Roman", size, FontStyle.Regular); - rTB.SelectionCharOffset = +3; - n = rTB.Find(s, n + 1, RichTextBoxFinds.MatchCase); - rTB.Rtf = rTB.Rtf.Remove(rTB.Rtf.IndexOf("^"), 1); - } - } - } + private static void ConvertRichTextBoxReset(ref RichTextBox rTB) + { + rTB.SelectAll(); + rTB.SelectionFont = new Font("Times New Roman", 14, FontStyle.Regular); + } - private static void ConvertRichTextBoxReset(ref RichTextBox rTB) - { - rTB.SelectAll(); - rTB.SelectionFont = new Font("Times New Roman", 14, FontStyle.Regular); - } + private void FormCrystallographicInformation_Load(object sender, EventArgs e) + { + CrystalControl.CrystalChanged += new EventHandler(crystalControl_CrystalChanged); + ChangeCrystal(); + } - private void FormCrystallographicInformation_Load(object sender, EventArgs e) - { - CrystalControl.CrystalChanged += new EventHandler(crystalControl_CrystalChanged); - ChangeCrystal(); - } + //結晶を変更する + public void ChangeCrystal() + { - //結晶を変更する - public void ChangeCrystal() + numericUpDown_ValueChanged(new object(), new EventArgs()); + SetWyckoffPosition(); + + ConvertRichTextBoxReset(ref richTextBoxSG_HM); + ConvertRichTextBoxReset(ref richTextBoxSG_HM_full); + ConvertRichTextBoxReset(ref richTextBoxSG_SF); + ConvertRichTextBoxReset(ref richTextBoxSG_Hall); + ConvertRichTextBoxReset(ref richTextBoxPG_HM); + ConvertRichTextBoxReset(ref richTextBoxPG_SF); + ConvertRichTextBoxReset(ref richTextBoxLG); + ConvertRichTextBoxReset(ref richTextBoxCS); + ConvertRichTextBoxReset(ref richTextBoxExtinctionRule); + + richTextBoxSG_Num.Text = Crystal.Symmetry.SpaceGroupNumber.ToString() + ": " + Crystal.Symmetry.SpaceGroupSubNumber.ToString(); + richTextBoxSG_HM.Text = Crystal.Symmetry.SpaceGroupHMStr; + richTextBoxSG_HM_full.Text = Crystal.Symmetry.SpaceGroupHMfullStr; + richTextBoxSG_SF.Text = Crystal.Symmetry.SpaceGroupSFStr; + richTextBoxSG_Hall.Text = Crystal.Symmetry.SpaceGroupHallStr; + richTextBoxPG_HM.Text = Crystal.Symmetry.PointGroupHMStr; + richTextBoxPG_SF.Text = Crystal.Symmetry.PointGroupSFStr; + richTextBoxLG.Text = Crystal.Symmetry.LaueGroupStr; + richTextBoxCS.Text = Crystal.Symmetry.CrystalSystemStr; + richTextBoxExtinctionRule.Text = ""; + for (int n = 0; n < Crystal.Symmetry.ExtinctionRuleStr.Length; n++) + richTextBoxExtinctionRule.Text += Crystal.Symmetry.ExtinctionRuleStr[n] + "\r\n"; + if (richTextBoxExtinctionRule.Text.Length == 0) + richTextBoxExtinctionRule.Text = "No Condition"; + ConvertRichTextBox3(ref richTextBoxExtinctionRule); + + if (Crystal.Symmetry.SeriesNumber != 0) { - - numericUpDown_ValueChanged(new object(), new EventArgs()); - SetWyckoffPosition(); - - ConvertRichTextBoxReset(ref richTextBoxSG_HM); - ConvertRichTextBoxReset(ref richTextBoxSG_HM_full); - ConvertRichTextBoxReset(ref richTextBoxSG_SF); - ConvertRichTextBoxReset(ref richTextBoxSG_Hall); - ConvertRichTextBoxReset(ref richTextBoxPG_HM); - ConvertRichTextBoxReset(ref richTextBoxPG_SF); - ConvertRichTextBoxReset(ref richTextBoxLG); - ConvertRichTextBoxReset(ref richTextBoxCS); - ConvertRichTextBoxReset(ref richTextBoxExtinctionRule); - - richTextBoxSG_Num.Text = Crystal.Symmetry.SpaceGroupNumber.ToString() + ": " + Crystal.Symmetry.SpaceGroupSubNumber.ToString(); - richTextBoxSG_HM.Text = Crystal.Symmetry.SpaceGroupHMStr; - richTextBoxSG_HM_full.Text = Crystal.Symmetry.SpaceGroupHMfullStr; - richTextBoxSG_SF.Text = Crystal.Symmetry.SpaceGroupSFStr; - richTextBoxSG_Hall.Text = Crystal.Symmetry.SpaceGroupHallStr; - richTextBoxPG_HM.Text = Crystal.Symmetry.PointGroupHMStr; - richTextBoxPG_SF.Text = Crystal.Symmetry.PointGroupSFStr; - richTextBoxLG.Text = Crystal.Symmetry.LaueGroupStr; - richTextBoxCS.Text = Crystal.Symmetry.CrystalSystemStr; - richTextBoxExtinctionRule.Text = ""; - for (int n = 0; n < Crystal.Symmetry.ExtinctionRuleStr.Length; n++) - richTextBoxExtinctionRule.Text += Crystal.Symmetry.ExtinctionRuleStr[n] + "\r\n"; - if (richTextBoxExtinctionRule.Text.Length == 0) - richTextBoxExtinctionRule.Text = "No Condition"; - ConvertRichTextBox3(ref richTextBoxExtinctionRule); - - if (Crystal.Symmetry.SeriesNumber != 0) - { - ConvertRichTextBox1(ref richTextBoxSG_HM); - ConvertRichTextBox1(ref richTextBoxSG_HM_full); - ConvertRichTextBox2(ref richTextBoxSG_SF); - ConvertRichTextBox1(ref richTextBoxSG_Hall); - ConvertRichTextBox1(ref richTextBoxPG_HM); - ConvertRichTextBox2(ref richTextBoxPG_SF); - ConvertRichTextBox1(ref richTextBoxLG); - - richTextBoxCS.SelectAll(); - richTextBoxCS.SelectionFont = new Font("Times New Roman", 15, FontStyle.Regular); - } + ConvertRichTextBox1(ref richTextBoxSG_HM); + ConvertRichTextBox1(ref richTextBoxSG_HM_full); + ConvertRichTextBox2(ref richTextBoxSG_SF); + ConvertRichTextBox1(ref richTextBoxSG_Hall); + ConvertRichTextBox1(ref richTextBoxPG_HM); + ConvertRichTextBox2(ref richTextBoxPG_SF); + ConvertRichTextBox1(ref richTextBoxLG); + + richTextBoxCS.SelectAll(); + richTextBoxCS.SelectionFont = new Font("Times New Roman", 15, FontStyle.Regular); } + } - private void numericUpDown_ValueChanged(object sender, EventArgs e) - { - int h1 = (int)numericUpDownH1.Value; - int k1 = (int)numericUpDownK1.Value; - int l1 = (int)numericUpDownL1.Value; - int h2 = (int)numericUpDownH2.Value; - int k2 = (int)numericUpDownK2.Value; - int l2 = (int)numericUpDownL2.Value; - int u1 = (int)numericUpDownU1.Value; - int v1 = (int)numericUpDownV1.Value; - int w1 = (int)numericUpDownW1.Value; - int u2 = (int)numericUpDownU2.Value; - int v2 = (int)numericUpDownV2.Value; - int w2 = (int)numericUpDownW2.Value; - - textBoxLengthPlane1.Text = (Crystal.GetLengthPlane(h1, k1, l1) * 10).ToString("f4"); - textBoxLengthPlane2.Text = (Crystal.GetLengthPlane(h2, k2, l2) * 10).ToString("f4"); - textBoxLengthAxis1.Text = (Crystal.GetLengthAxis(u1, v1, w1) * 10).ToString("f4"); - textBoxLengthAxis2.Text = (Crystal.GetLengthAxis(u2, v2, w2) * 10).ToString("f4"); - - textBoxAnglePlanes.Text = (Crystal.GetAnglePlanes(h1, k1, l1, h2, k2, l2) * 180 / Math.PI).ToString("f4"); - textBoxAngleAxes.Text = (Crystal.GetAngleAxes(u1, v1, w1, u2, v2, w2) * 180 / Math.PI).ToString("f4"); - textBoxAnglePlaneAxis1.Text = (Crystal.GetAnglePlaneAxis(h1, k1, l1, u1, v1, w1) * 180 / Math.PI).ToString("f4"); - textBoxAnglePlaneAxis2.Text = (Crystal.GetAnglePlaneAxis(h2, k2, l2, u2, v2, w2) * 180 / Math.PI).ToString("f4"); - - textBoxZoneAxis.Text = "[" + Crystal.GetZoneAxis(h1, k1, l1, h2, k2, l2) + " ]"; - textBoxZonePlane.Text = "(" + Crystal.GetZoneAxis(u1, v1, w1, u2, v2, w2) + " )"; - } + private void numericUpDown_ValueChanged(object sender, EventArgs e) + { + int h1 = (int)numericUpDownH1.Value; + int k1 = (int)numericUpDownK1.Value; + int l1 = (int)numericUpDownL1.Value; + int h2 = (int)numericUpDownH2.Value; + int k2 = (int)numericUpDownK2.Value; + int l2 = (int)numericUpDownL2.Value; + int u1 = (int)numericUpDownU1.Value; + int v1 = (int)numericUpDownV1.Value; + int w1 = (int)numericUpDownW1.Value; + int u2 = (int)numericUpDownU2.Value; + int v2 = (int)numericUpDownV2.Value; + int w2 = (int)numericUpDownW2.Value; + + textBoxLengthPlane1.Text = (Crystal.GetLengthPlane(h1, k1, l1) * 10).ToString("f4"); + textBoxLengthPlane2.Text = (Crystal.GetLengthPlane(h2, k2, l2) * 10).ToString("f4"); + textBoxLengthAxis1.Text = (Crystal.GetLengthAxis(u1, v1, w1) * 10).ToString("f4"); + textBoxLengthAxis2.Text = (Crystal.GetLengthAxis(u2, v2, w2) * 10).ToString("f4"); + + textBoxAnglePlanes.Text = (Crystal.GetAnglePlanes(h1, k1, l1, h2, k2, l2) * 180 / Math.PI).ToString("f4"); + textBoxAngleAxes.Text = (Crystal.GetAngleAxes(u1, v1, w1, u2, v2, w2) * 180 / Math.PI).ToString("f4"); + textBoxAnglePlaneAxis1.Text = (Crystal.GetAnglePlaneAxis(h1, k1, l1, u1, v1, w1) * 180 / Math.PI).ToString("f4"); + textBoxAnglePlaneAxis2.Text = (Crystal.GetAnglePlaneAxis(h2, k2, l2, u2, v2, w2) * 180 / Math.PI).ToString("f4"); + + textBoxZoneAxis.Text = "[" + Crystal.GetZoneAxis(h1, k1, l1, h2, k2, l2) + " ]"; + textBoxZonePlane.Text = "(" + Crystal.GetZoneAxis(u1, v1, w1, u2, v2, w2) + " )"; + } - private void SetWyckoffPosition() + private void SetWyckoffPosition() + { + dataSet.Tables[0].Clear(); + if (Crystal.Symmetry.LatticeTypeStr == "P") + dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "", "", "" }); + else if (Crystal.Symmetry.LatticeTypeStr == "A") + dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "(0,1/2,1/2)+", "", "" }); + else if (Crystal.Symmetry.LatticeTypeStr == "B") + dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "(1/2,0,1/2)+", "", "" }); + else if (Crystal.Symmetry.LatticeTypeStr == "C") + dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "(1/2,1/2,0)+", "", "" }); + else if (Crystal.Symmetry.LatticeTypeStr == "F") + dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "(0,1/2,1/2)+", "(1/2,0,1/2)+", "(0,1/2,1/2)+" }); + else if (Crystal.Symmetry.LatticeTypeStr == "I") + dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "(1/2,1/2,1/2)+", "", "" }); + else if (Crystal.Symmetry.LatticeTypeStr == "H") + dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "(1/3,2/3,2/3)+", "(2/3,1/3,1/3)+", "" }); + + Crystal.Symmetry = SymmetryStatic.Symmetries[Crystal.SymmetrySeriesNumber]; + + for (int i = 0; i < SymmetryStatic.WyckoffPositions[Crystal.SymmetrySeriesNumber].Length; i++) { - dataSet.Tables[0].Clear(); - if (Crystal.Symmetry.LatticeTypeStr == "P") - dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "", "", "" }); - else if (Crystal.Symmetry.LatticeTypeStr == "A") - dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "(0,1/2,1/2)+", "", "" }); - else if (Crystal.Symmetry.LatticeTypeStr == "B") - dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "(1/2,0,1/2)+", "", "" }); - else if (Crystal.Symmetry.LatticeTypeStr == "C") - dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "(1/2,1/2,0)+", "", "" }); - else if (Crystal.Symmetry.LatticeTypeStr == "F") - dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "(0,1/2,1/2)+", "(1/2,0,1/2)+", "(0,1/2,1/2)+" }); - else if (Crystal.Symmetry.LatticeTypeStr == "I") - dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "(1/2,1/2,1/2)+", "", "" }); - else if (Crystal.Symmetry.LatticeTypeStr == "H") - dataSet.Tables[0].Rows.Add(new object[] { "-", "-", "-", "(0,0,0)+", "(1/3,2/3,2/3)+", "(2/3,1/3,1/3)+", "" }); - - Crystal.Symmetry = SymmetryStatic.Symmetries[Crystal.SymmetrySeriesNumber]; - - for (int i = 0; i < SymmetryStatic.WyckoffPositions[Crystal.SymmetrySeriesNumber].Length; i++) + int len = SymmetryStatic.WyckoffPositions[Crystal.SymmetrySeriesNumber][i].PositionStr.Length; + for (int j = 0; j < len; j += 4) { - int len = SymmetryStatic.WyckoffPositions[Crystal.SymmetrySeriesNumber][i].PositionStr.Length; - for (int j = 0; j < len; j += 4) + object[] o; + if (j == 0) { - object[] o; - if (j == 0) - { - o = new object[] { - SymmetryStatic.WyckoffPositions[Crystal.SymmetrySeriesNumber][i].Multiplicity, - SymmetryStatic.WyckoffPositions[Crystal.SymmetrySeriesNumber][i].WyckoffLetter, - SymmetryStatic.WyckoffPositions[Crystal.SymmetrySeriesNumber][i].SiteSymmetry, - j private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); + components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SymmetryControl)); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.checkBoxShowError = new System.Windows.Forms.CheckBox(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.label48 = new System.Windows.Forms.Label(); - this.label46 = new System.Windows.Forms.Label(); - this.numericBoxBeta = new Crystallography.Controls.NumericBox(); - this.numericBoxAlpha = new Crystallography.Controls.NumericBox(); - this.label47 = new System.Windows.Forms.Label(); - this.numericBoxGammaErr = new Crystallography.Controls.NumericBox(); - this.label23 = new System.Windows.Forms.Label(); - this.numericBoxAlphaErr = new Crystallography.Controls.NumericBox(); - this.numericBoxBetaErr = new Crystallography.Controls.NumericBox(); - this.numericBoxA = new Crystallography.Controls.NumericBox(); - this.label26 = new System.Windows.Forms.Label(); - this.label45 = new System.Windows.Forms.Label(); - this.numericBoxGamma = new Crystallography.Controls.NumericBox(); - this.label18 = new System.Windows.Forms.Label(); - this.numericBoxBErr = new Crystallography.Controls.NumericBox(); - this.numericBoxB = new Crystallography.Controls.NumericBox(); - this.label24 = new System.Windows.Forms.Label(); - this.label25 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.label27 = new System.Windows.Forms.Label(); - this.numericBoxC = new Crystallography.Controls.NumericBox(); - this.numericBoxCErr = new Crystallography.Controls.NumericBox(); - this.numericBoxAErr = new Crystallography.Controls.NumericBox(); - this.label44 = new System.Windows.Forms.Label(); - this.groupBoxSymmetry = new System.Windows.Forms.GroupBox(); - this.comboBoxSpaceGroup = new System.Windows.Forms.ComboBox(); - this.comboBoxPointGroup = new System.Windows.Forms.ComboBox(); - this.comboBoxCrystalSystem = new System.Windows.Forms.ComboBox(); - this.label20 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.label19 = new System.Windows.Forms.Label(); - this.textBoxSearch = new System.Windows.Forms.TextBox(); - this.label21 = new System.Windows.Forms.Label(); - this.comboBoxSearchResult = new System.Windows.Forms.ComboBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.toolTip = new System.Windows.Forms.ToolTip(this.components); - this.groupBox4.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); - this.groupBoxSymmetry.SuspendLayout(); - this.SuspendLayout(); + groupBox4 = new System.Windows.Forms.GroupBox(); + checkBoxShowError = new System.Windows.Forms.CheckBox(); + tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + label48 = new System.Windows.Forms.Label(); + label46 = new System.Windows.Forms.Label(); + numericBoxBeta = new NumericBox(); + numericBoxAlpha = new NumericBox(); + label47 = new System.Windows.Forms.Label(); + numericBoxGammaErr = new NumericBox(); + label23 = new System.Windows.Forms.Label(); + numericBoxAlphaErr = new NumericBox(); + numericBoxBetaErr = new NumericBox(); + numericBoxA = new NumericBox(); + label26 = new System.Windows.Forms.Label(); + label45 = new System.Windows.Forms.Label(); + numericBoxGamma = new NumericBox(); + label18 = new System.Windows.Forms.Label(); + numericBoxBErr = new NumericBox(); + numericBoxB = new NumericBox(); + label24 = new System.Windows.Forms.Label(); + label25 = new System.Windows.Forms.Label(); + label28 = new System.Windows.Forms.Label(); + label27 = new System.Windows.Forms.Label(); + numericBoxC = new NumericBox(); + numericBoxCErr = new NumericBox(); + numericBoxAErr = new NumericBox(); + label44 = new System.Windows.Forms.Label(); + groupBoxSymmetry = new System.Windows.Forms.GroupBox(); + comboBoxSpaceGroup = new System.Windows.Forms.ComboBox(); + comboBoxPointGroup = new System.Windows.Forms.ComboBox(); + comboBoxCrystalSystem = new System.Windows.Forms.ComboBox(); + label20 = new System.Windows.Forms.Label(); + label17 = new System.Windows.Forms.Label(); + label19 = new System.Windows.Forms.Label(); + textBoxSearch = new System.Windows.Forms.TextBox(); + label21 = new System.Windows.Forms.Label(); + comboBoxSearchResult = new System.Windows.Forms.ComboBox(); + panel1 = new System.Windows.Forms.Panel(); + toolTip = new System.Windows.Forms.ToolTip(components); + groupBox4.SuspendLayout(); + tableLayoutPanel1.SuspendLayout(); + groupBoxSymmetry.SuspendLayout(); + SuspendLayout(); // // groupBox4 // - this.groupBox4.Controls.Add(this.checkBoxShowError); - this.groupBox4.Controls.Add(this.tableLayoutPanel1); - resources.ApplyResources(this.groupBox4, "groupBox4"); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.TabStop = false; + groupBox4.Controls.Add(checkBoxShowError); + groupBox4.Controls.Add(tableLayoutPanel1); + resources.ApplyResources(groupBox4, "groupBox4"); + groupBox4.Name = "groupBox4"; + groupBox4.TabStop = false; // // checkBoxShowError // - resources.ApplyResources(this.checkBoxShowError, "checkBoxShowError"); - this.checkBoxShowError.Name = "checkBoxShowError"; - this.toolTip.SetToolTip(this.checkBoxShowError, resources.GetString("checkBoxShowError.ToolTip")); - this.checkBoxShowError.UseVisualStyleBackColor = true; - this.checkBoxShowError.CheckedChanged += new System.EventHandler(this.checkBoxShowError_CheckedChanged); + resources.ApplyResources(checkBoxShowError, "checkBoxShowError"); + checkBoxShowError.Name = "checkBoxShowError"; + toolTip.SetToolTip(checkBoxShowError, resources.GetString("checkBoxShowError.ToolTip")); + checkBoxShowError.UseVisualStyleBackColor = true; + checkBoxShowError.CheckedChanged += checkBoxShowError_CheckedChanged; // // tableLayoutPanel1 // - resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); - this.tableLayoutPanel1.Controls.Add(this.label48, 7, 2); - this.tableLayoutPanel1.Controls.Add(this.label46, 7, 1); - this.tableLayoutPanel1.Controls.Add(this.numericBoxBeta, 5, 1); - this.tableLayoutPanel1.Controls.Add(this.numericBoxAlpha, 5, 0); - this.tableLayoutPanel1.Controls.Add(this.label47, 7, 0); - this.tableLayoutPanel1.Controls.Add(this.numericBoxGammaErr, 6, 2); - this.tableLayoutPanel1.Controls.Add(this.label23, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.numericBoxAlphaErr, 6, 0); - this.tableLayoutPanel1.Controls.Add(this.numericBoxBetaErr, 6, 1); - this.tableLayoutPanel1.Controls.Add(this.numericBoxA, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.label26, 4, 0); - this.tableLayoutPanel1.Controls.Add(this.label45, 3, 2); - this.tableLayoutPanel1.Controls.Add(this.numericBoxGamma, 5, 2); - this.tableLayoutPanel1.Controls.Add(this.label18, 3, 1); - this.tableLayoutPanel1.Controls.Add(this.numericBoxBErr, 2, 1); - this.tableLayoutPanel1.Controls.Add(this.numericBoxB, 1, 1); - this.tableLayoutPanel1.Controls.Add(this.label24, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.label25, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.label28, 4, 2); - this.tableLayoutPanel1.Controls.Add(this.label27, 4, 1); - this.tableLayoutPanel1.Controls.Add(this.numericBoxC, 1, 2); - this.tableLayoutPanel1.Controls.Add(this.numericBoxCErr, 2, 2); - this.tableLayoutPanel1.Controls.Add(this.numericBoxAErr, 2, 0); - this.tableLayoutPanel1.Controls.Add(this.label44, 3, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + resources.ApplyResources(tableLayoutPanel1, "tableLayoutPanel1"); + tableLayoutPanel1.Controls.Add(label48, 7, 2); + tableLayoutPanel1.Controls.Add(label46, 7, 1); + tableLayoutPanel1.Controls.Add(numericBoxBeta, 5, 1); + tableLayoutPanel1.Controls.Add(numericBoxAlpha, 5, 0); + tableLayoutPanel1.Controls.Add(label47, 7, 0); + tableLayoutPanel1.Controls.Add(numericBoxGammaErr, 6, 2); + tableLayoutPanel1.Controls.Add(label23, 0, 0); + tableLayoutPanel1.Controls.Add(numericBoxAlphaErr, 6, 0); + tableLayoutPanel1.Controls.Add(numericBoxBetaErr, 6, 1); + tableLayoutPanel1.Controls.Add(numericBoxA, 1, 0); + tableLayoutPanel1.Controls.Add(label26, 4, 0); + tableLayoutPanel1.Controls.Add(label45, 3, 2); + tableLayoutPanel1.Controls.Add(numericBoxGamma, 5, 2); + tableLayoutPanel1.Controls.Add(label18, 3, 1); + tableLayoutPanel1.Controls.Add(numericBoxBErr, 2, 1); + tableLayoutPanel1.Controls.Add(numericBoxB, 1, 1); + tableLayoutPanel1.Controls.Add(label24, 0, 1); + tableLayoutPanel1.Controls.Add(label25, 0, 2); + tableLayoutPanel1.Controls.Add(label28, 4, 2); + tableLayoutPanel1.Controls.Add(label27, 4, 1); + tableLayoutPanel1.Controls.Add(numericBoxC, 1, 2); + tableLayoutPanel1.Controls.Add(numericBoxCErr, 2, 2); + tableLayoutPanel1.Controls.Add(numericBoxAErr, 2, 0); + tableLayoutPanel1.Controls.Add(label44, 3, 0); + tableLayoutPanel1.Name = "tableLayoutPanel1"; // // label48 // - resources.ApplyResources(this.label48, "label48"); - this.label48.Name = "label48"; + resources.ApplyResources(label48, "label48"); + label48.Name = "label48"; // // label46 // - resources.ApplyResources(this.label46, "label46"); - this.label46.Name = "label46"; + resources.ApplyResources(label46, "label46"); + label46.Name = "label46"; // // numericBoxBeta // - resources.ApplyResources(this.numericBoxBeta, "numericBoxBeta"); - this.numericBoxBeta.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxBeta.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxBeta.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxBeta.Name = "numericBoxBeta"; - this.numericBoxBeta.RestrictLimitValue = false; - this.numericBoxBeta.RoundErrorAccuracy = 12; - this.numericBoxBeta.SkipEventDuringInput = false; - this.numericBoxBeta.SmartIncrement = true; - this.numericBoxBeta.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.toolTip.SetToolTip(this.numericBoxBeta, resources.GetString("numericBoxBeta.ToolTip")); - this.numericBoxBeta.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxCellConstants_ValueChanged); + resources.ApplyResources(numericBoxBeta, "numericBoxBeta"); + numericBoxBeta.BackColor = System.Drawing.SystemColors.Control; + numericBoxBeta.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxBeta.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxBeta.Name = "numericBoxBeta"; + numericBoxBeta.RestrictLimitValue = false; + numericBoxBeta.RoundErrorAccuracy = 12; + numericBoxBeta.SkipEventDuringInput = false; + numericBoxBeta.SmartIncrement = true; + toolTip.SetToolTip(numericBoxBeta, resources.GetString("numericBoxBeta.ToolTip")); + numericBoxBeta.ValueChanged += numericBoxCellConstants_ValueChanged; // // numericBoxAlpha // - resources.ApplyResources(this.numericBoxAlpha, "numericBoxAlpha"); - this.numericBoxAlpha.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxAlpha.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxAlpha.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxAlpha.Name = "numericBoxAlpha"; - this.numericBoxAlpha.RestrictLimitValue = false; - this.numericBoxAlpha.RoundErrorAccuracy = 12; - this.numericBoxAlpha.SkipEventDuringInput = false; - this.numericBoxAlpha.SmartIncrement = true; - this.numericBoxAlpha.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.toolTip.SetToolTip(this.numericBoxAlpha, resources.GetString("numericBoxAlpha.ToolTip")); - this.numericBoxAlpha.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxCellConstants_ValueChanged); + resources.ApplyResources(numericBoxAlpha, "numericBoxAlpha"); + numericBoxAlpha.BackColor = System.Drawing.SystemColors.Control; + numericBoxAlpha.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxAlpha.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxAlpha.Name = "numericBoxAlpha"; + numericBoxAlpha.RestrictLimitValue = false; + numericBoxAlpha.RoundErrorAccuracy = 12; + numericBoxAlpha.SkipEventDuringInput = false; + numericBoxAlpha.SmartIncrement = true; + toolTip.SetToolTip(numericBoxAlpha, resources.GetString("numericBoxAlpha.ToolTip")); + numericBoxAlpha.ValueChanged += numericBoxCellConstants_ValueChanged; // // label47 // - resources.ApplyResources(this.label47, "label47"); - this.label47.Name = "label47"; + resources.ApplyResources(label47, "label47"); + label47.Name = "label47"; // // numericBoxGammaErr // - resources.ApplyResources(this.numericBoxGammaErr, "numericBoxGammaErr"); - this.numericBoxGammaErr.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxGammaErr.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxGammaErr.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxGammaErr.Name = "numericBoxGammaErr"; - this.numericBoxGammaErr.RestrictLimitValue = false; - this.numericBoxGammaErr.RoundErrorAccuracy = 12; - this.numericBoxGammaErr.SkipEventDuringInput = false; - this.numericBoxGammaErr.SmartIncrement = true; - this.numericBoxGammaErr.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.numericBoxGammaErr.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxCellConstants_ValueChanged); + resources.ApplyResources(numericBoxGammaErr, "numericBoxGammaErr"); + numericBoxGammaErr.BackColor = System.Drawing.SystemColors.Control; + numericBoxGammaErr.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxGammaErr.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxGammaErr.Name = "numericBoxGammaErr"; + numericBoxGammaErr.RestrictLimitValue = false; + numericBoxGammaErr.RoundErrorAccuracy = 12; + numericBoxGammaErr.SkipEventDuringInput = false; + numericBoxGammaErr.SmartIncrement = true; + numericBoxGammaErr.TabStop = false; + numericBoxGammaErr.ValueChanged += numericBoxCellConstants_ValueChanged; // // label23 // - resources.ApplyResources(this.label23, "label23"); - this.label23.Name = "label23"; + resources.ApplyResources(label23, "label23"); + label23.Name = "label23"; // // numericBoxAlphaErr // - resources.ApplyResources(this.numericBoxAlphaErr, "numericBoxAlphaErr"); - this.numericBoxAlphaErr.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxAlphaErr.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxAlphaErr.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxAlphaErr.Name = "numericBoxAlphaErr"; - this.numericBoxAlphaErr.RestrictLimitValue = false; - this.numericBoxAlphaErr.RoundErrorAccuracy = 12; - this.numericBoxAlphaErr.SkipEventDuringInput = false; - this.numericBoxAlphaErr.SmartIncrement = true; - this.numericBoxAlphaErr.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.numericBoxAlphaErr.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxCellConstants_ValueChanged); + resources.ApplyResources(numericBoxAlphaErr, "numericBoxAlphaErr"); + numericBoxAlphaErr.BackColor = System.Drawing.SystemColors.Control; + numericBoxAlphaErr.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxAlphaErr.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxAlphaErr.Name = "numericBoxAlphaErr"; + numericBoxAlphaErr.RestrictLimitValue = false; + numericBoxAlphaErr.RoundErrorAccuracy = 12; + numericBoxAlphaErr.SkipEventDuringInput = false; + numericBoxAlphaErr.SmartIncrement = true; + numericBoxAlphaErr.TabStop = false; + numericBoxAlphaErr.ValueChanged += numericBoxCellConstants_ValueChanged; // // numericBoxBetaErr // - resources.ApplyResources(this.numericBoxBetaErr, "numericBoxBetaErr"); - this.numericBoxBetaErr.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxBetaErr.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxBetaErr.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxBetaErr.Name = "numericBoxBetaErr"; - this.numericBoxBetaErr.RestrictLimitValue = false; - this.numericBoxBetaErr.RoundErrorAccuracy = 12; - this.numericBoxBetaErr.SkipEventDuringInput = false; - this.numericBoxBetaErr.SmartIncrement = true; - this.numericBoxBetaErr.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.numericBoxBetaErr.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxCellConstants_ValueChanged); + resources.ApplyResources(numericBoxBetaErr, "numericBoxBetaErr"); + numericBoxBetaErr.BackColor = System.Drawing.SystemColors.Control; + numericBoxBetaErr.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxBetaErr.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxBetaErr.Name = "numericBoxBetaErr"; + numericBoxBetaErr.RestrictLimitValue = false; + numericBoxBetaErr.RoundErrorAccuracy = 12; + numericBoxBetaErr.SkipEventDuringInput = false; + numericBoxBetaErr.SmartIncrement = true; + numericBoxBetaErr.TabStop = false; + numericBoxBetaErr.ValueChanged += numericBoxCellConstants_ValueChanged; // // numericBoxA // - resources.ApplyResources(this.numericBoxA, "numericBoxA"); - this.numericBoxA.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxA.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxA.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxA.Name = "numericBoxA"; - this.numericBoxA.RestrictLimitValue = false; - this.numericBoxA.RoundErrorAccuracy = 10; - this.numericBoxA.SkipEventDuringInput = false; - this.numericBoxA.SmartIncrement = true; - this.numericBoxA.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.toolTip.SetToolTip(this.numericBoxA, resources.GetString("numericBoxA.ToolTip")); - this.numericBoxA.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxCellConstants_ValueChanged); + resources.ApplyResources(numericBoxA, "numericBoxA"); + numericBoxA.BackColor = System.Drawing.SystemColors.Control; + numericBoxA.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxA.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxA.Name = "numericBoxA"; + numericBoxA.RestrictLimitValue = false; + numericBoxA.RoundErrorAccuracy = 10; + numericBoxA.SkipEventDuringInput = false; + numericBoxA.SmartIncrement = true; + toolTip.SetToolTip(numericBoxA, resources.GetString("numericBoxA.ToolTip")); + numericBoxA.ValueChanged += numericBoxCellConstants_ValueChanged; // // label26 // - resources.ApplyResources(this.label26, "label26"); - this.label26.Name = "label26"; + resources.ApplyResources(label26, "label26"); + label26.Name = "label26"; // // label45 // - resources.ApplyResources(this.label45, "label45"); - this.label45.Name = "label45"; + resources.ApplyResources(label45, "label45"); + label45.Name = "label45"; // // numericBoxGamma // - resources.ApplyResources(this.numericBoxGamma, "numericBoxGamma"); - this.numericBoxGamma.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxGamma.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxGamma.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxGamma.Name = "numericBoxGamma"; - this.numericBoxGamma.RestrictLimitValue = false; - this.numericBoxGamma.RoundErrorAccuracy = 12; - this.numericBoxGamma.SkipEventDuringInput = false; - this.numericBoxGamma.SmartIncrement = true; - this.numericBoxGamma.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.toolTip.SetToolTip(this.numericBoxGamma, resources.GetString("numericBoxGamma.ToolTip")); - this.numericBoxGamma.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxCellConstants_ValueChanged); + resources.ApplyResources(numericBoxGamma, "numericBoxGamma"); + numericBoxGamma.BackColor = System.Drawing.SystemColors.Control; + numericBoxGamma.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxGamma.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxGamma.Name = "numericBoxGamma"; + numericBoxGamma.RestrictLimitValue = false; + numericBoxGamma.RoundErrorAccuracy = 12; + numericBoxGamma.SkipEventDuringInput = false; + numericBoxGamma.SmartIncrement = true; + toolTip.SetToolTip(numericBoxGamma, resources.GetString("numericBoxGamma.ToolTip")); + numericBoxGamma.ValueChanged += numericBoxCellConstants_ValueChanged; // // label18 // - resources.ApplyResources(this.label18, "label18"); - this.label18.Name = "label18"; + resources.ApplyResources(label18, "label18"); + label18.Name = "label18"; // // numericBoxBErr // - resources.ApplyResources(this.numericBoxBErr, "numericBoxBErr"); - this.numericBoxBErr.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxBErr.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxBErr.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxBErr.Name = "numericBoxBErr"; - this.numericBoxBErr.RestrictLimitValue = false; - this.numericBoxBErr.RoundErrorAccuracy = 12; - this.numericBoxBErr.SkipEventDuringInput = false; - this.numericBoxBErr.SmartIncrement = true; - this.numericBoxBErr.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.numericBoxBErr.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxCellConstants_ValueChanged); + resources.ApplyResources(numericBoxBErr, "numericBoxBErr"); + numericBoxBErr.BackColor = System.Drawing.SystemColors.Control; + numericBoxBErr.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxBErr.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxBErr.Name = "numericBoxBErr"; + numericBoxBErr.RestrictLimitValue = false; + numericBoxBErr.RoundErrorAccuracy = 12; + numericBoxBErr.SkipEventDuringInput = false; + numericBoxBErr.SmartIncrement = true; + numericBoxBErr.TabStop = false; + numericBoxBErr.ValueChanged += numericBoxCellConstants_ValueChanged; // // numericBoxB // - resources.ApplyResources(this.numericBoxB, "numericBoxB"); - this.numericBoxB.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxB.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxB.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxB.Name = "numericBoxB"; - this.numericBoxB.RestrictLimitValue = false; - this.numericBoxB.RoundErrorAccuracy = 12; - this.numericBoxB.SkipEventDuringInput = false; - this.numericBoxB.SmartIncrement = true; - this.numericBoxB.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.toolTip.SetToolTip(this.numericBoxB, resources.GetString("numericBoxB.ToolTip")); - this.numericBoxB.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxCellConstants_ValueChanged); + resources.ApplyResources(numericBoxB, "numericBoxB"); + numericBoxB.BackColor = System.Drawing.SystemColors.Control; + numericBoxB.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxB.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxB.Name = "numericBoxB"; + numericBoxB.RestrictLimitValue = false; + numericBoxB.RoundErrorAccuracy = 12; + numericBoxB.SkipEventDuringInput = false; + numericBoxB.SmartIncrement = true; + toolTip.SetToolTip(numericBoxB, resources.GetString("numericBoxB.ToolTip")); + numericBoxB.ValueChanged += numericBoxCellConstants_ValueChanged; // // label24 // - resources.ApplyResources(this.label24, "label24"); - this.label24.Name = "label24"; + resources.ApplyResources(label24, "label24"); + label24.Name = "label24"; // // label25 // - resources.ApplyResources(this.label25, "label25"); - this.label25.Name = "label25"; + resources.ApplyResources(label25, "label25"); + label25.Name = "label25"; // // label28 // - resources.ApplyResources(this.label28, "label28"); - this.label28.Name = "label28"; + resources.ApplyResources(label28, "label28"); + label28.Name = "label28"; // // label27 // - resources.ApplyResources(this.label27, "label27"); - this.label27.Name = "label27"; + resources.ApplyResources(label27, "label27"); + label27.Name = "label27"; // // numericBoxC // - resources.ApplyResources(this.numericBoxC, "numericBoxC"); - this.numericBoxC.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxC.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxC.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxC.Name = "numericBoxC"; - this.numericBoxC.RestrictLimitValue = false; - this.numericBoxC.RoundErrorAccuracy = 12; - this.numericBoxC.SkipEventDuringInput = false; - this.numericBoxC.SmartIncrement = true; - this.numericBoxC.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.toolTip.SetToolTip(this.numericBoxC, resources.GetString("numericBoxC.ToolTip")); - this.numericBoxC.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxCellConstants_ValueChanged); + resources.ApplyResources(numericBoxC, "numericBoxC"); + numericBoxC.BackColor = System.Drawing.SystemColors.Control; + numericBoxC.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxC.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxC.Name = "numericBoxC"; + numericBoxC.RestrictLimitValue = false; + numericBoxC.RoundErrorAccuracy = 12; + numericBoxC.SkipEventDuringInput = false; + numericBoxC.SmartIncrement = true; + toolTip.SetToolTip(numericBoxC, resources.GetString("numericBoxC.ToolTip")); + numericBoxC.ValueChanged += numericBoxCellConstants_ValueChanged; // // numericBoxCErr // - resources.ApplyResources(this.numericBoxCErr, "numericBoxCErr"); - this.numericBoxCErr.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxCErr.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxCErr.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxCErr.Name = "numericBoxCErr"; - this.numericBoxCErr.RestrictLimitValue = false; - this.numericBoxCErr.RoundErrorAccuracy = 12; - this.numericBoxCErr.SkipEventDuringInput = false; - this.numericBoxCErr.SmartIncrement = true; - this.numericBoxCErr.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.numericBoxCErr.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxCellConstants_ValueChanged); + resources.ApplyResources(numericBoxCErr, "numericBoxCErr"); + numericBoxCErr.BackColor = System.Drawing.SystemColors.Control; + numericBoxCErr.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxCErr.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxCErr.Name = "numericBoxCErr"; + numericBoxCErr.RestrictLimitValue = false; + numericBoxCErr.RoundErrorAccuracy = 12; + numericBoxCErr.SkipEventDuringInput = false; + numericBoxCErr.SmartIncrement = true; + numericBoxCErr.TabStop = false; + numericBoxCErr.ValueChanged += numericBoxCellConstants_ValueChanged; // // numericBoxAErr // - resources.ApplyResources(this.numericBoxAErr, "numericBoxAErr"); - this.numericBoxAErr.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxAErr.FooterBackColor = System.Drawing.SystemColors.Control; - this.numericBoxAErr.HeaderBackColor = System.Drawing.SystemColors.Control; - this.numericBoxAErr.Name = "numericBoxAErr"; - this.numericBoxAErr.RestrictLimitValue = false; - this.numericBoxAErr.RoundErrorAccuracy = 12; - this.numericBoxAErr.SkipEventDuringInput = false; - this.numericBoxAErr.SmartIncrement = true; - this.numericBoxAErr.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.numericBoxAErr.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.numericBoxCellConstants_ValueChanged); + resources.ApplyResources(numericBoxAErr, "numericBoxAErr"); + numericBoxAErr.BackColor = System.Drawing.SystemColors.Control; + numericBoxAErr.FooterBackColor = System.Drawing.SystemColors.Control; + numericBoxAErr.HeaderBackColor = System.Drawing.SystemColors.Control; + numericBoxAErr.Name = "numericBoxAErr"; + numericBoxAErr.RestrictLimitValue = false; + numericBoxAErr.RoundErrorAccuracy = 12; + numericBoxAErr.SkipEventDuringInput = false; + numericBoxAErr.SmartIncrement = true; + numericBoxAErr.TabStop = false; + numericBoxAErr.ValueChanged += numericBoxCellConstants_ValueChanged; // // label44 // - resources.ApplyResources(this.label44, "label44"); - this.label44.Name = "label44"; + resources.ApplyResources(label44, "label44"); + label44.Name = "label44"; // // groupBoxSymmetry // - this.groupBoxSymmetry.Controls.Add(this.comboBoxSpaceGroup); - this.groupBoxSymmetry.Controls.Add(this.comboBoxPointGroup); - this.groupBoxSymmetry.Controls.Add(this.comboBoxCrystalSystem); - this.groupBoxSymmetry.Controls.Add(this.label20); - this.groupBoxSymmetry.Controls.Add(this.label17); - this.groupBoxSymmetry.Controls.Add(this.label19); - this.groupBoxSymmetry.Controls.Add(this.textBoxSearch); - this.groupBoxSymmetry.Controls.Add(this.label21); - this.groupBoxSymmetry.Controls.Add(this.comboBoxSearchResult); - resources.ApplyResources(this.groupBoxSymmetry, "groupBoxSymmetry"); - this.groupBoxSymmetry.Name = "groupBoxSymmetry"; - this.groupBoxSymmetry.TabStop = false; + groupBoxSymmetry.Controls.Add(comboBoxSpaceGroup); + groupBoxSymmetry.Controls.Add(comboBoxPointGroup); + groupBoxSymmetry.Controls.Add(comboBoxCrystalSystem); + groupBoxSymmetry.Controls.Add(label20); + groupBoxSymmetry.Controls.Add(label17); + groupBoxSymmetry.Controls.Add(label19); + groupBoxSymmetry.Controls.Add(textBoxSearch); + groupBoxSymmetry.Controls.Add(label21); + groupBoxSymmetry.Controls.Add(comboBoxSearchResult); + resources.ApplyResources(groupBoxSymmetry, "groupBoxSymmetry"); + groupBoxSymmetry.Name = "groupBoxSymmetry"; + groupBoxSymmetry.TabStop = false; // // comboBoxSpaceGroup // - resources.ApplyResources(this.comboBoxSpaceGroup, "comboBoxSpaceGroup"); - this.comboBoxSpaceGroup.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxSpaceGroup.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBoxSpaceGroup.DropDownWidth = 250; - this.comboBoxSpaceGroup.Name = "comboBoxSpaceGroup"; - this.toolTip.SetToolTip(this.comboBoxSpaceGroup, resources.GetString("comboBoxSpaceGroup.ToolTip")); - this.comboBoxSpaceGroup.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.comboBoxSpaceGroup_DrawItem); - this.comboBoxSpaceGroup.SelectedIndexChanged += new System.EventHandler(this.comboBoxSpaceGroup_SelectedIndexChanged); + resources.ApplyResources(comboBoxSpaceGroup, "comboBoxSpaceGroup"); + comboBoxSpaceGroup.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + comboBoxSpaceGroup.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + comboBoxSpaceGroup.DropDownWidth = 250; + comboBoxSpaceGroup.Name = "comboBoxSpaceGroup"; + toolTip.SetToolTip(comboBoxSpaceGroup, resources.GetString("comboBoxSpaceGroup.ToolTip")); + comboBoxSpaceGroup.DrawItem += comboBoxSpaceGroup_DrawItem; + comboBoxSpaceGroup.SelectedIndexChanged += comboBoxSpaceGroup_SelectedIndexChanged; // // comboBoxPointGroup // - resources.ApplyResources(this.comboBoxPointGroup, "comboBoxPointGroup"); - this.comboBoxPointGroup.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxPointGroup.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBoxPointGroup.Name = "comboBoxPointGroup"; - this.toolTip.SetToolTip(this.comboBoxPointGroup, resources.GetString("comboBoxPointGroup.ToolTip")); - this.comboBoxPointGroup.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.comboBoxSpaceGroup_DrawItem); - this.comboBoxPointGroup.SelectedIndexChanged += new System.EventHandler(this.comboBoxPointGroup_SelectedIndexChanged); + resources.ApplyResources(comboBoxPointGroup, "comboBoxPointGroup"); + comboBoxPointGroup.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + comboBoxPointGroup.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + comboBoxPointGroup.Name = "comboBoxPointGroup"; + toolTip.SetToolTip(comboBoxPointGroup, resources.GetString("comboBoxPointGroup.ToolTip")); + comboBoxPointGroup.DrawItem += comboBoxSpaceGroup_DrawItem; + comboBoxPointGroup.SelectedIndexChanged += comboBoxPointGroup_SelectedIndexChanged; // // comboBoxCrystalSystem // - resources.ApplyResources(this.comboBoxCrystalSystem, "comboBoxCrystalSystem"); - this.comboBoxCrystalSystem.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBoxCrystalSystem.Items.AddRange(new object[] { - resources.GetString("comboBoxCrystalSystem.Items"), - resources.GetString("comboBoxCrystalSystem.Items1"), - resources.GetString("comboBoxCrystalSystem.Items2"), - resources.GetString("comboBoxCrystalSystem.Items3"), - resources.GetString("comboBoxCrystalSystem.Items4"), - resources.GetString("comboBoxCrystalSystem.Items5"), - resources.GetString("comboBoxCrystalSystem.Items6"), - resources.GetString("comboBoxCrystalSystem.Items7")}); - this.comboBoxCrystalSystem.Name = "comboBoxCrystalSystem"; - this.toolTip.SetToolTip(this.comboBoxCrystalSystem, resources.GetString("comboBoxCrystalSystem.ToolTip")); - this.comboBoxCrystalSystem.SelectedIndexChanged += new System.EventHandler(this.comboBoxCrystalSystem_SelectedIndexChanged); + resources.ApplyResources(comboBoxCrystalSystem, "comboBoxCrystalSystem"); + comboBoxCrystalSystem.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + comboBoxCrystalSystem.Items.AddRange(new object[] { resources.GetString("comboBoxCrystalSystem.Items"), resources.GetString("comboBoxCrystalSystem.Items1"), resources.GetString("comboBoxCrystalSystem.Items2"), resources.GetString("comboBoxCrystalSystem.Items3"), resources.GetString("comboBoxCrystalSystem.Items4"), resources.GetString("comboBoxCrystalSystem.Items5"), resources.GetString("comboBoxCrystalSystem.Items6"), resources.GetString("comboBoxCrystalSystem.Items7") }); + comboBoxCrystalSystem.Name = "comboBoxCrystalSystem"; + toolTip.SetToolTip(comboBoxCrystalSystem, resources.GetString("comboBoxCrystalSystem.ToolTip")); + comboBoxCrystalSystem.SelectedIndexChanged += comboBoxCrystalSystem_SelectedIndexChanged; // // label20 // - resources.ApplyResources(this.label20, "label20"); - this.label20.Name = "label20"; - this.toolTip.SetToolTip(this.label20, resources.GetString("label20.ToolTip")); + resources.ApplyResources(label20, "label20"); + label20.Name = "label20"; + toolTip.SetToolTip(label20, resources.GetString("label20.ToolTip")); // // label17 // - resources.ApplyResources(this.label17, "label17"); - this.label17.Name = "label17"; - this.toolTip.SetToolTip(this.label17, resources.GetString("label17.ToolTip")); + resources.ApplyResources(label17, "label17"); + label17.Name = "label17"; + toolTip.SetToolTip(label17, resources.GetString("label17.ToolTip")); // // label19 // - resources.ApplyResources(this.label19, "label19"); - this.label19.Name = "label19"; - this.toolTip.SetToolTip(this.label19, resources.GetString("label19.ToolTip")); + resources.ApplyResources(label19, "label19"); + label19.Name = "label19"; + toolTip.SetToolTip(label19, resources.GetString("label19.ToolTip")); // // textBoxSearch // - resources.ApplyResources(this.textBoxSearch, "textBoxSearch"); - this.textBoxSearch.Name = "textBoxSearch"; - this.toolTip.SetToolTip(this.textBoxSearch, resources.GetString("textBoxSearch.ToolTip")); - this.textBoxSearch.TextChanged += new System.EventHandler(this.textBoxSearch_TextChanged); + resources.ApplyResources(textBoxSearch, "textBoxSearch"); + textBoxSearch.Name = "textBoxSearch"; + toolTip.SetToolTip(textBoxSearch, resources.GetString("textBoxSearch.ToolTip")); + textBoxSearch.TextChanged += textBoxSearch_TextChanged; // // label21 // - resources.ApplyResources(this.label21, "label21"); - this.label21.Name = "label21"; - this.toolTip.SetToolTip(this.label21, resources.GetString("label21.ToolTip")); + resources.ApplyResources(label21, "label21"); + label21.Name = "label21"; + toolTip.SetToolTip(label21, resources.GetString("label21.ToolTip")); // // comboBoxSearchResult // - resources.ApplyResources(this.comboBoxSearchResult, "comboBoxSearchResult"); - this.comboBoxSearchResult.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.comboBoxSearchResult.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBoxSearchResult.DropDownWidth = 200; - this.comboBoxSearchResult.Name = "comboBoxSearchResult"; - this.comboBoxSearchResult.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.comboBoxSpaceGroup_DrawItem); - this.comboBoxSearchResult.SelectedIndexChanged += new System.EventHandler(this.comboBoxSearchResult_SelectedIndexChanged); + resources.ApplyResources(comboBoxSearchResult, "comboBoxSearchResult"); + comboBoxSearchResult.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + comboBoxSearchResult.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + comboBoxSearchResult.DropDownWidth = 200; + comboBoxSearchResult.Name = "comboBoxSearchResult"; + comboBoxSearchResult.DrawItem += comboBoxSpaceGroup_DrawItem; + comboBoxSearchResult.SelectedIndexChanged += comboBoxSearchResult_SelectedIndexChanged; // // panel1 // - resources.ApplyResources(this.panel1, "panel1"); - this.panel1.Name = "panel1"; + resources.ApplyResources(panel1, "panel1"); + panel1.Name = "panel1"; // // SymmetryControl // resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.Controls.Add(this.groupBox4); - this.Controls.Add(this.panel1); - this.Controls.Add(this.groupBoxSymmetry); - this.Name = "SymmetryControl"; - this.groupBox4.ResumeLayout(false); - this.groupBox4.PerformLayout(); - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel1.PerformLayout(); - this.groupBoxSymmetry.ResumeLayout(false); - this.groupBoxSymmetry.PerformLayout(); - this.ResumeLayout(false); - + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + Controls.Add(groupBox4); + Controls.Add(panel1); + Controls.Add(groupBoxSymmetry); + Name = "SymmetryControl"; + groupBox4.ResumeLayout(false); + groupBox4.PerformLayout(); + tableLayoutPanel1.ResumeLayout(false); + tableLayoutPanel1.PerformLayout(); + groupBoxSymmetry.ResumeLayout(false); + groupBoxSymmetry.PerformLayout(); + ResumeLayout(false); } #endregion diff --git a/Crystallography.Controls/Crystal/SymmetryControl.cs b/Crystallography.Controls/Crystal/SymmetryControl.cs index 2bd5597..8907061 100644 --- a/Crystallography.Controls/Crystal/SymmetryControl.cs +++ b/Crystallography.Controls/Crystal/SymmetryControl.cs @@ -125,6 +125,7 @@ public bool ShowError checkBoxShowError.Checked = value; SkipEvent = false; tableLayoutPanel1.ColumnStyles[2].Width = tableLayoutPanel1.ColumnStyles[6].Width = checkBoxShowError.Checked ? 25 : 0; + numericBoxAErr.TabStop = numericBoxBErr.TabStop = numericBoxCErr.TabStop = numericBoxAlphaErr.TabStop = numericBoxBetaErr.TabStop = numericBoxGammaErr.TabStop = value; } } diff --git a/Crystallography.Controls/Crystal/SymmetryControl.resx b/Crystallography.Controls/Crystal/SymmetryControl.resx index 19ba10f..67c2567 100644 --- a/Crystallography.Controls/Crystal/SymmetryControl.resx +++ b/Crystallography.Controls/Crystal/SymmetryControl.resx @@ -1,4 +1,64 @@ -ｻｿ +ｻｿ + + @@ -79,7 +139,7 @@ 83, 19 - 2 + 0 Show error @@ -200,19 +260,22 @@ 0, 0, 0, 0 - 1000, 25 + 1000, 28 - 1, 23 + 1, 18 0, 0, 1, 0 - 64, 25 + 64, 28 - 1 + 7 + + + Segoe UI Symbol, 9pt Cell constant "ﾎｲ" in degree @@ -254,19 +317,22 @@ 0, 0, 0, 0 - 1000, 25 + 1000, 28 - 1, 23 + 1, 18 0, 0, 1, 0 - 64, 25 + 64, 27 - 0 + 6 + + + Segoe UI Symbol, 9pt Cell constant "ﾎｱ" in degree @@ -347,19 +413,22 @@ 0, 0, 0, 0 - 1000, 25 + 1000, 28 - 1, 23 + 1, 18 0, 0, 1, 0 - 64, 25 + 64, 28 - 5 + 11 + + + Segoe UI Symbol, 9pt numericBoxGammaErr @@ -434,19 +503,22 @@ 0, 0, 0, 0 - 1000, 25 + 1000, 28 - 1, 23 + 1, 18 0, 0, 1, 0 - 64, 25 + 64, 27 - 3 + 9 + + + Segoe UI Symbol, 9pt numericBoxAlphaErr @@ -485,19 +557,22 @@ 0, 0, 0, 0 - 1000, 25 + 1000, 28 - 1, 23 + 1, 18 0, 0, 1, 0 - 64, 25 + 64, 28 - 4 + 10 + + + Segoe UI Symbol, 9pt numericBoxBetaErr @@ -533,20 +608,23 @@ 0, 0, 0, 0 - 1000, 25 + 1000, 28 - 1, 23 + 1, 18 0, 0, 1, 0 - 64, 25 + 64, 27 0 + + Segoe UI Symbol, 9pt + Cell constant "a" in angstrom @@ -659,19 +737,22 @@ 0, 0, 0, 0 - 1000, 25 + 1000, 28 - 1, 23 + 1, 18 0, 0, 1, 0 - 64, 25 + 64, 28 - 2 + 8 + + + Segoe UI Symbol, 9pt Cell constant "ﾎｳ" in degree @@ -752,20 +833,23 @@ 0, 0, 0, 0 - 1000, 25 + 1000, 28 - 1, 23 + 1, 18 0, 0, 1, 0 - 64, 25 + 64, 28 4 + + Segoe UI Symbol, 9pt + numericBoxBErr @@ -800,20 +884,23 @@ 0, 0, 0, 0 - 1000, 25 + 1000, 28 - 1, 23 + 1, 18 0, 0, 1, 0 - 64, 25 + 64, 28 1 + + Segoe UI Symbol, 9pt + Cell constant "b" in angstrom @@ -998,20 +1085,23 @@ 0, 0, 0, 0 - 1000, 25 + 1000, 28 - 1, 23 + 1, 18 0, 0, 1, 0 - 64, 25 + 64, 28 2 + + Segoe UI Symbol, 9pt + Cell constant "c" in angstrom @@ -1055,20 +1145,23 @@ 0, 0, 0, 0 - 1000, 25 + 1000, 28 - 1, 23 + 1, 18 0, 0, 1, 0 - 64, 25 + 64, 28 5 + + Segoe UI Symbol, 9pt + numericBoxCErr @@ -1106,20 +1199,23 @@ 0, 0, 0, 0 - 1000, 25 + 1000, 28 - 1, 23 + 1, 18 0, 0, 1, 0 - 64, 25 + 64, 27 3 + + Segoe UI Symbol, 9pt + numericBoxAErr diff --git a/Crystallography.Controls/CrystalDatabase/CrystalDatabaseControl.cs b/Crystallography.Controls/CrystalDatabase/CrystalDatabaseControl.cs index 95a3892..f1e8720 100644 --- a/Crystallography.Controls/CrystalDatabase/CrystalDatabaseControl.cs +++ b/Crystallography.Controls/CrystalDatabase/CrystalDatabaseControl.cs @@ -231,7 +231,7 @@ private void SaveDatabaseWorker_DoWork(object sender, DoWorkEventArgs e) //譛蠕後∪縺ｧ譚･縺ｦ縺繧区凾縺ｧ縲√°縺､髢ｾ蛟､莉･荳九ｮ螳ｹ驥上〒縲√°縺､縺薙ｌ縺ｾ縺ｧ荳蠎ｦ繧ょ蜑ｲ繧ゅ＠縺ｦ縺縺ｪ縺蝣ｴ蜷 if (i + division >= total && byteList.Count <= thresholdBytes && filecounter == 0) - fs.Write(byteList.ToArray(), 0, byteList.Count);//譛蛻昴ｮ繝輔ぃ繧､繝ｫ縺ｫ譖ｸ縺崎ｾｼ繧薙〒邨ゆｺ + fs.Write([.. byteList], 0, byteList.Count);//譛蛻昴ｮ繝輔ぃ繧､繝ｫ縺ｫ譖ｸ縺崎ｾｼ繧薙〒邨ゆｺ //譛蠕後∪縺ｧ譚･縺ｦ縺繧区凾縺九髢ｾ蛟､莉･荳翫ｮ螳ｹ驥上ｮ蝣ｴ蜷 else if (i + division >= total || byteList.Count > thresholdBytes) @@ -239,7 +239,7 @@ private void SaveDatabaseWorker_DoWork(object sender, DoWorkEventArgs e) if (filecounter == 0) Directory.CreateDirectory(fn.Remove(fn.Length - 5, 5)); using (var fs1 = new FileStream(header + filecounter.ToString("000"), FileMode.Create, FileAccess.Write)) - fs1.Write(byteList.ToArray(), 0, byteList.Count); + fs1.Write([.. byteList], 0, byteList.Count); fileSize.Add(byteList.Count); byteList.Clear(); diff --git a/Crystallography.Controls/Crystallography.Controls.csproj b/Crystallography.Controls/Crystallography.Controls.csproj index ef169f0..cc661a4 100644 --- a/Crystallography.Controls/Crystallography.Controls.csproj +++ b/Crystallography.Controls/Crystallography.Controls.csproj @@ -4,8 +4,8 @@ Library net8.0-windows10.0.22621.0 true - 2023.12.13.0531 - 2023.12.13.0531 + 2024.2.27.0332 + 2024.2.27.0332 PerMonitorV2 true true @@ -21,11 +21,11 @@ - + - + PreserveNewest @@ -33,7 +33,7 @@ - + diff --git a/Crystallography.Controls/Crystallography.Controls.sln b/Crystallography.Controls/Crystallography.Controls.sln new file mode 100644 index 0000000..4d37617 --- /dev/null +++ b/Crystallography.Controls/Crystallography.Controls.sln @@ -0,0 +1,31 @@ +ｻｿ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32721.290 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Crystallography.Controls", "Crystallography.Controls\Crystallography.Controls.csproj", "{9146B807-6430-487A-AF4A-445A027D25D2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Crystallography", "..\Crystallography\Crystallography\Crystallography.csproj", "{7A2E2FF5-0BFE-4AF4-A653-E51770C78478}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9146B807-6430-487A-AF4A-445A027D25D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9146B807-6430-487A-AF4A-445A027D25D2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9146B807-6430-487A-AF4A-445A027D25D2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9146B807-6430-487A-AF4A-445A027D25D2}.Release|Any CPU.Build.0 = Release|Any CPU + {7A2E2FF5-0BFE-4AF4-A653-E51770C78478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7A2E2FF5-0BFE-4AF4-A653-E51770C78478}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7A2E2FF5-0BFE-4AF4-A653-E51770C78478}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7A2E2FF5-0BFE-4AF4-A653-E51770C78478}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {AC9639A6-F177-4227-81D4-6EFAE829FC8C} + EndGlobalSection +EndGlobal diff --git a/Crystallography.Controls/GraphControl.cs b/Crystallography.Controls/GraphControl.cs index f5ba56e..e0697ba 100644 --- a/Crystallography.Controls/GraphControl.cs +++ b/Crystallography.Controls/GraphControl.cs @@ -233,7 +233,7 @@ public PointD[] VerticalLines } get => verticalLineList.ToArray(); } - private readonly List verticalLineList = new List(); + private readonly List verticalLineList = []; /// /// @@ -249,7 +249,7 @@ public PointD[] VerticalLines #region 繝斐ｼ繧ｯ髢｢謨ｰ [Browsable(false)] public PeakFunction[] Peaks { set { peaks.Clear(); peaks.AddRange(value); } get => peaks.ToArray(); } - private List peaks = new(); + private List peaks = []; #endregion #region 繝励Ο繝輔ぃ繧､繝ｫ @@ -275,7 +275,7 @@ public Profile Profile return srcProfileList[0]; } } - private List srcProfileList = new(); + private List srcProfileList = []; [Category(" 繝励Ο繝輔ぃ繧､繝ｫ")] @@ -506,7 +506,7 @@ public bool YLog #endregion 繝励Ο繝代ユ繧｣ - private List destProfileList = new(); + private List destProfileList = []; #region 繝励Ο繝輔ぃ繧､繝ｫ縺ｮ霑ｽ蜉縲∫ｽｮ謠帙√せ繝繝ｼ繧ｸ繝ｳ繧ｰ public void AddPoint(int profileNumber, PointD pt) @@ -890,7 +890,7 @@ private void DrawProfilePoint() float maxX = PictureBoxSize.Width, minX = originPosition.X, maxY = PictureBoxSize.Height - originPosition.Y, minY = 0; for (int j = 0; j < destProfileList.Count; j++) { - PointD[] pt = destProfileList[j].Pt.ToArray(); + PointD[] pt = [.. destProfileList[j].Pt]; if (pt.Length > 0) { Brush brush = new SolidBrush(srcProfileList[j].Color); @@ -989,7 +989,7 @@ private void DrawProfileLine() /// public static SortedList GetDivisions(double min, double max, int maxDiv, bool log) { - if (double.IsInfinity(min) || double.IsInfinity(max)) return new SortedList(); + if (double.IsInfinity(min) || double.IsInfinity(max)) return []; var results = new SortedList(); double d = max - min; string str; diff --git a/Crystallography.Controls/Numeric/NumericBox.cs b/Crystallography.Controls/Numeric/NumericBox.cs index 310f8af..0b37600 100644 --- a/Crystallography.Controls/Numeric/NumericBox.cs +++ b/Crystallography.Controls/Numeric/NumericBox.cs @@ -51,6 +51,7 @@ public partial class NumericBox : UserControl /// public int RoundErrorAccuracy { get; set; } = -1; + /// /// UpDownボタンを有効にするかどうか /// diff --git a/Crystallography.Controls/ScalablePictureBox.cs b/Crystallography.Controls/ScalablePictureBox.cs index 3ae41db..8514c0b 100644 --- a/Crystallography.Controls/ScalablePictureBox.cs +++ b/Crystallography.Controls/ScalablePictureBox.cs @@ -722,7 +722,7 @@ private void pictureBox_Paint(object sender, PaintEventArgs e) private void drawSymbols(PaintEventArgs e, List spot, List spotLabel, Brush brush1, Brush brush2, bool showLabel, int? emphasizeNum) { - var gp = new GraphicsPath(); + GraphicsPath gp; FontFamily ff = new("Arial"); Pen pen1 = new(brush1), pen2 = new(brush2); if (spot != null && spot.Count > 0) @@ -765,10 +765,7 @@ private void drawSymbols(PaintEventArgs e, List spot, List spotL /// public event PaintEventHandler PaintControl; - private void ScalablePictureBox_Paint(object sender, PaintEventArgs e) - { - PaintControl?.Invoke(sender, e); - } + private void ScalablePictureBox_Paint(object sender, PaintEventArgs e) => PaintControl?.Invoke(sender, e); /// /// 繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ蜈ｨ菴薙′繝ｪ繧ｵ繧､繧ｺ縺輔ｌ縺溘→縺 @@ -1030,15 +1027,9 @@ public void CopyAsBitmap() Clipboard.SetDataObject(GetBitmapImage(),true); } - public void SaveAsMetafile() - { - metafile(true); - } + public void SaveAsMetafile() => metafile(true); - public void CopyAsMetafile() - { - metafile(false); - } + public void CopyAsMetafile() => metafile(false); private void metafile(bool save) { @@ -1077,12 +1068,6 @@ private void metafile(bool save) ClipboardMetafileHelper.PutEnhMetafileOnClipboard(this.Handle, mf); } - - - - - - //縺薙ｮ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ縺後ヵ繧ｩ繝ｼ繧ｫ繧ｹ繧呈ｵｴ縺ｳ縺滓凾縺ｮ蜃ｦ逅 private void ScalablePictureBox_Enter(object sender, EventArgs e) { diff --git a/Crystallography.Controls/ScalablePictureBoxAdvanced.cs b/Crystallography.Controls/ScalablePictureBoxAdvanced.cs index bdc6116..42c6bec 100644 --- a/Crystallography.Controls/ScalablePictureBoxAdvanced.cs +++ b/Crystallography.Controls/ScalablePictureBoxAdvanced.cs @@ -594,10 +594,7 @@ public void ReadImage(string fileName) if (ImageIO.ReadImage(fileName)) { PseudoBitmap = new PseudoBitmap(Ring.Intensity.ToArray(), Ring.SrcImgSize.Width); - ProcessImageFilter(); - - } } diff --git a/Crystallography.Controls/Wave/WaveLengthControl.Designer.cs b/Crystallography.Controls/Wave/WaveLengthControl.Designer.cs index 3423b52..fe89f2e 100644 --- a/Crystallography.Controls/Wave/WaveLengthControl.Designer.cs +++ b/Crystallography.Controls/Wave/WaveLengthControl.Designer.cs @@ -35,16 +35,18 @@ private void InitializeComponent() radioButtonElectron = new System.Windows.Forms.RadioButton(); comboBoxXrayLine = new System.Windows.Forms.ComboBox(); numericBoxEnergy = new NumericBox(); - flowLayoutPanelElement = new System.Windows.Forms.FlowLayoutPanel(); label1 = new System.Windows.Forms.Label(); numericBoxWaveLength = new NumericBox(); radioButtonNeutron = new System.Windows.Forms.RadioButton(); - flowLayoutPanelWaveSource = new System.Windows.Forms.FlowLayoutPanel(); - flowLayoutPanelMain = new System.Windows.Forms.FlowLayoutPanel(); + labelFlatWhite = new System.Windows.Forms.Label(); toolTip = new System.Windows.Forms.ToolTip(components); - flowLayoutPanelElement.SuspendLayout(); + flowLayoutPanelWaveSource = new System.Windows.Forms.FlowLayoutPanel(); + flowLayoutPanelElement = new System.Windows.Forms.FlowLayoutPanel(); + flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); + panel1 = new System.Windows.Forms.Panel(); flowLayoutPanelWaveSource.SuspendLayout(); - flowLayoutPanelMain.SuspendLayout(); + flowLayoutPanelElement.SuspendLayout(); + flowLayoutPanel2.SuspendLayout(); SuspendLayout(); // // comboBoxXRayElement @@ -96,17 +98,9 @@ private void InitializeComponent() numericBoxEnergy.HeaderBackColor = System.Drawing.SystemColors.Control; numericBoxEnergy.Name = "numericBoxEnergy"; numericBoxEnergy.RoundErrorAccuracy = 8; - toolTip.SetToolTip(numericBoxEnergy, resources.GetString("numericBoxEnergy.ToolTip")); + toolTip.SetToolTip(numericBoxEnergy, resources.GetString("numericBoxEnergy.ToolTip1")); numericBoxEnergy.ValueChanged += numericBoxEnergy_ValueChanged; // - // flowLayoutPanelElement - // - resources.ApplyResources(flowLayoutPanelElement, "flowLayoutPanelElement"); - flowLayoutPanelElement.Controls.Add(label1); - flowLayoutPanelElement.Controls.Add(comboBoxXRayElement); - flowLayoutPanelElement.Controls.Add(comboBoxXrayLine); - flowLayoutPanelElement.Name = "flowLayoutPanelElement"; - // // label1 // resources.ApplyResources(label1, "label1"); @@ -120,7 +114,7 @@ private void InitializeComponent() numericBoxWaveLength.HeaderBackColor = System.Drawing.SystemColors.Control; numericBoxWaveLength.Name = "numericBoxWaveLength"; numericBoxWaveLength.RoundErrorAccuracy = 12; - toolTip.SetToolTip(numericBoxWaveLength, resources.GetString("numericBoxWaveLength.ToolTip")); + toolTip.SetToolTip(numericBoxWaveLength, resources.GetString("numericBoxWaveLength.ToolTip1")); numericBoxWaveLength.ValueChanged += numericBoxWaveLength_ValueChanged; // // radioButtonNeutron @@ -131,6 +125,11 @@ private void InitializeComponent() radioButtonNeutron.UseVisualStyleBackColor = true; radioButtonNeutron.CheckedChanged += radioButtonWaveSource_CheckedChanged; // + // labelFlatWhite + // + resources.ApplyResources(labelFlatWhite, "labelFlatWhite"); + labelFlatWhite.Name = "labelFlatWhite"; + // // flowLayoutPanelWaveSource // resources.ApplyResources(flowLayoutPanelWaveSource, "flowLayoutPanelWaveSource"); @@ -138,29 +137,43 @@ private void InitializeComponent() flowLayoutPanelWaveSource.Controls.Add(radioButtonElectron); flowLayoutPanelWaveSource.Controls.Add(radioButtonNeutron); flowLayoutPanelWaveSource.Name = "flowLayoutPanelWaveSource"; - toolTip.SetToolTip(flowLayoutPanelWaveSource, resources.GetString("flowLayoutPanelWaveSource.ToolTip")); // - // flowLayoutPanelMain + // flowLayoutPanelElement + // + resources.ApplyResources(flowLayoutPanelElement, "flowLayoutPanelElement"); + flowLayoutPanelElement.Controls.Add(label1); + flowLayoutPanelElement.Controls.Add(comboBoxXRayElement); + flowLayoutPanelElement.Controls.Add(comboBoxXrayLine); + flowLayoutPanelElement.Name = "flowLayoutPanelElement"; + // + // flowLayoutPanel2 + // + resources.ApplyResources(flowLayoutPanel2, "flowLayoutPanel2"); + flowLayoutPanel2.Controls.Add(flowLayoutPanelElement); + flowLayoutPanel2.Controls.Add(numericBoxEnergy); + flowLayoutPanel2.Controls.Add(numericBoxWaveLength); + flowLayoutPanel2.Controls.Add(labelFlatWhite); + flowLayoutPanel2.Name = "flowLayoutPanel2"; + // + // panel1 // - resources.ApplyResources(flowLayoutPanelMain, "flowLayoutPanelMain"); - flowLayoutPanelMain.Controls.Add(flowLayoutPanelElement); - flowLayoutPanelMain.Controls.Add(numericBoxEnergy); - flowLayoutPanelMain.Controls.Add(numericBoxWaveLength); - flowLayoutPanelMain.Name = "flowLayoutPanelMain"; + resources.ApplyResources(panel1, "panel1"); + panel1.Name = "panel1"; // // WaveLengthControl // resources.ApplyResources(this, "$this"); AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - Controls.Add(flowLayoutPanelMain); + Controls.Add(panel1); + Controls.Add(flowLayoutPanel2); Controls.Add(flowLayoutPanelWaveSource); Name = "WaveLengthControl"; - flowLayoutPanelElement.ResumeLayout(false); - flowLayoutPanelElement.PerformLayout(); flowLayoutPanelWaveSource.ResumeLayout(false); flowLayoutPanelWaveSource.PerformLayout(); - flowLayoutPanelMain.ResumeLayout(false); - flowLayoutPanelMain.PerformLayout(); + flowLayoutPanelElement.ResumeLayout(false); + flowLayoutPanelElement.PerformLayout(); + flowLayoutPanel2.ResumeLayout(false); + flowLayoutPanel2.PerformLayout(); ResumeLayout(false); PerformLayout(); } @@ -173,12 +186,14 @@ private void InitializeComponent() private System.Windows.Forms.RadioButton radioButtonElectron; private System.Windows.Forms.ComboBox comboBoxXrayLine; private NumericBox numericBoxEnergy; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanelElement; // private System.Windows.Forms.FlowLayoutPanel flowLayoutPanelXray; private System.Windows.Forms.Label label1; private System.Windows.Forms.RadioButton radioButtonNeutron; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanelWaveSource; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanelMain; private System.Windows.Forms.ToolTip toolTip; + private System.Windows.Forms.Label labelFlatWhite; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanelWaveSource; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanelElement; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2; + private System.Windows.Forms.Panel panel1; } } diff --git a/Crystallography.Controls/Wave/WaveLengthControl.cs b/Crystallography.Controls/Wave/WaveLengthControl.cs index f332385..8c36fed 100644 --- a/Crystallography.Controls/Wave/WaveLengthControl.cs +++ b/Crystallography.Controls/Wave/WaveLengthControl.cs @@ -40,11 +40,14 @@ public FlowDirection Direction direction = value; if (direction == FlowDirection.LeftToRight) { + this.AutoSize = false; flowLayoutPanelWaveSource.FlowDirection = FlowDirection.TopDown; flowLayoutPanelWaveSource.Dock = DockStyle.Left; + } else { + this.AutoSize = true; flowLayoutPanelWaveSource.FlowDirection = FlowDirection.LeftToRight; flowLayoutPanelWaveSource.Dock = DockStyle.Top; } @@ -59,7 +62,16 @@ public FlowDirection Direction } public FlowDirection direction = FlowDirection.TopDown; - [Localizable(true)] + public bool Monochrome + { + set + { numericBoxEnergy.Visible = numericBoxWaveLength.Visible = value; + flowLayoutPanelElement.Visible = WaveSource == WaveSource.Xray && value; + labelFlatWhite.Visible = !value; } + get => numericBoxEnergy.Visible; + } + +[Localizable(true)] public Font TextFont { set diff --git a/Crystallography.Controls/Wave/WaveLengthControl.ja.resx b/Crystallography.Controls/Wave/WaveLengthControl.ja.resx index 4e698d5..c0b50d8 100644 --- a/Crystallography.Controls/Wave/WaveLengthControl.ja.resx +++ b/Crystallography.Controls/Wave/WaveLengthControl.ja.resx @@ -1,4 +1,64 @@ -ｻｿ +ｻｿ + + @@ -103,6 +163,9 @@ 160, 27 + + + 繝｡繧､繝ｪ繧ｪ, 9pt @@ -112,6 +175,9 @@ 蜈邏 + + + 繝｡繧､繝ｪ繧ｪ, 9pt @@ -148,7 +214,13 @@ 198, 86 + + + 198, 111 + + + \ No newline at end of file diff --git a/Crystallography.Controls/Wave/WaveLengthControl.resx b/Crystallography.Controls/Wave/WaveLengthControl.resx index 39f5c22..abeb792 100644 --- a/Crystallography.Controls/Wave/WaveLengthControl.resx +++ b/Crystallography.Controls/Wave/WaveLengthControl.resx @@ -423,7 +423,7 @@ 98: Cf - 54, 2 + 54, 0 @@ -508,13 +508,16 @@ NoControl - 59, 0 + 58, 0 - 1, 0, 0, 0 + 0, 0, 0, 0 + + + 4, 0, 0, 0 - 73, 21 + 77, 21 100 @@ -571,7 +574,7 @@ Lﾎｲ2 - 126, 2 + 126, 0 2, 0, 0, 0 @@ -613,7 +616,7 @@ Energy - 5, 27 + 5, 25 5, 0, 0, 0 @@ -628,14 +631,11 @@ 0, 2, 1, 0 - 167, 27 + 158, 27 102 - - 繝｡繧､繝ｪ繧ｪ, 9pt - Inuput wave energy @@ -649,59 +649,11 @@ Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - flowLayoutPanelMain + flowLayoutPanel2 1 - - True - - - GrowAndShrink - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanelElement - - - 0 - - - 5, 0 - - - 5, 0, 0, 0 - - - 0, 2, 0, 0 - - - 182, 27 - - - 105 - - - False - - - flowLayoutPanelElement - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flowLayoutPanelMain - - - 0 - True @@ -712,7 +664,7 @@ NoControl - 0, 5 + 0, 3 0, 3, 0, 0 @@ -751,7 +703,7 @@ Wavelength - 5, 54 + 5, 52 5, 0, 0, 0 @@ -771,9 +723,6 @@ 102 - - 繝｡繧､繝ｪ繧ｪ, 9pt - Input wave length @@ -787,7 +736,7 @@ Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null - flowLayoutPanelMain + flowLayoutPanel2 2 @@ -802,13 +751,16 @@ NoControl - 133, 0 + 136, 0 1, 0, 0, 0 + + 0, 0, 4, 0 + - 74, 21 + 78, 21 100 @@ -831,6 +783,42 @@ 2 + + True + + + Segoe UI Symbol, 9.75pt + + + 5, 79 + + + 5, 0, 0, 0 + + + 62, 17 + + + 106 + + + Flat white + + + False + + + labelFlatWhite + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanel2 + + + 3 + True @@ -843,20 +831,11 @@ 0, 0 - - 0, 0, 0, 0 - - - 0, 0, 0, 3 - - 207, 24 + 210, 21 - 109 - - - Select wave source + 115 False @@ -871,50 +850,116 @@ $this - 1 + 2 - + True - + GrowAndShrink - - Fill + + 3, 0 + + + 3, 0, 0, 0 + + + 182, 25 + + + 117 + + + flowLayoutPanelElement - + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanel2 + + + 0 + + + True + + + GrowAndShrink + + + Top + + TopDown - - 0, 24 + + 0, 21 - - 207, 83 + + 210, 96 - - 110 + + 118 - - flowLayoutPanelMain + + False - + + flowLayoutPanel2 + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + + 1 + + + True + + + Top + + + 0, 117 + + + 0, 1 + + + 210, 1 + + + 119 + + + panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 - - ja - True 96, 96 + + True + + + GrowAndShrink + Segoe UI Symbol, 9pt @@ -924,8 +969,11 @@ 500, 500 + + 210, 0 + - 207, 107 + 210, 118 toolTip diff --git a/Crystallography.Controls/doc/CrystalInformationManual.docx b/Crystallography.Controls/doc/CrystalInformationManual(ja).docx similarity index 68% rename from Crystallography.Controls/doc/CrystalInformationManual.docx rename to Crystallography.Controls/doc/CrystalInformationManual(ja).docx index 0607729..886443c 100644 Binary files a/Crystallography.Controls/doc/CrystalInformationManual.docx and b/Crystallography.Controls/doc/CrystalInformationManual(ja).docx differ diff --git a/Crystallography.Controls/doc/CrystalInformationManual(ja).pdf b/Crystallography.Controls/doc/CrystalInformationManual(ja).pdf new file mode 100644 index 0000000..2d8089a Binary files /dev/null and b/Crystallography.Controls/doc/CrystalInformationManual(ja).pdf differ diff --git a/Crystallography.Controls/doc/CrystalInformationManual.pdf b/Crystallography.Controls/doc/CrystalInformationManual.pdf deleted file mode 100644 index 98f1405..0000000 Binary files a/Crystallography.Controls/doc/CrystalInformationManual.pdf and /dev/null differ diff --git a/Crystallography/AssemblyState.cs b/Crystallography/AssemblyState.cs index 8ce0bbe..91d9af9 100644 --- a/Crystallography/AssemblyState.cs +++ b/Crystallography/AssemblyState.cs @@ -2,7 +2,7 @@ public static class AssemblyState { - public const bool IsDebug = + public static bool IsDebug => #if DEBUG true; #else diff --git a/Crystallography/Atom/AtomStatic.cs b/Crystallography/Atom/AtomStatic.cs index 4e263e4..8925509 100644 --- a/Crystallography/Atom/AtomStatic.cs +++ b/Crystallography/Atom/AtomStatic.cs @@ -7242,7 +7242,7 @@ public static double MassAbsorption(double energy, int z) if (energy == coef[i].X) { if (massAbsorption[z] == null) - massAbsorption[z] = new Dictionary(); + massAbsorption[z] = []; lock (lockObjForMassAbsorption) massAbsorption[z].Add(energy, coef[i].Y); return coef[i].Y; @@ -7439,7 +7439,7 @@ public static void ReadChantlerData(string[] fileNames) absorp.Add(new PointD(Convert.ToDouble(str[i].Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries)[0]), Convert.ToDouble(str[i].Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries)[1]))); //sbAbsorption.AppendLine("new PointD(" + str[i].Replace(" ", ",") + ")" + (i == str.Count - 2 ? "" : ",")); absorp.Sort(); - var pf = new List { new Profile() }; + var pf = new List { new() }; for (int j = 0; j < absorp.Count; j++) { if (double.IsPositiveInfinity(absorp[j].Y) && pf[^1].Pt.Count != 0) @@ -7471,7 +7471,7 @@ public static void ReadChantlerData(string[] fileNames) { sbAbsorption.AppendLine("new PointD[]{"); for (int k = 0; k < pf[j].Pt.Count; k++) - sbAbsorption.AppendLine("new PointD(" + pf[j].Pt[k].X.ToString("E6") + "," + pf[j].Pt[k].Y.ToString("E6") + (k == pf[j].Pt.Count - 1 ? ")" : "),")); + sbAbsorption.AppendLine($"new PointD({pf[j].Pt[k].X.ToString("E6")},{pf[j].Pt[k].Y.ToString("E6")}{(k == pf[j].Pt.Count - 1 ? ")" : "),")}"); sbAbsorption.AppendLine("}" + (j == pf.Count - 1 ? "" : ",")); } sbAbsorption.AppendLine("}" + (fileName.Contains("92") ? "" : ",")); diff --git a/Crystallography/Atom/AtomStaticSub.cs b/Crystallography/Atom/AtomStaticSub.cs index 4194f18..cab25c4 100644 --- a/Crystallography/Atom/AtomStaticSub.cs +++ b/Crystallography/Atom/AtomStaticSub.cs @@ -11,7 +11,7 @@ public static readonly (double X, double Y)[][][] MassAbsorptionCoefficient = #region [ [ - System.Array.Empty<(double X, double Y)>() + [] ], [ diff --git a/Crystallography/Atom/Atoms.cs b/Crystallography/Atom/Atoms.cs index edfbff0..bcedd86 100644 --- a/Crystallography/Atom/Atoms.cs +++ b/Crystallography/Atom/Atoms.cs @@ -44,7 +44,7 @@ public override int GetHashCode() public int ID; [XmlIgnore] - public Vector3D[] Atom = Array.Empty(); + public Vector3D[] Atom = []; public double X, Y, Z; public double X_err, Y_err, Z_err; @@ -197,7 +197,7 @@ public Atoms(string label, int atomicNumber, int subXray, int subElectron, doubl SubNumberXray = subXray; SubNumberElectron = subElectron; - Isotope = isotope ?? Array.Empty(); + Isotope = isotope ?? []; AtomicNumber = atomicNumber; ElementName = AtomicNumber.ToString() + ": " + AtomStatic.AtomicName(atomicNumber); } diff --git a/Crystallography/BetheMethod.cs b/Crystallography/BetheMethod.cs index c2fd70d..f73ffa7 100644 --- a/Crystallography/BetheMethod.cs +++ b/Crystallography/BetheMethod.cs @@ -5,6 +5,7 @@ using OpenTK.Platform.Windows; using System; using System.Buffers; +using System.Collections.Frozen; using System.Collections.Generic; using System.ComponentModel; using System.Drawing; @@ -327,7 +328,7 @@ private unsafe void cbed_DoWork(object sender, DoWorkEventArgs e) if (diskAmplitude[r] != null) amplitudes[r] = diskAmplitude[r][t * bLen]; - Disks[t][0] = new CBED_Disk(new[] { Beams[0].H, Beams[0].K, Beams[0].L }, Beams[0].Vec, Thicknesses[t], amplitudes) { Amplitudes = amplitudes }; + Disks[t][0] = new CBED_Disk([Beams[0].H, Beams[0].K, Beams[0].L], Beams[0].Vec, Thicknesses[t], amplitudes) { Amplitudes = amplitudes }; }); } @@ -343,7 +344,7 @@ private unsafe void cbed_DoWork(object sender, DoWorkEventArgs e) if (diskAmplitude[r] != null) amplitudes[r] = diskAmplitude[r][t * bLen + g]; - Disks[t][g] = new CBED_Disk(new[] { Beams[g].H, Beams[g].K, Beams[g].L }, Beams[g].Vec, Thicknesses[t], amplitudes); + Disks[t][g] = new CBED_Disk([Beams[g].H, Beams[g].K, Beams[g].L], Beams[g].Vec, Thicknesses[t], amplitudes); } }); @@ -407,7 +408,9 @@ private unsafe void cbed_DoWork(object sender, DoWorkEventArgs e) if (bwCBED.CancellationPending) e.Cancel = true; } + #endregion + #region EBSD /// /// EBSD險育ｮ礼畑 /// @@ -468,7 +471,7 @@ private void cbed_DoWork2(object sender, DoWorkEventArgs e) #region 蜷繧ｽ繝ｫ繝舌ｼ縺ｫ繧医ｋ險育ｮ //EigenｼｿEigen縺ｮ蝣ｴ蜷 if (solver == Solver.Eigen_Eigen && EigenEnabled) - result = NativeWrapper.CBEDSolver_Eigen(potentialMatrix, psi0.ToArray(), Thicknesses); + result = NativeWrapper.CBEDSolver_Eigen(potentialMatrix, [.. psi0], Thicknesses); //Eigen_MKL 縺ゅｋ縺縺ｯ Eigen_Managed縺ｮ蝣ｴ蜷 else if (solver == Solver.Eigen_MKL) { @@ -486,7 +489,7 @@ private void cbed_DoWork2(object sender, DoWorkEventArgs e) } //MtxExp_Eigen縺ｮ蝣ｴ蜷 else if (solver == Solver.MtxExp_Eigen && EigenEnabled) - result = NativeWrapper.CBEDSolver_MatExp(potentialMatrix, psi0.ToArray(), Thicknesses); + result = NativeWrapper.CBEDSolver_MatExp(potentialMatrix, [.. psi0], Thicknesses); //MtxExp_MKL縺ｮ蝣ｴ蜷 else { @@ -564,8 +567,8 @@ private void cbed_DoWork2(object sender, DoWorkEventArgs e) Disks = new CBED_Disk[Thicknesses.Length][]; for (int t = 0; t < Thicknesses.Length; t++) { - Disks[t] = new[] { new CBED_Disk(new[] { 0, 0, 0 }, new Vector3DBase(0,0,0), Thicknesses[t], - directDiskIntensities[t].Select(intensity => new Complex(Math.Sqrt(intensity), 0)).ToArray()) }; + Disks[t] = [new CBED_Disk([0, 0, 0], new Vector3DBase(0, 0, 0), Thicknesses[t], + directDiskIntensities[t].Select(intensity => new Complex(Math.Sqrt(intensity), 0)).ToArray())]; Disks[t][0].Amplitudes = Disks[t][0].RawAmplitudes; } @@ -636,7 +639,7 @@ public Beam[] GetDifractedBeamAmpriltudes(int maxNumOfBloch, double voltage, Mat //險育ｮ怜ｯｾ雎｡縺ｮg-Vectors繧呈ｱｺ繧√ｋ縲 Beams = Find_gVectors(BaseRotation, vecK0); - if (Beams == null || Beams.Length == 0) return Array.Empty(); + if (Beams == null || Beams.Length == 0) return []; var potentialMatrix = getEigenMatrix(Beams); dim = Beams.Length; @@ -794,7 +797,7 @@ public Beam[] GetPrecessionElectronDiffraction(int maxNumOfBloch, double voltage var c = a.Rating - b.Rating; return (c > 0) ? 1 : (c < 0) ? -1 : 0; }); - Beams = beams.ToArray(); + Beams = [.. beams]; return Beams; } @@ -845,7 +848,7 @@ public unsafe void stem_DoWork(object sender, DoWorkEventArgs e) //k0繝吶け繝医Ν繧定ｨ育ｮ var vecK0 = getVecK0(kvac, u0); //險育ｮ怜ｯｾ雎｡縺ｮg-Vectors繧呈ｱｺ繧√ｋ縲Ｊndex縺悟ｰ上＆縺上√°縺､sg(蜉ｱ襍ｷ隱､蟾ｮ)縺ｮ蟆上＆縺g-vector繧呈歓蜃ｺ縺吶ｋ - Beams = Find_gVectors(BaseRotation, vecK0).OrderBy(e => e.Vec.Length2).ToArray(); + Beams = [.. Find_gVectors(BaseRotation, vecK0).OrderBy(e => e.Vec.Length2)]; #region 讀懆ｨｼ繧ｳ繝ｼ繝 25nm^-1 莉･荳翫ｮ繝薙ｼ繝縺ｯ蜑企勁 25nm^-1 = 62.7mrad //var _beam = new List(); @@ -1065,7 +1068,6 @@ Complex Lenz(in PointD k, in PointD kq, in double defocus) }); #endregion - #region 蠑ｾ諤ｧ謨｣荵ｱ 縺ｮ險育ｮ bwSTEM.ReportProgress(0, "Calculating I_elastic(Q)");//迥ｶ豕√ｒ蝣ｱ蜻 Complex[,,] I_Elas = new Complex[qList.Count, tLen, dLen]; @@ -1130,7 +1132,7 @@ Complex Lenz(in PointD k, in PointD kq, in double defocus) //U[qIndex * bLen2 + j * bLen + i] = getU(AccVoltage, qList[qIndex], -Beams[i] + Beams[j], detAngleInner, detAngleOuter).Imag.Conjugate(); //U[m][k++] = getU(AccVoltage, qList[m], -Beams[i] + Beams[j], detAngleInner, detAngleOuter).Imag;//髱槫ｱ謇蠖｢蠑上ｮ蝣ｴ蜷 } - if (Interlocked.Increment(ref count) % 10 == 0) bwSTEM.ReportProgress((int)(1E6 * count / qList.Count/bLen), "Calculating U matrix");//迥ｶ豕√ｒ蝣ｱ蜻 + if (Interlocked.Increment(ref count) % 10 == 0) bwSTEM.ReportProgress((int)(1E6 * count / qList.Count / bLen), "Calculating U matrix");//迥ｶ豕√ｒ蝣ｱ蜻 if (bwSTEM.CancellationPending) { e.Cancel = true; return; } } }); @@ -1200,7 +1202,7 @@ Complex Lenz(in PointD k, in PointD kq, in double defocus) NativeWrapper.GenerateTC1(bLen, thickness, _kg_z, _eVal, _eVec, _tc_k + kIndex * bLen); }); #endregion - + tcP.ForAll(kIndex => { Complex[] sumTmp = Shared.Rent(list[kIndex].Count * dLen), tc_kq = Shared.Rent(bLen); @@ -1214,7 +1216,7 @@ Complex Lenz(in PointD k, in PointD kq, in double defocus) NativeWrapper.BlendAndConjugate(bLen, _tc_k + n[0] * bLen, _tc_k + n[1] * bLen, _tc_k + n[2] * bLen, _tc_k + n[3] * bLen, r[0], r[1], r[2], r[3], _tc_kq); var tmp = NativeWrapper.RowVec_SqMat_ColVec(bLen, _tc_kq, _U + qIndex * bLen2, _tc_k + kIndex * bLen); - + for (int dIndex = 0; dIndex < dLen; dIndex++) sumTmp[i * dLen + dIndex] = tmp * lenz[dIndex]; } @@ -1634,7 +1636,7 @@ public void GetHRTEMImage(int BlochNum, double AccVol, Matrix3D rot, (double R, /// public (Complex Real, Complex Imag) getU(double voltage) => getU(voltage, new Beam((0, 0, 0), new Vector3DBase(0, 0, 0))); - private readonly Dictionary<(int Key1, int Key2), (Complex Real, Complex Imag)> uDictionary = new(); + private readonly Dictionary<(int Key1, int Key2), (Complex Real, Complex Imag)> uDictionary = []; #endregion #region 繝昴ユ繝ｳ繧ｷ繝｣繝ｫ縺ｮ繝槭ヨ繝ｪ繝繧ｯ繧ｹ @@ -1692,16 +1694,16 @@ private void getEigenMatrix(int dim, Beam[] b, ref Complex[] eigenMatrix, Comple #endregion #region 蛟呵｣懊→縺ｪ繧吉 vectors縺ｮ讀懃ｴ｢ - static readonly (int h, int k, int l)[] directionF = new[] { (1, 1, 1), (1, 1, -1), (1, -1, 1), (1, -1, -1), (-1, 1, 1), (-1, 1, -1), (-1, -1, 1), (-1, -1, -1) }; - static readonly (int h, int k, int l)[] directionA = new[] { (0, 1, 1), (0, 1, -1), (0, -1, 1), (0, -1, -1), (1, 0, 0), (-1, 0, 0) }; - static readonly (int h, int k, int l)[] directionB = new[] { (1, 0, 1), (1, 0, -1), (-1, 0, 1), (-1, 0, -1), (0, 1, 0), (0, -1, 0) }; - static readonly (int h, int k, int l)[] directionC = new[] { (1, 1, 0), (1, -1, 0), (-1, 1, 0), (-1, -1, 0), (0, 0, 1), (0, 0, -1) }; - static readonly (int h, int k, int l)[] directionI = new[] { (1, 1, 0), (1, -1, 0), (-1, 1, 0), (-1, -1, 0), (0, 1, 1), (0, 1, -1), (0, -1, 1), (0, -1, -1), (1, 0, 1), (1, 0, -1), (-1, 0, 1), (-1, 0, -1) }; - static readonly (int h, int k, int l)[] directionRH = new[] { (1, 0, 1), (0, -1, 1), (-1, 1, 1), (-1, 0, -1), (0, 1, -1), (1, -1, -1) }; - static readonly (int h, int k, int l)[] directionHex = new[] { (1, 0, 0), (-1, 0, 0), (0, 1, 0), (0, -1, 0), (1, -1, 0), (-1, 1, 0), (0, 0, 1), (0, 0, -1) }; - static readonly (int h, int k, int l)[] directionP = new[] { (1, 0, 0), (-1, 0, 0), (0, 1, 0), (0, -1, 0), (0, 0, 1), (0, 0, -1) }; - - readonly Dictionary<(int H, int K, int L), Vector3DBase> gDic = new(); + static readonly FrozenSet<(int h, int k, int l)> directionF = new [] { (1, 1, 1), (1, 1, -1), (1, -1, 1), (1, -1, -1), (-1, 1, 1), (-1, 1, -1), (-1, -1, 1), (-1, -1, -1) }.ToFrozenSet(); + static readonly FrozenSet<(int h, int k, int l)> directionA = new [] { (0, 1, 1), (0, 1, -1), (0, -1, 1), (0, -1, -1), (1, 0, 0), (-1, 0, 0) }.ToFrozenSet(); + static readonly FrozenSet<(int h, int k, int l)> directionB = new [] { (1, 0, 1), (1, 0, -1), (-1, 0, 1), (-1, 0, -1), (0, 1, 0), (0, -1, 0) }.ToFrozenSet(); + static readonly FrozenSet<(int h, int k, int l)> directionC = new [] { (1, 1, 0), (1, -1, 0), (-1, 1, 0), (-1, -1, 0), (0, 0, 1), (0, 0, -1) }.ToFrozenSet(); + static readonly FrozenSet<(int h, int k, int l)> directionI = new [] { (1, 1, 0), (1, -1, 0), (-1, 1, 0), (-1, -1, 0), (0, 1, 1), (0, 1, -1), (0, -1, 1), (0, -1, -1), (1, 0, 1), (1, 0, -1), (-1, 0, 1), (-1, 0, -1) }.ToFrozenSet(); + static readonly FrozenSet<(int h, int k, int l)> directionRH = new [] { (1, 0, 1), (0, -1, 1), (-1, 1, 1), (-1, 0, -1), (0, 1, -1), (1, -1, -1) }.ToFrozenSet(); + static readonly FrozenSet<(int h, int k, int l)> directionHex = new [] { (1, 0, 0), (-1, 0, 0), (0, 1, 0), (0, -1, 0), (1, -1, 0), (-1, 1, 0), (0, 0, 1), (0, 0, -1) }.ToFrozenSet(); + static readonly FrozenSet<(int h, int k, int l)> directionP = new [] { (1, 0, 0), (-1, 0, 0), (0, 1, 0), (0, -1, 0), (0, 0, 1), (0, 0, -1) }.ToFrozenSet(); + + readonly Dictionary<(int H, int K, int L), Vector3DBase> gDic = []; static int compose(in int h, in int k, in int l) => ((h + 255) << 20) + ((k + 255) << 10) + l + 255; static int compose(in (int h, int k, int l) index) => ((index.h + 255) << 20) + ((index.k + 255) << 10) + index.l + 255; static (int h, int k, int l) decompose(in int key) => ((key >> 20) - 255, ((key << 12) >> 22) - 255, ((key << 22) >> 22) - 255); @@ -1722,7 +1724,7 @@ public Beam[] Find_gVectors(Matrix3D baseRotation, Vector3DBase vecK0, int maxNu if (maxNumOfBloch == -1) maxNumOfBloch = MaxNumOfBloch; var mat = baseRotation * Crystal.MatrixInverse.Transpose(); - var direction = Array.Empty<(int h, int k, int l)>(); + FrozenSet<(int h, int k, int l)> direction; #region direction繧貞晄悄蛹 if (Crystal.Symmetry.LatticeTypeStr == "F") direction = directionF; @@ -1818,7 +1820,7 @@ public Beam[] Find_gVectors(Matrix3D baseRotation, Vector3DBase vecK0, int maxNu } beams.RemoveRange(n, beams.Count - n); - return beams.ToArray(); + return [.. beams]; } #endregion @@ -1827,7 +1829,7 @@ public Beam[] Find_gVectors(Matrix3D baseRotation, Vector3DBase vecK0, int maxNu public static Beam[] ExtractInsideBeams(Beam[] beams, double acc, double radius, double shiftX, double shiftY) { if (double.IsInfinity(radius)) - return beams.ToArray(); + return [.. beams]; else { var rambda = UniversalConstants.Convert.EnergyToElectronWaveLength(acc); @@ -2023,37 +2025,26 @@ public override string ToString() #endregion #region CBED_Disk繧ｯ繝ｩ繧ｹ - public class CBED_Disk + public class CBED_Disk(int[] hkl, Vector3DBase vec, double thickness, Complex[] amplitudes) { /// /// 謖謨ｰ /// - public readonly int H, K, L; + public readonly int H = hkl[0], K = hkl[1], L = hkl[2]; /// /// 蜴壹∩ /// - public readonly double Thickness; + public readonly double Thickness = thickness; - public readonly Vector3DBase G; + public readonly Vector3DBase G = vec; /// /// 謖ｯ蟷繧呈ｼ邏阪＠縺滄榊 /// public Complex[] Amplitudes; - public readonly Complex[] RawAmplitudes; - - public CBED_Disk(int[] hkl, Vector3DBase vec, double thickness, Complex[] amplitudes) - { - H = hkl[0]; - K = hkl[1]; - L = hkl[2]; - G = vec; - Thickness = thickness; - //Amplitudes = amplitudes; - RawAmplitudes = amplitudes; - } + public readonly Complex[] RawAmplitudes = amplitudes; } #endregion diff --git a/Crystallography/Crystal/BondsAndPolyhedra.cs b/Crystallography/Crystal/BondsAndPolyhedra.cs index 98a83a6..dd3b9ca 100644 --- a/Crystallography/Crystal/BondsAndPolyhedra.cs +++ b/Crystallography/Crystal/BondsAndPolyhedra.cs @@ -42,7 +42,7 @@ public partial class Bonds [XmlIgnore] //[MemoryPackIgnore] - public List pairID = new(); + public List pairID = []; #endregion @@ -164,7 +164,7 @@ public static Bonds[] GetVestaBonds(IEnumerable elementNames) VestaCations.ForEach(cation => bonds.Remove(bonds.Find(b => b.Element1 == cation && b.Element2 == cation))); } - return bonds.ToArray(); + return [.. bonds]; } static Bonds() diff --git a/Crystallography/Crystal/ConvertCrystalData.cs b/Crystallography/Crystal/ConvertCrystalData.cs index 6b06a7b..7bf519a 100644 --- a/Crystallography/Crystal/ConvertCrystalData.cs +++ b/Crystallography/Crystal/ConvertCrystalData.cs @@ -285,7 +285,7 @@ public static Crystal ConvertToCrystal(string fileName) } catch (Exception e) { - if (Crystallography.AssemblyState.IsDebug) + if (AssemblyState.IsDebug) System.Windows.Forms.MessageBox.Show(e.Message); return null; } @@ -442,9 +442,9 @@ private static Crystal2 ConvertFromAmc(string[] str) if (xShift != 0 || yShift != 0 || zShift != 0) { - x = (x.ToDouble() + xShift).ToString("f8").TrimEnd(new[] { '0' }); - y = (y.ToDouble() + yShift).ToString("f8").TrimEnd(new[] { '0' }); - z = (z.ToDouble() + zShift).ToString("f8").TrimEnd(new[] { '0' }); + x = (x.ToDouble() + xShift).ToString("f8").TrimEnd(['0']); + y = (y.ToDouble() + yShift).ToString("f8").TrimEnd(['0']); + z = (z.ToDouble() + zShift).ToString("f8").TrimEnd(['0']); } var occ = "1"; @@ -495,14 +495,14 @@ private static Crystal2 ConvertFromAmc(string[] str) } else if (atomicNumber == -1)//"OH"のときの対処 { - atoms.Add(new Atoms2(label, 1, 0, 0, new[] { x, y, z }, occ, IsIso, IsUtypeUsed, iso, aniso)); - atoms.Add(new Atoms2(label, 8, 0, 0, new[] { x, y, z }, occ, IsIso, IsUtypeUsed, iso, aniso)); + atoms.Add(new Atoms2(label, 1, 0, 0, [x, y, z], occ, IsIso, IsUtypeUsed, iso, aniso)); + atoms.Add(new Atoms2(label, 8, 0, 0, [x, y, z], occ, IsIso, IsUtypeUsed, iso, aniso)); } else if (atomicNumber == -2)//"Wat"水のときの対処 { - atoms.Add(new Atoms2(label, 1, 0, 0, new[] { x, y, z }, occ, IsIso, IsUtypeUsed, iso, aniso)); - atoms.Add(new Atoms2(label, 1, 0, 0, new[] { x, y, z }, occ, IsIso, IsUtypeUsed, iso, aniso)); - atoms.Add(new Atoms2(label, 8, 0, 0, new[] { x, y, z }, occ, IsIso, IsUtypeUsed, iso, aniso)); + atoms.Add(new Atoms2(label, 1, 0, 0, [x, y, z], occ, IsIso, IsUtypeUsed, iso, aniso)); + atoms.Add(new Atoms2(label, 1, 0, 0, [x, y, z], occ, IsIso, IsUtypeUsed, iso, aniso)); + atoms.Add(new Atoms2(label, 8, 0, 0, [x, y, z], occ, IsIso, IsUtypeUsed, iso, aniso)); } } crystal.name = Name; @@ -716,7 +716,7 @@ private static Crystal2 CellParamForAmc(string str) return new Crystal2 { - CellTexts = new[] { s[0], s[1], s[2], s[3], s[4], s[5] }, + CellTexts = [s[0], s[1], s[2], s[3], s[4], s[5]], sym = (short)symmetrySeriesNumber, argb = Color.FromArgb(r.Next(255), r.Next(255), r.Next(255)).ToArgb() }; @@ -782,10 +782,10 @@ private static double ConvertToDouble(string str, bool IsHex) #endregion #region CIFファイルの読み込み - static readonly Random r = new Random(); + static readonly Random r = new(); - static readonly string[] ignoreWords1 = new[] { "_shelx_hkl_", "_shelx_fab_", "_shelx_res_" }; - static readonly string[] ignoreWords2 = new[] { "_refln", "_geom", "_platon" }; + static readonly string[] ignoreWords1 = ["_shelx_hkl_", "_shelx_fab_", "_shelx_res_"]; + static readonly string[] ignoreWords2 = ["_refln", "_geom", "_platon"]; private static Crystal2 ConvertFromCIF(string fileName) { var sb = new StringBuilder(); @@ -799,7 +799,7 @@ private static Crystal2 ConvertFromCIF(string fileName) if (strTemp.Contains('\r')) strTemp = strTemp.Replace("\r", "\n"); - stringList = strTemp.Split('\n', true).ToList(); + stringList = [.. strTemp.Split('\n', true)]; } foreach (var word in ignoreWords1) @@ -980,12 +980,12 @@ private static Crystal2 ConvertFromCIF(List str) //ここまででCIF_Groupクラスのリストが完成 //格子定数は、CIFファイル中に何回も記載されている場合があるため、リストにする。 - List<(int index, string value)> aList = new(), bList = new(), cList = new(), alphaList = new(), betaList = new(), gammaList = new(); + List<(int index, string value)> aList = [], bList = [], cList = [], alphaList = [], betaList = [], gammaList = []; string name = "", sectionTitle = "", journalNameFull = "", journalCodenASTM = ""; string volume = "", year = "", pageFirst = "", pageLast = "", issue = ""; var journal = new StringBuilder(); - List spaceGroupNameHM = new(), spaceGroupNameHall = new(); + List spaceGroupNameHM = [], spaceGroupNameHall = []; string chemical_formula_sum = "", chemical_formula_structural = ""; var symmetry_Int_Tables_number = -1; var author = new List(); @@ -1098,7 +1098,7 @@ Func func(string sExpr) { try { - sExpr = sExpr.Replace(" ", "").Replace(",+", ",").TrimStart(new[] { '+' }); + sExpr = sExpr.Replace(" ", "").Replace(",+", ",").TrimStart(['+']); sExpr = "new [] {" + sExpr.Replace("/", ".0/").Replace(".0.0", ".0") + "}";//分子に小数点を加える var f = DynamicExpressionParser.ParseLambda(prms, typeof(double[]), sExpr).Compile() as Func; @@ -1252,16 +1252,16 @@ Func func(string sExpr) if (iso.Length == 0) iso = "0"; - var aniso = isU ? //11, 22, 33, 12, 23, 31の順番 - new[] { u11, u22, u33, u12, u23, u13 } : - new[] { b11, b22, b33, b12, b23, b13 }; + string[] aniso = isU ? //11, 22, 33, 12, 23, 31の順番 + [u11, u22, u33, u12, u23, u13] : + [b11, b22, b33, b12, b23, b13]; if (atomicNumber > 0) - atoms.Add(new Atoms2(atomLabel, atomicNumber, 0, 0, new[] { x, y, z }, occ, isIso, isU, iso, aniso)); + atoms.Add(new Atoms2(atomLabel, atomicNumber, 0, 0, [x, y, z], occ, isIso, isU, iso, aniso)); else if (atomicNumber == -1)//"OH"のときの対処 { - atoms.Add(new Atoms2(atomLabel, 1, 0, 0, new[] { x, y, z }, occ, isIso, isU, iso, aniso)); - atoms.Add(new Atoms2(atomLabel, 8, 0, 0, new[] { x, y, z }, occ, isIso, isU, iso, aniso)); + atoms.Add(new Atoms2(atomLabel, 1, 0, 0, [x, y, z], occ, isIso, isU, iso, aniso)); + atoms.Add(new Atoms2(atomLabel, 8, 0, 0, [x, y, z], occ, isIso, isU, iso, aniso)); } } @@ -1278,7 +1278,7 @@ Func func(string sExpr) return new Crystal2 { - CellTexts = new[] { a, b, c, alpha, beta, gamma }, + CellTexts = [a, b, c, alpha, beta, gamma], sym = (short)sgnum, name = name, atoms = atoms, @@ -1690,12 +1690,12 @@ public static string ConvertToCIF(Crystal crystal) sb.AppendLine("loop_"); sb.AppendLine("_symmetry_equiv_pos_as_xyz"); bool[][] flag = Array.Empty(); - if (sym.LatticeTypeStr == "P") flag = new[] { new[] { false, false, false } }; - else if (sym.LatticeTypeStr == "A") flag = new[] { new[] { false, false, false }, new[] { false, true, true } }; - else if (sym.LatticeTypeStr == "B") flag = new[] { new[] { false, false, false }, new[] { true, false, true } }; - else if (sym.LatticeTypeStr == "C") flag = new[] { new[] { false, false, false }, new[] { true, true, false } }; - else if (sym.LatticeTypeStr == "I") flag = new[] { new[] { false, false, false }, new[] { true, true, true } }; - else if (sym.LatticeTypeStr == "F") flag = new[] { new[] { false, false, false }, new[] { false, true, true }, new[] { true, false, true }, new[] { true, true, false } }; + if (sym.LatticeTypeStr == "P") flag = [[false, false, false]]; + else if (sym.LatticeTypeStr == "A") flag = [[false, false, false], [false, true, true]]; + else if (sym.LatticeTypeStr == "B") flag = [[false, false, false], [true, false, true]]; + else if (sym.LatticeTypeStr == "C") flag = [[false, false, false], [true, true, false]]; + else if (sym.LatticeTypeStr == "I") flag = [[false, false, false], [true, true, true]]; + else if (sym.LatticeTypeStr == "F") flag = [[false, false, false], [false, true, true], [true, false, true], [true, true, false]]; foreach (string wp in SymmetryStatic.WyckoffPositions[crystal.SymmetrySeriesNumber][0].PositionStr) { diff --git a/Crystallography/Crystal/Crystal.cs b/Crystallography/Crystal/Crystal.cs index 300dc32..33058ff 100644 --- a/Crystallography/Crystal/Crystal.cs +++ b/Crystallography/Crystal/Crystal.cs @@ -1,14 +1,12 @@ #region using using MathNet.Numerics; -using MathNet.Numerics.LinearAlgebra.Factorization; -using Microsoft.VisualBasic.Devices; using System; +using System.Collections.Frozen; using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Numerics; using System.Runtime.InteropServices; -using System.Threading; using System.Threading.Tasks; using System.Xml.Serialization; #endregion @@ -151,6 +149,14 @@ public override int GetHashCode() [XmlIgnore] public Vector3D[] VectorOfG = []; + /// + /// 逆格子点ベクトル (kinematical)のパラレルクエリ。VectorOfGを初期化すると、これもセットで初期化される。 + /// + [NonSerialized] + [XmlIgnore] + public ParallelQuery VectorOfG_P; + + /// /// 菊池線ベクトル /// @@ -219,42 +225,42 @@ public override int GetHashCode() /// [NonSerialized] [XmlIgnore] - public Vector3D A_Axis; + public Vector3DBase A_Axis; /// /// b軸ベクトル /// [NonSerialized] [XmlIgnore] - public Vector3D B_Axis; + public Vector3DBase B_Axis; /// /// c軸ベクトル /// [NonSerialized] [XmlIgnore] - public Vector3D C_Axis; + public Vector3DBase C_Axis; /// /// a*軸ベクトル /// [NonSerialized] [XmlIgnore] - public Vector3D A_Star; + public Vector3DBase A_Star; /// /// b*軸ベクトル /// [NonSerialized] [XmlIgnore] - public Vector3D B_Star; + public Vector3DBase B_Star; /// /// c*軸ベクトル /// [NonSerialized] [XmlIgnore] - public Vector3D C_Star; + public Vector3DBase C_Star; /// /// 逆格子行列 (1行目にa*, 2行目にb*, 3行目にｃ*) @@ -884,11 +890,7 @@ public void SetVectorOfAxis((int U, int V, int W)[] indices) if (A_Axis == null) return; VectorOfAxis = []; foreach (var (U, V, W) in indices) - { - var vec = U * A_Axis + V * B_Axis + W * C_Axis; - vec.Text = $"[{U}{V}{W}]"; - VectorOfAxis.Add(vec); - } + VectorOfAxis.Add(new Vector3D(U * A_Axis + V * B_Axis + W * C_Axis) { Text = $"[{U}{V}{W}]" }); } /// @@ -901,23 +903,19 @@ public void SetVectorOfAxis(int uMax, int vMax, int wMax) { if (A_Axis == null) return; VectorOfAxis = []; - var vec = new Vector3D(); - vec = A_Axis; vec.Text = "[100]"; VectorOfAxis.Add(vec); - vec = B_Axis; vec.Text = "[010]"; VectorOfAxis.Add(vec); - vec = C_Axis; vec.Text = "[001]"; VectorOfAxis.Add(vec); - vec = -A_Axis; vec.Text = "[-100]"; VectorOfAxis.Add(vec); - vec = -B_Axis; vec.Text = "[0-10]"; VectorOfAxis.Add(vec); - vec = -C_Axis; vec.Text = "[00-1]"; VectorOfAxis.Add(vec); + + VectorOfAxis.Add(new Vector3D(A_Axis) { Text = "[100]" }); + VectorOfAxis.Add(new Vector3D(B_Axis) { Text = "[010]" }); + VectorOfAxis.Add(new Vector3D(C_Axis) { Text = "[001]" }); + VectorOfAxis.Add(new Vector3D(-A_Axis) { Text = "[-100]" }); + VectorOfAxis.Add(new Vector3D(-B_Axis) { Text = "[0-10]" }); + VectorOfAxis.Add(new Vector3D(-C_Axis) { Text = "[00-1]" }); for (int u = -uMax; u <= uMax; u++) for (int v = -vMax; v <= vMax; v++) for (int w = -wMax; w <= wMax; w++) if (CheckIrreducible(u, v, w) && !(u * v == 0 && v * w == 0 && w * u == 0)) - { - vec = u * A_Axis + v * B_Axis + w * C_Axis; - vec.Text = $"[{u}{v}{w}]"; - VectorOfAxis.Add(vec); - } + VectorOfAxis.Add(new Vector3D(u * A_Axis + v * B_Axis + w * C_Axis) { Text = $"[{u}{v}{w}]" }); } #endregion 軸ベクトルの計算 @@ -932,11 +930,7 @@ public void SetVectorOfPlane((int H, int K, int L)[] indices) { VectorOfPlane = []; foreach (var (H, K, L) in indices) - { - var vec = H * A_Star + K * B_Star + L * C_Star; - vec.Text = $"({H}{K}{L})"; - VectorOfPlane.Add(vec); - } + VectorOfPlane.Add(new Vector3D(H * A_Star + K * B_Star + L * C_Star) { Text = $"({H}{K}{L})" }); } /// @@ -1234,10 +1228,12 @@ public void SetVectorOfG(double dMin, WaveSource wavesource, bool excludeLattice double cX = C_Star.X, cY = C_Star.Y, cZ = C_Star.Z; double gMax = 1 / dMin, gMax2 = gMax * gMax; - (int h, int k, int l)[] directions; + #region directionを初期化 - if (excludeLatticeCondition) - { + var directions = new[] { (1, 0, 0), (0, 1, 0), (0, -1, 0), (0, 0, 1), (0, 0, -1) }.ToFrozenSet(); + + //if (excludeLatticeCondition) + //{ //if (Symmetry.LatticeTypeStr == "F") // directions = new [] { (1, 1, 1), (1, 1, -1), (1, -1, 1), (1, -1, -1), (-1, 1, 1), (-1, 1, -1), (-1, -1, 1), (-1, -1, -1) }; //else if (Symmetry.LatticeTypeStr == "A") @@ -1253,10 +1249,10 @@ public void SetVectorOfG(double dMin, WaveSource wavesource, bool excludeLattice //else if (Symmetry.CrystalSystemStr == "trigonal" || Symmetry.CrystalSystemStr == "hexagonal") // directions = new [] { (1, 0, 0), (-1, 0, 0), (0, 1, 0), (0, -1, 0), (1, -1, 0), (-1, 1, 0), (0, 0, 1), (0, 0, -1) }; //else - directions = new[] { (1, 0, 0), (0, 1, 0), (0, -1, 0), (0, 0, 1), (0, 0, -1) };//(-1, 0, 0)は除いておく - } - else - directions = new[] { (1, 0, 0), (0, 1, 0), (0, -1, 0), (0, 0, 1), (0, 0, -1) };//(-1, 0, 0)は除いておく + //directions = new[] { (1, 0, 0), (0, 1, 0), (0, -1, 0), (0, 0, 1), (0, 0, -1) };//(-1, 0, 0)は除いておく + //} + //else + // directions = new[] { (1, 0, 0), (0, 1, 0), (0, -1, 0), (0, 0, 1), (0, 0, -1) };//(-1, 0, 0)は除いておく #endregion @@ -1314,6 +1310,7 @@ public void SetVectorOfG(double dMin, WaveSource wavesource, bool excludeLattice var maxIntensity = VectorOfG.Max(v => v.RawIntensity); Parallel.ForEach(VectorOfG, _g => _g.RelativeIntensity = _g.RawIntensity / maxIntensity); } + VectorOfG_P = VectorOfG.AsParallel(); } #endregion @@ -1332,11 +1329,9 @@ public void SetVectorOfG_KikuchiLine(double d_limit, WaveSource wavesource) for (int k = h == 0 ? 0 : -kMax; k <= kMax; k++) for (int l = (h == 0 && k == 0) ? 1 : -lMax; l <= lMax; l++) { - Vector3D temp = h * A_Star + k * B_Star + l * C_Star; + var temp = (h * A_Star + k * B_Star + l * C_Star).ToVector3D(); if ((temp.d = temp.Length) < 1 / d_limit) { - //temp.Theta = waveLength / 2 * temp.Length; - //temp.TanTheta = Math.Tan(temp.Theta); temp.d = 1 / temp.Length; temp.Text = $"{h} {k} {l}"; temp.Index = (h, k, l); @@ -1825,9 +1820,9 @@ public void RevertInitialCellConstants() } #endregion - + #region 指定した原子(target)の近辺にある原子を探索し、相対座標、距離、ラベルを返す. (絶対座標でないことに注意) /// - /// 指定した原子(target)の近辺にある原子を探索し、相対座標、距離、ラベルを返す. (絶対座標でないことに注意) + /// 指定した原子(target)の近辺にある原子を探索し、相対座標(絶対座標でないことに注意)、距離、ラベルを返す. /// /// /// nm 単位 @@ -1837,7 +1832,7 @@ public void RevertInitialCellConstants() Vector3DBase pos = MatrixReal * target.Atom[0]; var maxLen2 = maxLength * maxLength; var result = new List<(double X, double Y, double Z, double Distance, string Label)>(); - //まず、隣り合った単位格子の原子位置をすべて探索してCoordinatedAtom型のリストに全部入れる + //まず、隣り合った単位格子の原子位置をすべて探索してresultリストに全部入れる for (int max = 0; max < 8; max++) { bool flag = false; @@ -1854,11 +1849,10 @@ public void RevertInitialCellConstants() var diffPos = MatrixReal * (v + new Vector3DBase(xShift, yShift, zShift)) - pos; if (maxLen2 > (diffPos ).Length2) { - lock (lockObj) { result.Add((diffPos.X, diffPos.Y, diffPos.Z, diffPos.Length, atm.Label)); - flag = true;//一個でも見つけられたら続行 + flag = true;//一個でも見つけられたら続行　 } } } @@ -1868,7 +1862,9 @@ public void RevertInitialCellConstants() if (flag == false && max > 2) break; } + result.Sort((a1, a2) => a1.Distance.CompareTo(a2.Distance)); return result; } + #endregion } diff --git a/Crystallography/Crystal/CrystalGeometry.cs b/Crystallography/Crystal/CrystalGeometry.cs index e9aa607..46198b5 100644 --- a/Crystallography/Crystal/CrystalGeometry.cs +++ b/Crystallography/Crystal/CrystalGeometry.cs @@ -83,6 +83,6 @@ public static double[] GetErrorTriclinic(Plane[] plane) v_err = Math.Sqrt(ValVstar2) * v * v * v / 2; } - return new double[] { a, b, c, alpha, beta, gamma, v, a_err, b_err, c_err, alpha_err, beta_err, gamma_err, v_err }; + return [a, b, c, alpha, beta, gamma, v, a_err, b_err, c_err, alpha_err, beta_err, gamma_err, v_err]; } } diff --git a/Crystallography/Crystal/CrystalMinimum.cs b/Crystallography/Crystal/CrystalMinimum.cs index 425b8c3..a764db1 100644 --- a/Crystallography/Crystal/CrystalMinimum.cs +++ b/Crystallography/Crystal/CrystalMinimum.cs @@ -160,7 +160,7 @@ public static Crystal GetCrystal(Crystal2 c) var bonds = Bonds.GetVestaBonds(atom.Select(a => a.AtomicNumber)); - return new Crystal(cell.Values, cell.Errors, c.sym, c.name, System.Drawing.Color.FromArgb(c.argb), new Matrix3D(), atom.ToArray(), (c.note, c.auth, c.jour, c.sect), bonds); + return new Crystal(cell.Values, cell.Errors, c.sym, c.name, System.Drawing.Color.FromArgb(c.argb), new Matrix3D(), [.. atom], (c.note, c.auth, c.jour, c.sect), bonds); } public static Crystal2 FromCrystal(Crystal c) @@ -177,10 +177,10 @@ public static Crystal2 FromCrystal(Crystal c) jour = c.Journal, formula = c.ChemicalFormulaSum, density = (float)c.Density, - CellTexts = new[] { + CellTexts = [ Compose(c.A * 10, c.A_err * 10), Compose(c.B * 10, c.B_err * 10), Compose(c.C * 10, c.C_err * 10), - Compose(c.Alpha /Math.PI*180, c.Alpha_err/Math.PI*180), Compose(c.Beta /Math.PI*180, c.Beta_err/Math.PI*180), Compose(c.Gamma /Math.PI*180, c.Gamma_err/Math.PI*180) }, - atoms = new List() + Compose(c.Alpha /Math.PI*180, c.Alpha_err/Math.PI*180), Compose(c.Beta /Math.PI*180, c.Beta_err/Math.PI*180), Compose(c.Gamma /Math.PI*180, c.Gamma_err/Math.PI*180) ], + atoms = [] }; foreach (Atoms a in c.Atoms) @@ -191,7 +191,7 @@ public static Crystal2 FromCrystal(Crystal c) AtomNo = (byte)a.AtomicNumber, SubXray = (byte)a.SubNumberXray, SubElectron = (byte)a.SubNumberElectron, - PositionTexts = new[] { Compose(a.X, a.X_err), Compose(a.Y, a.Y_err), Compose(a.Z, a.Z_err) }, + PositionTexts = [Compose(a.X, a.X_err), Compose(a.Y, a.Y_err), Compose(a.Z, a.Z_err)], OccText = Compose(a.Occ, a.Occ_err), IsIso = a.Dsf.UseIso, IsU = a.Dsf.OriginalType == DiffuseScatteringFactor.Type.U, @@ -529,9 +529,9 @@ public static byte[] ToBytes(string s) { s = s.Trim().TrimEnd().Replace('e', 'E'); if (s.Length == 0 || s == "?" || s == "NaN") - return new[] { (byte)255 }; + return [(byte)255]; else if (s == "0") - return new[] { (byte)(240 + 0) }; + return [(byte)(240 + 0)]; else { if (s.StartsWith("0.", Ord)) @@ -565,7 +565,7 @@ public static byte[] ToBytes(string s) { if (AssemblyState.IsDebug) MessageBox.Show(e.ToString()); - return new[] { (byte)255 }; + return [(byte)255]; } } } diff --git a/Crystallography/Crystal/Plane.cs b/Crystallography/Crystal/Plane.cs index 4f1b8e5..bff9374 100644 --- a/Crystallography/Crystal/Plane.cs +++ b/Crystallography/Crystal/Plane.cs @@ -41,7 +41,7 @@ public class Plane : IComparable public double XCalc; public double Weight; public string strHKL, strD; - public string[] strCondition = Array.Empty(); + public string[] strCondition = []; public string str; public int num; diff --git a/Crystallography/Crystallography.csproj b/Crystallography/Crystallography.csproj index 4ff86f1..b8a1331 100644 --- a/Crystallography/Crystallography.csproj +++ b/Crystallography/Crystallography.csproj @@ -4,8 +4,8 @@ Library net8.0-windows10.0.22621.0 true - 2023.12.13.0531 - 2023.12.13.0531 + 2024.2.27.0332 + 2024.2.27.0332 7.0 @@ -28,7 +28,7 @@ - + diff --git a/Crystallography/Crystallography.sln b/Crystallography/Crystallography.sln new file mode 100644 index 0000000..d3dc259 --- /dev/null +++ b/Crystallography/Crystallography.sln @@ -0,0 +1,25 @@ +ｻｿ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30114.128 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crystallography", "Crystallography\Crystallography.csproj", "{C781798C-B320-4EF4-8D09-A62DE2183620}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C781798C-B320-4EF4-8D09-A62DE2183620}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C781798C-B320-4EF4-8D09-A62DE2183620}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C781798C-B320-4EF4-8D09-A62DE2183620}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C781798C-B320-4EF4-8D09-A62DE2183620}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {30E001D6-B67B-47F7-AFA0-92B8EDDB0EB6} + EndGlobalSection +EndGlobal diff --git a/Crystallography/Detector/Ring.cs b/Crystallography/Detector/Ring.cs index 1925933..5d464a2 100644 --- a/Crystallography/Detector/Ring.cs +++ b/Crystallography/Detector/Ring.cs @@ -229,55 +229,50 @@ public enum ImageTypeEnum public static Size SrcImgSize; public static double[] R2; - public static List Intensity = new(); - public static List IntensityOriginal = new(); + public static List Intensity = []; + public static List IntensityOriginal = []; public static Size SrcImgSizeOriginal; //繝舌ャ繧ｯ繧ｰ繝ｩ繧ｦ繝ｳ繝画ｼ皮ｮ励〒菴ｿ逕ｨ - public static List Background = new(); + public static List Background = []; public static double BackgroundCoeff = 1; //SequentialImage(*.his,*.h5)縺ｧ蛻ｩ逕ｨ縺吶ｋ螟画焚 - public static List> SequentialImageIntensities = new(); + public static List> SequentialImageIntensities = []; - public static List SequentialImageNames = new(); + public static List SequentialImageNames = []; //HDF *h5繝輔ぃ繧､繝ｫ縺ｧ縺ｮ縺ｿ縺ｫ菴ｿ逕ｨ縺吶ｋ - public static List SequentialImageEnergy = new(); + public static List SequentialImageEnergy = []; - public static List SequentialImagePulsePower = new(); + public static List SequentialImagePulsePower = []; public static bool PulsePowerNormarized = false; - public static List> SequentialImageEnergySpectrum = new(); + public static List> SequentialImageEnergySpectrum = []; - public static SortedList Frequency = new(); + public static SortedList Frequency = []; public static ImageTypeEnum ImageType = ImageTypeEnum.Unknown; - public static List IsValid = new();//譛牙柑縺ｪ(繝槭せ繧ｯ縺輔ｌ縺ｦ縺縺ｪ縺轤ｹ縺九←縺縺) - //public static ParallelQuery IsValidP; + public static List IsValid = [];//譛牙柑縺ｪ(繝槭せ繧ｯ縺輔ｌ縺ｦ縺縺ｪ縺轤ｹ縺九←縺縺) - public static List IsSpots = new();//繧ｹ繝昴ャ繝育憾縺ｮ轤ｹ縺九←縺縺 - //public static ParallelQuery IsSpotsP; + public static List IsSpots = [];//繧ｹ繝昴ャ繝育憾縺ｮ轤ｹ縺九←縺縺 - public static List IsThresholdOver = new(); - //public static ParallelQuery IsThresholdOverP; + public static List IsThresholdOver = []; - public static List IsThresholdUnder = new();//鬟ｽ蜥後＠縺ｦ縺繧九°縺ｩ縺縺 - //public static ParallelQuery IsThresholdUnderP; + public static List IsThresholdUnder = [];//鬟ｽ蜥後＠縺ｦ縺繧九°縺ｩ縺縺 /// /// 謖螳壹＆繧後◆遨榊鬆伜沺(遏ｩ蠖｢縲√そ繧ｯ繧ｿ繝ｼ)縺ｮ遽蝗ｲ螟悶ｮ蝣ｴ蜷医ｯtrue /// - public static List IsOutsideOfIntegralRegion = new();//遨榊繧ｨ繝ｪ繧｢縺ｮ螟(謌悶＞縺ｯ驕ｸ謚樣伜沺縺ｮ螟) - //public static ParallelQuery IsOutsideOfIntegralRegionP; + public static List IsOutsideOfIntegralRegion = [];//遨榊繧ｨ繝ｪ繧｢縺ｮ螟(謌悶＞縺ｯ驕ｸ謚樣伜沺縺ｮ螟) /// /// 謖螳壹＆繧後◆遨榊蟇ｾ雎｡隗貞ｺｦ縺ｮ遽蝗ｲ螟悶ｮ蝣ｴ蜷医ｯtrue /// - public static List IsOutsideOfIntegralProperty = new();//繧ｨ繝ｪ繧｢縺ｮ螟(謌悶＞縺ｯ驕ｸ謚樣伜沺縺ｮ螟) + public static List IsOutsideOfIntegralProperty = [];//繧ｨ繝ｪ繧｢縺ｮ螟(謌悶＞縺ｯ驕ｸ謚樣伜沺縺ｮ螟) //public static ParallelQuery IsOutsideOfIntegralPropertyP; @@ -1027,7 +1022,7 @@ public static void SetInsideArea(IntegralProperty IP, bool calcRegion = true, bo double r = IP.GandolfiRadius; double CL = IP.FilmDistance; - Matrix3D m1 = new Matrix3D(CosTau, SinTau * SinPhi, SinTau * CosPhi, 0, CosPhi, -SinPhi, -SinTau, CosTau * SinPhi, CosTau * CosPhi); + var m1 = new Matrix3D(CosTau, SinTau * SinPhi, SinTau * CosPhi, 0, CosPhi, -SinPhi, -SinTau, CosTau * SinPhi, CosTau * CosPhi); //繝斐け繧ｻ繝ｫ蠎ｧ讓吶ｒ螳溽ｩｺ髢灘ｺｧ讓吶↓螟画鋤縺吶ｋFunc var convPixelToReal = new Func((x, y) => m1 * new Vector3DBase( @@ -1127,8 +1122,8 @@ public static void CircumferentialBlur(double theta) { int rMax = (int)Math.Ceiling(r[baseIndex] * sin3theta); - List blurRatio = new List(); - List blurIndex = new List(); + List blurRatio = []; + List blurIndex = []; for (int y = Math.Max(j - rMax, 0); y <= Math.Min(j + rMax, SrcImgSize.Height - 1); y++) for (int x = Math.Max(i - rMax, 0); x <= Math.Min(i + rMax, SrcImgSize.Width - 1); x++) { @@ -1149,7 +1144,7 @@ public static void CircumferentialBlur(double theta) } } } - double[] blur = Statistics.Normarize(blurRatio.ToArray()); + double[] blur = Statistics.Normarize([.. blurRatio]); for (int k = 0; k < blur.Length; k++) pixels[baseIndex] += Intensity[blurIndex[k]] * blur[k]; baseIndex++; @@ -1670,7 +1665,7 @@ private static Profile GetRadialProfile(IntegralProperty iP) double totalArea = Geometriy.GetPolygonalArea(pixelVertex); //豎ゅａ縺4髫縺ｮ轤ｹ縺九ｉ縲√せ繝繝繝励ｮ謖謨ｰ縺ｮ荳企剞縲∽ｸ矩剞繧定ｨｭ螳 - List angles = new List(); + List angles = []; foreach (PointD pt in pixelVertex) angles.Add(Math.Atan2(pt.Y, pt.X)); angles.Sort(); @@ -1959,7 +1954,7 @@ private static Profile GetConcenrticProfile(IntegralProperty iP) } //Profile螟画焚縺ｫ莉｣蜈･ - Profile profile = new Profile(); + Profile profile = new(); //繝輔Λ繝繝医ヱ繝阪Ν繝｢繝ｼ繝峨ｮ譎 if (IP.Camera == IntegralProperty.CameraEnum.FlatPanel) @@ -2280,7 +2275,7 @@ public static Profile GetProfileForFindTiltCorrection(IntegralProperty iP) } //Profile螟画焚縺ｫ莉｣蜈･ - Profile p = new Profile(); + Profile p = new(); double temp; for (i = 0; i < length; i++) { @@ -3048,7 +3043,7 @@ public static List SubtractBackground(IEnumerable src, #region 繝舌ャ繧ｯ繧ｰ繝ｩ繝ｳ繝蛾未謨ｰ縲 譛ｪ螳梧 public static double[] GetBackground(double lower, double upper) { - return Intensity.ToArray(); + return [.. Intensity]; /* //繝舌ャ繧ｯ繧ｰ繝ｩ繧ｦ繝ｳ繝牙ｽ｢迥ｶ繧呈爾縺怜ｺ縺吶 diff --git a/Crystallography/EOS.cs b/Crystallography/EOS.cs index 75ddeae..73b307a 100644 Binary files a/Crystallography/EOS.cs and b/Crystallography/EOS.cs differ diff --git a/Crystallography/Euler.cs b/Crystallography/Euler.cs index 73ab65c..b64a9af 100644 --- a/Crystallography/Euler.cs +++ b/Crystallography/Euler.cs @@ -217,13 +217,13 @@ public static Matrix3D SerchEulerAngleFromZoneAxes(ZoneAxis za1, ZoneAxis za2, Z double tilt3 = za3.tilt1; double azimuth3 = za3.tilt2; - Vector3D v1 = Vector3D.Normarize(za1.u * cry.A_Axis + za1.v * cry.B_Axis + za1.w * cry.C_Axis); - Vector3D v2 = Vector3D.Normarize(za2.u * cry.A_Axis + za2.v * cry.B_Axis + za2.w * cry.C_Axis); - Vector3D v3 = Vector3D.Normarize(za3.u * cry.A_Axis + za3.v * cry.B_Axis + za3.w * cry.C_Axis); + var v1 = Vector3DBase.Normarize(za1.u * cry.A_Axis + za1.v * cry.B_Axis + za1.w * cry.C_Axis); + var v2 = Vector3DBase.Normarize(za2.u * cry.A_Axis + za2.v * cry.B_Axis + za2.w * cry.C_Axis); + var v3 = Vector3DBase.Normarize(za3.u * cry.A_Axis + za3.v * cry.B_Axis + za3.w * cry.C_Axis); - Vector3D V1 = new Vector3D(-Math.Sin(tilt1), -Math.Cos(tilt1) * Math.Sin(azimuth1), Math.Cos(tilt1) * Math.Cos(azimuth1)); - Vector3D V2 = new Vector3D(-Math.Sin(tilt2), -Math.Cos(tilt2) * Math.Sin(azimuth2), Math.Cos(tilt2) * Math.Cos(azimuth2)); - Vector3D V3 = new Vector3D(-Math.Sin(tilt3), -Math.Cos(tilt3) * Math.Sin(azimuth3), Math.Cos(tilt3) * Math.Cos(azimuth3)); + Vector3D V1 = new(-Math.Sin(tilt1), -Math.Cos(tilt1) * Math.Sin(azimuth1), Math.Cos(tilt1) * Math.Cos(azimuth1)); + Vector3D V2 = new(-Math.Sin(tilt2), -Math.Cos(tilt2) * Math.Sin(azimuth2), Math.Cos(tilt2) * Math.Cos(azimuth2)); + Vector3D V3 = new(-Math.Sin(tilt3), -Math.Cos(tilt3) * Math.Sin(azimuth3), Math.Cos(tilt3) * Math.Cos(azimuth3)); double Phi, phi1, phi2, PhiStart, PhiEnd, phi1Start, phi1End, phi2Start, phi2End, step, PhiBest, phi1Best, phi2Best; double dev, devTemp; @@ -415,18 +415,18 @@ public static double[] DecomposeMatrix2(Matrix3D targetRotation, params (Vector3 return -(mat * rotInv).SumOfDiagonalCompenent(); }); - var temp = func(new DVec(initialAngles.ToArray())); + var temp = func(new DVec([.. initialAngles])); try { - var result = FindMinimum.OfFunction(func, new DVec(initialAngles.ToArray()), 1e-12, 100000).ToList(); + var result = FindMinimum.OfFunction(func, new DVec([.. initialAngles]), 1e-12, 100000).ToList(); for (int i = 0; i < settings.Length; i++) if (!settings[i].Variable) result.Insert(i, settings[i].Angle); - return result.ToArray(); + return [.. result]; } catch { - return initialAngles.ToArray(); + return [.. initialAngles]; } } diff --git a/Crystallography/ExtensionMethods.cs b/Crystallography/ExtensionMethods.cs index 813f5e4..675b5dc 100644 --- a/Crystallography/ExtensionMethods.cs +++ b/Crystallography/ExtensionMethods.cs @@ -356,7 +356,7 @@ public static void FillPie(this Graphics g, Brush brush, double x, double y, dou => g.FillPie(brush, (float)x, (float)y, (float)width, (float)height, (float)startAngle, (float)sweepAngle); - static Dictionary<(int Alpha, Color Color), SolidBrush> solidBrushDic = new(); + static Dictionary<(int Alpha, Color Color), SolidBrush> solidBrushDic = []; #region 蜀縺ｮ霈ｪ驛ｭ縲√≠繧九＞縺ｯ蜀縺ｮ蝪励ｊ縺､縺ｶ縺 public static void FillCircle(this Graphics graphics, in Color c, in PointD pt, in double radius, in int alpha) diff --git a/Crystallography/FindZoneAxis.cs b/Crystallography/FindZoneAxis.cs index cdfefeb..4dac84b 100644 --- a/Crystallography/FindZoneAxis.cs +++ b/Crystallography/FindZoneAxis.cs @@ -157,8 +157,8 @@ public static ZoneAxes[] ZoneAxisFromTwoZoneAxis(Crystal cry, PhotoInformation p //if (zoneAxis1[n].plane1.IsRootIndex) for (int m = 0; m < zoneAxis2.Length; m++) { - Vector3D v1 = zoneAxis1[n].u * cry.A_Axis + zoneAxis1[n].v * cry.B_Axis + zoneAxis1[n].w * cry.C_Axis; - Vector3D v2 = zoneAxis2[m].u * cry.A_Axis + zoneAxis2[m].v * cry.B_Axis + zoneAxis2[m].w * cry.C_Axis; + var v1= zoneAxis1[n].u * cry.A_Axis + zoneAxis1[n].v * cry.B_Axis + zoneAxis1[n].w * cry.C_Axis; + var v2 = zoneAxis2[m].u * cry.A_Axis + zoneAxis2[m].v * cry.B_Axis + zoneAxis2[m].w * cry.C_Axis; double calcAngle = Vector3D.AngleBetVectors(v1, v2); if (angleMax >= calcAngle && angleMin <= calcAngle) { @@ -191,7 +191,7 @@ public static ZoneAxes[] ZoneAxisFromTwoZoneAxis(Crystal cry, PhotoInformation p } } - return zoneAxes.ToArray(); + return [.. zoneAxes]; } public static ZoneAxes[] ZoneAxisFromThreeZoneAxis(Crystal cry, PhotoInformation photo1, PhotoInformation photo2, PhotoInformation photo3, bool excludeEquivalence) diff --git a/Crystallography/Images/ImageIO.cs b/Crystallography/Images/ImageIO.cs index eaa0dc5..e29df4a 100644 --- a/Crystallography/Images/ImageIO.cs +++ b/Crystallography/Images/ImageIO.cs @@ -51,6 +51,8 @@ public static string FilterString } } + private static readonly char[] separator = ['=']; + public static bool IsReadable(string _ext) { var ext = _ext.StartsWith('.') ? _ext[1..] : _ext; @@ -161,7 +163,7 @@ public static bool ReadImage(string str, bool? flag = null) bool result = true; - string ext = Path.GetExtension(str).TrimStart(new char[] { '.' }); + string ext = Path.GetExtension(str).TrimStart(['.']); if (str.EndsWith("img"))//R-Axis5 or Fuji BAS or Fuji FDL { if (File.Exists(str.Remove(str.Length - 3, 3) + "inf")) @@ -172,8 +174,8 @@ public static bool ReadImage(string str, bool? flag = null) while ((tempstr = reader.ReadLine()) != null) strList.Add(tempstr); - if (strList != null && strList.Any() && strList[0].Contains("BAS_IMAGE_FILE", StringComparison.Ordinal))//BAS2000 - result = ImageIO.BAS2000or2500(str, strList.ToArray()); + if (strList != null && strList.Count != 0 && strList[0].Contains("BAS_IMAGE_FILE", StringComparison.Ordinal))//BAS2000 + result = BAS2000or2500(str, [.. strList]); else { return false; @@ -198,7 +200,7 @@ public static bool ReadImage(string str, bool? flag = null) result = Raxis4(str); else if (str.ToLower().EndsWith("osc"))//Rigaku R-Axis4_Osc result = Raxis4(str); - else if (Path.GetExtension(str).TrimStart(new char[] { '.' }).StartsWith("0") && ImageIO.IsTiffImage(str)) + else if (Path.GetExtension(str).TrimStart(['.']).StartsWith('0') && IsTiffImage(str)) result = RayonixSX200(str); else if (str.ToLower().EndsWith(".ccd"))//Bruker CCD result = Brucker(str); @@ -257,17 +259,17 @@ private static bool SMV(string filename) var str = sr.ReadLine(); if (!str.StartsWith("HEADER_BYTES=")) return false; - headersize = Convert.ToInt32(str.Split(new[] { '=', ';' })[1]); + headersize = Convert.ToInt32(str.Split(['=', ';'])[1]); } - using BinaryReader br = new BinaryReader(new FileStream(filename, FileMode.Open, FileAccess.Read)); + using BinaryReader br = new(new FileStream(filename, FileMode.Open, FileAccess.Read)); var headers = new string(br.ReadChars(headersize)).Split(new[] { '{', '}', '\n', ';' }, StringSplitOptions.RemoveEmptyEntries); - var little_endian = headers.First(h => h.StartsWith("BYTE_ORDER=")).Split(new[] { '=' })[1] == "little_endian"; - var type = headers.First(h => h.StartsWith("TYPE=")).Split(new[] { '=' })[1]; - var size1 = Convert.ToInt32(headers.First(h => h.StartsWith("SIZE1=")).Split(new[] { '=' })[1]); - var size2 = Convert.ToInt32(headers.First(h => h.StartsWith("SIZE2=")).Split(new[] { '=' })[1]); - var size3 = Convert.ToInt32(headers.First(h => h.StartsWith("SIZE3=")).Split(new[] { '=' })[1]); - var size4 = Convert.ToInt32(headers.First(h => h.StartsWith("SIZE4=")).Split(new[] { '=' })[1]); + var little_endian = headers.First(h => h.StartsWith("BYTE_ORDER=")).Split(['='])[1] == "little_endian"; + var type = headers.First(h => h.StartsWith("TYPE=")).Split(separator)[1]; + var size1 = Convert.ToInt32(headers.First(h => h.StartsWith("SIZE1=")).Split(['='])[1]); + var size2 = Convert.ToInt32(headers.First(h => h.StartsWith("SIZE2=")).Split(['='])[1]); + var size3 = Convert.ToInt32(headers.First(h => h.StartsWith("SIZE3=")).Split(['='])[1]); + var size4 = Convert.ToInt32(headers.First(h => h.StartsWith("SIZE4=")).Split(['='])[1]); if (type != "UNSIGNED_SHORT" && type != "float") return false; @@ -276,14 +278,14 @@ private static bool SMV(string filename) int numberOfFrame = size3; long length = imageWidth * imageHeight; - Ring.SequentialImageIntensities = new List>(); - Ring.SequentialImageNames = new List(); + Ring.SequentialImageIntensities = []; + Ring.SequentialImageNames = []; var read = type == "UNSIGNED_SHORT" ? new Func(() => br.ReadUInt16()) : new Func(() => br.ReadSingle()); for (int j = 0; j < numberOfFrame; j++) { - Ring.SequentialImageIntensities.Add(new List()); + Ring.SequentialImageIntensities.Add([]); br.BaseStream.Position = headersize + j * length * (type == "UNSIGNED_SHORT" ? 2 : 4); for (int i = 0; i < length; i++) Ring.SequentialImageIntensities[j].Add(read()); @@ -327,18 +329,22 @@ public static bool RadIcon(string str) { var br = new BinaryReader(new FileStream(str, FileMode.Open, FileAccess.Read)); int imageWidth = 2064, imageHeight = 1548, length = imageWidth * imageHeight; - if (Ring.Intensity.Count != length)//蜑榊屓縺ｨ蜷後§繧ｵ繧､繧ｺ縺ｧ縺ｯ縺ｪ縺縺ｨ縺 - { + var sameSize = Ring.Intensity.Count == length; + + if (!sameSize)//蜑榊屓縺ｨ蜷後§繧ｵ繧､繧ｺ縺ｧ縺ｯ縺ｪ縺縺ｨ縺 Ring.Intensity.Clear(); - for (int y = 0; y < imageHeight; y++) - for (int x = 0; x < imageWidth; x++) - Ring.Intensity.Add(256 * br.ReadByte() + br.ReadByte()); - } - else + + for (int n = 0; n < length; n++) { - for (int n = 0; n>(); - Ring.SequentialImageNames = new List(); + Ring.SequentialImageIntensities = []; + Ring.SequentialImageNames = []; var read = bitLength == "7" ? new Func(() => br.ReadByte()) : new Func(() => br.ReadInt16()); @@ -410,7 +416,7 @@ public static bool RadIcon(string str) var option = Encoding.UTF8.GetString(br.ReadBytes(32)); Ring.SequentialImageNames.Add(num.ToString()); - Ring.SequentialImageIntensities.Add(new List()); + Ring.SequentialImageIntensities.Add([]); for (int y = 0; y < height; y++) for (int x = 0; x < width; x++) Ring.SequentialImageIntensities[i].Add(read()); @@ -568,7 +574,7 @@ public static bool MAR(string str) br.BaseStream.Position = n++; try { - string s = new string(br.ReadChars(17)); + string s = new(br.ReadChars(17)); if (s.StartsWith("CCP4 packed image")) { if (br.ReadChar() == ',') @@ -629,7 +635,7 @@ public static bool RayonixSX200(string str) { try { - Tiff.Loader t = new Tiff.Loader(str); + Tiff.Loader t = new(str); if (t.IsGray == false || t.NumberOfFrames != 1) return false; Ring.Comments = ""; @@ -656,7 +662,7 @@ public static bool Gel(string str) { try { - Tiff.Loader t = new Tiff.Loader(str); + Tiff.Loader t = new(str); if (t.IsGray == false || t.NumberOfFrames != 1) return false; Ring.Comments = ""; @@ -748,8 +754,7 @@ public static bool HDF5(string str, bool? normarize = null) { try { - if (Ring.IP == null) - Ring.IP = new IntegralProperty(); + Ring.IP ??= new IntegralProperty(); var hdf = new HDF(str); @@ -760,7 +765,7 @@ public static bool HDF5(string str, bool? normarize = null) (float[] dataPulsePower, _) = hdf.GetValue1(groupID2name + "/event_info/bl_3/oh_2/bm_2_pulse_energy_in_joule"); if (dataPulsePower != null) { - Ring.SequentialImagePulsePower = new List(); + Ring.SequentialImagePulsePower = []; for (int i = 0; i < dataPulsePower.Length; i++) Ring.SequentialImagePulsePower.Add(dataPulsePower[i]); } @@ -771,7 +776,7 @@ public static bool HDF5(string str, bool? normarize = null) (float[] dataPhotonEnergy, _) = hdf.GetValue1(groupID2name + "/event_info/bl_3/oh_2/photon_energy_in_eV"); if (dataPhotonEnergy != null) { - Ring.SequentialImageEnergy = new List(); + Ring.SequentialImageEnergy = []; for (int i = 0; i < dataPhotonEnergy.Length; i++) Ring.SequentialImageEnergy.Add(dataPhotonEnergy[i]); } @@ -833,8 +838,8 @@ public static bool HDF5(string str, bool? normarize = null) } //蜷дag縺ｮ逕ｻ蜒上ｒ隱ｭ縺ｿ霎ｼ縺ｿ - Ring.SequentialImageIntensities = new List>(); - Ring.SequentialImageNames = new List(); + Ring.SequentialImageIntensities = []; + Ring.SequentialImageNames = []; int imageWidth = 1024, imageHeight = 1024; for (int i = 0; i < tag.Count; i++) { @@ -865,11 +870,10 @@ public static bool HDF5(string str, bool? normarize = null) Ring.SequentialImageIntensities[i].Add(dataImageLeft[h][w]); } else - Ring.SequentialImageIntensities.Add(new List()); + Ring.SequentialImageIntensities.Add([]); //蠑ｷ蠎ｦ繧偵ヮ繝ｼ繝槭Λ繧､繧ｺ縺吶ｋ蝣ｴ蜷 - if (normarize == null) - normarize = MessageBox.Show("Normarize intensities by pulse power?", "HDF file option", MessageBoxButtons.YesNo) == DialogResult.Yes; + normarize ??= MessageBox.Show("Normarize intensities by pulse power?", "HDF file option", MessageBoxButtons.YesNo) == DialogResult.Yes; if (normarize == true && dataPulsePower[i] > 0) Ring.SequentialImageIntensities[i] = Ring.SequentialImageIntensities[i].Select(d => d / (double)dataPulsePower[i] / 10000).ToList(); @@ -908,7 +912,7 @@ public static bool HIS(string str) try { var img = Array.Empty(); - BinaryReader br = new BinaryReader(new FileStream(str, FileMode.Open, FileAccess.Read)); + BinaryReader br = new(new FileStream(str, FileMode.Open, FileAccess.Read)); int ID = br.ReadUInt16(); int headerSize = br.ReadUInt16(); @@ -937,12 +941,12 @@ public static bool HIS(string str) //int numberOfFrame = br.ReadUInt16(); int imageWidth = BRX - ULX + 1, imageHeight = BRY - ULY + 1; - Ring.SequentialImageIntensities = new List>(); - Ring.SequentialImageNames = new List(); + Ring.SequentialImageIntensities = []; + Ring.SequentialImageNames = []; for (int j = 0; j < numberOfFrame; j++) { - Ring.SequentialImageIntensities.Add(new List()); + Ring.SequentialImageIntensities.Add([]); br.BaseStream.Position = headerSize + imageHeaderSize + j * imageWidth * imageHeight * 2; for (int i = 0; i < imageHeight * imageWidth; i++) Ring.SequentialImageIntensities[j].Add(br.ReadUInt16()); @@ -984,8 +988,8 @@ public static bool ADXV(string str) var br = new BinaryReader(new FileStream(str, FileMode.Open, FileAccess.Read)); var headers = new string(br.ReadChars(512)).Split('\n'); - int imageWidth = Convert.ToInt32(headers[4].Split(new char[] { '=', ';' })[1]); - int imageHeight = Convert.ToInt32(headers[5].Split(new char[] { '=', ';' })[1]); + int imageWidth = Convert.ToInt32(headers[4].Split(['=', ';'])[1]); + int imageHeight = Convert.ToInt32(headers[5].Split(['=', ';'])[1]); var data_length = 0; // 0 縺ｯ ushort (16bit), 1 縺ｯ uint (32bit), 縺昴ｌ莉･螟悶ｯ辟｡蜉ｹ @@ -1069,13 +1073,13 @@ public static bool ITEX(string str) }); Ring.BitsPerPixels = fileType switch { 0 => 8, 2 => 16, 3 => 32, _ => 0 }; - Ring.SequentialImageIntensities = new List>(); - Ring.SequentialImageNames = new List(); + Ring.SequentialImageIntensities = []; + Ring.SequentialImageNames = []; int n = 0; while (readHeader() && n < 10000) { - Ring.SequentialImageIntensities.Add(new List()); + Ring.SequentialImageIntensities.Add([]); for (int i = 0; i < length; i++) Ring.SequentialImageIntensities[n].Add(readData()); Ring.SequentialImageNames.Add(n.ToString("0000")); @@ -1108,7 +1112,7 @@ public static bool ADSC(string str) StringBuilder sb = new() { Capacity = 100000 }; try { - BinaryReader br = new BinaryReader(new FileStream(str, FileMode.Open, FileAccess.Read)); + BinaryReader br = new(new FileStream(str, FileMode.Open, FileAccess.Read)); //繝倥ャ繝驛ｨ蛻隱ｭ縺ｿ霎ｼ縺ｿ { 縺九ｉ }縺ｾ縺ｧ繧定ｪｭ縺ｿ霎ｼ繧 br.BaseStream.Position = 2; @@ -1122,9 +1126,9 @@ public static bool ADSC(string str) var tags = new Dictionary(); foreach (var tag in sb.ToString().Split(new char[] { ';', '\n' }, StringSplitOptions.RemoveEmptyEntries)) { - var temp = tag.Split(new char[] { '=' }); + var temp = tag.Split(['=']); if (temp.Length == 2) - tags.Add(tag.Split(new char[] { '=' })[0], tag.Split(new char[] { '=' })[1]); + tags.Add(tag.Split(['='])[0], tag.Split(['='])[1]); } int imageWidth = Convert.ToInt32(tags["SIZE1"]); @@ -1280,7 +1284,7 @@ public static bool Brucker(string str) { try { - BinaryReader br = new BinaryReader(new FileStream(str, FileMode.Open, FileAccess.Read)); + BinaryReader br = new(new FileStream(str, FileMode.Open, FileAccess.Read)); Ring.Comments = ""; //繝倥ャ繝驛ｨ蛻隱ｭ縺ｿ霎ｼ縺ｿ br.ReadBytes(8); var format = new string(br.ReadChars(72)); @@ -1612,7 +1616,7 @@ public static bool Tiff(string str, bool? normarize = null) for (int j = 0; j < t.NumberOfFrames; j++) { - Ring.SequentialImageIntensities.Add(new List()); + Ring.SequentialImageIntensities.Add([]); if (t.Images[j].Value != null) Ring.SequentialImageIntensities[j].AddRange(t.Images[j].Value); @@ -1660,7 +1664,7 @@ public static bool Tiff(string str, bool? normarize = null) public static IPAImage IPAImageGenerator(double[] data, int width, int height, PointD center, double resolution, double cameralength, WaveProperty waveProperty) { - IPAImage ipa = new IPAImage + IPAImage ipa = new() { IntensityDouble = data, Width = width, @@ -1719,7 +1723,7 @@ public static bool IPA(string fileName) Ring.ImageType = Ring.ImageTypeEnum.IPAImage; Ring.BitsPerPixels = 16; - if (Ring.IP == null) Ring.IP = new IntegralProperty(); + Ring.IP ??= new IntegralProperty(); Ring.IP.FilmDistance = ipa.CameraLength; Ring.IP.PixSizeX = Ring.IP.PixSizeY = ipa.Resolution; Ring.IP.CenterX = ipa.Center.X; diff --git a/Crystallography/Images/PseudoBitmap.cs b/Crystallography/Images/PseudoBitmap.cs index 2ecec3e..2ab1bd8 100644 --- a/Crystallography/Images/PseudoBitmap.cs +++ b/Crystallography/Images/PseudoBitmap.cs @@ -429,29 +429,19 @@ public Scales Scale public Complex[][] ComplexG;//蜈逕ｻ蜒秀縺ｮ隍邏謨ｰ; public Complex[][] ComplexB;//蜈逕ｻ蜒州縺ｮ隍邏謨ｰ; - public List FFT_Filter = new(); - public List FilterTemporary = new(); - public List Filter1 = new(); - public List Filter2 = new(); - public List Filter3 = new(); - public List Filter4 = new(); - public List Filter5 = new(); - public bool Filter1Visible = true; - public bool Filter2Visible = true; - public bool Filter3Visible = true; - public bool Filter4Visible = true; - public bool Filter5Visible = true; + public List FFT_Filter = []; + public List FilterTemporary = []; + public List Filter1 = [], Filter2 = [], Filter3 = [], Filter4 = [], Filter5 = []; + public bool Filter1Visible = true, Filter2Visible = true, Filter3Visible = true, Filter4Visible = true, Filter5Visible = true; /// /// 騾乗主ｺｦ繝輔ぅ繝ｫ繧ｿ繝ｼ. 0縺碁乗弱255縺御ｸ埼乗. AlphaEnabled縺卦rue縺ｮ譎ゅ□縺台ｽｿ繧上ｌ繧. /// - public List FilterAlfha { get; set; } = new List(); + public List FilterAlfha { get; set; } = []; public (byte R, byte G, byte B)[] ColorScale; - public List SrcValuesR = new(); - public List SrcValuesG = new(); - public List SrcValuesB = new(); + public List SrcValuesR = [], SrcValuesG = [], SrcValuesB = []; /// /// 繧ｰ繝ｬ繝ｼ繧ｹ繧ｱ繝ｼ繝ｫ縺ｮ逕ｻ蜒上ョ繝ｼ繧ｿ (BlurMode縺梧怏蜉ｹ縺ｮ譎ゅｯ縲√ヵ繧｣繝ｫ繧ｿ繝ｼ蠕後ｮ繝繝ｼ繧ｿ) @@ -588,7 +578,6 @@ public Color GetPixelColor(int x, int y) public double GetPixelRawValue(PointD pt) => GetPixelRawValue(pt.X, pt.Y); - public void SetScaleColdWarm(bool linear = true) { if (linear) @@ -633,8 +622,6 @@ public void SetScaleRotation() GrayScale = false; } - - /// /// 繧ｰ繝ｬ繝ｼ繧ｹ繧ｱ繝ｼ繝ｫ縺ｮ譎ゅｮx, y菴咲ｽｮ縺ｮ逕溘ｮ蠑ｷ蠎ｦ繧定ｿ斐☆. 繧ｰ繝ｬ繝ｼ繧ｹ繧ｱ繝ｼ繝ｫ縺ｧ縺ｯ縺ｪ縺九▲縺溘ｉ蟶ｸ縺ｫ0繧定ｿ斐☆. /// @@ -666,12 +653,10 @@ public double GetPixelRawValue(int x, int y) /// public Complex[] GetPixelComplex(int x, int y) { - if (x < 0 || Width <= x || y < 0 || Height <= y || this.RealImage == true) return new Complex[] { new Complex(), new Complex(), new Complex() }; - - if (this.GrayScale == true) - return new Complex[] { ComplexGray[y][x], ComplexGray[y][x], ComplexGray[y][x] }; + if (x < 0 || Width <= x || y < 0 || Height <= y || this.RealImage == true) + return [new(), new(), new()]; else - return new Complex[] { ComplexR[y][x], ComplexG[y][x], ComplexB[y][x] }; + return this.GrayScale ? ([ComplexGray[y][x], ComplexGray[y][x], ComplexGray[y][x]]) : ([ComplexR[y][x], ComplexG[y][x], ComplexB[y][x]]); } public Complex[] GetPixelComplex(double x, double y) => GetPixelComplex((int)Math.Round(x), (int)Math.Round(y)); @@ -708,7 +693,7 @@ public Bitmap GetImage(PointD srcCenter, double zoom, Size destSize) => srcCente /// /// public static RectangleD GetDrawingArea(PointD srcCenter, double zoom, Size destSize) - => new RectangleD(srcCenter.X - destSize.Width / zoom / 2.0, srcCenter.Y - destSize.Height / zoom / 2.0, destSize.Width / zoom, destSize.Height / zoom); + => new(srcCenter.X - destSize.Width / zoom / 2.0, srcCenter.Y - destSize.Height / zoom / 2.0, destSize.Width / zoom, destSize.Height / zoom); private Bitmap destBmp; @@ -716,8 +701,8 @@ public static RectangleD GetDrawingArea(PointD srcCenter, double zoom, Size dest public delegate byte GetValue(double value, byte[] scale); - private RectangleD justBeforeSrcRect = new RectangleD(); - private Size justBeforeDestSize = new Size(); + private RectangleD justBeforeSrcRect; + private Size justBeforeDestSize; /// /// 謖螳壹＆繧後◆遽蝗ｲ縺ｮ繧､繝｡繝ｼ繧ｸ繧貞叙蠕励☆繧 diff --git a/Crystallography/Language.cs b/Crystallography/Language.cs index 79e62c2..da983cc 100644 --- a/Crystallography/Language.cs +++ b/Crystallography/Language.cs @@ -8,9 +8,6 @@ public enum Languages { English, Japanese }; public static class Language { - - - public static void Change(object obj, ComponentResourceManager resources = null) { if (obj is Form form) diff --git a/Crystallography/Mathematics/Algebra.cs b/Crystallography/Mathematics/Algebra.cs new file mode 100644 index 0000000..deb40ff --- /dev/null +++ b/Crystallography/Mathematics/Algebra.cs @@ -0,0 +1,39 @@ +ｻｿusing System; + +namespace Crystallography.Mathematics; + +static public class Algebra +{ + /// + /// 3縺､縺ｮ謨ｴ謨ｰ縺御ｸ弱∴繧峨ｌ縺溘→縺阪√◎繧後′譌｢邏縺九←縺縺九ｒ蛻､螳壹＠縲∵里邏縺ｧ縺ゅｌ縺ｰ1縲√◎縺縺ｧ縺ｪ縺縺ｨ縺阪ｯ譛螟ｧ蜈ｬ邏謨ｰ(2莉･荳翫ｮ謨ｴ謨ｰ)繧定ｿ斐☆縲 + /// + /// + /// + /// + /// + static public int Irreducible(int h, int k, int l) + { + //邨ｶ蟇ｾ蛟､繧貞ｰ上＆縺鬆縺ｫ荳ｦ縺ｳ螟峨∴ + var vals = new[] { Math.Abs(h), Math.Abs(k), Math.Abs(l) }; + Array.Sort(vals); + + if (vals[0] == 1 || vals[1] == 1 || vals[2] < 2) + return 1; + + for (int n = vals[0] > 1 ? vals[0] : (vals[1] > 1 ? vals[1] : vals[2]); n >= 2; n--) + if (h % n == 0 && k % n == 0 && l % n == 0) + return n; + + return 1; + } + + /// + /// 3縺､縺ｮ謨ｴ謨ｰ縺御ｸ弱∴繧峨ｌ縺溘→縺阪√◎繧後′譌｢邏縺九←縺縺九ｒ蛻､螳壹＠縲∵里邏縺ｧ縺ゅｌ縺ｰ1縲√◎縺縺ｧ縺ｪ縺縺ｨ縺阪ｯ譛螟ｧ蜈ｬ邏謨ｰ(2莉･荳翫ｮ謨ｴ謨ｰ)繧定ｿ斐☆縲 + /// + /// + /// + /// + /// + static public int Irreducible((int h, int k, int l) index) => Irreducible(index.h, index.k, index.l); + +} diff --git a/Crystallography/Mathematics/Geometriy.cs b/Crystallography/Mathematics/Geometriy.cs index 25c14c0..df4378a 100644 --- a/Crystallography/Mathematics/Geometriy.cs +++ b/Crystallography/Mathematics/Geometriy.cs @@ -90,7 +90,7 @@ public static double[] GetParameterOfCurveOfSecondaryDegree(PointD[] point) double d = C[3]; double e = C[4]; - return new double[] { a, b, c, d, e }; + return [a, b, c, d, e]; } /// @@ -170,8 +170,8 @@ public static void GetTiltAndOffset(PointD[] EllipseCenter, double[] Radius, dou ref double tau, ref double tauDev, ref double phi, ref double phiDev) { //任意の二点を選んでoffset, tau, phiを計算する - List offsetXList = new(), offsetYList = new(); - List tauList = new(), phiList = new(); + List offsetXList = [], offsetYList = []; + List tauList = [], phiList = []; for (int i = 0; i < EllipseCenter.Length; i++) for (int j = i + 1; j < EllipseCenter.Length; j++) @@ -189,15 +189,15 @@ public static void GetTiltAndOffset(PointD[] EllipseCenter, double[] Radius, dou tauList.Add(tauTemp); phiList.Add(phiTemp); } - offsetDev = new PointD(Statistics.Deviation(offsetXList.ToArray()), Statistics.Deviation(offsetYList.ToArray())); - tauDev = Statistics.Deviation(tauList.ToArray()); + offsetDev = new PointD(Statistics.Deviation([.. offsetXList]), Statistics.Deviation([.. offsetYList])); + tauDev = Statistics.Deviation([.. tauList]); double phiDev1, phiDev2; - phiDev1 = Statistics.Deviation(phiList.ToArray()); + phiDev1 = Statistics.Deviation([.. phiList]); for (int i = 0; i < phiList.Count; i++) if (phiList[i] < 0) phiList[i] += Math.PI; - phiDev2 = Statistics.Deviation(phiList.ToArray()); + phiDev2 = Statistics.Deviation([.. phiList]); phiDev = Math.Min(phiDev1, phiDev2); @@ -461,13 +461,13 @@ public static void GetPixelShape(EllipseParameter[] ellipse, ref double PixX, re } PixX = tempPixX.Average(); - PixXDev = Statistics.Deviation(tempPixX.ToArray()); + PixXDev = Statistics.Deviation([.. tempPixX]); PixY = tempPixY.Average(); - PixYDev = Statistics.Deviation(tempPixY.ToArray()); + PixYDev = Statistics.Deviation([.. tempPixY]); if (distortion) { Ksi = tempKsi.Average(); - KsiDev = Statistics.Deviation(tempKsi.ToArray()); + KsiDev = Statistics.Deviation([.. tempKsi]); } } @@ -599,7 +599,7 @@ public static (double X, double Y)[] GetPolygonDividedByLine((double X, double Y //すべてが範囲外ならnullを返す if (flag2) - return Array.Empty<(double X, double Y)>(); + return []; for (int i = 0; i < ptAlpha.Count; i++) { @@ -618,7 +618,7 @@ public static (double X, double Y)[] GetPolygonDividedByLine((double X, double Y if (ptAlpha[i].Flag) ptBeta.Add((ptAlpha[i].X, ptAlpha[i].Y)); - return ptBeta.ToArray(); + return [.. ptBeta]; } /// @@ -774,9 +774,9 @@ public static PointD[][] GetPointsWithinRectangle(IEnumerable sourcePoin pt.RemoveRange(last, pt.Count - last); if (pt.Max(p => p.Y) <= area.UpperY && pt.Min(pt => pt.Y) >= area.Y) - return new[] { pt.ToArray() }; + return [[.. pt]]; else if (pt.Max(p => p.Y) <= area.Y || pt.Min(pt => pt.Y) >= area.UpperY) - return new[] { Array.Empty() }; + return [[]]; else { for (int i = 0; i < pt.Count - 1; i++) @@ -1213,7 +1213,7 @@ public static List> ConicSection(in double alpha, in double phi, in { if (flags[j]) { - result.Add(new List()); + result.Add([]); for (; j < pts.Count && flags[j]; j++) result[^1].Add(pts[j]); } diff --git a/Crystallography/Matrix.cs b/Crystallography/Matrix.cs index d53b92c..b915909 100644 --- a/Crystallography/Matrix.cs +++ b/Crystallography/Matrix.cs @@ -729,6 +729,8 @@ public void NormarizeThis() } } + public Vector3D ToVector3D() => new(X, Y, Z); + /// /// 2つのベクトルの外積を返す @@ -790,7 +792,7 @@ public static Vector3DBase Average(IEnumerable vectors) /// 3次元ベクトルと静的関数を提供 /// [Serializable()] -public class Vector3D : Vector3DBase, System.IComparable, ICloneable +public class Vector3D : Vector3DBase, IComparable, ICloneable { public new object Clone() => (Vector3D)this.MemberwiseClone(); @@ -826,15 +828,18 @@ public class Vector3D : Vector3DBase, System.IComparable, ICloneable [XmlIgnore] public SymmetryOperation Operation { get; set; } + [XmlIgnore] + public Vector3DBase Coordinates { get => new(X, Y, Z); set { X = value.X; Y = value.Y; Z = value.Z; } } + public int CompareTo(Vector3D v) { if (d != v.d) return -d.CompareTo(v.d); else if (X != v.X) - return -X.CompareTo(((Vector3D)v).X); + return -X.CompareTo(v.X); else if (Y != v.Y) return -Y.CompareTo(v.Y); - else if (Z != ((Vector3D)v).Z) + else if (Z != v.Z) return -Z.CompareTo(v.Z); else return 0; @@ -859,6 +864,13 @@ public Vector3D(in double x, in double y, in double z, in bool IsCalcD = true) d = Math.Sqrt(X * X + Y * Y + Z * Z); } + public Vector3D(Vector3DBase v, in bool IsCalcD = true) + { + X = v.X; Y = v.Y; Z = v.Z; + if (IsCalcD) + d = Math.Sqrt(X * X + Y * Y + Z * Z); + } + public Vector3D(double[] v) { if (v.Length == 3) @@ -917,7 +929,7 @@ public Vector3D(float[] v) public new void NormarizeThis() { - Vector3D v = Vector3D.Normarize(this); + Vector3D v = Normarize(this); X = v.X; Y = v.Y; Z = v.Z; @@ -942,7 +954,7 @@ public static double LengthBetVectors(Vector3D v1, Vector3D v2) /// public static double LengthSquareBetVectors(Vector3D v1, Vector3D v2) { - return Math.Sqrt((v1.X - v2.X) * (v1.X - v2.X) + (v1.Y - v2.Y) * (v1.Y - v2.Y) + (v1.Z - v2.Z) * (v1.Z - v2.Z)); + return (v1.X - v2.X) * (v1.X - v2.X) + (v1.Y - v2.Y) * (v1.Y - v2.Y) + (v1.Z - v2.Z) * (v1.Z - v2.Z); } /// @@ -1010,10 +1022,8 @@ public static double AngleBetStereoNetPoints(PointD pt1, PointD pt2) } //2つのベクトルの外積を返す - public static Vector3D VectorProduct(Vector3D v1, Vector3D v2) - { - return new Vector3D(v1.Y * v2.Z - v1.Z * v2.Y, v1.Z * v2.X - v1.X * v2.Z, v1.X * v2.Y - v1.Y * v2.X); - } + public static Vector3D VectorProduct(Vector3D v1, Vector3D v2) + => new Vector3D(v1.Y * v2.Z - v1.Z * v2.Y, v1.Z * v2.X - v1.X * v2.Z, v1.X * v2.Y - v1.Y * v2.X); /// /// 座標一ずつを加減算し、0から1の範囲内に収める diff --git a/Crystallography/NativeWrapper.cs b/Crystallography/NativeWrapper.cs index 940ef09..73f1ad2 100644 --- a/Crystallography/NativeWrapper.cs +++ b/Crystallography/NativeWrapper.cs @@ -34,6 +34,7 @@ public enum Library { None, Eigen, Cuda } [LibraryImport("Crystallography.Native.dll")] private static unsafe partial void _PointwiseMultiply(int dim, double* mat1, double* mat2, double* result); + [LibraryImport("Crystallography.Native.dll")] private static unsafe partial void _AdjointAndMultiply(int dim, double* mat1, double* mat2, double* result); [LibraryImport("Crystallography.Native.dll")] @@ -71,8 +72,8 @@ public enum Library { None, Eigen, Cuda } [LibraryImport("Crystallography.Native.dll")] private static unsafe partial void _Inverse_Real(int dim, double* mat, double* matInv); - [LibraryImport("Crystallography.Native.dll")] - private static unsafe partial void _EigenSolver(int dim, double[] mat, double[] eigenValues, double[] eigenVectors); + //[LibraryImport("Crystallography.Native.dll")] + //private static unsafe partial void _EigenSolver(int dim, in double[] mat, in double[] eigenValues, double[] eigenVectors); [LibraryImport("Crystallography.Native.dll")] private static unsafe partial void _EigenSolver(int dim, double* mat, double* eigenValues, double* eigenVectors); diff --git a/Crystallography/UniversalConstants.cs b/Crystallography/UniversalConstants.cs index eb5d501..ba21ea7 100644 --- a/Crystallography/UniversalConstants.cs +++ b/Crystallography/UniversalConstants.cs @@ -81,10 +81,7 @@ public static class MathematicalConstants public static class UniversalConstants { - public enum LengthUnit - { - km, m, cm, mm, um, nm, pm, fm - } + public enum LengthUnit { km, m, cm, mm, um, nm, pm, fm } /// /// 繧｢繝懊ぎ繝峨Ο謨ｰ (g) @@ -153,27 +150,24 @@ public static class Convert /// /// /// - public static double NeutronVelocityToWavelength(in double velocity) - => h / n0 / velocity * 1.0E3; + public static double NeutronVelocityToWavelength(in double velocity) => h / n0 / velocity * 1.0E3; /// /// 荳ｭ諤ｧ蟄舌ｮ豕｢髟ｷ(nm)繧剃ｸ弱∴縺ｦ騾溷ｺｦ(m/ﾎｼs)繧定ｿ斐☆ /// /// /// - public static double WavelengthToNeutronVelocity(in double wavelength) - => h / n0 / wavelength * 1.0E3; + public static double WavelengthToNeutronVelocity(in double wavelength) => h / n0 / wavelength * 1.0E3; /// /// 荳ｭ諤ｧ蟄舌ｮ騾溷ｺｦ繧剃ｸ弱∴縺ｦ繧ｨ繝阪Ν繧ｮ繝ｼ(eV)繧定ｿ斐☆ /// /// /// - public static double NeutronVelocityToNeutronEnergy(in double velocity) - => n0 * velocity * velocity / 2.0 / eV_joule; + public static double NeutronVelocityToNeutronEnergy(in double velocity) => n0 * velocity * velocity / 2.0 / eV_joule; /// - /// 豕｢髟ｷ(nm)繧帝崕蟄千ｷ壹ｮ繧ｨ繝阪Ν繧ｮ繝ｼ(kV)縺ｫ螟画鋤 + /// 髮ｻ蟄舌ｮ豕｢髟ｷ(nm)繧偵お繝阪Ν繧ｮ繝ｼ(kV)縺ｫ螟画鋤 /// /// /// @@ -181,14 +175,14 @@ public static double WaveLengthToElectronEnergy(in double waveLength) { //U =voltage //WaveLength = h / Math.Sqrt ( 2 * m0 * e0 * U * ( 1 + e0 * U / 2 / m0 / c^2 ) ) - double b = 1000; - double a = 0.9784753725226711491437618236159; - double c = -1.2264262862108010441350327657997 / waveLength; - return (-b + Math.Sqrt(b * b + 4 * a * c * c)) / 2 / a; + const double b = 1000; + const double a = 0.9784753725226711491437618236159; + const double c = -1.2264262862108010441350327657997; + return (-b + Math.Sqrt(b * b + 4 * a * c / waveLength * c / waveLength)) / 2 / a; } /// - /// 豕｢髟ｷ(nm)繧帝崕逎∵ｳ｢縺ｮ繧ｨ繝阪Ν繧ｮ繝ｼ(eV)縺ｫ螟画鋤 + /// 髮ｻ逎∵ｳ｢縺ｮ豕｢髟ｷ(nm)繧偵お繝阪Ν繧ｮ繝ｼ(eV)縺ｫ螟画鋤 /// /// /// @@ -196,7 +190,7 @@ public static double WavelengthToXrayEnergy(in double waveLength) => 6.62606896 / 1.60217733 * 2.99792458 / waveLength * 100.0; /// - /// 豕｢髟ｷ(nm)繧剃ｸｭ諤ｧ蟄舌ｮ繧ｨ繝阪Ν繧ｮ繝ｼ(eV)縺ｫ螟画鋤 + /// 荳ｭ諤ｧ蟄舌ｮ豕｢髟ｷ(nm)繧偵お繝阪Ν繧ｮ繝ｼ(eV)縺ｫ螟画鋤 /// /// /// @@ -204,7 +198,7 @@ public static double WaveLengthToNeutronEnergy(in double wavelength) => 6.62606896 * 6.62606896 / 1.674927351 / wavelength / wavelength / 2.0 / 1.602176565 * 1.0E5; /// - /// 繧ｨ繝阪Ν繧ｮ繝ｼ繧帝崕逎∵ｳ｢縺ｮ豕｢髟ｷ(nm)縺ｫ螟画鋤 + /// 髮ｻ逎∵ｳ｢縺ｮ繧ｨ繝阪Ν繧ｮ繝ｼ(ev)繧呈ｳ｢髟ｷ(nm)縺ｫ螟画鋤 /// /// /// @@ -212,45 +206,37 @@ public static double EnergyToXrayWaveLength(in double energy) => 6.62606896 / 1.60217733 * 2.99792458 / energy * 100.0; /// - /// 繧ｨ繝阪Ν繧ｮ繝ｼ(kV)繧帝崕蟄千ｷ壹ｮ豕｢髟ｷ(nm)縺ｫ螟画鋤 + /// 髮ｻ蟄千ｷ壹ｮ繧ｨ繝阪Ν繧ｮ繝ｼ(kV)繧呈ｳ｢髟ｷ(nm)縺ｫ螟画鋤 + /// WaveLength = h / Math.Sqrt ( 2 * m0 * e0 * V * ( 1 + e0 * V / 2 / m0 / c^2 ) ) /// /// /// public static double EnergyToElectronWaveLength(in double kiloVoltage) - { - //U =voltage - //WaveLength = h / Math.Sqrt ( 2 * m0 * e0 * U * ( 1 + e0 * U / 2 / m0 / c^2 ) ) - return 1.2264262862108010441350327657997 / Math.Sqrt(kiloVoltage * 1000.0 * (1 + kiloVoltage * 0.9784753725226711491437618236159 / 1000)); - } + => 1.2264262862108010441350327657997 / Math.Sqrt(kiloVoltage * 1000.0 * (1 + kiloVoltage * 0.9784753725226711491437618236159 / 1000)); /// - /// 繧ｨ繝阪Ν繧ｮ繝ｼ(kV)繧帝崕蟄千ｷ壹ｮ豕｢謨ｰ(nm^-1)縺ｫ螟画鋤 (2ﾏ縺ｧ蜑ｲ縺｣縺滓焚蛟､縺ｧ縺ｯ辟｡縺) + /// 髮ｻ蟄千ｷ壹ｮ繧ｨ繝阪Ν繧ｮ繝ｼ(kV)繧呈ｳ｢謨ｰ(nm^-1)縺ｫ螟画鋤 (2ﾏ縺ｧ蜑ｲ縺｣縺滓焚蛟､縺ｧ縺ｯ辟｡縺) + /// WaveLength = h / Math.Sqrt ( 2 * m0 * e0 * V * ( 1 + e0 * V / 2 / m0 / c^2 ) /// /// /// public static double EnergyToElectronWaveNumber(in double kiloVoltage) - { - //U =voltage - //WaveLength = h / Math.Sqrt ( 2 * m0 * e0 * U * ( 1 + e0 * U / 2 / m0 / c^2 ) ) - return Math.Sqrt(kiloVoltage * 1000.0 * (1 + kiloVoltage * 0.9784753725226711491437618236159 / 1000)) / 1.2264262862108010441350327657997; - } + => Math.Sqrt(kiloVoltage * 1000.0 * (1 + kiloVoltage * 0.9784753725226711491437618236159 / 1000)) / 1.2264262862108010441350327657997; /// /// 髮ｻ蟄千ｷ壹ｮ豕｢謨ｰ(nm^-1)繧偵お繝阪Ν繧ｮ繝ｼ(kV)縺ｫ螟画鋤 /// /// /// - public static double ElectronWaveNumberToEnergy(in double wavenumber) - => WaveLengthToElectronEnergy(1 / wavenumber); + public static double ElectronWaveNumberToEnergy(in double wavenumber) => WaveLengthToElectronEnergy(1 / wavenumber); /// - /// 繧ｨ繝阪Ν繧ｮ繝ｼ(kV)繧剃ｸｭ諤ｧ蟄舌ｮ豕｢髟ｷ(nm)縺ｫ螟画鋤 + /// 荳ｭ諤ｧ蟄舌ｮ繧ｨ繝阪Ν繧ｮ繝ｼ(kV)繧呈ｳ｢髟ｷ(nm)縺ｫ螟画鋤 /// /// /// - public static double EnergyToNeutronWaveLength(in double energy) - => 6.62606896 * Math.Sqrt(1 / 1.674927351 / energy / 2.0 / 1.602176565 * 1.0E5); + public static double EnergyToNeutronWaveLength(in double energy) => 6.62606896 * Math.Sqrt(1 / 1.674927351 / energy / 2.0 / 1.602176565 * 1.0E5); /// /// 髱｢髢馴囈d(nm)縺ｨ蜿悶ｊ蜃ｺ縺苓ｧ(2ﾎ)繧剃ｸ弱∴繧九→繝悶Λ繝繧ｰ譚｡莉ｶ繧呈ｺ縺溘☆蜈･蟆邱壹ｮ豕｢髟ｷ(nm)繧定ｿ斐☆ @@ -267,13 +253,7 @@ public static double DspacingToXrayEnergy(in double d, in double takeoffAngle) } [Serializable()] -public enum XrayLine -{ - Ka, Ka1, Ka2, Kb1, Kb3, KbI2, KbII2, La1, La2, Lb1, Lb2 -} +public enum XrayLine { Ka, Ka1, Ka2, Kb1, Kb3, KbI2, KbII2, La1, La2, Lb1, Lb2 } [Serializable()] -public enum XrayLineEdge -{ - K, L1, L2, L3, M1, M2, M3, M4, M5, N1, N2, N3, N4, N5, N6, N7, O1, O2, O3, O4, O5, O6, P1, P2, P3 -} \ No newline at end of file +public enum XrayLineEdge { K, L1, L2, L3, M1, M2, M3, M4, M5, N1, N2, N3, N4, N5, N6, N7, O1, O2, O3, O4, O5, O6, P1, P2, P3 } \ No newline at end of file diff --git a/IPAnalyzer/FormMain.cs b/IPAnalyzer/FormMain.cs index 6ec59c3..86c3088 100644 --- a/IPAnalyzer/FormMain.cs +++ b/IPAnalyzer/FormMain.cs @@ -2013,6 +2013,11 @@ public void ReadImage(string str, bool? flag = null) trackBarAdvancedMinInt.Value = FormProperty.MaintainImageContrast ? justBeforeMin : min; trackBarAdvancedMaxInt.Value = FormProperty.MaintainImageContrast ? justBeforeMax : max; } + else + { + trackBarAdvancedMinInt.Value = min; + trackBarAdvancedMaxInt.Value = max; + } graphControlFrequency.VerticalLines = new PointD[2] { new PointD(trackBarAdvancedMinInt.Value, double.NaN), new PointD(trackBarAdvancedMaxInt.Value, double.NaN) }; diff --git a/IPAnalyzer/IPAnalyzer.csproj b/IPAnalyzer/IPAnalyzer.csproj index 81aa1a4..ea4d2dc 100644 --- a/IPAnalyzer/IPAnalyzer.csproj +++ b/IPAnalyzer/IPAnalyzer.csproj @@ -4,8 +4,8 @@ WinExe net8.0-windows10.0.22621.0 true - 2023.12.13.0531 - 2023.12.13.0531 + 2024.2.27.0332 + 2024.2.27.0332 App.ico IPAnalyzer.Program embedded diff --git a/IPAnalyzer/Version.cs b/IPAnalyzer/Version.cs index b52222e..5475e86 100644 --- a/IPAnalyzer/Version.cs +++ b/IPAnalyzer/Version.cs @@ -9,6 +9,7 @@ static class Version static public string History = "History" + + "\r\n ver3.956(2024/02/27) Minor change: The data of Rad-icon1520 (*.raw) is treated as 16-bit signed integer." + "\r\n ver3.955(2023/12/13) Fixed bugs on loading Rad-icon1520 files (*.raw)." + "\r\n ver3.953(2023/11/29) Fixed bugs on 'Azimuthal Division Analysis' mode." + "\r\n ver3.952(2023/11/27) The target framework has been changed to .Net Desktop Runtime 8.0. Fixed a minor bug (thx to Okazaki-san)." +