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

OTSPartA_STDEditor/UI/Form_Main.cs

@@ -403,7 +403,7 @@ namespace OTSPartA_STDEditor
 
 
                 //forth_elem干扰or分隔符，故先行去掉
-                str_RemoveBlank = str_RemoveBlank.Replace("forth_elem", "");
+                //str_RemoveBlank = str_RemoveBlank.Replace("fourth_elem", "");
 
                 string[] str_Removeand = System.Text.RegularExpressions.Regex.Split(str_RemoveBlank, "and", System.Text.RegularExpressions.RegexOptions.None);
                 List<string> str_Removeandor = new List<string>();
@@ -645,12 +645,12 @@ namespace OTSPartA_STDEditor
                     List<string> UsingOtherPropertyL = new List<string>();
 
                     string str_RemoveBlank = kv.Value.Expression;
-                    //forth_elem干扰or分隔符，故先行去掉
-                    if (str_RemoveBlank.Contains("forth_elem"))
-                    {
-                        str_RemoveBlank = str_RemoveBlank.Replace("forth_elem", "");
-                        UsingOtherPropertyList = "forth_elem";
-                    }
+                    ////forth_elem干扰or分隔符，故先行去掉
+                    //if (str_RemoveBlank.Contains("fourth_elem"))
+                    //{
+                    //    str_RemoveBlank = str_RemoveBlank.Replace("fourth_elem", "");
+                    //    UsingOtherPropertyList = "fourth_elem";
+                    //}
 
                     str_RemoveBlank = str_RemoveBlank.Replace(" ", "");
                     string[] str_Removeand = System.Text.RegularExpressions.Regex.Split(str_RemoveBlank, "and", System.Text.RegularExpressions.RegexOptions.None);
@@ -796,12 +796,12 @@ namespace OTSPartA_STDEditor
                     List<string> UsingOtherPropertyL = new List<string>();
 
                     string str_RemoveBlank = kv.Value.Expression;
-                    //forth_elem干扰or分隔符，故先行去掉
-                    if (str_RemoveBlank.Contains("forth_elem"))
-                    {
-                        str_RemoveBlank = str_RemoveBlank.Replace("forth_elem", "");
-                        UsingOtherPropertyList = "forth_elem,";
-                    }
+                    ////forth_elem干扰or分隔符，故先行去掉
+                    //if (str_RemoveBlank.Contains("fourth_elem"))
+                    //{
+                    //    str_RemoveBlank = str_RemoveBlank.Replace("fourth_elem", "");
+                    //    UsingOtherPropertyList = "fourth_elem,";
+                    //}
 
                     str_RemoveBlank = str_RemoveBlank.Replace(" ", "");
                     string[] str_Removeand = System.Text.RegularExpressions.Regex.Split(str_RemoveBlank, "and", System.Text.RegularExpressions.RegexOptions.None);
@@ -1173,9 +1173,9 @@ namespace OTSPartA_STDEditor
                     this.Text = this.Text.Split(' ')[0] + "   " + STDDBAddress;
                     IsModified = false;
                 }
-                catch
+                catch(Exception ex)
                 {
-                    MessageBox.Show("The selected standard library is formatted incorrectly, please open the correct standard library!", "Tip");
+                    MessageBox.Show(ex.ToString(), "Tip");
                 }
             }
         }

OTSPartA_STDEditor/UI/Form_MaxEDSRules.cs

@@ -42,7 +42,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");
@@ -498,11 +498,11 @@ namespace OTSPartA_STDEditor
 
                 string str_RemoveBlank = "";
                 //forth_elem干扰or分隔符，故先行去掉
-                if (XmlTree_MaxEDSRules.Nodes[num].Tag.ToString().Contains("forth_elem"))
-                {
-                    str_RemoveBlank = str_RemoveBlank.Replace("forth_elem", "");
-                    UsingOtherPropertyList = "forth_elem,";
-                }
+                //if (XmlTree_MaxEDSRules.Nodes[num].Tag.ToString().Contains("fourth_elem"))
+                //{
+                //    str_RemoveBlank = str_RemoveBlank.Replace("fourth_elem", "");
+                //    UsingOtherPropertyList = "fourth_elem,";
+                //}
 
                 str_RemoveBlank = XmlTree_MaxEDSRules.Nodes[num].Tag.ToString().Replace(" ", "");
                 string[] str_Removeand = System.Text.RegularExpressions.Regex.Split(str_RemoveBlank, "and", System.Text.RegularExpressions.RegexOptions.None);
@@ -788,7 +788,7 @@ namespace OTSPartA_STDEditor
             }
 
             //forth_elem干扰or分隔符，故先行去掉
-            str_RemoveBlank = str_RemoveBlank.Replace("forth_elem", "");
+            //str_RemoveBlank = str_RemoveBlank.Replace("fourth_elem", "");
 
             string[] str_Removeand = System.Text.RegularExpressions.Regex.Split(str_RemoveBlank, "and", System.Text.RegularExpressions.RegexOptions.None);
             List<string> str_Removeandor = new List<string>();

OTSPartA_STDEditor/UI/Form_ZeroElementRules.cs

@@ -40,7 +40,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");
@@ -467,11 +467,11 @@ namespace OTSPartA_STDEditor
 
                 string str_RemoveBlank = "";
                 //forth_elem干扰or分隔符，故先行去掉
-                if (XmlTree_ZeroElementRules.Nodes[num].Tag.ToString().Contains("forth_elem"))
-                {
-                    str_RemoveBlank = str_RemoveBlank.Replace("forth_elem", "");
-                    UsingOtherPropertyList = "forth_elem,";
-                }
+                //if (XmlTree_ZeroElementRules.Nodes[num].Tag.ToString().Contains("fourth_elem"))
+                //{
+                //    str_RemoveBlank = str_RemoveBlank.Replace("fourth_elem", "");
+                //    UsingOtherPropertyList = "fourth_elem,";
+                //}
 
                 str_RemoveBlank = XmlTree_ZeroElementRules.Nodes[num].Tag.ToString().Replace(" ", "");
                 string[] str_Removeand = System.Text.RegularExpressions.Regex.Split(str_RemoveBlank, "and", System.Text.RegularExpressions.RegexOptions.None);
@@ -781,7 +781,7 @@ namespace OTSPartA_STDEditor
             }
 
             //forth_elem干扰or分隔符，故先行去掉
-            str_RemoveBlank = str_RemoveBlank.Replace("forth_elem", "");
+            //str_RemoveBlank = str_RemoveBlank.Replace("fourth_elem", "");
 
             string[] str_Removeand = System.Text.RegularExpressions.Regex.Split(str_RemoveBlank, "and", System.Text.RegularExpressions.RegexOptions.None);
             List<string> str_Removeandor = new List<string>();

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");
@@ -688,7 +688,7 @@ namespace OTSPartA_STDEditor
 
             string str_RemoveBlank = textbox_STDEditor.Text.ToString().Replace(" ", "");
             str_RemoveBlank = str_RemoveBlank.Replace("\r\n", "");
-            str_RemoveBlank = str_RemoveBlank.Replace("forth_elem", "");
+            //str_RemoveBlank = str_RemoveBlank.Replace("fourth_elem", "");
             string[] str_Removeand = System.Text.RegularExpressions.Regex.Split(str_RemoveBlank, "and", System.Text.RegularExpressions.RegexOptions.None);
             List<string> str_Removeandor = new List<string>();
             for (int i = 0; i < str_Removeand.Length; i++)