Changeset 9835 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphView.cs

Timestamp:

08/01/13 13:01:40 (11 years ago)

Author:

bburlacu

Message:

#1772: Merged remaining trunk changes into the EvolutionaryTracking branch.

Location:

branches/HeuristicLab.EvolutionaryTracking

Files:

• . (modified) (3 props)
• HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphView.cs (modified) (6 diffs)

branches/HeuristicLab.EvolutionaryTracking

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphView.cs

@@ -30 +30 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
-using HeuristicLab.Visualization;
 
 namespace HeuristicLab.EvolutionaryTracking.Views {
@@ -49 +48 @@
       InitializeComponent();
       // set button icons here because if set in the designer file, they get overwritten
-      this.moveModeButton.Image = Common.Resources.VSImageLibrary.Pointer;
-      this.zoomModeButton.Image = Common.Resources.VSImageLibrary.Zoom;
-      this.selectModeButton.Image = Common.Resources.VSImageLibrary.Object;
       this.highlightAllButton.Image = Common.Resources.VSImageLibrary.Gradient;
       this.simpleLineagesCheckBox.Image = Common.Resources.VSImageLibrary.ArrowDown;
@@ -111 +107 @@
       var genealogyGraphNode = visualGenealogyGraphNode.Data;
       symbolicExpressionTreeChart.Tree = genealogyGraphNode.SymbolicExpressionTree;
+
       if (genealogyGraphNode.InEdges == null) return;
       var arc = genealogyGraphNode.InEdges.Last(x => x.Source != x.Target);
@@ -121 +118 @@
       }
       symbolicExpressionTreeChart.Repaint();
-    }
-
-    private void moveModeButton_CheckedChanged(object sender, EventArgs e) {
-      var btn = (RadioButton)sender;
-      if (btn.Checked) { genealogyGraphChart.Chart.Mode = ChartMode.Move; }
-    }
-
-    private void zoomModeButton_CheckedChanged(object sender, EventArgs e) {
-      var btn = (RadioButton)sender;
-      if (btn.Checked) { genealogyGraphChart.Chart.Mode = ChartMode.Zoom; }
-    }
-
-    private void selectModeButton_CheckedChanged(object sender, EventArgs e) {
-      var btn = (RadioButton)sender;
-      if (btn.Checked) { genealogyGraphChart.Chart.Mode = ChartMode.Select; }
     }
 
@@ -191 +173 @@
       genealogyGraphChart.Chart.UpdateEnabled = false;
       genealogyGraphChart.ClearAllNodes(); // clear node colors
-      var fragment = new Fragment(clonedNodes[selectedVisualSymbExprTreeNode.SymbolicExpressionTreeNode]);
+      var fragment = new Fragment { Root = clonedNodes[selectedVisualSymbExprTreeNode.SymbolicExpressionTreeNode] };
       var fragmentLength = fragment.Length;
       // highlight nodes
@@ -247 +229 @@
       genealogyGraphChart.LockGenealogy = lockGenealogyCheckBox.Checked;
     }
+
+    private void highlightRootParentsButton_Click(object sender, EventArgs e) {
+      var nodes = genealogyGraphChart.Graph.Nodes.Where(n => n.InEdges != null && n.InEdges.Count == 2).Select(n => (SymbolicExpressionGenealogyGraphNode)n.InEdges[0].Source).ToList();
+      genealogyGraphChart.HighlightNodes(nodes);
+    }
+
+    private void highlightSecondaryParentsButton_Click(object sender, EventArgs e) {
+      var nodes = genealogyGraphChart.Graph.Nodes.Where(n => n.InEdges != null && n.InEdges.Count == 2).Select(n => (SymbolicExpressionGenealogyGraphNode)n.InEdges[1].Source).ToList();
+      genealogyGraphChart.HighlightNodes(nodes);
+    }
   }
 }

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin