浏览代码

修改标准库编辑器添加规则后包含元素默认归为非必要元素

cxs 1 年之前
父节点
当前提交
d55b87f283
共有 3 个文件被更改,包括 29 次插入28 次删除
  1. 1 1
      OTSPartA_STDEditor/UI/Form_Main.cs
  2. 26 27
      OTSPartA_STDEditor/UI/STDEditor.cs
  3. 2 0
      OTSPartA_STDEditor/UI/STDRuleslist.cs

+ 1 - 1
OTSPartA_STDEditor/UI/Form_Main.cs

@@ -919,7 +919,7 @@ namespace OTSPartA_STDEditor
             new_STDdata.Element = "1";
             new_STDdata.StrName = "NewRuleName";
             //new_STDdata.Expression = "NewRules";
-            new_STDdata.Expression = "";
+            new_STDdata.Expression = "false";
             new_STDdata.KeyElementList = "";
             new_STDdata.SubElementList = "";
 

+ 26 - 27
OTSPartA_STDEditor/UI/STDEditor.cs

@@ -682,13 +682,12 @@ namespace OTSPartA_STDEditor
 
         private void textbox_STDEditor_MouseLeave(object sender, EventArgs e)
         {
-            dataGridView_KeyElements.Rows.Clear();
-            dataGridView_KeyElements.Columns.Clear();
+            dataGridView_SubElements.Rows.Clear();
+            dataGridView_SubElements.Columns.Clear(); 
 
 
             string str_RemoveBlank = textbox_STDEditor.Text.ToString().Replace(" ", "");
             str_RemoveBlank = str_RemoveBlank.Replace("\r\n", "");
-            //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++)
@@ -712,46 +711,46 @@ namespace OTSPartA_STDEditor
                 }
             }
 
-            List<string> SubElements = new List<string>();
-            for (int i = 0; i < dataGridView_SubElements.ColumnCount; i++)
+            List<string> KeyElements = new List<string>();
+            for (int i = 0; i < dataGridView_KeyElements.ColumnCount; i++)
             {
-                if (UsingElementL.Contains(dataGridView_SubElements.Rows[0].Cells[i].Value))
+                if (UsingElementL.Contains(dataGridView_KeyElements.Rows[0].Cells[i].Value))
                 {
-                    SubElements.Add(dataGridView_SubElements.Rows[0].Cells[i].Value.ToString());
+                    KeyElements.Add(dataGridView_KeyElements.Rows[0].Cells[i].Value.ToString());
                 }
             }
 
-            dataGridView_SubElements.Rows.Clear();
-            dataGridView_SubElements.Columns.Clear();
+            dataGridView_KeyElements.Rows.Clear();
+            dataGridView_KeyElements.Columns.Clear();
 
-            for (int i = 0; i < SubElements.Count; i++)
+            for (int i = 0; i < KeyElements.Count; i++)
             {
                 DataGridViewButtonColumn dataGridViewButtonColumn = new DataGridViewButtonColumn();
-                dataGridViewButtonColumn.Name = dataGridView_SubElements.Columns.Count.ToString();
-                dataGridView_SubElements.Columns.Add(dataGridViewButtonColumn);
-                if (dataGridView_SubElements.Rows.Count == 0)
+                dataGridViewButtonColumn.Name = dataGridView_KeyElements.Columns.Count.ToString();
+                dataGridView_KeyElements.Columns.Add(dataGridViewButtonColumn);
+                if (dataGridView_KeyElements.Rows.Count == 0)
                 {
                     DataGridViewRow row = new DataGridViewRow();
-                    dataGridView_SubElements.Rows.Add(row);
+                    dataGridView_KeyElements.Rows.Add(row);
                 }
-                dataGridView_SubElements.Rows[0].Cells[dataGridView_SubElements.ColumnCount - 1].Value = SubElements[i];
+                dataGridView_KeyElements.Rows[0].Cells[dataGridView_KeyElements.ColumnCount - 1].Value = KeyElements[i];
             }
 
-            if (SubElements.Count > 0)
+            if (KeyElements.Count > 0)
             {
                 for (int i = 0; i < UsingElementL.Count; i++)
                 {
-                    if (!SubElements.Contains(UsingElementL[i]))
+                    if (!KeyElements.Contains(UsingElementL[i]))
                     {
                         DataGridViewButtonColumn dataGridViewButtonColumn = new DataGridViewButtonColumn();
-                        dataGridViewButtonColumn.Name = dataGridView_KeyElements.Columns.Count.ToString();
-                        dataGridView_KeyElements.Columns.Add(dataGridViewButtonColumn);
-                        if (dataGridView_KeyElements.Rows.Count == 0)
+                        dataGridViewButtonColumn.Name = dataGridView_SubElements.Columns.Count.ToString();
+                        dataGridView_SubElements.Columns.Add(dataGridViewButtonColumn);
+                        if (dataGridView_SubElements.Rows.Count == 0)
                         {
                             DataGridViewRow row = new DataGridViewRow();
-                            dataGridView_KeyElements.Rows.Add(row);
+                            dataGridView_SubElements.Rows.Add(row);
                         }
-                        dataGridView_KeyElements.Rows[0].Cells[dataGridView_KeyElements.ColumnCount - 1].Value = UsingElementL[i];
+                        dataGridView_SubElements.Rows[0].Cells[dataGridView_SubElements.ColumnCount - 1].Value = UsingElementL[i];
                     }
                 }
             }
@@ -760,14 +759,14 @@ namespace OTSPartA_STDEditor
                 for (int i = 0; i < UsingElementL.Count; i++)
                 {
                     DataGridViewButtonColumn dataGridViewButtonColumn = new DataGridViewButtonColumn();
-                    dataGridViewButtonColumn.Name = dataGridView_KeyElements.Columns.Count.ToString();
-                    dataGridView_KeyElements.Columns.Add(dataGridViewButtonColumn);
-                    if (dataGridView_KeyElements.Rows.Count == 0)
+                    dataGridViewButtonColumn.Name = dataGridView_SubElements.Columns.Count.ToString();
+                    dataGridView_SubElements.Columns.Add(dataGridViewButtonColumn);
+                    if (dataGridView_SubElements.Rows.Count == 0)
                     {
                         DataGridViewRow row = new DataGridViewRow();
-                        dataGridView_KeyElements.Rows.Add(row);
+                        dataGridView_SubElements.Rows.Add(row);
                     }
-                    dataGridView_KeyElements.Rows[0].Cells[i].Value = UsingElementL[i];
+                    dataGridView_SubElements.Rows[0].Cells[i].Value = UsingElementL[i];
                 }
             }
             dataGridView_KeyElements.ClearSelection();

+ 2 - 0
OTSPartA_STDEditor/UI/STDRuleslist.cs

@@ -84,6 +84,8 @@ namespace OTSPartA_STDEditor
                 i++;
             }
 
+
+
             Grid_Minerals.Controller.AddController(m_ValueChangedEvent);
             Grid_Minerals.FixedRows = 1;// 第一行是列标题不可以滚动
             Grid_Minerals.Selection.FocusStyle = FocusStyle.None;