Changeset 11120 for stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarAllowedChildSymbolsControl.cs

Timestamp:

07/07/14 16:55:50 (10 years ago)

Author:

gkronber

Message:

#2076,#2159, #2092
multi-ticket merge to stable:

• merged r10496,r10519,r10520,r10521,r10531,r10561,r10564,r10565,r10799,r10800,r10862,r10885,r11065 (#2076)
• merged r10499 (#2092)
• merged r10522,r10523,r10953,r10956 (#2159)

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarAllowedChildSymbolsControl.cs (modified) (9 diffs)

stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarAllowedChildSymbolsControl.cs

@@ -29 +29 @@
 using HeuristicLab.PluginInfrastructure;
 
+using VisualSymbolicExpressionTreeNode = HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.VisualTreeNode<HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.ISymbolicExpressionTreeNode>;
+
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
   public sealed partial class SymbolicExpressionGrammarAllowedChildSymbolsControl : UserControl {
@@ -103 +105 @@
 
       var tree = new SymbolicExpressionTree(new SymbolicExpressionTreeNode(Symbol));
-      symbolicExpressionTreeChart.SuspendRepaint = true;
       if (Grammar.GetMaximumSubtreeCount(Symbol) > 0) {
         for (int i = 0; i < Grammar.GetMaximumSubtreeCount(Symbol); i++) {
@@ -116 +117 @@
       }
       symbolicExpressionTreeChart.Tree = tree;
-
+      symbolicExpressionTreeChart.SuspendRepaint = true;
       foreach (var subtreeNode in tree.Root.Subtrees) {
         foreach (var allowedChildNode in subtreeNode.Subtrees) {
@@ -142 +143 @@
         }
       }
-
       symbolicExpressionTreeChart.SuspendRepaint = false;
       UpdateSelectedSymbolicExpressionTreeNodes();
@@ -153 +153 @@
         else visualNode.FillColor = Color.LightSteelBlue;
       }
-      symbolicExpressionTreeChart.Repaint();
+      symbolicExpressionTreeChart.RepaintNodes();
     }
 
@@ -162 +162 @@
 
       VisualSymbolicExpressionTreeNode clickedNode = (VisualSymbolicExpressionTreeNode)sender;
-      var selectedNode = clickedNode.SymbolicExpressionTreeNode;
+      var selectedNode = clickedNode.Content;
       if (selectedNode.SubtreeCount == 0) {
         if (!selectedSymbolicExpressionTreeNodes.Contains(selectedNode))
@@ -207 +207 @@
         var visualNode = symbolicExpressionTreeChart.FindVisualSymbolicExpressionTreeNodeAt(coordinates.X, coordinates.Y);
         if (visualNode != null) {
-          var node = visualNode.SymbolicExpressionTreeNode;
+          var node = visualNode.Content;
           var root = symbolicExpressionTreeChart.Tree.Root;
           if (node == root || node.Parent == root) e.Effect = DragDropEffects.Copy;
@@ -223 +223 @@
       var symbols = data as IEnumerable<ISymbol>;
 
-      if (node.SymbolicExpressionTreeNode == root) {
+      if (node.Content == root) {
         if (symbol != null)
           Grammar.AddAllowedChildSymbol(root.Symbol, symbol);
@@ -229 +229 @@
           foreach (var s in symbols) Grammar.AddAllowedChildSymbol(root.Symbol, s);
       } else {
-        int argumentIndex = root.IndexOfSubtree(node.SymbolicExpressionTreeNode);
+        int argumentIndex = root.IndexOfSubtree(node.Content);
         if (symbol != null)
           Grammar.AddAllowedChildSymbol(root.Symbol, symbol, argumentIndex);