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

Timestamp:

06/29/11 13:08:43 (13 years ago)

Author:

mkommend

Message:

#1479: Generate sample tree and minor bug fixes.

File:

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

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

@@ -32 +32 @@
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
   [View("Symbolic Expression Grammar Editor")]
-  [Content(typeof(ISymbolicExpressionGrammar), false)]
+  [Content(typeof(ISymbolicExpressionGrammar), true)]
   public partial class SymbolicExpressionGrammarEditorView : NamedItemView {
     public SymbolicExpressionGrammarEditorView() {
@@ -220 +220 @@
     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) {
+      TreeNode node = symbolsTreeView.GetNodeAt(coordinates);
+      if (e.Button == System.Windows.Forms.MouseButtons.Left && node == null) {
         symbolsTreeView.SelectedNode = null;
         symbolDetailsViewHost.Content = null;
@@ -256 +256 @@
           ISymbol symbol = (ISymbol)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
           ChangeDuplicateSymbolNames(symbol);
-
-          var selectedNode = symbolsTreeView.SelectedNode;
-          GroupSymbol groupSymbol = selectedNode.Tag as GroupSymbol;
-          if (groupSymbol == null && selectedNode.Parent != null) groupSymbol = selectedNode.Parent.Tag as GroupSymbol;
-
+          GroupSymbol groupSymbol = null;
+
+          TreeNode selectedNode = symbolsTreeView.SelectedNode;
+          if (selectedNode != null) {
+            groupSymbol = selectedNode.Tag as GroupSymbol;
+            if (groupSymbol == null && selectedNode.Parent != null) groupSymbol = selectedNode.Parent.Tag as GroupSymbol;
+          }
           if (groupSymbol != null) groupSymbol.SymbolsCollection.Add(symbol);
           else Content.AddSymbol(symbol);
@@ -300 +302 @@
       splitContainer1.Panel2Collapsed = !showDetailsCheckBox.Checked;
     }
+
+    private void showSampleTreeButton_Click(object sender, EventArgs e) {
+      SymbolicExpressionGrammarSampleExpressionTreeView view = new SymbolicExpressionGrammarSampleExpressionTreeView();
+      view.Content = Content;
+      view.Show();
+    }
+
     #endregion