Changeset 6299 for branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarEditorView.cs

Timestamp:

05/26/11 15:11:48 (13 years ago)

Author:

mkommend

Message:

#1479: Corrected handling of GroupSymbols.

File:

• branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarEditorView.cs (modified) (5 diffs)

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarEditorView.cs

@@ -100 +100 @@
     private void RebuildSymbolsTreeView() {
       symbolsTreeView.Nodes.Clear();
-      var start = new TreeNode();
-      var symbols = new DummySymbol("Symbols");
-      start.Name = "Symbols";
-      start.Text = "Symbols";
-      start.Tag = symbols;
-      start.Checked = true;
-      symbolsTreeView.Nodes.Add(start);
+      var symbols = Content.Symbols.ToList();
+      var groupSymbols = symbols.OfType<GroupSymbol>().ToList();
+      var topLevelSymbols = Content.Symbols.Where(s => !groupSymbols.Any(g => g.Symbols.Contains(s)));
+      AddChildTreeNodes(symbolsTreeView.Nodes, topLevelSymbols);
 
-      foreach (ISymbol symbol in Content.Symbols.Where(s => !(s is IReadOnlySymbol))) {
+      RebuildImageList();
+      symbolsTreeView.ExpandAll();
+    }
+
+    private void AddChildTreeNodes(TreeNodeCollection collection, IEnumerable<ISymbol> symbols) {
+      foreach (ISymbol symbol in symbols) {
         var node = new TreeNode();
         node.Name = symbol.Name;
         node.Text = symbol.Name;
         node.Tag = symbol;
-        node.Checked = !symbol.InitialFrequency.IsAlmost(0.0);
-        start.Nodes.Add(node);
+        node.Checked = symbol.Enabled;
+        collection.Add(node);
+        var groupSymbol = symbol as GroupSymbol;
+        if (groupSymbol != null) AddChildTreeNodes(node.Nodes, groupSymbol.Symbols);
       }
-      RebuildImageList();
-      symbolsTreeView.ExpandAll();
     }
 
@@ -134 +136 @@
       if (e.Action != TreeViewAction.Unknown) {
         DeregisterContentEvents();
-        foreach (var symbol in IterateTreeNodes(e.Node).Select(n => n.Tag).OfType<ISymbol>()) {
-          if (e.Node.Checked) symbol.InitialFrequency = 1.0;
-          else symbol.InitialFrequency = 0.0;
-        }
+        var symbol = (ISymbol)e.Node.Tag;
+        symbol.Enabled = e.Node.Checked;
         RegisterContentEvents();
         Content_Changed(Content, EventArgs.Empty);
@@ -176 +176 @@
     protected virtual void RebuildImageList() {
       symbolsTreeView.ImageList.Images.Clear();
-      foreach (TreeNode treeNode in symbolsTreeView.Nodes) {
+      foreach (TreeNode treeNode in IterateTreeNodes()) {
         var symbol = (ISymbol)treeNode.Tag;
         symbolsTreeView.ImageList.Images.Add(symbol == null ? HeuristicLab.Common.Resources.VSImageLibrary.Nothing : symbol.ItemImage);
@@ -183 +183 @@
     }
   }
+    #endregion
 
   [NonDiscoverableType]
@@ -190 +191 @@
     public override IDeepCloneable Clone(Cloner cloner) { return new DummySymbol(this, cloner); }
   }
-
-    #endregion
 }