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