Changeset 11852 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4

Timestamp:

02/01/15 23:17:56 (9 years ago)

Author:

bburlacu

Message:

#1772: Added some useful functionality to the GenealogyGraphView.

Location:

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

Files:

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

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

@@ -40 +40 @@
     private readonly Pen defaultPen;
 
+    private Dictionary<IGenealogyGraphNode, VisualGenealogyGraphNode> nodeMap;
+    private Dictionary<Tuple<VisualGenealogyGraphNode, VisualGenealogyGraphNode>, VisualGenealogyGraphArc> arcMap;
+
     public IGenealogyGraph GenealogyGraph {
       get { return genealogyGraph; }
@@ -63 +66 @@
     }
 
-    private Dictionary<IGenealogyGraphNode, VisualGenealogyGraphNode> nodeMap;
-    private Dictionary<Tuple<VisualGenealogyGraphNode, VisualGenealogyGraphNode>, VisualGenealogyGraphArc> arcMap;
+    public bool UpdateEnabled {
+      get { return Chart.UpdateEnabled; }
+      set { Chart.UpdateEnabled = value; }
+    }
+
+    public void EnforceUpdate() {
+      Chart.EnforceUpdate();
+    }
 
     #region chart modes
@@ -225 +234 @@
 
       // update
-      Chart.UpdateEnabled = true;
-      Chart.EnforceUpdate();
+      UpdateEnabled = true;
+      EnforceUpdate();
 
       if (SelectedVisualNode != null)
-        /* emit clicked event */
-        OnGenealogyGraphNodeClicked(SelectedVisualNode, e);
+        OnGenealogyGraphNodeClicked(SelectedVisualNode, e); // emit clicked event
 
       base.pictureBox_MouseUp(sender, e);
@@ -306 +314 @@
     }
 
+    public void ClearArcs() {
+      foreach (var primitive in Chart.Group.Primitives.OfType<VisualGenealogyGraphArc>()) {
+        primitive.Pen = Pens.Transparent;
+      }
+    }
+
+    public void ClearNodes() {
+      foreach (var primitive in Chart.Group.Primitives.OfType<VisualGenealogyGraphNode>()) {
+        primitive.Brush = new SolidBrush(Color.Transparent);
+        primitive.Pen = new Pen(Color.LightGray);
+      }
+    }
+
     public virtual void ClearPrimitives() {
       foreach (var primitive in Chart.Group.Primitives) {
@@ -313 +334 @@
           primitive.Brush = new SolidBrush(Color.Transparent);
           primitive.Pen = new Pen(Color.DarkGray);
-        }
-      }
-    }
-
-    public void HighlightNodes(IEnumerable<IGenealogyGraphNode> nodes) {
-      Chart.UpdateEnabled = false;
-      ClearPrimitives();
+          //          primitive.Pen = Pens.Transparent; // remove the node contour
+        }
+      }
+    }
+
+    public void HighlightNodes(IEnumerable<IGenealogyGraphNode> nodes, bool clearPrimitives = true) {
+      if (clearPrimitives)
+        ClearPrimitives();
+
       foreach (var node in nodes) {
         var graphNode = GetMappedNode(node);
         graphNode.Brush = new SolidBrush(node.GetColor());
       }
-      Chart.UpdateEnabled = true;
-      Chart.EnforceUpdate();
+    }
+
+    public void HighlightNodes(IEnumerable<IGenealogyGraphNode> nodes, Color color, bool clearPrimitives = true) {
+      if (clearPrimitives)
+        ClearPrimitives();
+
+      foreach (var node in nodes.Select(GetMappedNode)) {
+        node.Brush = new SolidBrush(color);
+      }
     }
 
     public void HighlightAll() {
-      Chart.UpdateEnabled = false;
       foreach (var visualNode in nodeMap.Values) {
         visualNode.Brush = new SolidBrush(visualNode.Data.GetColor());
@@ -340 +369 @@
         arc.Pen.Brush = new LinearGradientBrush(start, end, source.GetColor(), target.GetColor());
       }
-      Chart.UpdateEnabled = true;
-      Chart.EnforceUpdate();
     }
 

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();
@@ -31 +32 @@
       this.simpleLineages_checkBox = new System.Windows.Forms.CheckBox();
       this.trace_checkBox = new System.Windows.Forms.CheckBox();
-      this.genealogyGraphChart = new HeuristicLab.EvolutionTracking.Views.GenealogyGraphChart();
+      this.openNew_CheckBox = new System.Windows.Forms.CheckBox();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
@@ -58 +59 @@
       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.Name = "genealogyGraphChart";
+      this.genealogyGraphChart.ScaleOnResize = true;
+      this.genealogyGraphChart.SimpleLineages = false;
+      this.genealogyGraphChart.Size = new System.Drawing.Size(689, 738);
+      this.genealogyGraphChart.TabIndex = 0;
+      this.genealogyGraphChart.TraceFragments = false;
+      this.genealogyGraphChart.UpdateEnabled = true;
+      // 
       // viewHost
       // 
@@ -77 +95 @@
       // groupBox
       // 
+      this.groupBox.Controls.Add(this.openNew_CheckBox);
       this.groupBox.Controls.Add(this.lockGraph_checkBox);
       this.groupBox.Controls.Add(this.simpleLineages_checkBox);
@@ -123 +142 @@
       this.trace_checkBox.CheckedChanged += new System.EventHandler(this.trace_checkBox_CheckedChanged);
       // 
-      // genealogyGraphChart
+      // openNew_CheckBox
       // 
-      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.SimpleLineages = false;
-      this.genealogyGraphChart.Size = new System.Drawing.Size(689, 738);
-      this.genealogyGraphChart.TabIndex = 0;
-      this.genealogyGraphChart.TraceFragments = false;
+      this.openNew_CheckBox.AutoSize = true;
+      this.openNew_CheckBox.Location = new System.Drawing.Point(237, 20);
+      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;
       // 
       // GenealogyGraphView
@@ -166 +179 @@
     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/HeuristicLab.EvolutionTracking.Views-3.4.csproj

@@ -129 +129 @@
     <None Include="HeuristicLab.snk" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="GenealogyGraphView.resx">
+      <DependentUpon>GenealogyGraphView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>