Changeset 7784 for branches/HeuristicLab.TreeSimplifierView/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4

Timestamp:

05/08/12 10:10:14 (12 years ago)

Author:

bburlacu

Message:

#1832: Moved replacement and impact values calculation code from view to separate files. Implemented simplifier actions: copy, cut, delete, insert node/subtree.

Location:

branches/HeuristicLab.TreeSimplifierView/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj (modified) (3 diffs)
• InteractiveSymbolicExpressionTreeChart.Designer.cs (added)
• InteractiveSymbolicExpressionTreeChart.cs (added)
• InteractiveSymbolicExpressionTreeChart.resx (added)
• SymbolView.cs (modified) (1 diff)
• SymbolicExpressionGrammarEditorView.Designer.cs (modified) (1 diff)
• SymbolicExpressionGrammarEditorView.cs (modified) (7 diffs)
• SymbolicExpressionTreeChart.Designer.cs (modified) (5 diffs)
• SymbolicExpressionTreeChart.cs (modified) (7 diffs)
• SymbolicExpressionTreeChart.resx (added)
• SymbolicExpressionTreeNodeChangeValueDialog.Designer.cs (added)
• SymbolicExpressionTreeNodeChangeValueDialog.cs (added)
• SymbolicExpressionTreeNodeChangeValueDialog.resx (added)
• SymbolicExpressionTreeNodeInsertDialog.Designer.cs (added)
• SymbolicExpressionTreeNodeInsertDialog.cs (added)
• SymbolicExpressionTreeNodeInsertDialog.resx (added)

branches/HeuristicLab.TreeSimplifierView/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj

@@ -159 +159 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="InteractiveSymbolicExpressionTreeChart.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="InteractiveSymbolicExpressionTreeChart.Designer.cs">
+      <DependentUpon>InteractiveSymbolicExpressionTreeChart.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="SymbolicExpressionGrammarAllowedChildSymbolsControl.cs">
@@ -183 +189 @@
     <Compile Include="SymbolicExpressionGrammarView.Designer.cs">
       <DependentUpon>SymbolicExpressionGrammarView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SymbolicExpressionTreeNodeChangeValueDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SymbolicExpressionTreeNodeChangeValueDialog.Designer.cs">
+      <DependentUpon>SymbolicExpressionTreeNodeChangeValueDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SymbolicExpressionTreeNodeInsertDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SymbolicExpressionTreeNodeInsertDialog.Designer.cs">
+      <DependentUpon>SymbolicExpressionTreeNodeInsertDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="SymbolView.cs">
@@ -233 +251 @@
       <Install>true</Install>
     </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="InteractiveSymbolicExpressionTreeChart.resx">
+      <DependentUpon>InteractiveSymbolicExpressionTreeChart.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SymbolicExpressionTreeChart.resx">
+      <DependentUpon>SymbolicExpressionTreeChart.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SymbolicExpressionTreeNodeChangeValueDialog.resx">
+      <DependentUpon>SymbolicExpressionTreeNodeChangeValueDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SymbolicExpressionTreeNodeInsertDialog.resx">
+      <DependentUpon>SymbolicExpressionTreeNodeInsertDialog.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/HeuristicLab.TreeSimplifierView/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolView.cs

@@ -29 +29 @@
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
   [View("Symbol View")]
-  [Content(typeof(ISymbol), false)]
+  [Content(typeof(ISymbol), true)]
   public partial class SymbolView : NamedItemView {
     public new ISymbol Content {

branches/HeuristicLab.TreeSimplifierView/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarEditorView.Designer.cs

@@ -170 +170 @@
       this.symbolsTreeView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.symbolsTreeView_KeyDown);
       this.symbolsTreeView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.symbolsTreeView_MouseDown);
+      this.symbolsTreeView.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(symbolsTreeView_NodeMouseDoubleClick);
       // 
       // imageList

branches/HeuristicLab.TreeSimplifierView/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarEditorView.cs

@@ -62 +62 @@
         copyButton.Enabled = false;
         treeViewBackColor = symbolsTreeView.BackColor;
-        symbolsTreeView.BackColor = Color.FromArgb(255,240,240,240);
+        symbolsTreeView.BackColor = Color.FromArgb(255, 240, 240, 240);
       } else {
         addButton.Enabled = true;
@@ -125 +125 @@
     #endregion
 
-    private bool internalTreeViewUpdateInProgress = false;
     private void UpdateSymbolsTreeView() {
-      internalTreeViewUpdateInProgress = true;
       var symbols = Content.Symbols.ToList();
       foreach (var treeNode in IterateTreeNodes().ToList()) {
@@ -140 +138 @@
 
       RebuildImageList();
-      internalTreeViewUpdateInProgress = false;
     }
 
@@ -181 +178 @@
 
     private void symbolsTreeView_BeforeCheck(object sender, TreeViewCancelEventArgs e) {
-      if (internalTreeViewUpdateInProgress) return;      
       if (Content == null || Content.ReadOnly) e.Cancel = true;
       if (ReadOnly || Locked) e.Cancel = true;
@@ -187 +183 @@
 
     #region drag & drop operations
-    private GroupSymbol parentOfDraggedSymbol;
     private void symbolsTreeView_ItemDrag(object sender, ItemDragEventArgs e) {
       if (!Locked) {
         var treeNode = e.Item as TreeNode;
-        if (treeNode.Parent != null) parentOfDraggedSymbol = treeNode.Parent.Tag as GroupSymbol;
         var data = new DataObject();
         data.SetData(HeuristicLab.Common.Constants.DragDropDataFormat, treeNode.Tag);
@@ -257 +251 @@
     }
 
+    private void symbolsTreeView_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e) {
+      var symbol = e.Node.Tag as ISymbol;
+      if (symbol == null) return;
+      if (e.Button != MouseButtons.Left) return;
+      if (e.X < e.Node.Bounds.Left - symbolsTreeView.ImageList.Images[e.Node.ImageIndex].Width || e.X > e.Node.Bounds.Right) return;
+      MainFormManager.MainForm.ShowContent(symbol);
+      e.Node.Toggle();
+    }
+
     private void symbolsTreeView_KeyDown(object sender, KeyEventArgs e) {
       if (Content == null || Content.ReadOnly || ReadOnly || Locked) return;
@@ -424 +427 @@
 
   //this class is necessary to prevent double clicks which do not fire the checkbox checked event
+  //workaround taken from http://connect.microsoft.com/VisualStudio/feedback/details/374516/treeview-control-does-not-fire-events-reliably-when-double-clicking-on-checkbox
   internal class CheckBoxTreeView : TreeView {
     protected override void WndProc(ref Message m) {
       // Suppress WM_LBUTTONDBLCLK
-      if (m.Msg == 0x203) { m.Result = IntPtr.Zero; } else base.WndProc(ref m);
+      if (m.Msg == 0x203 && IsOnCheckBox(m)) { m.Result = IntPtr.Zero; } else base.WndProc(ref m);
+    }
+
+    private int GetXLParam(IntPtr lParam) {
+      return lParam.ToInt32() & 0xffff;
+    }
+
+    private int GetYLParam(IntPtr lParam) {
+      return lParam.ToInt32() >> 16;
+    }
+
+    private bool IsOnCheckBox(Message m) {
+      int x = GetXLParam(m.LParam);
+      int y = GetYLParam(m.LParam);
+      TreeNode node = this.GetNodeAt(x, y);
+      return ((x <= node.Bounds.Left - 20) && (x >= node.Bounds.Left - 32));
     }
   }

branches/HeuristicLab.TreeSimplifierView/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.Designer.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Windows.Forms;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
@@ -53 +50 @@
       this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
       this.saveImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.changeValueToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
       this.contextMenuStrip.SuspendLayout();
@@ -61 +57 @@
       // 
       this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.saveImageToolStripMenuItem,
-            this.changeValueToolStripMenuItem});
+            this.saveImageToolStripMenuItem});
       this.contextMenuStrip.Name = "contextMenuStrip";
-      this.contextMenuStrip.Size = new System.Drawing.Size(153, 70);
-      this.contextMenuStrip.Opened += new System.EventHandler(this.contextMenuStrip_Opened);
+      this.contextMenuStrip.Size = new System.Drawing.Size(153, 48);
       // 
       // saveImageToolStripMenuItem
@@ -73 +67 @@
       this.saveImageToolStripMenuItem.Text = "Save Image";
       this.saveImageToolStripMenuItem.Click += new System.EventHandler(this.saveImageToolStripMenuItem_Click);
-      // 
-      // changeValueToolStripMenuItem
-      // 
-      this.changeValueToolStripMenuItem.Enabled = false;
-      this.changeValueToolStripMenuItem.Name = "changeValueToolStripMenuItem";
-      this.changeValueToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-      this.changeValueToolStripMenuItem.Text = "Change Value";
-      this.changeValueToolStripMenuItem.Click += new System.EventHandler(this.changeValueToolStripMenuItem_Click);
       // 
       // saveFileDialog
@@ -105 +91 @@
 
     private System.Windows.Forms.ToolTip toolTip;
-    private System.Windows.Forms.ContextMenuStrip contextMenuStrip;
     private System.Windows.Forms.ToolStripMenuItem saveImageToolStripMenuItem;
     private System.Windows.Forms.SaveFileDialog saveFileDialog;
-    private System.Windows.Forms.ToolStripMenuItem changeValueToolStripMenuItem;
+    internal System.Windows.Forms.ContextMenuStrip contextMenuStrip;
   }
 }

branches/HeuristicLab.TreeSimplifierView/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
-  public sealed partial class SymbolicExpressionTreeChart : UserControl {
+  public partial class SymbolicExpressionTreeChart : UserControl {
     private Image image;
     private StringFormat stringFormat;
-    private Dictionary<ISymbolicExpressionTreeNode, VisualSymbolicExpressionTreeNode> visualTreeNodes;
-    private Dictionary<Tuple<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>, VisualSymbolicExpressionTreeNodeConnection> visualLines;
-    private VisualSymbolicExpressionTreeNode selectedNode;
+    protected Dictionary<ISymbolicExpressionTreeNode, VisualSymbolicExpressionTreeNode> visualTreeNodes;
+    protected Dictionary<Tuple<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>, VisualSymbolicExpressionTreeNodeConnection> visualLines;
 
     public SymbolicExpressionTreeChart() {
@@ -44 +43 @@
       this.backgroundColor = Color.White;
       this.textFont = new Font("Times New Roman", 8);
-      selectedNode = null;
     }
 
@@ -158 +156 @@
 
     #region events
-    public event EventHandler SymbolicExpressionTreeNodeChanged;
-    private void OnSymbolicExpressionTreeNodeChanged(object sender, EventArgs e) {
-      var changed = SymbolicExpressionTreeNodeChanged;
-      if (changed != null) {
-        changed(sender, e);
-      }
-    }
-
     public event MouseEventHandler SymbolicExpressionTreeNodeClicked;
-    private void OnSymbolicExpressionTreeNodeClicked(object sender, MouseEventArgs e) {
+    protected void OnSymbolicExpressionTreeNodeClicked(object sender, MouseEventArgs e) {
       var clicked = SymbolicExpressionTreeNodeClicked;
       if (clicked != null)
@@ -173 +163 @@
     }
 
-    private void SymbolicExpressionTreeChart_MouseClick(object sender, MouseEventArgs e) {
+    protected virtual void SymbolicExpressionTreeChart_MouseClick(object sender, MouseEventArgs e) {
       VisualSymbolicExpressionTreeNode visualTreeNode = FindVisualSymbolicExpressionTreeNodeAt(e.X, e.Y);
-      if (visualTreeNode != null)
+      if (visualTreeNode != null) {
         OnSymbolicExpressionTreeNodeClicked(visualTreeNode, e);
+      }
     }
 
     public event MouseEventHandler SymbolicExpressionTreeNodeDoubleClicked;
-    private void OnSymbolicExpressionTreeNodeDoubleClicked(object sender, MouseEventArgs e) {
+    protected void OnSymbolicExpressionTreeNodeDoubleClicked(object sender, MouseEventArgs e) {
       var doubleClicked = SymbolicExpressionTreeNodeDoubleClicked;
       if (doubleClicked != null)
@@ -193 +184 @@
 
     public event ItemDragEventHandler SymbolicExpressionTreeNodeDrag;
-    private void OnSymbolicExpressionTreeNodeDragDrag(object sender, ItemDragEventArgs e) {
+    protected void OnSymbolicExpressionTreeNodeDragDrag(object sender, ItemDragEventArgs e) {
       var dragged = SymbolicExpressionTreeNodeDrag;
       if (dragged != null)
@@ -244 +235 @@
     /// 
     /// </summary>
-    /// <param name="functionTree"> functiontree to draw</param>
+    /// <param name="functionTree"> function tree to draw</param>
     /// <param name="graphics">graphics object to draw on</param>
     /// <param name="x">x coordinate of drawing area</param>
@@ -357 +348 @@
     }
     #endregion
-
-    private void contextMenuStrip_Opened(object sender, EventArgs e) {
-      var menu = sender as ContextMenuStrip;
-      if (menu == null) return;
-      var point = menu.SourceControl.PointToClient(Cursor.Position);
-      selectedNode = FindVisualSymbolicExpressionTreeNodeAt(point.X, point.Y);
-      if (selectedNode != null) {
-        OnSymbolicExpressionTreeNodeClicked(selectedNode, new MouseEventArgs(MouseButtons.Right, 1, point.X, point.Y, 0));
-      }
-    }
-
-    private void changeValueToolStripMenuItem_Click(object sender, EventArgs e) {
-      if (selectedNode != null) // this should never be null anyway
-        OnSymbolicExpressionTreeNodeChanged(selectedNode, e);
-    }
   }
 }