Changeset 10677 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/FragmentGraphView.cs

Timestamp:

03/28/14 16:23:40 (11 years ago)

Author:

bburlacu

Message:

#1772: Improved usage of GenealogyGraph and GenealogyGraphNode classes. Made some progress on building block tracing.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/FragmentGraphView.cs (modified) (5 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/FragmentGraphView.cs

@@ -20 +20 @@
     public new IGenealogyGraph<IFragment<ISymbolicExpressionTreeNode>> Content {
       get { return (IGenealogyGraph<IFragment<ISymbolicExpressionTreeNode>>)base.Content; }
-      set {
-        base.Content = value;
-        MakeTiles();
-        Draw();
-      }
+      set { base.Content = value; }
     }
 
@@ -38 +34 @@
       var chart = symbolicExpressionChartControl.Chart;
       tileDictionary.Clear();
-      foreach (var node in Content.Nodes.Cast<IGenealogyGraphNode<IFragment<ISymbolicExpressionTreeNode>>>()) {
+      foreach (var node in Content.Nodes) {
         var tile = new SymbolicExpressionTreeTile(chart);
         tile.LayoutEngine = symbolicExpressionEngine;
@@ -48 +44 @@
       }
 
-      foreach (var node in Content.Nodes.Where(n => n.InArcs != null && n.InArcs.Count > 0)) {
-        var graphNode = (IGenealogyGraphNode<IFragment<ISymbolicExpressionTreeNode>>)node;
-        var layoutNode = tileDictionary[graphNode];
+
+      foreach (var node in Content.Nodes.Where(n => n.Children.Any())) {
+        var layoutNode = tileDictionary[node];
         layoutNode.Children = new List<TileLayoutNode>();
-        foreach (var c in node.InArcs.Select(x => x.Source as IGenealogyGraphNode<IFragment<ISymbolicExpressionTreeNode>>)) {
-          layoutNode.Children.Add(tileDictionary[c]);
+        foreach (var child in node.Children) {
+          layoutNode.Children.Add(tileDictionary[child]);
         }
       }
@@ -59 +55 @@
 
     private void Draw() {
-      var root = tileDictionary[(IGenealogyGraphNode<IFragment<ISymbolicExpressionTreeNode>>)Content.Nodes[0]];
-      var visualNodes = layoutEngine.CalculateLayout(root);
+      var root = Content.Nodes.First();
+
+      var fragmentRoot = tileDictionary[root];
+      var visualNodes = layoutEngine.CalculateLayout(fragmentRoot);
 
       symbolicExpressionChartControl.UpdateEnabled = false;
@@ -82 +80 @@
 
     #region Event Handlers (Content)
-
     // TODO: Put event handlers of the content here
-
-    #endregion
-
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content == null) {
-        // TODO: Add code when content has been changed and is null
-      } else {
-        // TODO: Add code when content has been changed and is not null
+      if (Content != null) {
+        MakeTiles();
+        Draw();
       }
     }
-
+    #endregion
 
     protected override void SetEnabledStateOfControls() {