Changeset 6377 for branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views

Timestamp:

06/07/11 12:49:03 (13 years ago)

Author:

mkommend

Message:

#1479: Merged trunk changes into branch.

Location:

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

Files:

• SymbolicExpressionGrammarEditorView.Designer.cs (modified) (10 diffs)
• SymbolicExpressionGrammarEditorView.cs (modified) (11 diffs)
• SymbolicExpressionTreeChart.cs (modified) (3 diffs)

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

@@ -31 +31 @@
       this.imageList = new System.Windows.Forms.ImageList(this.components);
       this.splitContainer2 = new System.Windows.Forms.SplitContainer();
-      this.symbolViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.symbolDetailsViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.showDetailsCheckBox = new System.Windows.Forms.CheckBox();
       this.removeButton = new System.Windows.Forms.Button();
       this.addButton = new System.Windows.Forms.Button();
-      this.symbolicExpressionTreeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
+      this.allowedChildSymbolsControl = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.grpSymbols.SuspendLayout();
@@ -60 +60 @@
       // grpSymbols
       // 
-      this.grpSymbols.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.grpSymbols.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.grpSymbols.Controls.Add(this.splitContainer1);
@@ -93 +93 @@
       // symbolsTreeView
       // 
-      this.symbolsTreeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.symbolsTreeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.symbolsTreeView.CheckBoxes = true;
@@ -123 +123 @@
       // splitContainer2.Panel1
       // 
-      this.splitContainer2.Panel1.Controls.Add(this.symbolicExpressionTreeChart);
+      this.splitContainer2.Panel1.Controls.Add(this.allowedChildSymbolsControl);
       // 
       // splitContainer2.Panel2
       // 
-      this.splitContainer2.Panel2.Controls.Add(this.symbolViewHost);
+      this.splitContainer2.Panel2.Controls.Add(this.symbolDetailsViewHost);
       this.splitContainer2.Size = new System.Drawing.Size(568, 359);
       this.splitContainer2.SplitterDistance = 165;
@@ -134 +134 @@
       // symbolViewHost
       // 
-      this.symbolViewHost.Caption = "View";
-      this.symbolViewHost.Content = null;
-      this.symbolViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.symbolViewHost.Enabled = false;
-      this.symbolViewHost.Location = new System.Drawing.Point(0, 0);
-      this.symbolViewHost.Name = "symbolViewHost";
-      this.symbolViewHost.ReadOnly = false;
-      this.symbolViewHost.Size = new System.Drawing.Size(568, 190);
-      this.symbolViewHost.TabIndex = 0;
-      this.symbolViewHost.ViewsLabelVisible = true;
-      this.symbolViewHost.ViewType = null;
+      this.symbolDetailsViewHost.Caption = "View";
+      this.symbolDetailsViewHost.Content = null;
+      this.symbolDetailsViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.symbolDetailsViewHost.Enabled = false;
+      this.symbolDetailsViewHost.Location = new System.Drawing.Point(0, 0);
+      this.symbolDetailsViewHost.Name = "symbolViewHost";
+      this.symbolDetailsViewHost.ReadOnly = false;
+      this.symbolDetailsViewHost.Size = new System.Drawing.Size(568, 190);
+      this.symbolDetailsViewHost.TabIndex = 0;
+      this.symbolDetailsViewHost.ViewsLabelVisible = true;
+      this.symbolDetailsViewHost.ViewType = null;
       // 
       // showDetailsCheckBox
@@ -151 +151 @@
       this.showDetailsCheckBox.Checked = true;
       this.showDetailsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.showDetailsCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("showDetailsCheckBox.Image")));
+      this.showDetailsCheckBox.Image = HeuristicLab.Common.Resources.VSImageLibrary.Properties;
       this.showDetailsCheckBox.Location = new System.Drawing.Point(63, 3);
       this.showDetailsCheckBox.Name = "showDetailsCheckBox";
@@ -163 +163 @@
       // 
       this.removeButton.Enabled = false;
-      this.removeButton.Image = ((System.Drawing.Image)(resources.GetObject("removeButton.Image")));
+      this.removeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Remove;
       this.removeButton.Location = new System.Drawing.Point(33, 3);
       this.removeButton.Name = "removeButton";
@@ -174 +174 @@
       // addButton
       // 
-      this.addButton.Image = ((System.Drawing.Image)(resources.GetObject("addButton.Image")));
+      this.addButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Add;
       this.addButton.Location = new System.Drawing.Point(3, 3);
       this.addButton.Name = "addButton";
@@ -185 +185 @@
       // symbolicExpressionTreeChart
       // 
-      this.symbolicExpressionTreeChart.AllowDrop = true;
-      this.symbolicExpressionTreeChart.BackgroundColor = System.Drawing.Color.White;
-      this.symbolicExpressionTreeChart.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.symbolicExpressionTreeChart.LineColor = System.Drawing.Color.Black;
-      this.symbolicExpressionTreeChart.Location = new System.Drawing.Point(0, 0);
-      this.symbolicExpressionTreeChart.Name = "symbolicExpressionTreeChart";
-      this.symbolicExpressionTreeChart.Size = new System.Drawing.Size(568, 165);
-      this.symbolicExpressionTreeChart.Spacing = 5;
-      this.symbolicExpressionTreeChart.TabIndex = 0;
-      this.symbolicExpressionTreeChart.TextFont = new System.Drawing.Font("Times New Roman", 8F);
-      this.symbolicExpressionTreeChart.Tree = null;
-      this.symbolicExpressionTreeChart.SymbolicExpressionTreeNodeClicked += new System.Windows.Forms.MouseEventHandler(this.symbolicExpressionTreeChart_SymbolicExpressionTreeNodeClicked);
-      this.symbolicExpressionTreeChart.DragDrop += new System.Windows.Forms.DragEventHandler(this.symbolicExpressionTreeChart_DragDrop);
-      this.symbolicExpressionTreeChart.DragEnter += new System.Windows.Forms.DragEventHandler(this.symbolicExpressionTreeChart_DragEnter);
-      this.symbolicExpressionTreeChart.DragOver += new System.Windows.Forms.DragEventHandler(this.symbolicExpressionTreeChart_DragOver);
-      this.symbolicExpressionTreeChart.KeyDown += new System.Windows.Forms.KeyEventHandler(this.symbolicExpressionTreeChart_KeyDown);
+      this.allowedChildSymbolsControl.AllowDrop = true;
+      this.allowedChildSymbolsControl.BackgroundColor = System.Drawing.Color.White;
+      this.allowedChildSymbolsControl.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.allowedChildSymbolsControl.LineColor = System.Drawing.Color.Black;
+      this.allowedChildSymbolsControl.Location = new System.Drawing.Point(0, 0);
+      this.allowedChildSymbolsControl.Name = "symbolicExpressionTreeChart";
+      this.allowedChildSymbolsControl.Size = new System.Drawing.Size(568, 165);
+      this.allowedChildSymbolsControl.Spacing = 5;
+      this.allowedChildSymbolsControl.TabIndex = 0;
+      this.allowedChildSymbolsControl.TextFont = new System.Drawing.Font("Times New Roman", 8F);
+      this.allowedChildSymbolsControl.Tree = null;
+      this.allowedChildSymbolsControl.SymbolicExpressionTreeNodeClicked += new System.Windows.Forms.MouseEventHandler(this.symbolicExpressionTreeChart_SymbolicExpressionTreeNodeClicked);
+      this.allowedChildSymbolsControl.DragDrop += new System.Windows.Forms.DragEventHandler(this.symbolicExpressionTreeChart_DragDrop);
+      this.allowedChildSymbolsControl.DragEnter += new System.Windows.Forms.DragEventHandler(this.symbolicExpressionTreeChart_DragEnter);
+      this.allowedChildSymbolsControl.DragOver += new System.Windows.Forms.DragEventHandler(this.symbolicExpressionTreeChart_DragOver);
+      this.allowedChildSymbolsControl.KeyDown += new System.Windows.Forms.KeyEventHandler(this.symbolicExpressionTreeChart_KeyDown);
       // 
       // SymbolicExpressionGrammarEditorView
@@ -233 +233 @@
     private System.Windows.Forms.TreeView symbolsTreeView;
     private System.Windows.Forms.SplitContainer splitContainer2;
-    private SymbolicExpressionTreeChart symbolicExpressionTreeChart;
-    private MainForm.WindowsForms.ViewHost symbolViewHost;
+    private SymbolicExpressionTreeChart allowedChildSymbolsControl;
+    private MainForm.WindowsForms.ViewHost symbolDetailsViewHost;
     private System.Windows.Forms.ImageList imageList;
     protected System.Windows.Forms.CheckBox showDetailsCheckBox;

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

@@ -82 +82 @@
       if (symbol != null && Content.ContainsSymbol(symbol)) {
         BuildAllowedChildSymbolsTree(symbol);
-        symbolViewHost.Content = symbol;
+        symbolDetailsViewHost.Content = symbol;
         symbolsTreeView.SelectedNode = IterateSymbolTreeNodes().Where(n => n.Tag == symbol).ToList().FirstOrDefault();
       }
@@ -96 +96 @@
       if (Content != null) {
         RebuildSymbolsTreeView();
-        symbolicExpressionTreeChart.Tree = null;
-        symbolViewHost.Content = null;
+        allowedChildSymbolsControl.Tree = null;
+        symbolDetailsViewHost.Content = null;
       } else {
         symbolsTreeView.Nodes.Clear();
-        symbolicExpressionTreeChart.Tree = null;
-        symbolViewHost.Content = null;
+        allowedChildSymbolsControl.Tree = null;
+        symbolDetailsViewHost.Content = null;
       }
     }
@@ -121 +121 @@
       if (e.Action != TreeViewAction.Unknown) {
         var symbol = (ISymbol)e.Node.Tag;
-        symbolViewHost.Content = symbol;
+        symbolDetailsViewHost.Content = symbol;
         selectedSymbolicExpressionTreeNodes.Clear();
         BuildAllowedChildSymbolsTree(symbol);
@@ -168 +168 @@
         }
       }
-      symbolicExpressionTreeChart.Tree = tree;
+      allowedChildSymbolsControl.Tree = tree;
       UpdateSelectedSymbolicExpressionTreeNodes();
     }
@@ -191 +191 @@
       if (e.KeyCode == Keys.Delete) {
         DeregisterContentEvents();
-        var root = symbolicExpressionTreeChart.Tree.Root;
+        var root = allowedChildSymbolsControl.Tree.Root;
         foreach (var node in selectedSymbolicExpressionTreeNodes) {
           int argIndex = root.IndexOfSubtree(node.Parent);
@@ -216 +216 @@
       var symbol = data as ISymbol;
       var symbols = data as IEnumerable<ISymbol>;
-      if (symbol != null && Content.ContainsSymbol(symbol)) validDragOperation = true;
-      else if (symbols != null && symbols.All(s => Content.ContainsSymbol(s))) validDragOperation = true;
-    }
-
+      if (symbol != null && !(symbol is IReadOnlySymbol) && !Content.ContainsSymbol(symbol)) validDragOperation = true;
+      else if (symbols != null && symbols.All(s => !(symbol is IReadOnlySymbol) && Content.ContainsSymbol(s))) validDragOperation = true;
+    }
 
     private void symbolicExpressionTreeChart_DragOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
       if (validDragOperation) {
-        Point coordinates = symbolicExpressionTreeChart.PointToClient(new Point(e.X, e.Y));
-        var visualNode = symbolicExpressionTreeChart.FindVisualSymbolicExpressionTreeNodeAt(coordinates.X, coordinates.Y);
+        Point coordinates = allowedChildSymbolsControl.PointToClient(new Point(e.X, e.Y));
+        var visualNode = allowedChildSymbolsControl.FindVisualSymbolicExpressionTreeNodeAt(coordinates.X, coordinates.Y);
         if (visualNode != null) {
           var node = visualNode.SymbolicExpressionTreeNode;
-          var root = symbolicExpressionTreeChart.Tree.Root;
+          var root = allowedChildSymbolsControl.Tree.Root;
+          if (root.Symbol is ProgramRootSymbol) return;
           if (node == root || node.Parent == root) e.Effect = DragDropEffects.Copy;
         }
@@ -235 +235 @@
 
     private void symbolicExpressionTreeChart_DragDrop(object sender, DragEventArgs e) {
-      Point coordinates = symbolicExpressionTreeChart.PointToClient(new Point(e.X, e.Y));
-      var node = symbolicExpressionTreeChart.FindVisualSymbolicExpressionTreeNodeAt(coordinates.X, coordinates.Y);
-      var root = symbolicExpressionTreeChart.Tree.Root;
+      Point coordinates = allowedChildSymbolsControl.PointToClient(new Point(e.X, e.Y));
+      var node = allowedChildSymbolsControl.FindVisualSymbolicExpressionTreeNodeAt(coordinates.X, coordinates.Y);
+      var root = allowedChildSymbolsControl.Tree.Root;
 
       var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
@@ -261 +261 @@
 
     private void UpdateSelectedSymbolicExpressionTreeNodes() {
-      foreach (var node in symbolicExpressionTreeChart.Tree.IterateNodesPrefix()) {
-        var visualNode = symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(node);
+      foreach (var node in allowedChildSymbolsControl.Tree.IterateNodesPrefix()) {
+        var visualNode = allowedChildSymbolsControl.GetVisualSymbolicExpressionTreeNode(node);
         if (!selectedSymbolicExpressionTreeNodes.Contains(node)) {
           visualNode.FillColor = Color.White;
@@ -271 +271 @@
         }
       }
-      symbolicExpressionTreeChart.Repaint();
+      allowedChildSymbolsControl.Repaint();
     }
 
@@ -291 +291 @@
             i++;
           }
-          Content.AddSymbol(symbol);
+
+          var selectedNode = symbolsTreeView.SelectedNode;
+          GroupSymbol groupSymbol = null;
+          while (selectedNode != null) {
+            groupSymbol = selectedNode.Tag as GroupSymbol;
+            if (groupSymbol != null && Content.ContainsSymbol(groupSymbol)) break;
+          }
+
+          if (groupSymbol != null && Content.ContainsSymbol(groupSymbol)) groupSymbol.SymbolsCollection.Add(symbol);
+          else Content.AddSymbol(symbol);
         }
         catch (Exception ex) {
@@ -304 +313 @@
         Content.RemoveSymbol(symbol);
       removeButton.Enabled = false;
+      allowedChildSymbolsControl.Tree = null;
+      symbolDetailsViewHost.Content = null;
     }
 

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

@@ -24 +24 @@
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.Linq;
 using System.Windows.Forms;
 
@@ -263 +262 @@
 
       //draw terminal node
-      if (node.Subtrees.Count() == 0) {
+      if (node.SubtreesCount == 0) {
         graphics.FillRectangle(nodeFillBrush, visualTreeNode.X, visualTreeNode.Y, visualTreeNode.Width, visualTreeNode.Height);
         graphics.DrawRectangle(nodeLinePen, visualTreeNode.X, visualTreeNode.Y, visualTreeNode.Width, visualTreeNode.Height);
@@ -281 +280 @@
       //calculate areas for the subtrees according to their tree size and call drawFunctionTree
       Point connectFrom = new Point(visualTreeNode.X + visualTreeNode.Width / 2, visualTreeNode.Y + visualTreeNode.Height);
-      int[] xBoundaries = new int[node.Subtrees.Count() + 1];
+      int[] xBoundaries = new int[node.SubtreesCount + 1];
       xBoundaries[0] = x;
-      for (int i = 0; i < node.Subtrees.Count(); i++) {
-        xBoundaries[i + 1] = (int)(xBoundaries[i] + (width * (double)node.Subtrees.ElementAt(i).GetLength()) / (node.GetLength() - 1));
-        DrawFunctionTree(node.Subtrees.ElementAt(i), graphics, xBoundaries[i], y + height,
+      for (int i = 0; i < node.SubtreesCount; i++) {
+        xBoundaries[i + 1] = (int)(xBoundaries[i] + (width * (double)node.GetSubtree(i).GetLength()) / (node.GetLength() - 1));
+        DrawFunctionTree(node.GetSubtree(i), graphics, xBoundaries[i], y + height,
           xBoundaries[i + 1] - xBoundaries[i], height, connectFrom);
       }