Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -1102,7 +1102,7 @@
    <Name>DlgStageMgr</Name>
     <Controls>
       <Control name="button_edit" text="Edit" />
-      <Control name="button_New" text="New" />
+      <Control name="button_New" text="SaveAs" />
     </Controls>
  </Form>
  <Form>

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -958,7 +958,7 @@
    <Name>DlgStageMgr</Name>
     <Controls>
       <Control name="button_edit" text="编辑" />
-      <Control name="button_New" text="新建" />
+      <Control name="button_New" text="另存" />
     </Controls>
  </Form>
   <!-- OTSIncAMeasureApp -->

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageEdit.Designer.cs

@@ -107,6 +107,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             this.tStageName.Name = "tStageName";
             this.tStageName.Size = new System.Drawing.Size(444, 21);
             this.tStageName.TabIndex = 4;
+            this.tStageName.TextChanged += new System.EventHandler(this.tStageName_TextChanged);
             // 
             // label2
             // 
@@ -492,7 +493,6 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             // 
             // button_Ok
             // 
-            this.button_Ok.Enabled = false;
             this.button_Ok.Location = new System.Drawing.Point(1065, 586);
             this.button_Ok.Margin = new System.Windows.Forms.Padding(2);
             this.button_Ok.Name = "button_Ok";
@@ -539,13 +539,12 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             // 
             // btn_new
             // 
-            this.btn_new.Enabled = false;
-            this.btn_new.Location = new System.Drawing.Point(1003, 586);
+            this.btn_new.Location = new System.Drawing.Point(985, 586);
             this.btn_new.Margin = new System.Windows.Forms.Padding(2);
             this.btn_new.Name = "btn_new";
-            this.btn_new.Size = new System.Drawing.Size(58, 30);
+            this.btn_new.Size = new System.Drawing.Size(76, 30);
             this.btn_new.TabIndex = 25;
-            this.btn_new.Text = "新建";
+            this.btn_new.Text = "另存";
             this.btn_new.UseVisualStyleBackColor = true;
             this.btn_new.Click += new System.EventHandler(this.btn_new_Click);
             // 

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageEdit.cs

@@ -70,10 +70,13 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             {
                 LoadStageData(Stage);
             }
+            else
+            {
+                btn_new.Visible = false;
+            }
             SetHelp();
 
             StageNames.Remove(tStageName.Text);
-            StageN = tStageName.Text;
         }
         void SetHelp()
         {
@@ -232,20 +235,20 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
 
         bool CheckAndSetStage()
         { 
-            if(StageNames.Contains(tStageName.Text))
+            if(StageNames.Contains(StageN))
             {
                 MessageBox.Show("Already exist " + tStageName.Text.Trim() + "!", "Error");
                 return false;
             }
             if (!CheckParams())
             {
-                this.button_Ok.Enabled = false;
+                //this.button_Ok.Enabled = false;
                 MessageBox.Show("Please check Params!");
                 return false;
             }
             if (tBoundaryWide.Text == "1" || tBoundaryHeight.Text == "1" || tStandardsampleWide.Text == "1" || tStandardsampleHeight.Text == "1")
             {
-                this.button_Ok.Enabled = false;
+                //this.button_Ok.Enabled = false;
                 MessageBox.Show("The length value cannot be 1!");
                 return false;
             }
@@ -255,7 +258,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
                 {
                     if (dataGridView_Holes.Rows[i].Cells[j].Value.ToString() == "1")
                     {
-                        this.button_Ok.Enabled = false;
+                        //this.button_Ok.Enabled = false;
                         MessageBox.Show("The length value cannot be 1!");
                         return false;
                     }
@@ -268,7 +271,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             a_pCSEMStageData = m_DefaultParam.GetStageDataParam();
 
             Stage = new CStage();
-            Stage.SetName(tStageName.Text);
+            Stage.SetName(StageN);
             // boundary
             string strValue = "";
             if(radioButton_BoundaryCircle.Checked)
@@ -685,17 +688,28 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
 
         private void btn_new_Click(object sender, EventArgs e)
         {
-            if(StageN.Trim()== tStageName.Text.Trim())
+            StageNameSaveAs stageNameSaveAs = new StageNameSaveAs();
+            DialogResult dialogResult = stageNameSaveAs.ShowDialog();
+            if (dialogResult == DialogResult.OK)
             {
-                MessageBox.Show("Already exist " + tStageName.Text.Trim() + "!", "Error");
-                return;
-            }
-            if (!CheckAndSetStage())
-            {
-                return;
+                if (tStageName.Text == stageNameSaveAs.StageNamewhichSaveAs)
+                {
+                    MessageBox.Show("Already exist " + tStageName.Text.Trim() + "!", "Error");
+                    return;
+                }
+                StageN = stageNameSaveAs.StageNamewhichSaveAs;
+                if (!CheckAndSetStage())
+                {
+                    return;
+                }
+                this.DialogResult = DialogResult.No;
+                this.Close();
             }
-            this.DialogResult = DialogResult.No;
-            this.Close();
+        }
+
+        private void tStageName_TextChanged(object sender, EventArgs e)
+        {
+            StageN = tStageName.Text;
         }
     }
 }

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageRename.Designer.cs

@@ -74,6 +74,7 @@
             this.MinimizeBox = false;
             this.MinimumSize = new System.Drawing.Size(457, 106);
             this.Name = "DlgStageRename";
+            this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "样品台重命名";
             this.Load += new System.EventHandler(this.DlgStageRename_Load);

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/StageNameSaveAs.Designer.cs

@@ -0,0 +1,78 @@
+
+namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
+{
+    partial class StageNameSaveAs
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.button1 = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(27, 12);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(210, 21);
+            this.textBox1.TabIndex = 0;
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(256, 12);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(60, 21);
+            this.button1.TabIndex = 1;
+            this.button1.Text = "OK";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // StageNameSaveAs
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.ClientSize = new System.Drawing.Size(329, 43);
+            this.Controls.Add(this.button1);
+            this.Controls.Add(this.textBox1);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "StageNameSaveAs";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "请输入样品台名称(另存)";
+            this.Load += new System.EventHandler(this.StageNameSaveAs_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.Button button1;
+    }
+}

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/StageNameSaveAs.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
+{
+    public partial class StageNameSaveAs : Form
+    {
+        public StageNameSaveAs()
+        {
+            InitializeComponent();
+        }
+
+        private void StageNameSaveAs_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        public string StageNamewhichSaveAs
+        {
+            get;
+            set;
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            StageNamewhichSaveAs = textBox1.Text;
+            this.DialogResult = DialogResult.OK;
+        }
+    }
+}

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/StageNameSaveAs.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -423,6 +423,12 @@
       <DependentUpon>DlgStageRename.cs</DependentUpon>
     </Compile>
     <Compile Include="7-OTSProgMgrInfo\Stage\StageDisplayHelp.cs" />
+    <Compile Include="7-OTSProgMgrInfo\Stage\StageNameSaveAs.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="7-OTSProgMgrInfo\Stage\StageNameSaveAs.Designer.cs">
+      <DependentUpon>StageNameSaveAs.cs</DependentUpon>
+    </Compile>
     <Compile Include="CRegistration.cs" />
     <Compile Include="BaseFunctionTest.cs">
       <SubType>Form</SubType>
@@ -648,6 +654,9 @@
     <EmbeddedResource Include="7-OTSProgMgrInfo\Stage\DlgStageRename.resx">
       <DependentUpon>DlgStageRename.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="7-OTSProgMgrInfo\Stage\StageNameSaveAs.resx">
+      <DependentUpon>StageNameSaveAs.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="About.resx">
       <DependentUpon>About.cs</DependentUpon>
     </EmbeddedResource>

OTSPartA_STDEditor/UI/STDEditor.Designer.cs

@@ -181,6 +181,10 @@
             // 
             // groupBox_Data
             // 
+            this.groupBox_Data.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox_Data.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.groupBox_Data.Controls.Add(this.groupBox_CalculatingSymbols);
             this.groupBox_Data.Controls.Add(this.groupBox_ChemicalElement);
             this.groupBox_Data.Controls.Add(this.groupBox_OtherCommonlyUsedSymbols);
@@ -192,6 +196,8 @@
             // 
             // groupBox_CalculatingSymbols
             // 
+            this.groupBox_CalculatingSymbols.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox_CalculatingSymbols.Controls.Add(this.button_del);
             this.groupBox_CalculatingSymbols.Controls.Add(this.button_0);
             this.groupBox_CalculatingSymbols.Controls.Add(this.button_4);
@@ -224,6 +230,9 @@
             // 
             // button_del
             // 
+            this.button_del.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_del.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_del.Font = new System.Drawing.Font("楷体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_del.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -237,6 +246,9 @@
             // 
             // button_0
             // 
+            this.button_0.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_0.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_0.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_0.Location = new System.Drawing.Point(204, 72);
@@ -249,6 +261,9 @@
             // 
             // button_4
             // 
+            this.button_4.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_4.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_4.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_4.Location = new System.Drawing.Point(156, 20);
@@ -261,6 +276,9 @@
             // 
             // button_5
             // 
+            this.button_5.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_5.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_5.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_5.Location = new System.Drawing.Point(204, 20);
@@ -273,6 +291,9 @@
             // 
             // button_9
             // 
+            this.button_9.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_9.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_9.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_9.Location = new System.Drawing.Point(156, 72);
@@ -285,6 +306,9 @@
             // 
             // button_Divide
             // 
+            this.button_Divide.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_Divide.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_Divide.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_Divide.Location = new System.Drawing.Point(397, 21);
@@ -297,6 +321,9 @@
             // 
             // button_3
             // 
+            this.button_3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_3.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_3.Location = new System.Drawing.Point(108, 20);
@@ -309,6 +336,9 @@
             // 
             // button_2
             // 
+            this.button_2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_2.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_2.Location = new System.Drawing.Point(60, 20);
@@ -321,6 +351,9 @@
             // 
             // button_Or
             // 
+            this.button_Or.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_Or.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_Or.Font = new System.Drawing.Font("楷体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_Or.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -334,6 +367,9 @@
             // 
             // button_1
             // 
+            this.button_1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_1.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_1.Location = new System.Drawing.Point(12, 20);
@@ -346,6 +382,9 @@
             // 
             // button_And
             // 
+            this.button_And.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_And.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_And.Font = new System.Drawing.Font("楷体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_And.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -359,6 +398,9 @@
             // 
             // button_6
             // 
+            this.button_6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_6.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_6.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_6.Location = new System.Drawing.Point(12, 72);
@@ -371,6 +413,9 @@
             // 
             // button_7
             // 
+            this.button_7.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_7.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_7.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_7.Location = new System.Drawing.Point(60, 72);
@@ -383,6 +428,9 @@
             // 
             // button_Equal
             // 
+            this.button_Equal.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_Equal.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_Equal.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_Equal.Location = new System.Drawing.Point(424, 71);
@@ -395,6 +443,9 @@
             // 
             // button_Multiply
             // 
+            this.button_Multiply.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_Multiply.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_Multiply.Font = new System.Drawing.Font("方正舒体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_Multiply.Location = new System.Drawing.Point(348, 21);
@@ -407,6 +458,9 @@
             // 
             // button_8
             // 
+            this.button_8.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_8.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_8.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_8.Location = new System.Drawing.Point(108, 72);
@@ -419,6 +473,9 @@
             // 
             // button_Subtract
             // 
+            this.button_Subtract.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_Subtract.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_Subtract.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_Subtract.Location = new System.Drawing.Point(300, 20);
@@ -431,6 +488,9 @@
             // 
             // button_Plus
             // 
+            this.button_Plus.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_Plus.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_Plus.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_Plus.Location = new System.Drawing.Point(252, 20);
@@ -443,6 +503,9 @@
             // 
             // button_RightParenthesis
             // 
+            this.button_RightParenthesis.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_RightParenthesis.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_RightParenthesis.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_RightParenthesis.Location = new System.Drawing.Point(386, 72);
@@ -455,6 +518,9 @@
             // 
             // button_LeftParenthesis
             // 
+            this.button_LeftParenthesis.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_LeftParenthesis.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_LeftParenthesis.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_LeftParenthesis.Location = new System.Drawing.Point(348, 72);
@@ -467,6 +533,9 @@
             // 
             // button_More
             // 
+            this.button_More.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_More.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_More.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_More.Location = new System.Drawing.Point(252, 72);
@@ -479,6 +548,9 @@
             // 
             // button_Less
             // 
+            this.button_Less.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.button_Less.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.button_Less.Font = new System.Drawing.Font("方正舒体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button_Less.Location = new System.Drawing.Point(300, 72);
@@ -491,6 +563,8 @@
             // 
             // groupBox_ChemicalElement
             // 
+            this.groupBox_ChemicalElement.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox_ChemicalElement.Controls.Add(this.button_PeriodicTableSwitch);
             this.groupBox_ChemicalElement.Controls.Add(this.comboBox_PeriodicTable);
             this.groupBox_ChemicalElement.Location = new System.Drawing.Point(6, 20);
@@ -502,6 +576,7 @@
             // 
             // button_PeriodicTableSwitch
             // 
+            this.button_PeriodicTableSwitch.AutoSize = true;
             this.button_PeriodicTableSwitch.Location = new System.Drawing.Point(6, 79);
             this.button_PeriodicTableSwitch.Name = "button_PeriodicTableSwitch";
             this.button_PeriodicTableSwitch.Size = new System.Drawing.Size(108, 25);
@@ -522,6 +597,8 @@
             // 
             // groupBox_OtherCommonlyUsedSymbols
             // 
+            this.groupBox_OtherCommonlyUsedSymbols.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox_OtherCommonlyUsedSymbols.Controls.Add(this.label_help1);
             this.groupBox_OtherCommonlyUsedSymbols.Controls.Add(this.label_help2);
             this.groupBox_OtherCommonlyUsedSymbols.Controls.Add(this.comboBox_Constants);
@@ -573,6 +650,9 @@
             // 
             // label_DefinedConstant
             // 
+            this.label_DefinedConstant.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.label_DefinedConstant.AutoSize = true;
             this.label_DefinedConstant.Location = new System.Drawing.Point(260, 76);
             this.label_DefinedConstant.Name = "label_DefinedConstant";
@@ -582,6 +662,9 @@
             // 
             // label_Other
             // 
+            this.label_Other.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.label_Other.AutoSize = true;
             this.label_Other.Location = new System.Drawing.Point(296, 29);
             this.label_Other.Name = "label_Other";
@@ -591,6 +674,9 @@
             // 
             // label_ElementFormTwo
             // 
+            this.label_ElementFormTwo.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.label_ElementFormTwo.AutoSize = true;
             this.label_ElementFormTwo.Location = new System.Drawing.Point(2, 77);
             this.label_ElementFormTwo.Name = "label_ElementFormTwo";
@@ -600,6 +686,9 @@
             // 
             // label_ElementFormOne
             // 
+            this.label_ElementFormOne.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.label_ElementFormOne.AutoSize = true;
             this.label_ElementFormOne.Location = new System.Drawing.Point(2, 31);
             this.label_ElementFormOne.Name = "label_ElementFormOne";
@@ -662,6 +751,7 @@
             this.groupBox_Data.ResumeLayout(false);
             this.groupBox_CalculatingSymbols.ResumeLayout(false);
             this.groupBox_ChemicalElement.ResumeLayout(false);
+            this.groupBox_ChemicalElement.PerformLayout();
             this.groupBox_OtherCommonlyUsedSymbols.ResumeLayout(false);
             this.groupBox_OtherCommonlyUsedSymbols.PerformLayout();
             this.ResumeLayout(false);

OTSPartA_STDEditor/UI/STDEditor.cs

@@ -55,7 +55,7 @@ namespace OTSPartA_STDEditor
             this.comboBox_Elem1.Items.Add("first_elem");
             this.comboBox_Elem1.Items.Add("second_elem");
             this.comboBox_Elem1.Items.Add("third_elem");
-            this.comboBox_Elem1.Items.Add("forth_elem");
+            this.comboBox_Elem1.Items.Add("fourth_elem");
             this.comboBox_Elem1.Items.Add("fifth_elem");
             this.comboBox_Elem1.Items.Add("sixth_elem");
             this.comboBox_Elem1.Items.Add("seventh_elem");

OTSPartA_STDEditor/UI/STDRuleslist.Designer.cs

@@ -40,16 +40,18 @@
             // 
             // Grid_Minerals
             // 
-            this.Grid_Minerals.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
+            this.Grid_Minerals.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.Grid_Minerals.BackColor = System.Drawing.SystemColors.Control;
             this.Grid_Minerals.ContextMenuStrip = this.MenuStrip_STDRulelist;
             this.Grid_Minerals.EnableSort = true;
-            this.Grid_Minerals.Location = new System.Drawing.Point(27, 0);
+            this.Grid_Minerals.Location = new System.Drawing.Point(23, 0);
+            this.Grid_Minerals.Margin = new System.Windows.Forms.Padding(3, 3, 10, 3);
             this.Grid_Minerals.Name = "Grid_Minerals";
             this.Grid_Minerals.OptimizeMode = SourceGrid.CellOptimizeMode.ForRows;
             this.Grid_Minerals.SelectionMode = SourceGrid.GridSelectionMode.Cell;
-            this.Grid_Minerals.Size = new System.Drawing.Size(341, 847);
+            this.Grid_Minerals.Size = new System.Drawing.Size(341, 751);
             this.Grid_Minerals.TabIndex = 9;
             this.Grid_Minerals.TabStop = true;
             this.Grid_Minerals.ToolTipText = "";
@@ -104,9 +106,11 @@
             // 
             // STDRuleslist
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(368, 847);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.AutoScroll = true;
+            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.ClientSize = new System.Drawing.Size(364, 751);
             this.CloseButton = false;
             this.CloseButtonVisible = false;
             this.Controls.Add(this.button_UpOrder);

OTSPartA_STDEditor/UI/STDRuleslist.cs

@@ -415,10 +415,9 @@ namespace OTSPartA_STDEditor
             m_MainForm.STDDictionary[id].StrName = Grid_Minerals[selrow - 1, 0].Value.ToString();
             m_MainForm.STDDictionary[id2].StrName = Grid_Minerals[selrow, 0].Value.ToString();
 
-            Position pos = new Position(selrow - 1, 0);
+            Position pos = new Position(selrow - 1, 1);
             Grid_Minerals[selrow - 1, 0].Grid.Select();
             Grid_Minerals.Selection.Focus(pos, true);
-
             PreRow = selrow - 1;
 
             button_DownOrder.Enabled = true;
@@ -427,6 +426,7 @@ namespace OTSPartA_STDEditor
                 button_UpOrder.Enabled = false;
             }
             m_MainForm.IsModified = true;
+            Grid_Minerals.Refresh();
             //m_MainForm.ChangeSTDEditorAndGrid_Attributes(int.Parse(Grid_Minerals[selrow-1, 0].Tag.ToString()));
         }
 
@@ -488,6 +488,7 @@ namespace OTSPartA_STDEditor
             //}
             #endregion
             m_MainForm.IsModified = true;
+            Grid_Minerals.Refresh();
         }
 
         public void InsertNewRow(int STDId, string RuleName, Color color)