Changeset 7372

Timestamp:

01/19/12 17:04:32 (12 years ago)

Author:

bburlacu

Message:

#1763: Intermediate commit with work done on the SymbolicExpressionTreeChart view (proxy right click events to nodes, methods for changing the weight/value of variable/constant nodes).

Location:

branches/HeuristicLab.TreeSimplifierView

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.Designer.cs (modified) (4 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.suo (modified) (previous)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (1 diff)

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

@@ -135 +135 @@
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Random-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
@@ -232 +233 @@
       <Install>true</Install>
     </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SymbolicExpressionTreeChart.resx">
+      <DependentUpon>SymbolicExpressionTreeChart.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -19 +19 @@
  */
 #endregion
+
+using System;
+using System.Windows.Forms;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
@@ -49 +53 @@
       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();
@@ -56 +61 @@
       // 
       this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.saveImageToolStripMenuItem});
+            this.saveImageToolStripMenuItem,
+            this.changeValueToolStripMenuItem});
       this.contextMenuStrip.Name = "contextMenuStrip";
-      this.contextMenuStrip.Size = new System.Drawing.Size(135, 26);
+      this.contextMenuStrip.Size = new System.Drawing.Size(153, 70);
+      this.contextMenuStrip.Opened += new System.EventHandler(this.contextMenuStrip_Opened);
       // 
       // saveImageToolStripMenuItem
       // 
       this.saveImageToolStripMenuItem.Name = "saveImageToolStripMenuItem";
-      this.saveImageToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
+      this.saveImageToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
       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
       // 
       this.saveFileDialog.Filter = "Bitmap (*.bmp)|*.bmp|EMF (*.emf)|*.emf";
-      this.saveFileDialog.FilterIndex = 1;      
+      // 
       // SymbolicExpressionTreeChart
       // 
@@ -93 +108 @@
     private System.Windows.Forms.ToolStripMenuItem saveImageToolStripMenuItem;
     private System.Windows.Forms.SaveFileDialog saveFileDialog;
+    private System.Windows.Forms.ToolStripMenuItem changeValueToolStripMenuItem;
   }
 }

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

@@ -25 +25 @@
 using System.Drawing.Imaging;
 using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
@@ -32 +33 @@
     private Dictionary<ISymbolicExpressionTreeNode, VisualSymbolicExpressionTreeNode> visualTreeNodes;
     private Dictionary<Tuple<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>, VisualSymbolicExpressionTreeNodeConnection> visualLines;
+    private VisualSymbolicExpressionTreeNode selectedNode;
 
     public SymbolicExpressionTreeChart() {
@@ -43 +45 @@
       this.backgroundColor = Color.White;
       this.textFont = new Font("Times New Roman", 8);
+      selectedNode = null;
     }
 
@@ -347 +350 @@
     }
     #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) {
+      var treeNode = selectedNode.SymbolicExpressionTreeNode;
+      // textbox as a popup/tooltip
+      var dialog = new Core.Views.TextDialog("Change value", String.Empty, false);
+      dialog.AutoSize = true;
+      dialog.ShowDialog(this);
+      double newValue;
+      if (double.TryParse(dialog.Text, out newValue)) {
+        if (treeNode.Symbol is Problems.DataAnalysis.Symbolic.Constant) {
+          var node = treeNode as Problems.DataAnalysis.Symbolic.ConstantTreeNode;
+          node.Value = newValue;
+        } else if (treeNode.Symbol is Problems.DataAnalysis.Symbolic.Variable) {
+          var node = treeNode as Problems.DataAnalysis.Symbolic.VariableTreeNode;
+          node.Weight = newValue;
+        }
+      }
+      this.Repaint();
+    }
   }
 }

branches/HeuristicLab.TreeSimplifierView/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

@@ -211 +211 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="InteractiveSymbolicDataAnalysisSolutionSimplifierView.resx">
+      <DependentUpon>InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/HeuristicLab.TreeSimplifierView/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.treeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.splitContainer = new System.Windows.Forms.SplitContainer();
@@ -53 +52 @@
       this.btnOptimizeConstants = new System.Windows.Forms.Button();
       this.grpViewHost = new System.Windows.Forms.GroupBox();
+      this.treeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
@@ -61 +61 @@
       this.grpViewHost.SuspendLayout();
       this.SuspendLayout();
-      // 
-      // treeChart
-      // 
-      this.treeChart.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.treeChart.BackgroundColor = System.Drawing.Color.White;
-      this.treeChart.LineColor = System.Drawing.Color.Black;
-      this.treeChart.Location = new System.Drawing.Point(6, 16);
-      this.treeChart.Name = "treeChart";
-      this.treeChart.Size = new System.Drawing.Size(201, 291);
-      this.treeChart.Spacing = 5;
-      this.treeChart.TabIndex = 0;
-      this.treeChart.TextFont = new System.Drawing.Font("Times New Roman", 8F);
-      this.treeChart.Tree = null;
-      this.treeChart.SymbolicExpressionTreeNodeDoubleClicked += new System.Windows.Forms.MouseEventHandler(this.treeChart_SymbolicExpressionTreeNodeDoubleClicked);
       // 
       // viewHost
@@ -168 +152 @@
       this.grpViewHost.Text = "Details";
       // 
+      // treeChart
+      // 
+      this.treeChart.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.treeChart.BackgroundColor = System.Drawing.Color.White;
+      this.treeChart.LineColor = System.Drawing.Color.Black;
+      this.treeChart.Location = new System.Drawing.Point(6, 16);
+      this.treeChart.Name = "treeChart";
+      this.treeChart.Size = new System.Drawing.Size(201, 291);
+      this.treeChart.Spacing = 5;
+      this.treeChart.SuspendRepaint = false;
+      this.treeChart.TabIndex = 0;
+      this.treeChart.TextFont = new System.Drawing.Font("Times New Roman", 8F);
+      this.treeChart.Tree = null;
+      this.treeChart.SymbolicExpressionTreeNodeClicked += new System.Windows.Forms.MouseEventHandler(this.treeChart_SymbolicExpressionTreeNodeClicked);
+      this.treeChart.SymbolicExpressionTreeNodeDoubleClicked += new System.Windows.Forms.MouseEventHandler(this.treeChart_SymbolicExpressionTreeNodeDoubleClicked);
+      // 
       // InteractiveSymbolicDataAnalysisSolutionSimplifierView
       // 

branches/HeuristicLab.TreeSimplifierView/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

@@ -146 +146 @@
             updateInProgress = false;
             return; // break all loops
+          }
+        }
+      }
+    }
+
+    private void treeChart_SymbolicExpressionTreeNodeClicked(object sender, MouseEventArgs e) {
+      if (e.Button == MouseButtons.Right) {
+        var visualTreeNode = sender as VisualSymbolicExpressionTreeNode;
+        var node = visualTreeNode.SymbolicExpressionTreeNode;
+        // on a right click we want to show the option of changing the node value (if the node is a constant) or the weight (if the node is a variable)
+        var menu = treeChart.ContextMenuStrip;
+        ToolStripItem[] items = menu.Items.Find("changeValueToolStripMenuItem", false);
+        ToolStripItem changeValueMenuItem = null;
+        if (items.Length > 0) {
+          changeValueMenuItem = items[0];
+        }
+
+        if (node.Symbol is Constant || node.Symbol is Variable) {
+          if (changeValueMenuItem != null) {
+            changeValueMenuItem.Enabled = true;
+            changeValueMenuItem.Visible = true;
+          }
+        } else {
+          if (changeValueMenuItem != null) {
+            changeValueMenuItem.Enabled = false;
+            changeValueMenuItem.Visible = false;
           }
         }