Changeset 15561 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views

Timestamp:

12/29/17 16:43:29 (7 years ago)

Author:

bburlacu

Message:

#1772: Refactor SymbolicDataAnalysisGenealogyGraphView

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4

Files:

• GenealogyGraphChart.cs (modified) (12 diffs)
• GenealogyGraphView.Designer.cs (modified) (6 diffs)
• GenealogyGraphView.cs (modified) (3 diffs)
• HeuristicLab.EvolutionTracking.Views-3.4.csproj (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs

@@ -32 +32 @@
   public partial class GenealogyGraphChart : ChartControl {
     private IGenealogyGraph genealogyGraph;
-    private const double XIncrement = 30;
-    private const double YIncrement = 30;
+    private const double XIncrement = 25;
+    private const double YIncrement = 25;
     private const double Diameter = 20;
     private readonly Brush defaultBrush;
@@ -44 +44 @@
     public bool SimpleLineages { get; set; }
     public bool LockGenealogy { get; set; }
-    public bool TraceFragments { get; set; }
+    public Func<IGenealogyGraphNode, Color> ColorSelector { get; set; }
     #endregion
 
@@ -98 +98 @@
     }
 
-    public GenealogyGraphChart() : base(new Chart(0, 0, 800, 600)) {
+    public GenealogyGraphChart() : base(new GridlessChart(0, 0, 800, 600)) {
       InitializeComponent();
       AddChartModes(new PanChartMode(this), new ZoomInChartMode(this), new ZoomOutChartMode(this), new SelectChartMode(this));
       defaultBrush = new SolidBrush(Color.Transparent);
       defaultPen = new Pen(Color.DarkGray);
+
+      ColorSelector = node => ColorGradient.Colors[(int)Math.Round(node.Quality * 255)];
     }
 
@@ -114 +116 @@
 
       foreach (var rank in ranks) {
+        var rect = new Visualization.Rectangle(Chart, new PointD(x, y), new PointD(x + diameter, y + diameter));
+        var font = new Font(FontFamily.GenericSansSerif, 12);
+        var genLabel = new LabeledPrimitive(rect, rank.Rank.ToString(), font);
+        Chart.Group.Add(genLabel);
+
+        x += xIncrement;
+
         var nodes = rank.Nodes.ToList();
         nodes.Sort((a, b) => b.CompareTo(a)); // sort descending by quality
@@ -119 +128 @@
 
         foreach (var node in nodes) {
-          var brush = new SolidBrush(node.GetColor());
+          var brush = new SolidBrush(ColorSelector(node));
           var visualNode = new VisualGenealogyGraphNode(Chart, x, y, x + diameter, y + diameter, defaultPen, brush) {
             Data = node,
@@ -199 +208 @@
         var visualNode = GetMappedNode(graphNode);
 
-        DrawLineage(visualNode, n => SimpleLineages ? n.IncomingArcs.Take(1) : n.IncomingArcs, a => a.Source);
+        DrawLineage(visualNode, n => SimpleLineages ? n.IncomingArcs.Take(1) : n.IncomingArcs, a => a.Source, ColorSelector);
         ((SolidBrush)visualNode.Brush).Color = Color.Transparent;
-        DrawLineage(visualNode, n => n.OutgoingArcs, a => a.Target);
+        DrawLineage(visualNode, n => n.OutgoingArcs, a => a.Target, ColorSelector);
       }
 
@@ -212 +221 @@
 
     #region drawing routines
-    private static void DrawLineage(VisualGenealogyGraphNode node, Func<VisualGenealogyGraphNode, IEnumerable<VisualGenealogyGraphArc>> arcSelector, Func<VisualGenealogyGraphArc, VisualGenealogyGraphNode> nodeSelector) {
+    private static void DrawLineage(VisualGenealogyGraphNode node, Func<VisualGenealogyGraphNode, IEnumerable<VisualGenealogyGraphArc>> arcSelector, Func<VisualGenealogyGraphArc, VisualGenealogyGraphNode> nodeSelector, Func<IGenealogyGraphNode, Color> getNodeColor) {
       var brush = (SolidBrush)node.Brush;
       if (brush.Color != Color.Transparent) return; // this lineage was already drawn (avoid redrawing common ancestors)
-      brush.Color = node.Data.GetColor();
+      brush.Color = getNodeColor(node.Data);
       var arcs = arcSelector(node);
       var pen = new Pen(Color.Transparent);
@@ -224 +233 @@
         var end = new Point((int)arc.End.X, (int)arc.End.Y);
         arc.Pen = pen;
-        arc.Pen.Brush = new LinearGradientBrush(start, end, source.GetColor(), target.GetColor());
-        DrawLineage(nodeSelector(arc), arcSelector, nodeSelector);
+        arc.Pen.Brush = new LinearGradientBrush(start, end, getNodeColor(source), getNodeColor(target));
+        DrawLineage(nodeSelector(arc), arcSelector, nodeSelector, getNodeColor);
       }
     }
@@ -287 +296 @@
       foreach (var node in nodes) {
         var graphNode = GetMappedNode(node);
-        graphNode.Brush = new SolidBrush(node.GetColor());
+        graphNode.Brush = new SolidBrush(ColorSelector(node));
       }
     }
@@ -302 +311 @@
     public void HighlightAll() {
       foreach (var visualNode in nodeMap.Values) {
-        visualNode.Brush = new SolidBrush(visualNode.Data.GetColor());
-      }
+        visualNode.Brush = new SolidBrush(ColorSelector(visualNode.Data));
+        Chart.IntoForeground(visualNode);
+      }
+      // draw arcs first and then nodes
       foreach (var arc in arcMap.Values) {
         var source = arc.Source.Data;
@@ -309 +320 @@
         var start = new Point((int)arc.Start.X, (int)arc.Start.Y);
         var end = new Point((int)arc.End.X, (int)arc.End.Y);
-        arc.Pen.Brush = new LinearGradientBrush(start, end, source.GetColor(), target.GetColor());
+        arc.Pen = new Pen(new LinearGradientBrush(start, end, ColorSelector(source), ColorSelector(target)));
+        Chart.IntoBackground(arc);
       }
     }
@@ -319 +331 @@
       var end = new Point((int)arc.End.X, (int)arc.End.Y);
       arc.Pen = new Pen(Color.Transparent);
-      arc.Pen.Brush = new LinearGradientBrush(start, end, source.GetColor(), target.GetColor());
+      arc.Pen = new Pen(new LinearGradientBrush(start, end, ColorSelector(source), ColorSelector(target)));
+      Chart.IntoBackground(arc);
     }
     #endregion
-  }
-
-  internal static class Util {
-    public static Color GetColor(this IGenealogyGraphNode node) {
-      if (double.IsNaN(node.Quality))
-        return ColorGradient.Colors[0];
-      var colorIndex = (int)Math.Round(node.Quality * ColorGradient.Colors.Count);
-      if (colorIndex >= ColorGradient.Colors.Count) return ColorGradient.Colors.Last();
-      return ColorGradient.Colors[colorIndex];
+
+    // workaround to disable the chart grid
+    private class GridlessChart : Chart {
+      public GridlessChart(PointD lowerLeft, PointD upperRight) : base(lowerLeft, upperRight) {
+        Grid = null;
+      }
+
+      public GridlessChart(double x1, double y1, double x2, double y2) : this(new PointD(x1, y1), new PointD(x2, y2)) { }
     }
   }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphView.Designer.cs

@@ -26 +26 @@
     private void InitializeComponent() {
       this.splitContainer = new System.Windows.Forms.SplitContainer();
+      this.genealogyGraphChart = new HeuristicLab.EvolutionTracking.Views.GenealogyGraphChart();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      this.groupBox = new System.Windows.Forms.GroupBox();
-      this.openNew_CheckBox = new System.Windows.Forms.CheckBox();
-      this.lockGraph_checkBox = new System.Windows.Forms.CheckBox();
-      this.simpleLineages_checkBox = new System.Windows.Forms.CheckBox();
-      this.trace_checkBox = new System.Windows.Forms.CheckBox();
-      this.genealogyGraphChart = new HeuristicLab.EvolutionTracking.Views.GenealogyGraphChart();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
       this.splitContainer.Panel2.SuspendLayout();
       this.splitContainer.SuspendLayout();
-      this.groupBox.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -45 +39 @@
             | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.splitContainer.Location = new System.Drawing.Point(3, 55);
+      this.splitContainer.Location = new System.Drawing.Point(3, 3);
       this.splitContainer.Name = "splitContainer";
       // 
@@ -55 +49 @@
       // 
       this.splitContainer.Panel2.Controls.Add(this.viewHost);
-      this.splitContainer.Size = new System.Drawing.Size(1394, 742);
-      this.splitContainer.SplitterDistance = 694;
+      this.splitContainer.Size = new System.Drawing.Size(1404, 794);
+      this.splitContainer.SplitterDistance = 698;
       this.splitContainer.TabIndex = 0;
+      // 
+      // genealogyGraphChart
+      // 
+      this.genealogyGraphChart.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.genealogyGraphChart.BackColor = System.Drawing.SystemColors.Control;
+      this.genealogyGraphChart.GenealogyGraph = null;
+      this.genealogyGraphChart.Location = new System.Drawing.Point(0, 0);
+      this.genealogyGraphChart.LockGenealogy = false;
+      this.genealogyGraphChart.Mode = null;
+      this.genealogyGraphChart.Name = "genealogyGraphChart";
+      this.genealogyGraphChart.ScaleOnResize = true;
+      this.genealogyGraphChart.SelectedGraphNode = null;
+      this.genealogyGraphChart.ShowToolBar = true;
+      this.genealogyGraphChart.SimpleLineages = false;
+      this.genealogyGraphChart.Size = new System.Drawing.Size(693, 790);
+      this.genealogyGraphChart.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+      this.genealogyGraphChart.TabIndex = 0;
       // 
       // viewHost
@@ -71 +84 @@
       this.viewHost.Name = "viewHost";
       this.viewHost.ReadOnly = false;
-      this.viewHost.Size = new System.Drawing.Size(697, 743);
+      this.viewHost.Size = new System.Drawing.Size(703, 795);
       this.viewHost.TabIndex = 0;
       this.viewHost.ViewsLabelVisible = true;
       this.viewHost.ViewType = null;
-      // 
-      // groupBox
-      // 
-      this.groupBox.Controls.Add(this.openNew_CheckBox);
-      this.groupBox.Controls.Add(this.lockGraph_checkBox);
-      this.groupBox.Controls.Add(this.simpleLineages_checkBox);
-      this.groupBox.Controls.Add(this.trace_checkBox);
-      this.groupBox.Location = new System.Drawing.Point(3, 4);
-      this.groupBox.Name = "groupBox";
-      this.groupBox.Size = new System.Drawing.Size(602, 44);
-      this.groupBox.TabIndex = 1;
-      this.groupBox.TabStop = false;
-      this.groupBox.Text = "Genealogy Options";
-      // 
-      // openNew_CheckBox
-      // 
-      this.openNew_CheckBox.AutoSize = true;
-      this.openNew_CheckBox.Location = new System.Drawing.Point(485, 19);
-      this.openNew_CheckBox.Name = "openNew_CheckBox";
-      this.openNew_CheckBox.Size = new System.Drawing.Size(111, 17);
-      this.openNew_CheckBox.TabIndex = 1;
-      this.openNew_CheckBox.Text = "Open in new view";
-      this.openNew_CheckBox.UseVisualStyleBackColor = true;
-      // 
-      // lockGraph_checkBox
-      // 
-      this.lockGraph_checkBox.Appearance = System.Windows.Forms.Appearance.Button;
-      this.lockGraph_checkBox.AutoSize = true;
-      this.lockGraph_checkBox.Location = new System.Drawing.Point(157, 15);
-      this.lockGraph_checkBox.Name = "lockGraph_checkBox";
-      this.lockGraph_checkBox.Size = new System.Drawing.Size(73, 23);
-      this.lockGraph_checkBox.TabIndex = 0;
-      this.lockGraph_checkBox.Text = "Lock Graph";
-      this.lockGraph_checkBox.UseVisualStyleBackColor = true;
-      this.lockGraph_checkBox.CheckedChanged += new System.EventHandler(this.lockGraph_checkBox_CheckedChanged);
-      // 
-      // simpleLineages_checkBox
-      // 
-      this.simpleLineages_checkBox.Appearance = System.Windows.Forms.Appearance.Button;
-      this.simpleLineages_checkBox.AutoSize = true;
-      this.simpleLineages_checkBox.Location = new System.Drawing.Point(57, 15);
-      this.simpleLineages_checkBox.Name = "simpleLineages_checkBox";
-      this.simpleLineages_checkBox.Size = new System.Drawing.Size(94, 23);
-      this.simpleLineages_checkBox.TabIndex = 0;
-      this.simpleLineages_checkBox.Text = "Simple Lineages";
-      this.simpleLineages_checkBox.UseVisualStyleBackColor = true;
-      this.simpleLineages_checkBox.CheckedChanged += new System.EventHandler(this.simpleLineages_checkBox_CheckedChanged);
-      // 
-      // trace_checkBox
-      // 
-      this.trace_checkBox.Appearance = System.Windows.Forms.Appearance.Button;
-      this.trace_checkBox.AutoSize = true;
-      this.trace_checkBox.Location = new System.Drawing.Point(6, 15);
-      this.trace_checkBox.Name = "trace_checkBox";
-      this.trace_checkBox.Size = new System.Drawing.Size(45, 23);
-      this.trace_checkBox.TabIndex = 0;
-      this.trace_checkBox.Text = "Trace";
-      this.trace_checkBox.UseVisualStyleBackColor = true;
-      this.trace_checkBox.CheckedChanged += new System.EventHandler(this.trace_checkBox_CheckedChanged);
-      // 
-      // genealogyGraphChart
-      // 
-      this.genealogyGraphChart.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.genealogyGraphChart.BackColor = System.Drawing.SystemColors.Control;
-      this.genealogyGraphChart.GenealogyGraph = null;
-      this.genealogyGraphChart.Location = new System.Drawing.Point(0, 0);
-      this.genealogyGraphChart.LockGenealogy = false;
-      this.genealogyGraphChart.Name = "genealogyGraphChart";
-      this.genealogyGraphChart.ScaleOnResize = true;
-      this.genealogyGraphChart.SelectedGraphNode = null;
-      this.genealogyGraphChart.SimpleLineages = false;
-      this.genealogyGraphChart.Size = new System.Drawing.Size(689, 738);
-      this.genealogyGraphChart.TabIndex = 0;
-      this.genealogyGraphChart.TraceFragments = false;
       // 
       // GenealogyGraphView
@@ -156 +93 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.groupBox);
       this.Controls.Add(this.splitContainer);
       this.Name = "GenealogyGraphView";
-      this.Size = new System.Drawing.Size(1400, 800);
+      this.Size = new System.Drawing.Size(1410, 800);
       this.splitContainer.Panel1.ResumeLayout(false);
       this.splitContainer.Panel2.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
       this.splitContainer.ResumeLayout(false);
-      this.groupBox.ResumeLayout(false);
-      this.groupBox.PerformLayout();
       this.ResumeLayout(false);
 
@@ -175 +109 @@
     protected MainForm.WindowsForms.ViewHost viewHost;
     protected GenealogyGraphChart genealogyGraphChart;
-    private System.Windows.Forms.GroupBox groupBox;
-    protected System.Windows.Forms.CheckBox trace_checkBox;
-    protected System.Windows.Forms.CheckBox simpleLineages_checkBox;
-    protected System.Windows.Forms.CheckBox lockGraph_checkBox;
-    protected System.Windows.Forms.CheckBox openNew_CheckBox;
 
   }

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

@@ -7 +7 @@
   [View("GenealogyGraphView")]
   [Content(typeof(IGenealogyGraph<>), IsDefaultView = false)]
-  public partial class GenealogyGraphView<T> : ItemView where T : class,IItem {
+  public partial class GenealogyGraphView<T> : ItemView where T : class, IItem {
     public new IGenealogyGraph<T> Content {
       get { return (IGenealogyGraph<T>)base.Content; }
@@ -49 +49 @@
       var visualNode = (VisualGenealogyGraphNode)sender;
       var graphNode = (IGenealogyGraphNode<T>)visualNode.Data;
-      if (graphNode == null) return;
-      var content = graphNode.Data;
-      if (content == null) return;
-      viewHost.Content = content;
+      if (graphNode == null || graphNode.Data == null) return;
+      viewHost.Content = graphNode.Data;
     }
     public virtual void graphChart_GenealogyGraphNodeDoubleClicked(object sender, MouseEventArgs arcs) {
@@ -60 +58 @@
     #region events for configuring the behavior of the genealogy chart (trace/match, simple lineages, etc)
     private void trace_checkBox_CheckedChanged(object sender, System.EventArgs e) {
-      genealogyGraphChart.TraceFragments = trace_checkBox.Checked;
+      //genealogyGraphChart.TraceFragments = trace_checkBox.Checked;
     }
 
     private void simpleLineages_checkBox_CheckedChanged(object sender, System.EventArgs e) {
-      genealogyGraphChart.SimpleLineages = simpleLineages_checkBox.Checked;
+      //genealogyGraphChart.SimpleLineages = simpleLineages_checkBox.Checked;
     }
 
     private void lockGraph_checkBox_CheckedChanged(object sender, System.EventArgs e) {
-      genealogyGraphChart.LockGenealogy = lockGraph_checkBox.Checked;
+      //genealogyGraphChart.LockGenealogy = lockGraph_checkBox.Checked;
     }
     #endregion

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/HeuristicLab.EvolutionTracking.Views-3.4.csproj

@@ -97 +97 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GenealogyGraphChart.cs" />
+    <Compile Include="GenealogyGraphChart.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="GenealogyGraphChart.Designer.cs">
       <DependentUpon>GenealogyGraphChart.cs</DependentUpon>