diff --git a/CSManager/CSManager.csproj b/CSManager/CSManager.csproj
index 0983ff5..07ecd97 100644
--- a/CSManager/CSManager.csproj
+++ b/CSManager/CSManager.csproj
@@ -4,8 +4,8 @@
WinExe
net6.0-windows
true
- 2022.09.09.2035
- 2022.09.09.2035
+ 2022.10.25.1516
+ 2022.10.25.1516
App.ico
diff --git a/Crystallography.Controls/Crystal/CrystalControl.Designer.cs b/Crystallography.Controls/Crystal/CrystalControl.Designer.cs
index afbd8a7..2d08479 100644
--- a/Crystallography.Controls/Crystal/CrystalControl.Designer.cs
+++ b/Crystallography.Controls/Crystal/CrystalControl.Designer.cs
@@ -132,6 +132,8 @@ private void InitializeComponent()
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.textBoxName = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
@@ -171,6 +173,7 @@ private void InitializeComponent()
//
// tabControl
//
+ resources.ApplyResources(this.tabControl, "tabControl");
this.tabControl.AllowDrop = true;
this.tabControl.Controls.Add(this.tabPageBasicInfo);
this.tabControl.Controls.Add(this.tabPageAtom);
@@ -182,38 +185,40 @@ private void InitializeComponent()
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.toolTip.SetToolTip(this.tabControl, resources.GetString("tabControl.ToolTip"));
this.tabControl.DragDrop += new System.Windows.Forms.DragEventHandler(this.FormCrystal_DragDrop);
this.tabControl.DragEnter += new System.Windows.Forms.DragEventHandler(this.FormCrystal_DragEnter);
//
// tabPageBasicInfo
//
+ resources.ApplyResources(this.tabPageBasicInfo, "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"));
//
// panel5
//
+ resources.ApplyResources(this.panel5, "panel5");
this.panel5.Controls.Add(this.flowLayoutPanel4);
this.panel5.Controls.Add(this.symmetryControl);
- resources.ApplyResources(this.panel5, "panel5");
this.panel5.Name = "panel5";
+ this.toolTip.SetToolTip(this.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);
- resources.ApplyResources(this.flowLayoutPanel4, "flowLayoutPanel4");
this.flowLayoutPanel4.Name = "flowLayoutPanel4";
+ this.toolTip.SetToolTip(this.flowLayoutPanel4, resources.GetString("flowLayoutPanel4.ToolTip"));
//
// numericBoxVolume
//
@@ -300,8 +305,8 @@ private void InitializeComponent()
//
// colorControl
//
- this.colorControl.Argb = -986896;
resources.ApplyResources(this.colorControl, "colorControl");
+ this.colorControl.Argb = -986896;
this.colorControl.Blue = 240;
this.colorControl.BlueF = 0.9411765F;
this.colorControl.BoxSize = new System.Drawing.Size(20, 20);
@@ -317,29 +322,31 @@ private void InitializeComponent()
// symmetryControl
//
this.symmetryControl.A = 0D;
+ resources.ApplyResources(this.symmetryControl, "symmetryControl");
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.toolTip.SetToolTip(this.symmetryControl, resources.GetString("symmetryControl.ToolTip"));
this.symmetryControl.ItemChanged += new System.EventHandler(this.symmetryControl_ItemChanged);
//
// tabPageAtom
//
+ resources.ApplyResources(this.tabPageAtom, "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"));
//
// atomControl
//
+ resources.ApplyResources(this.atomControl, "atomControl");
this.atomControl.Alpha = 0F;
this.atomControl.Ambient = 0F;
this.atomControl.Aniso11 = 0D;
@@ -360,7 +367,6 @@ private void InitializeComponent()
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;
@@ -382,6 +388,7 @@ private void InitializeComponent()
this.atomControl.ShowLabel = false;
this.atomControl.SkipEvent = false;
this.atomControl.Specular = 0F;
+ this.toolTip.SetToolTip(this.atomControl, resources.GetString("atomControl.ToolTip"));
this.atomControl.UseIsotropy = false;
this.atomControl.UseTypeU = false;
this.atomControl.X = 0D;
@@ -397,12 +404,14 @@ private void InitializeComponent()
resources.ApplyResources(this.panelAtom, "panelAtom");
this.panelAtom.Controls.Add(this.panel3);
this.panelAtom.Name = "panelAtom";
+ this.toolTip.SetToolTip(this.panelAtom, resources.GetString("panelAtom.ToolTip"));
//
// panel3
//
resources.ApplyResources(this.panel3, "panel3");
this.panel3.ContextMenuStrip = this.contextMenuStrip2;
this.panel3.Name = "panel3";
+ this.toolTip.SetToolTip(this.panel3, resources.GetString("panel3.ToolTip"));
//
// contextMenuStrip2
//
@@ -411,19 +420,21 @@ private void InitializeComponent()
this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.resetToolStripMenuItem});
this.contextMenuStrip2.Name = "contextMenuStrip2";
+ this.toolTip.SetToolTip(this.contextMenuStrip2, resources.GetString("contextMenuStrip2.ToolTip"));
//
// resetToolStripMenuItem
//
- this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
resources.ApplyResources(this.resetToolStripMenuItem, "resetToolStripMenuItem");
+ this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click);
//
// tabPageBondsPolyhedra
//
+ resources.ApplyResources(this.tabPageBondsPolyhedra, "tabPageBondsPolyhedra");
this.tabPageBondsPolyhedra.BackColor = System.Drawing.SystemColors.Control;
this.tabPageBondsPolyhedra.Controls.Add(this.bondControl);
- resources.ApplyResources(this.tabPageBondsPolyhedra, "tabPageBondsPolyhedra");
this.tabPageBondsPolyhedra.Name = "tabPageBondsPolyhedra";
+ this.toolTip.SetToolTip(this.tabPageBondsPolyhedra, resources.GetString("tabPageBondsPolyhedra.ToolTip"));
//
// bondControl
//
@@ -432,88 +443,101 @@ private void InitializeComponent()
this.bondControl.ElementList = null;
this.bondControl.Name = "bondControl";
this.bondControl.SkipEvent = false;
+ this.toolTip.SetToolTip(this.bondControl, resources.GetString("bondControl.ToolTip"));
//
// tabPageReference
//
+ resources.ApplyResources(this.tabPageReference, "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";
+ this.toolTip.SetToolTip(this.tabPageReference, resources.GetString("tabPageReference.ToolTip"));
//
// groupBox8
//
- this.groupBox8.Controls.Add(this.textBoxTitle);
resources.ApplyResources(this.groupBox8, "groupBox8");
+ this.groupBox8.Controls.Add(this.textBoxTitle);
this.groupBox8.Name = "groupBox8";
this.groupBox8.TabStop = false;
+ this.toolTip.SetToolTip(this.groupBox8, resources.GetString("groupBox8.ToolTip"));
//
// textBoxTitle
//
this.textBoxTitle.AcceptsReturn = true;
resources.ApplyResources(this.textBoxTitle, "textBoxTitle");
this.textBoxTitle.Name = "textBoxTitle";
+ this.toolTip.SetToolTip(this.textBoxTitle, resources.GetString("textBoxTitle.ToolTip"));
//
// groupBox6
//
- this.groupBox6.Controls.Add(this.textBoxAuthor);
resources.ApplyResources(this.groupBox6, "groupBox6");
+ this.groupBox6.Controls.Add(this.textBoxAuthor);
this.groupBox6.Name = "groupBox6";
this.groupBox6.TabStop = false;
+ this.toolTip.SetToolTip(this.groupBox6, resources.GetString("groupBox6.ToolTip"));
//
// textBoxAuthor
//
this.textBoxAuthor.AcceptsReturn = true;
resources.ApplyResources(this.textBoxAuthor, "textBoxAuthor");
this.textBoxAuthor.Name = "textBoxAuthor";
+ this.toolTip.SetToolTip(this.textBoxAuthor, resources.GetString("textBoxAuthor.ToolTip"));
//
// groupBox7
//
- this.groupBox7.Controls.Add(this.textBoxJournal);
resources.ApplyResources(this.groupBox7, "groupBox7");
+ this.groupBox7.Controls.Add(this.textBoxJournal);
this.groupBox7.Name = "groupBox7";
this.groupBox7.TabStop = false;
+ this.toolTip.SetToolTip(this.groupBox7, resources.GetString("groupBox7.ToolTip"));
//
// textBoxJournal
//
this.textBoxJournal.AcceptsReturn = true;
resources.ApplyResources(this.textBoxJournal, "textBoxJournal");
this.textBoxJournal.Name = "textBoxJournal";
+ this.toolTip.SetToolTip(this.textBoxJournal, resources.GetString("textBoxJournal.ToolTip"));
//
// groupBox5
//
- this.groupBox5.Controls.Add(this.textBoxMemo);
resources.ApplyResources(this.groupBox5, "groupBox5");
+ this.groupBox5.Controls.Add(this.textBoxMemo);
this.groupBox5.Name = "groupBox5";
this.groupBox5.TabStop = false;
+ this.toolTip.SetToolTip(this.groupBox5, resources.GetString("groupBox5.ToolTip"));
//
// textBoxMemo
//
resources.ApplyResources(this.textBoxMemo, "textBoxMemo");
this.textBoxMemo.Name = "textBoxMemo";
+ this.toolTip.SetToolTip(this.textBoxMemo, resources.GetString("textBoxMemo.ToolTip"));
//
// tabPageEOS
//
+ resources.ApplyResources(this.tabPageEOS, "tabPageEOS");
this.tabPageEOS.BackColor = System.Drawing.SystemColors.Control;
this.tabPageEOS.Controls.Add(this.eosControl);
- resources.ApplyResources(this.tabPageEOS, "tabPageEOS");
this.tabPageEOS.Name = "tabPageEOS";
+ this.toolTip.SetToolTip(this.tabPageEOS, resources.GetString("tabPageEOS.ToolTip"));
//
// eosControl
//
- this.eosControl.Crystal = null;
resources.ApplyResources(this.eosControl, "eosControl");
+ this.eosControl.Crystal = null;
this.eosControl.Name = "eosControl";
this.eosControl.SkipEvent = false;
+ this.toolTip.SetToolTip(this.eosControl, resources.GetString("eosControl.ToolTip"));
//
// tabPageElasticity
//
+ resources.ApplyResources(this.tabPageElasticity, "tabPageElasticity");
this.tabPageElasticity.BackColor = System.Drawing.SystemColors.Control;
this.tabPageElasticity.Controls.Add(this.elasticityControl1);
- resources.ApplyResources(this.tabPageElasticity, "tabPageElasticity");
this.tabPageElasticity.Name = "tabPageElasticity";
+ this.toolTip.SetToolTip(this.tabPageElasticity, resources.GetString("tabPageElasticity.ToolTip"));
//
// elasticityControl1
//
@@ -521,10 +545,12 @@ private void InitializeComponent()
this.elasticityControl1.Mode = Crystallography.Elasticity.Mode.Stiffness;
this.elasticityControl1.Name = "elasticityControl1";
this.elasticityControl1.SymmetrySeriesNumber = 1;
+ this.toolTip.SetToolTip(this.elasticityControl1, resources.GetString("elasticityControl1.ToolTip"));
this.elasticityControl1.ValueChanged += new Crystallography.Controls.ElasticityControl.MyEventHandler(this.elasticityControl1_ValueChanged);
//
// tabPageStrainStress
//
+ resources.ApplyResources(this.tabPageStrainStress, "tabPageStrainStress");
this.tabPageStrainStress.BackColor = System.Drawing.SystemColors.Control;
this.tabPageStrainStress.Controls.Add(this.button1);
this.tabPageStrainStress.Controls.Add(this.numericBoxStrain33);
@@ -556,13 +582,14 @@ private void InitializeComponent()
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";
+ this.toolTip.SetToolTip(this.tabPageStrainStress, resources.GetString("tabPageStrainStress.ToolTip"));
//
// button1
//
resources.ApplyResources(this.button1, "button1");
this.button1.Name = "button1";
+ this.toolTip.SetToolTip(this.button1, resources.GetString("button1.ToolTip"));
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
@@ -578,6 +605,7 @@ private void InitializeComponent()
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);
+ this.toolTip.SetToolTip(this.numericBoxStrain33, resources.GetString("numericBoxStrain33.ToolTip"));
//
// numericBoxHill
//
@@ -592,87 +620,104 @@ private void InitializeComponent()
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.toolTip.SetToolTip(this.numericBoxHill, resources.GetString("numericBoxHill.ToolTip"));
this.numericBoxHill.Value = 1D;
//
// label116
//
resources.ApplyResources(this.label116, "label116");
this.label116.Name = "label116";
+ this.toolTip.SetToolTip(this.label116, resources.GetString("label116.ToolTip"));
//
// label117
//
resources.ApplyResources(this.label117, "label117");
this.label117.Name = "label117";
+ this.toolTip.SetToolTip(this.label117, resources.GetString("label117.ToolTip"));
//
// label109
//
resources.ApplyResources(this.label109, "label109");
this.label109.Name = "label109";
+ this.toolTip.SetToolTip(this.label109, resources.GetString("label109.ToolTip"));
//
// label110
//
resources.ApplyResources(this.label110, "label110");
this.label110.Name = "label110";
+ this.toolTip.SetToolTip(this.label110, resources.GetString("label110.ToolTip"));
//
// label111
//
resources.ApplyResources(this.label111, "label111");
this.label111.Name = "label111";
+ this.toolTip.SetToolTip(this.label111, resources.GetString("label111.ToolTip"));
//
// label112
//
resources.ApplyResources(this.label112, "label112");
this.label112.Name = "label112";
+ this.toolTip.SetToolTip(this.label112, resources.GetString("label112.ToolTip"));
//
// label113
//
resources.ApplyResources(this.label113, "label113");
this.label113.Name = "label113";
+ this.toolTip.SetToolTip(this.label113, resources.GetString("label113.ToolTip"));
//
// label114
//
resources.ApplyResources(this.label114, "label114");
this.label114.Name = "label114";
+ this.toolTip.SetToolTip(this.label114, resources.GetString("label114.ToolTip"));
//
// label115
//
resources.ApplyResources(this.label115, "label115");
this.label115.Name = "label115";
+ this.toolTip.SetToolTip(this.label115, resources.GetString("label115.ToolTip"));
//
// label102
//
resources.ApplyResources(this.label102, "label102");
this.label102.Name = "label102";
+ this.toolTip.SetToolTip(this.label102, resources.GetString("label102.ToolTip"));
//
// label103
//
resources.ApplyResources(this.label103, "label103");
this.label103.Name = "label103";
+ this.toolTip.SetToolTip(this.label103, resources.GetString("label103.ToolTip"));
//
// label104
//
resources.ApplyResources(this.label104, "label104");
this.label104.Name = "label104";
+ this.toolTip.SetToolTip(this.label104, resources.GetString("label104.ToolTip"));
//
// label105
//
resources.ApplyResources(this.label105, "label105");
this.label105.Name = "label105";
+ this.toolTip.SetToolTip(this.label105, resources.GetString("label105.ToolTip"));
//
// label106
//
resources.ApplyResources(this.label106, "label106");
this.label106.Name = "label106";
+ this.toolTip.SetToolTip(this.label106, resources.GetString("label106.ToolTip"));
//
// label107
//
resources.ApplyResources(this.label107, "label107");
this.label107.Name = "label107";
+ this.toolTip.SetToolTip(this.label107, resources.GetString("label107.ToolTip"));
//
// label108
//
resources.ApplyResources(this.label108, "label108");
this.label108.Name = "label108";
+ this.toolTip.SetToolTip(this.label108, resources.GetString("label108.ToolTip"));
//
// numericBoxStress33
//
@@ -686,6 +731,7 @@ private void InitializeComponent()
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);
+ this.toolTip.SetToolTip(this.numericBoxStress33, resources.GetString("numericBoxStress33.ToolTip"));
//
// numericBoxStress22
//
@@ -699,6 +745,7 @@ private void InitializeComponent()
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);
+ this.toolTip.SetToolTip(this.numericBoxStress22, resources.GetString("numericBoxStress22.ToolTip"));
//
// numericBoxStress11
//
@@ -712,6 +759,7 @@ private void InitializeComponent()
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);
+ this.toolTip.SetToolTip(this.numericBoxStress11, resources.GetString("numericBoxStress11.ToolTip"));
//
// numericBoxStress23
//
@@ -725,6 +773,7 @@ private void InitializeComponent()
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);
+ this.toolTip.SetToolTip(this.numericBoxStress23, resources.GetString("numericBoxStress23.ToolTip"));
//
// numericBoxStress13
//
@@ -738,6 +787,7 @@ private void InitializeComponent()
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);
+ this.toolTip.SetToolTip(this.numericBoxStress13, resources.GetString("numericBoxStress13.ToolTip"));
//
// numericBoxStress12
//
@@ -751,6 +801,7 @@ private void InitializeComponent()
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);
+ this.toolTip.SetToolTip(this.numericBoxStress12, resources.GetString("numericBoxStress12.ToolTip"));
//
// numericBoxStrain11
//
@@ -764,6 +815,7 @@ private void InitializeComponent()
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);
+ this.toolTip.SetToolTip(this.numericBoxStrain11, resources.GetString("numericBoxStrain11.ToolTip"));
//
// numericBoxStrain22
//
@@ -777,6 +829,7 @@ private void InitializeComponent()
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);
+ this.toolTip.SetToolTip(this.numericBoxStrain22, resources.GetString("numericBoxStrain22.ToolTip"));
//
// numericBoxStrain12
//
@@ -790,6 +843,7 @@ private void InitializeComponent()
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);
+ this.toolTip.SetToolTip(this.numericBoxStrain12, resources.GetString("numericBoxStrain12.ToolTip"));
//
// numericBoxStrain23
//
@@ -803,6 +857,7 @@ private void InitializeComponent()
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);
+ this.toolTip.SetToolTip(this.numericBoxStrain23, resources.GetString("numericBoxStrain23.ToolTip"));
//
// numericBoxStrain13
//
@@ -816,82 +871,88 @@ private void InitializeComponent()
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);
+ this.toolTip.SetToolTip(this.numericBoxStrain13, resources.GetString("numericBoxStrain13.ToolTip"));
//
// tabPagePolycrystalline
//
+ resources.ApplyResources(this.tabPagePolycrystalline, "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";
+ this.toolTip.SetToolTip(this.tabPagePolycrystalline, resources.GetString("tabPagePolycrystalline.ToolTip"));
//
// contextMenuStripPoleFigure
//
+ resources.ApplyResources(this.contextMenuStripPoleFigure, "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");
+ this.toolTip.SetToolTip(this.contextMenuStripPoleFigure, resources.GetString("contextMenuStripPoleFigure.ToolTip"));
//
// readToolStripMenuItem
//
- this.readToolStripMenuItem.Name = "readToolStripMenuItem";
resources.ApplyResources(this.readToolStripMenuItem, "readToolStripMenuItem");
+ this.readToolStripMenuItem.Name = "readToolStripMenuItem";
this.readToolStripMenuItem.Click += new System.EventHandler(this.readToolStripMenuItem_Click);
//
// saveToolStripMenuItem
//
- this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
resources.ApplyResources(this.saveToolStripMenuItem, "saveToolStripMenuItem");
+ this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
//
// exportToolStripMenuItem
//
+ resources.ApplyResources(this.exportToolStripMenuItem, "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");
//
// asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem
//
- this.asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem.Name = "asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem";
resources.ApplyResources(this.asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem, "asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem");
+ this.asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem.Name = "asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem";
this.asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem.Click += new System.EventHandler(this.asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem_Click);
//
// asTXTFileAllEulerAngleAndDensityToolStripMenuItem
//
- this.asTXTFileAllEulerAngleAndDensityToolStripMenuItem.Name = "asTXTFileAllEulerAngleAndDensityToolStripMenuItem";
resources.ApplyResources(this.asTXTFileAllEulerAngleAndDensityToolStripMenuItem, "asTXTFileAllEulerAngleAndDensityToolStripMenuItem");
+ this.asTXTFileAllEulerAngleAndDensityToolStripMenuItem.Name = "asTXTFileAllEulerAngleAndDensityToolStripMenuItem";
this.asTXTFileAllEulerAngleAndDensityToolStripMenuItem.Click += new System.EventHandler(this.asTXTFileAllEulerAngleAndDensityToolStripMenuItem_Click);
//
// asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem
//
- this.asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem.Name = "asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem";
resources.ApplyResources(this.asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem, "asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem");
+ this.asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem.Name = "asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem";
this.asTXTFileallEulerAngleAndDensitySortedToolStripMenuItem.Click += new System.EventHandler(this.asTXTFileAllEulerAngleAndDensityToolStripMenuItem_Click);
//
// poleFigureControl
//
- this.poleFigureControl.Crystal = null;
resources.ApplyResources(this.poleFigureControl, "poleFigureControl");
+ this.poleFigureControl.Crystal = null;
this.poleFigureControl.Name = "poleFigureControl";
+ this.toolTip.SetToolTip(this.poleFigureControl, resources.GetString("poleFigureControl.ToolTip"));
//
// flowLayoutPanel3
//
resources.ApplyResources(this.flowLayoutPanel3, "flowLayoutPanel3");
this.flowLayoutPanel3.Controls.Add(this.buttonGenerateRandomOrientations);
this.flowLayoutPanel3.Name = "flowLayoutPanel3";
+ this.toolTip.SetToolTip(this.flowLayoutPanel3, resources.GetString("flowLayoutPanel3.ToolTip"));
//
// buttonGenerateRandomOrientations
//
resources.ApplyResources(this.buttonGenerateRandomOrientations, "buttonGenerateRandomOrientations");
this.buttonGenerateRandomOrientations.Name = "buttonGenerateRandomOrientations";
+ this.toolTip.SetToolTip(this.buttonGenerateRandomOrientations, resources.GetString("buttonGenerateRandomOrientations.ToolTip"));
this.buttonGenerateRandomOrientations.UseVisualStyleBackColor = true;
this.buttonGenerateRandomOrientations.Click += new System.EventHandler(this.buttonGenerateRandomOrientations_Click);
//
@@ -906,16 +967,18 @@ private void InitializeComponent()
this.flowLayoutPanel2.Controls.Add(this.numericUpDownCrystallineSize);
this.flowLayoutPanel2.Controls.Add(this.label99);
this.flowLayoutPanel2.Name = "flowLayoutPanel2";
+ this.toolTip.SetToolTip(this.flowLayoutPanel2, resources.GetString("flowLayoutPanel2.ToolTip"));
//
// label5
//
resources.ApplyResources(this.label5, "label5");
this.label5.Name = "label5";
+ this.toolTip.SetToolTip(this.label5, resources.GetString("label5.ToolTip"));
//
// numericUpDownAngleResolution
//
- this.numericUpDownAngleResolution.DecimalPlaces = 1;
resources.ApplyResources(this.numericUpDownAngleResolution, "numericUpDownAngleResolution");
+ this.numericUpDownAngleResolution.DecimalPlaces = 1;
this.numericUpDownAngleResolution.Increment = new decimal(new int[] {
5,
0,
@@ -932,6 +995,7 @@ private void InitializeComponent()
0,
65536});
this.numericUpDownAngleResolution.Name = "numericUpDownAngleResolution";
+ this.toolTip.SetToolTip(this.numericUpDownAngleResolution, resources.GetString("numericUpDownAngleResolution.ToolTip"));
this.numericUpDownAngleResolution.Value = new decimal(new int[] {
2,
0,
@@ -943,6 +1007,7 @@ private void InitializeComponent()
//
resources.ApplyResources(this.label29, "label29");
this.label29.Name = "label29";
+ this.toolTip.SetToolTip(this.label29, resources.GetString("label29.ToolTip"));
//
// numericUpDownAngleSubDivision
//
@@ -958,6 +1023,7 @@ private void InitializeComponent()
0,
0});
this.numericUpDownAngleSubDivision.Name = "numericUpDownAngleSubDivision";
+ this.toolTip.SetToolTip(this.numericUpDownAngleSubDivision, resources.GetString("numericUpDownAngleSubDivision.ToolTip"));
this.numericUpDownAngleSubDivision.Value = new decimal(new int[] {
4,
0,
@@ -969,6 +1035,7 @@ private void InitializeComponent()
//
resources.ApplyResources(this.label101, "label101");
this.label101.Name = "label101";
+ this.toolTip.SetToolTip(this.label101, resources.GetString("label101.ToolTip"));
//
// numericUpDownCrystallineSize
//
@@ -989,6 +1056,7 @@ private void InitializeComponent()
0,
0});
this.numericUpDownCrystallineSize.Name = "numericUpDownCrystallineSize";
+ this.toolTip.SetToolTip(this.numericUpDownCrystallineSize, resources.GetString("numericUpDownCrystallineSize.ToolTip"));
this.numericUpDownCrystallineSize.Value = new decimal(new int[] {
100,
0,
@@ -1000,40 +1068,46 @@ private void InitializeComponent()
//
resources.ApplyResources(this.label99, "label99");
this.label99.Name = "label99";
+ this.toolTip.SetToolTip(this.label99, resources.GetString("label99.ToolTip"));
//
// tabPageBounds
//
- this.tabPageBounds.Controls.Add(this.boundControl);
resources.ApplyResources(this.tabPageBounds, "tabPageBounds");
+ this.tabPageBounds.Controls.Add(this.boundControl);
this.tabPageBounds.Name = "tabPageBounds";
+ this.toolTip.SetToolTip(this.tabPageBounds, resources.GetString("tabPageBounds.ToolTip"));
//
// boundControl
//
- this.boundControl.Crystal = null;
resources.ApplyResources(this.boundControl, "boundControl");
+ this.boundControl.Crystal = null;
this.boundControl.Name = "boundControl";
this.boundControl.SkipEvent = false;
+ this.toolTip.SetToolTip(this.boundControl, resources.GetString("boundControl.ToolTip"));
//
// tabPageLatticePlane
//
- this.tabPageLatticePlane.Controls.Add(this.latticePlaneControl);
resources.ApplyResources(this.tabPageLatticePlane, "tabPageLatticePlane");
+ this.tabPageLatticePlane.Controls.Add(this.latticePlaneControl);
this.tabPageLatticePlane.Name = "tabPageLatticePlane";
+ this.toolTip.SetToolTip(this.tabPageLatticePlane, resources.GetString("tabPageLatticePlane.ToolTip"));
//
// latticePlaneControl
//
- this.latticePlaneControl.Crystal = null;
resources.ApplyResources(this.latticePlaneControl, "latticePlaneControl");
+ this.latticePlaneControl.Crystal = null;
this.latticePlaneControl.Name = "latticePlaneControl";
this.latticePlaneControl.SkipEvent = false;
+ this.toolTip.SetToolTip(this.latticePlaneControl, resources.GetString("latticePlaneControl.ToolTip"));
//
// panel1
//
+ resources.ApplyResources(this.panel1, "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";
+ this.toolTip.SetToolTip(this.panel1, resources.GetString("panel1.ToolTip"));
//
// textBoxFormula
//
@@ -1064,6 +1138,7 @@ private void InitializeComponent()
//
// contextMenuStrip
//
+ resources.ApplyResources(this.contextMenuStrip, "contextMenuStrip");
this.contextMenuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.scatteringFactorToolStripMenuItem,
@@ -1076,72 +1151,87 @@ private void InitializeComponent()
this.clearAllDataToolStripMenuItem,
this.revertCellConstantsToolStripMenuItem,
this.toolStripSeparator3,
- this.strainControlToolStripMenuItem});
+ this.strainControlToolStripMenuItem,
+ this.convertToP1SymmetryToolStripMenuItem,
+ this.convertToSuperstructureToolStripMenuItem});
this.contextMenuStrip.Name = "contextMenuStrip1";
- resources.ApplyResources(this.contextMenuStrip, "contextMenuStrip");
+ this.toolTip.SetToolTip(this.contextMenuStrip, resources.GetString("contextMenuStrip.ToolTip"));
//
// scatteringFactorToolStripMenuItem
//
- this.scatteringFactorToolStripMenuItem.Name = "scatteringFactorToolStripMenuItem";
resources.ApplyResources(this.scatteringFactorToolStripMenuItem, "scatteringFactorToolStripMenuItem");
+ this.scatteringFactorToolStripMenuItem.Name = "scatteringFactorToolStripMenuItem";
this.scatteringFactorToolStripMenuItem.Click += new System.EventHandler(this.scatteringFactorToolStripMenuItem_Click);
//
// symmetryInformationToolStripMenuItem
//
- this.symmetryInformationToolStripMenuItem.Name = "symmetryInformationToolStripMenuItem";
resources.ApplyResources(this.symmetryInformationToolStripMenuItem, "symmetryInformationToolStripMenuItem");
+ this.symmetryInformationToolStripMenuItem.Name = "symmetryInformationToolStripMenuItem";
this.symmetryInformationToolStripMenuItem.Click += new System.EventHandler(this.symmetryInformationToolStripMenuItem_Click);
//
// toolStripSeparator2
//
- this.toolStripSeparator2.Name = "toolStripSeparator2";
resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
//
// importCrystalFromCIFAMCToolStripMenuItem
//
- this.importCrystalFromCIFAMCToolStripMenuItem.Name = "importCrystalFromCIFAMCToolStripMenuItem";
resources.ApplyResources(this.importCrystalFromCIFAMCToolStripMenuItem, "importCrystalFromCIFAMCToolStripMenuItem");
+ this.importCrystalFromCIFAMCToolStripMenuItem.Name = "importCrystalFromCIFAMCToolStripMenuItem";
this.importCrystalFromCIFAMCToolStripMenuItem.Click += new System.EventHandler(this.importCrystalFromCIFAMCToolStripMenuItem_Click);
//
// exportThisCrystalAsCIFToolStripMenuItem
//
- this.exportThisCrystalAsCIFToolStripMenuItem.Name = "exportThisCrystalAsCIFToolStripMenuItem";
resources.ApplyResources(this.exportThisCrystalAsCIFToolStripMenuItem, "exportThisCrystalAsCIFToolStripMenuItem");
+ this.exportThisCrystalAsCIFToolStripMenuItem.Name = "exportThisCrystalAsCIFToolStripMenuItem";
this.exportThisCrystalAsCIFToolStripMenuItem.Click += new System.EventHandler(this.exportThisCrystalAsCIFToolStripMenuItem_Click);
//
// sendThisCrystalToOtherSoftwareToolStripMenuItem
//
- this.sendThisCrystalToOtherSoftwareToolStripMenuItem.Name = "sendThisCrystalToOtherSoftwareToolStripMenuItem";
resources.ApplyResources(this.sendThisCrystalToOtherSoftwareToolStripMenuItem, "sendThisCrystalToOtherSoftwareToolStripMenuItem");
+ this.sendThisCrystalToOtherSoftwareToolStripMenuItem.Name = "sendThisCrystalToOtherSoftwareToolStripMenuItem";
this.sendThisCrystalToOtherSoftwareToolStripMenuItem.Click += new System.EventHandler(this.sendThisCrystalToOtherSoftwareToolStripMenuItem_Click);
//
// toolStripSeparator1
//
- this.toolStripSeparator1.Name = "toolStripSeparator1";
resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
//
// clearAllDataToolStripMenuItem
//
- this.clearAllDataToolStripMenuItem.Name = "clearAllDataToolStripMenuItem";
resources.ApplyResources(this.clearAllDataToolStripMenuItem, "clearAllDataToolStripMenuItem");
+ this.clearAllDataToolStripMenuItem.Name = "clearAllDataToolStripMenuItem";
+ this.clearAllDataToolStripMenuItem.Click += new System.EventHandler(this.clearAllDataToolStripMenuItem_Click);
//
// revertCellConstantsToolStripMenuItem
//
- this.revertCellConstantsToolStripMenuItem.Name = "revertCellConstantsToolStripMenuItem";
resources.ApplyResources(this.revertCellConstantsToolStripMenuItem, "revertCellConstantsToolStripMenuItem");
+ this.revertCellConstantsToolStripMenuItem.Name = "revertCellConstantsToolStripMenuItem";
this.revertCellConstantsToolStripMenuItem.Click += new System.EventHandler(this.revertCellConstantsToolStripMenuItem_Click);
//
// toolStripSeparator3
//
- this.toolStripSeparator3.Name = "toolStripSeparator3";
resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
//
// strainControlToolStripMenuItem
//
- this.strainControlToolStripMenuItem.Name = "strainControlToolStripMenuItem";
resources.ApplyResources(this.strainControlToolStripMenuItem, "strainControlToolStripMenuItem");
+ this.strainControlToolStripMenuItem.Name = "strainControlToolStripMenuItem";
this.strainControlToolStripMenuItem.Click += new System.EventHandler(this.strainControlToolStripMenuItem_Click);
//
+ // convertToP1SymmetryToolStripMenuItem
+ //
+ resources.ApplyResources(this.convertToP1SymmetryToolStripMenuItem, "convertToP1SymmetryToolStripMenuItem");
+ this.convertToP1SymmetryToolStripMenuItem.Name = "convertToP1SymmetryToolStripMenuItem";
+ this.convertToP1SymmetryToolStripMenuItem.Click += new System.EventHandler(this.convertToP1ToolStripMenuItem_Click);
+ //
+ // convertToSuperstructureToolStripMenuItem
+ //
+ resources.ApplyResources(this.convertToSuperstructureToolStripMenuItem, "convertToSuperstructureToolStripMenuItem");
+ this.convertToSuperstructureToolStripMenuItem.Name = "convertToSuperstructureToolStripMenuItem";
+ this.convertToSuperstructureToolStripMenuItem.Click += new System.EventHandler(this.convertToSuperstructureToolStripMenuItem_Click);
+ //
// textBoxName
//
resources.ApplyResources(this.textBoxName, "textBoxName");
@@ -1152,6 +1242,7 @@ private void InitializeComponent()
//
resources.ApplyResources(this.label22, "label22");
this.label22.Name = "label22";
+ this.toolTip.SetToolTip(this.label22, resources.GetString("label22.ToolTip"));
//
// buttonScatteringFactor
//
@@ -1177,20 +1268,22 @@ private void InitializeComponent()
//
resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1");
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+ this.toolTip.SetToolTip(this.flowLayoutPanel1, resources.GetString("flowLayoutPanel1.ToolTip"));
//
// panel4
//
+ resources.ApplyResources(this.panel4, "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";
+ this.toolTip.SetToolTip(this.panel4, resources.GetString("panel4.ToolTip"));
//
// CrystalControl
//
- this.AllowDrop = true;
resources.ApplyResources(this, "$this");
+ this.AllowDrop = true;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ContextMenuStrip = this.contextMenuStrip;
this.Controls.Add(this.tabControl);
@@ -1199,6 +1292,7 @@ private void InitializeComponent()
this.Controls.Add(this.flowLayoutPanel1);
this.DoubleBuffered = true;
this.Name = "CrystalControl";
+ this.toolTip.SetToolTip(this, resources.GetString("$this.ToolTip"));
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);
@@ -1362,5 +1456,7 @@ private void InitializeComponent()
private System.Windows.Forms.Button buttonScatteringFactor;
private EOSControl eosControl;
private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.ToolStripMenuItem convertToP1SymmetryToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem convertToSuperstructureToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/Crystallography.Controls/Crystal/CrystalControl.cs b/Crystallography.Controls/Crystal/CrystalControl.cs
index db520dc..873767d 100644
--- a/Crystallography.Controls/Crystal/CrystalControl.cs
+++ b/Crystallography.Controls/Crystal/CrystalControl.cs
@@ -1,6 +1,8 @@
#region Using
+using Crystallography.Controls;
using MathNet.Numerics.LinearAlgebra.Double;
using System;
+using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.IO;
@@ -283,17 +285,8 @@ public void SetToInterface(bool ChangeCellParameter = true)
public void ReadCrystal(string filename)
{
-
- try
- {
- Crystal = ConvertCrystalData.ConvertToCrystal(filename);
- }
- catch (Exception ex)
- {
- if (Crystallography.AssemblyState.IsDebug)
- MessageBox.Show(ex.ToString());
- return;
- }
+ try { Crystal = ConvertCrystalData.ConvertToCrystal(filename); }
+ catch (Exception ex) { if (AssemblyState.IsDebug) MessageBox.Show(ex.ToString()); return; }
}
#region ドラッグドロップイベント
@@ -369,6 +362,69 @@ private void strainControlToolStripMenuItem_Click(object sender, EventArgs e)
formStrain.Visible = !formStrain.Visible;
}
+ ///
+ /// 空間群P1に変換
+ ///
+ ///
+ ///
+ private void convertToP1ToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ toSuperStructure(1, 1, 1);
+ }
+
+ //超構造に変換
+ private void convertToSuperstructureToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var dlg = new FormSuperStructure();
+ if(dlg.ShowDialog()== DialogResult.OK)
+ toSuperStructure(dlg.A, dlg.B, dlg.C);
+ }
+
+ private void toSuperStructure(int _u, int _v, int _w)
+ {
+ GenerateFromInterface();
+ crystal.SymmetrySeriesNumber = 1;
+
+ var temp_atoms = new List();
+ foreach (var atoms in Crystal.Atoms)
+ {
+ int n = 0;
+ foreach (var atom in atoms.Atom)
+ {
+ for (double u = 0; u < _u; u++)
+ for (double v = 0; v < _v; v++)
+ for (double w = 0; w < _w; w++)
+ {
+ var x = (atom.X + u) / _u;
+ var y = (atom.Y + v) / _v;
+ var z = (atom.Z + w) / _w;
+
+ var x_err = atoms.X_err / _u;
+ var y_err = atoms.Y_err / _v;
+ var z_err = atoms.Z_err / _w;
+
+ temp_atoms.Add(new Atoms(
+ atoms.Label.TrimEnd() + "_" + n.ToString(),
+ atoms.AtomicNumber, atoms.SubNumberXray, atoms.SubNumberElectron, atoms.Isotope,
+ 1,
+ new Vector3DBase(x, y, z), new Vector3DBase(x_err, y_err, z_err),
+ atoms.Occ, atoms.Occ_err,
+ atoms.Dsf,
+ atoms.Material,
+ atoms.Radius, atoms.GLEnabled, atoms.ShowLabel));
+ n++;
+ }
+ }
+ }
+ crystal.A *= _u;
+ crystal.B *= _v;
+ crystal.C *= _w;
+ crystal.Atoms = temp_atoms.ToArray();
+
+ SetToInterface(true);
+ GenerateFromInterface();
+ }
+
#endregion 右クリックメニュー
#region キーボードイベント
@@ -664,5 +720,10 @@ private void button1_Click(object sender, EventArgs e)
{
GenerateFromInterface();
}
+
+ private void clearAllDataToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+
+ }
}
}
\ No newline at end of file
diff --git a/Crystallography.Controls/Crystal/CrystalControl.ja.resx b/Crystallography.Controls/Crystal/CrystalControl.ja.resx
index 2c258cc..166aff8 100644
--- a/Crystallography.Controls/Crystal/CrystalControl.ja.resx
+++ b/Crystallography.Controls/Crystal/CrystalControl.ja.resx
@@ -1,64 +1,4 @@
-
-
-
+
@@ -124,15 +64,9 @@
単位格子体積
-
- 1000, 25
-
161, 25
-
- Segoe UI, 9pt
-
×10⁻²⁴ g
@@ -145,9 +79,6 @@
181, 4
-
- 1000, 25
-
195, 25
@@ -160,12 +91,6 @@
モル体積
-
- 10, 29
-
-
- 1000, 25
-
182, 25
@@ -178,9 +103,6 @@
202, 29
-
- 1000, 25
-
163, 25
@@ -193,12 +115,6 @@
密度
-
- 10, 54
-
-
- 1000, 25
-
135, 25
@@ -238,6 +154,15 @@
458, 276
+
+ 210, 22
+
+
+ デバイワラー因子をゼロにする
+
+
+ 211, 26
+
2, 2
@@ -326,87 +251,9 @@
弾性定数
-
- 1000, 24
-
-
- 47, 24
-
-
- 1000, 24
-
-
- 47, 24
-
-
- 1000, 24
-
-
- 47, 24
-
-
- 1000, 24
-
-
- 47, 24
-
-
- 1000, 24
-
-
- 47, 24
-
-
- 1000, 24
-
-
- 47, 24
-
-
- 1000, 24
-
-
- 47, 24
-
120, 123
-
- 1000, 24
-
-
- 47, 24
-
-
- 1000, 24
-
-
- 47, 24
-
-
- 1000, 24
-
-
- 47, 24
-
-
- 1000, 24
-
-
- 47, 24
-
-
- 1000, 24
-
-
- 47, 24
-
-
- 1000, 24
-
-
- 47, 24
-
462, 280
@@ -503,9 +350,76 @@
470, 24
+
+ 271, 22
+
+
+ 散乱因子
+
+
+ 271, 22
+
+
+ 対称性詳細
+
+
+ 268, 6
+
+
+ 271, 22
+
+
+ CIFファイル又はAMCファイルから読み込み
+
+
+ 271, 22
+
+
+ CIFファイルとして出力
+
+
+ 271, 22
+
+
+ 268, 6
+
+
+ 271, 22
+
+
+
+ False
+
+
+ 271, 22
+
+
+ アプリ起動時の格子定数に戻す
+
+
+ 268, 6
+
+
+ 271, 22
+
Strain control
+
+ 271, 22
+
+
+ 空間群をP1に変換
+
+
+ 271, 22
+
+
+ 超構造に変換
+
+
+ 272, 242
+
48, 0
diff --git a/Crystallography.Controls/Crystal/CrystalControl.resx b/Crystallography.Controls/Crystal/CrystalControl.resx
index 2438207..d670f3d 100644
--- a/Crystallography.Controls/Crystal/CrystalControl.resx
+++ b/Crystallography.Controls/Crystal/CrystalControl.resx
@@ -57,3364 +57,3628 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- GrowAndShrink
-
-
- Segoe UI Symbol, 9.75pt
-
-
- Segoe UI, 9pt
+
+ 22, 46
-
- ų
+
+ System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Segoe UI, 9pt
+
+
+ True
-
- Cell Volume
+
+
+ Right
-
- 10, 4
+
+ tabPageReference
-
- 10, 0, 0, 0
-
-
- 1000, 25
+
+ 3, 3, 3, 3
-
- 1, 23
+
+ α
-
- 0, 0, 1, 0
+
+ True
-
- 156, 25
+
+ 167, 57
-
-
- 90
+
+ 3, 3, 3, 3
-
- 17, 17
-
-
- Cell volume in ų
+
+ 209, 46
-
- Cell volume in ų
+
+ tabControl
-
- numericBoxVolume
+
+ 4, 0, 4, 0
-
- Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
+
+ numericBoxStrain12
-
- flowLayoutPanel4
+
+ 114, 107
-
- 0
+
+ flowLayoutPanel2
-
- GrowAndShrink
+
+ 0, 0, 4, 0
-
- Segoe UI Symbol, 9.75pt
+
+
-
- Segoe UI, 9pt
+
+ System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- × 10⁻²⁴ g
+
+ 0, 0, 1, 0
-
- Segoe UI, 9pt
+
+ groupBox6
-
- Cell Mass
+
+ 3, 5, 3, 0
-
- 176, 4
+
+ 23
-
- 10, 0, 0, 0
+
+ tabPageStrainStress
-
- 1000, 25
+
+ 7
-
- 1, 23
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 0, 0, 1, 0
+
+ numericBoxVolume
-
- 175, 25
+
+ ε11
-
- 90
+
+ GrowAndShrink
-
- Cell mass in 10⁻²⁴ g
+
+ saveToolStripMenuItem
-
- Cell mass in 10⁻²⁴ g
+
+ True
-
- numericBoxCellMass
+
+ Times New Roman, 9pt
-
- Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
+
+ 0
-
- flowLayoutPanel4
+
+ label103
-
- 1
+
+ 0, 0
-
- GrowAndShrink
+
+ 199, 25
-
- Segoe UI Symbol, 9.75pt
+
+ 7
-
- Segoe UI Symbol, 9pt
+
+ 47, 24
-
- cm³/mol
+
+ ε33
-
- Segoe UI Symbol, 9pt
+
+ 239
-
- Molar Volume
+
+ 19
-
- 10, 29
+
+ Density in g/cm³
-
- 10, 0, 0, 0
+
+ tabPageStrainStress
-
- 1000, 25
+
+ Arial, 9pt
-
- 1, 23
+
+
-
- 0, 0, 1, 0
+
+ 459, 298
-
- 199, 25
+
+ 114, 69
-
+
90
-
- Molar Volume in cm³/mol
+
+ 94
-
- Molar Volume in cm³/mol
+
+ 4
-
- numericBoxMolarVolume
+
+ 0, 0, 1, 0
-
- Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
+
+ Segoe UI Symbol, 9.75pt
-
- flowLayoutPanel4
+
+ 1
-
- 2
+
+ 98
-
+
GrowAndShrink
-
- Segoe UI Symbol, 9.75pt
+
+ GrowAndShrink
-
- Segoe UI Symbol, 9pt
+
+ 6
-
- g/mol
+
+ 3
-
- Segoe UI Symbol, 9pt
+
+ 10, 54
-
- Molar Mass
+
+ 1, 25
-
- 219, 29
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 10, 0, 0, 0
+
+ Segoe UI Symbol, 9.75pt
-
- 1000, 25
+
+ True
-
- 1, 23
+
+ 4, 26
-
+
+ 3
+
+
0, 0, 1, 0
-
- 171, 25
+
+ Segoe UI, 9pt
-
- 90
+
+ System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Molar Mass in g/mol
+
+ 0
-
- Molar Mass in g/mol
+
+ 1000, 24
-
- numericBoxMolarMass
+
+ 1, 1, 1, 1
-
- Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
+
+ Strain Control
-
- flowLayoutPanel4
+
+ tabPageStrainStress
-
- 3
+
+ 0, 0
-
- GrowAndShrink
+
+ 55, 19
-
- Segoe UI Symbol, 9.75pt
+
+ 254
-
- Segoe UI Symbol, 9pt
+
+ Segoe UI Symbol, 9.75pt
-
- g/cm³
+
+ True
-
- Segoe UI Symbol, 9pt
+
+ asCTFFilecomatibleToCHANNEL5FileToolStripMenuItem
-
- Density
+
+ 0, 0, 1, 0
-
- 10, 54
+
+ flowLayoutPanel2
-
- 10, 0, 0, 0
+
+ flowLayoutPanel2
-
- 1000, 25
+
+ System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 1, 23
+
+ as CTF file (comatible to CHANNEL 5 file)
-
- 0, 0, 1, 0
+
+ Crystallography.Controls.EOSControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
-
- 147, 25
+
+ 133
-
- 95
+
+ Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
-
- Density in g/cm³
+
+ Segoe UI Symbol, 9.75pt
-
- Density in g/cm³
+
+ groupBox8
-
- numericBoxDensity
+
+ symmetryInformationToolStripMenuItem
-
- Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
+
+ 24, 15
-
- flowLayoutPanel4
+
+ GrowAndShrink
-
- 4
+
+ Microsoft Sans Serif, 9pt
-
- True
+
+ 0, 0, 0, 2
-
- GrowAndShrink
+
+ Open another window with the structure factors
-
- Segoe UI Symbol, 9.75pt
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Segoe UI Symbol, 9pt
+
+ Molar Mass in g/mol
-
- 0, 0, 0, 0
+
+ 7
-
-
+
+ 6
-
- Segoe UI Symbol, 9pt
+
+ Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
-
- 0, 0, 0, 0
+
+ Top
-
- Profile color
+
+ Segoe UI Symbol, 9.75pt
-
- 167, 57
+
+ revertCellConstantsToolStripMenuItem
-
- 10, 3, 3, 3
+
+ 249, 0
-
- 91, 20
+
+ Convert to superstructure
-
- 89
+
+ tabControl
-
-
+
+ tabPageElasticity
-
- Profile color
-
+
+ System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- colorControl
+
+ 109, 115
-
- Crystallography.Controls.ColorControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
+
+ 0, 2, 0, 0
-
- flowLayoutPanel4
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 5
+
+ 3
-
- Fill
+
+ True
-
- 0, 133
+
+
-
- 4, 4, 4, 4
+
+ 353, 0
-
- 0, 4, 0, 0
+
+ 447, 33
-
- 453, 159
+
+ contextMenuStrip2
-
- 94
+
+ 252, 22
-
- flowLayoutPanel4
+
+ latticePlaneControl
-
- System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 5
-
- panel5
+
+ 2
-
- 0
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Top
+
+ 0, 0, 1, 0
-
- 0, 0
+
+ 114, 25
-
- 3, 11, 3, 11
+
+
-
- 453, 133
+
+ TopCenter
-
- 93
+
+ 459, 244
-
- symmetryControl
-
-
- Crystallography.Controls.SymmetryControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
+
+ 0
-
- panel5
+
+
-
- 1
+
+
-
- Fill
+
+ scatteringFactorToolStripMenuItem
-
- 3, 3
+
+ 114, 30
-
- 2, 2, 2, 2
+
+ 11
-
- 453, 292
+
+ 0, 27
-
- 93
+
+ GrowAndShrink
-
- panel5
+
+ 25, 15
-
- System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 249, 6
-
- tabPageBasicInfo
+
+ GrowAndShrink
-
- 0
+
+
-
- 4, 26
+
+ Times New Roman, 9pt
-
- 3, 3, 3, 3
+
+ Atom positions and species
-
- 459, 298
+
+ 206, 25
-
- 4
+
+ contextMenuStripPoleFigure
-
- Basic Info.
+
+ 120, 121
-
- Cell constants, symmetry, and other basic informaton
+
+ buttonSymmetryInfo
-
- Cell constants, symmetry, and other basic informaton
+
+ tabPageStrainStress
-
- tabPageBasicInfo
+
+ Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
-
+
System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tabControl
+
+ Times New Roman, 9pt
-
- 0
+
+ tabPageStrainStress
-
- True
+
+ 237
-
- Fill
+
+ Segoe UI Symbol, 9pt
-
- Microsoft Sans Serif, 9pt
+
+ NoControl
-
- 0, 0
+
+ True
-
- 0, 0, 0, 0
+
+ 235
-
- 446, 108
+
+ 12
-
- 459, 298
+
+ GrowAndShrink
-
- 0
+
+ Import from CIF, AMC...
-
- atomControl
+
+ 71, 84
-
- Crystallography.Controls.AtomControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
+
+ Segoe UI, 9pt
-
- tabPageAtom
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 0
+
+ 1
-
- True
+
+ Segoe UI Symbol, 9.75pt
-
- GrowAndShrink
+
+ Tahoma, 9pt
-
- True
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 249, 22
-
-
- Arial, 9pt
+
+ 0
-
- 217, 22
+
+ panelAtom
-
- Reset Debye-Waller factor
+
+ 459, 298
-
- 218, 26
+
+ 14
-
- contextMenuStrip2
+
+ Segoe UI Symbol, 9.75pt
-
- System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ NoControl
-
- Bottom
+
+ 0
-
- 0, 0
+
+ 1, 23
-
- 0, 0
+
+ 86
-
- 65
+
+ 1, 22
-
- panel3
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- panelAtom
+
+ 453, 57
-
- 0
+
+ ε13
-
- Microsoft Sans Serif, 9pt
+
+ tabPageBasicInfo
-
+
0, 0
-
- 0, 0, 0, 0
+
+ 248
-
- 0, 0
+
+ 64, 69
-
- 65
+
+ numericBoxStress33
-
- panelAtom
+
+ Segoe UI Symbol, 9.75pt
-
- System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 122, 14
-
- tabPageAtom
+
+ 0, 0
-
- 1
+
+ Segoe UI Symbol, 9.75pt
-
- Tahoma, 8.25pt
+
+ 47, 24
-
- 4, 26
+
+ 156, 25
-
- 0, 0, 0, 0
+
+ 274, 4
-
- 459, 298
+
+ groupBox6
-
+
+ panel3
+
+
+ Segoe UI Symbol, 9.75pt
+
+
0
-
- Atom Info.
+
+ 137
-
- Atom positions and species
+
+ 90
-
- Atom positions and species
+
+ 4, 0, 0, 0
-
- tabPageAtom
+
+ 357, 4
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ NoControl
-
- tabControl
+
+ 4, 26
-
- 1
+
+ label110
-
- True
+
+ numericBoxStrain33
-
- GrowAndShrink
+
+
-
- Fill
+
+ Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
-
- Segoe UI Symbol, 9pt
+
+ Fill
-
- 0, 0
+
+ tabPageStrainStress
-
- 0, 0, 0, 0
+
+ 1000, 24
-
- 459, 298
+
+ 9
-
- 0
+
+ 91, 20
-
- bondControl
+
+ 371, 25
-
- Crystallography.Controls.BondInputControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
+
+ System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tabPageBondsPolyhedra
+
+ 4, 2, 0, 0
-
- 0
+
+ σ23
-
- 4, 26
+
+ System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 459, 298
+
+ label112
-
- 3
+
+ tabPageStrainStress
-
- Bonds ( & Polyhedra)
+
+ 459, 298
-
- tabPageBondsPolyhedra
+
+ 249, 6
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tabControl
+
+ numericBoxMolarMass
-
- 2
+
+ Segoe UI Symbol, 9pt
-
- Fill
+
+ True
-
- Segoe UI Symbol, 9.75pt
+
+ 47, 24
-
- 3, 21
+
+ Density in g/cm³
-
- True
+
+ 467, 328
-
- Vertical
+
+ 1, 23
-
- 341, 156
+
+ Segoe UI Symbol, 9.75pt
-
- 0
+
+ tabPageEOS
-
- textBoxTitle
+
+ numericBoxStrain11
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 29
-
- groupBox8
+
+ Save
-
- 0
+
+ label106
-
- Fill
+
+ 0, 4, 0, 0
-
- 109, 115
+
+ Symmetry Information
-
- 347, 180
+
+ True
-
- 3
+
+ Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
-
- Title
+
+ NoControl
-
- groupBox8
+
+ tabPageStrainStress
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Crystallography.Controls.BondInputControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null
-
- tabPageReference
+
+
-
- 0
+
+ 120, 46
-
- Fill
+
+
-
- Segoe UI Symbol, 9.75pt
+
+ 6
-
- 3, 21
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
True
-
- Vertical
+
+ label114
-
- 100, 156
+
+ 0, 3, 3, 0
-
- 0
+
+ NoControl
-
- textBoxAuthor
+
+ Molar Mass in g/mol
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+