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

Timestamp:

06/28/11 15:16:25 (13 years ago)

Author:

mkommend

Message:

#1479: added functional improvements to SymbolicExpressionGrammar editor.

Location:

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

Files:

• SymbolicExpressionGrammarAllowedChildSymbolsControl.cs (modified) (1 diff)
• SymbolicExpressionGrammarEditorView.Designer.cs (modified) (1 diff)
• SymbolicExpressionGrammarEditorView.cs (modified) (12 diffs)

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

@@ -131 +131 @@
 
       symbolicExpressionTreeChart.SuspendRepaint = false;
-      symbolicExpressionTreeChart.Repaint();
       UpdateSelectedSymbolicExpressionTreeNodes();
     }

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

@@ -160 +160 @@
       this.symbolsTreeView.TabIndex = 0;
       this.symbolsTreeView.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.symbolsTreeView_AfterCheck);
-      this.symbolsTreeView.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.symbolsTreeView_ItemDrag);
       this.symbolsTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.symbolsTreeView_AfterSelect);
       this.symbolsTreeView.DragDrop += new System.Windows.Forms.DragEventHandler(this.symbolsTreeView_DragDrop);
       this.symbolsTreeView.DragEnter += new System.Windows.Forms.DragEventHandler(this.symbolsTreeView_DragEnter);
       this.symbolsTreeView.DragOver += new System.Windows.Forms.DragEventHandler(this.symbolsTreeView_DragOver);
+      this.symbolsTreeView.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.symbolsTreeView_ItemDrag);
+      this.symbolsTreeView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.symbolsTreeView_KeyDown);
+      this.symbolsTreeView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.symbolsTreeView_MouseDown);
       // 
       // imageList

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

@@ -102 +102 @@
       UpdateSymbolsTreeView();
       if (symbol != null && Content.ContainsSymbol(symbol)) {
-        allowedChildSymbolsControl.Symbol = symbol;
-        symbolDetailsViewHost.Content = symbol;
-        symbolsTreeView.SelectedNode = IterateSymbolTreeNodes().Where(n => n.Tag == symbol).ToList().FirstOrDefault();
+        symbolsTreeView.SelectedNode = IterateTreeNodes().Where(n => n.Tag == symbol).ToList().FirstOrDefault();
+        UpdateSymbolDetailsViews();
       }
     }
@@ -111 +110 @@
     private void UpdateSymbolsTreeView() {
       var symbols = Content.Symbols.ToList();
-      foreach (var treeNode in IterateSymbolTreeNodes().ToList()) {
+      foreach (var treeNode in IterateTreeNodes().ToList()) {
         var symbol = treeNode.Tag as ISymbol;
         if (!symbols.Contains(symbol))
@@ -132 +131 @@
           node.Text = symbol.Name;
           node.Tag = symbol;
-          node.Checked = symbol.Enabled;
           collection.Add(node);
         }
+        node.Checked = symbol.Enabled;
         var groupSymbol = symbol as GroupSymbol;
         if (groupSymbol != null) AddChildTreeNodes(node.Nodes, groupSymbol.Symbols);
@@ -141 +140 @@
 
     private void symbolsTreeView_AfterSelect(object sender, TreeViewEventArgs e) {
-      if (e.Action != TreeViewAction.Unknown) {
-        var symbol = (ISymbol)e.Node.Tag;
-        symbolDetailsViewHost.Content = symbol;
-        allowedChildSymbolsControl.Symbol = symbol;
-      }
+      if (e.Action != TreeViewAction.Unknown) UpdateSymbolDetailsViews();
+
       removeButton.Enabled = symbolsTreeView.SelectedNode != null && !(symbolsTreeView.SelectedNode.Tag is IReadOnlySymbol);
       copyButton.Enabled = symbolsTreeView.SelectedNode != null && !(symbolsTreeView.SelectedNode.Tag is IReadOnlySymbol);
@@ -156 +152 @@
         var symbol = (ISymbol)e.Node.Tag;
         symbol.Enabled = e.Node.Checked;
-        foreach (var node in IterateSymbolTreeNodes())
+        foreach (var node in IterateTreeNodes())
           node.Checked = ((ISymbol)node.Tag).Enabled;
 
-        if (symbolsTreeView.SelectedNode != null) {
-          symbol = (ISymbol)symbolsTreeView.SelectedNode.Tag;
-          allowedChildSymbolsControl.Symbol = symbol;
-        }
         Content.FinishedGrammarManipulation();
       }
@@ -226 +218 @@
     #endregion
 
+    private void symbolsTreeView_MouseDown(object sender, MouseEventArgs e) {
+      // enables deselection of treeNodes
+      if (symbolsTreeView.SelectedNode == null) return;
+      Point coordinates = new Point(e.X, e.Y);
+      if (e.Button == System.Windows.Forms.MouseButtons.Left && symbolsTreeView.GetNodeAt(coordinates) == null) {
+        symbolsTreeView.SelectedNode = null;
+        symbolDetailsViewHost.Content = null;
+        SetEnabledStateOfControls();
+      }
+    }
+
+    private void symbolsTreeView_KeyDown(object sender, KeyEventArgs e) {
+      if (ReadOnly) return;
+      if (symbolsTreeView.SelectedNode == null) return;
+      if (e.KeyCode != Keys.Delete) return;
+
+      var symbol = (ISymbol)symbolsTreeView.SelectedNode.Tag;
+      if (!(symbol is IReadOnlySymbol))
+        Content.RemoveSymbol(symbol);
+
+      SetEnabledStateOfControls();
+      UpdateSymbolDetailsViews();
+      RebuildImageList();
+    }
+
     #region button events
     private TypeSelectorDialog typeSelectorDialog;
@@ -256 +273 @@
       var symbol = symbolsTreeView.SelectedNode.Tag as ISymbol;
       if (symbol != null && !(symbol is IReadOnlySymbol)) {
-        allowedChildSymbolsControl.Symbol = null;
-        symbolDetailsViewHost.Content = null;
 
         Content.StartGrammarManipulation();
@@ -279 +294 @@
       if (symbol != null && !(symbol is IReadOnlySymbol)) {
         Content.RemoveSymbol(symbol);
-        allowedChildSymbolsControl.Symbol = null;
-        symbolDetailsViewHost.Content = null;
       }
     }
@@ -310 +323 @@
     }
 
-
     private void ChangeDuplicateSymbolNames(ISymbol symbol) {
       foreach (var s in symbol.Flatten()) {
@@ -322 +334 @@
     }
 
-    private IEnumerable<TreeNode> IterateSymbolTreeNodes(TreeNode node = null) {
+    private void UpdateSymbolDetailsViews() {
+      if (symbolsTreeView.SelectedNode != null) {
+        symbolDetailsViewHost.Content = (ISymbol)symbolsTreeView.SelectedNode.Tag;
+        allowedChildSymbolsControl.Symbol = (ISymbol)symbolsTreeView.SelectedNode.Tag;
+      } else {
+        symbolDetailsViewHost.Content = null;
+        allowedChildSymbolsControl.Symbol = null;
+      }
+    }
+
+    private IEnumerable<TreeNode> IterateTreeNodes(TreeNode node = null) {
       TreeNodeCollection nodes;
       if (node == null)
@@ -332 +354 @@
 
       foreach (var childNode in nodes.OfType<TreeNode>())
-        foreach (var n in IterateSymbolTreeNodes(childNode))
+        foreach (var n in IterateTreeNodes(childNode))
           yield return n;
     }
@@ -338 +360 @@
     protected virtual void RebuildImageList() {
       symbolsTreeView.ImageList.Images.Clear();
-      foreach (TreeNode treeNode in IterateSymbolTreeNodes()) {
+      foreach (TreeNode treeNode in IterateTreeNodes()) {
         var symbol = (ISymbol)treeNode.Tag;
         symbolsTreeView.ImageList.Images.Add(symbol == null ? HeuristicLab.Common.Resources.VSImageLibrary.Nothing : symbol.ItemImage);
         treeNode.ImageIndex = symbolsTreeView.ImageList.Images.Count - 1;
       }
+    }
+
+    //necessary code to handle dock correctly regarding the expanded nodes
+    bool[] expandendedState;
+    protected override void OnHandleCreated(EventArgs e) {
+      base.OnHandleCreated(e);
+      if (expandendedState == null) return;
+      var nodes = IterateTreeNodes().ToList();
+      for (int i = 0; i < nodes.Count; i++)
+        if (expandendedState[i]) nodes[i].Expand();
+    }
+    protected override void OnHandleDestroyed(EventArgs e) {
+      base.OnHandleDestroyed(e);
+      var nodes = IterateTreeNodes().ToList();
+      expandendedState = new bool[nodes.Count];
+      for (int i = 0; i < nodes.Count; i++)
+        expandendedState[i] = nodes[i].IsExpanded;
     }
     #endregion