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

Timestamp:

10/27/14 20:47:37 (10 years ago)

Author:

bburlacu

Message:

#1772: Updated views (fixed position and anchors).

Location:

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

Files:

• GenealogyGraphChart.cs (modified) (5 diffs)
• GenealogyGraphView.Designer.cs (modified) (5 diffs)

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

@@ -50 +50 @@
     }
 
-    public IGenealogyGraphNode SelectedGraphNode { get; private set; }
+    public IGenealogyGraphNode SelectedGraphNode {
+      get {
+        return SelectedVisualNode == null ? null : SelectedVisualNode.Data;
+      }
+    }
 
     private void Clear() {
@@ -70 +74 @@
     private Visualization.Rectangle TargetRectangle { get; set; }
     private bool DrawInProgress { get; set; } // do not try to update the chart while the drawing is not finished
-    private VisualGenealogyGraphNode SelectedVisualNode { get; set; }
+    protected VisualGenealogyGraphNode SelectedVisualNode { get; set; }
 
     private VisualGenealogyGraphNode GetMappedNode(IGenealogyGraphNode node) {
@@ -156 +160 @@
 
     public event MouseEventHandler GenealogyGraphNodeClicked;
-    private void OnGenealogyGraphNodeClicked(object sender, MouseEventArgs e) {
+    protected void OnGenealogyGraphNodeClicked(object sender, MouseEventArgs e) {
       var clicked = GenealogyGraphNodeClicked;
       if (clicked != null) clicked(sender, e);
     }
 
+    public event MouseEventHandler GenealogyGraphNodeDoubleClicked;
+    protected void OnGenealogyGraphNodeDoubleClicked(object sender, MouseEventArgs e) {
+      var doubleClicked = GenealogyGraphNodeDoubleClicked;
+      if (doubleClicked != null)
+        doubleClicked(sender, e);
+    }
     #region event handlers
+
     protected override void pictureBox_MouseMove(object sender, MouseEventArgs e) {
       if (!DrawInProgress) {
@@ -195 +206 @@
       SelectedVisualNode = visualNodes[0] as VisualGenealogyGraphNode;
       if (SelectedVisualNode == null) return;
-      SelectedGraphNode = SelectedVisualNode.Data;
 
       if (!LockGenealogy) {
@@ -334 +344 @@
       Chart.EnforceUpdate();
     }
+
+    public void HighlightArc(IGenealogyGraphNode source, IGenealogyGraphNode target) {
+      var arc = GetMappedArc(source, target) ??
+                AddArc(Chart, GetMappedNode(source), GetMappedNode(target), new Pen(Color.Transparent));
+      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 = new Pen(Color.Transparent);
+      arc.Pen.Brush = new LinearGradientBrush(start, end, source.GetColor(), target.GetColor());
+    }
   }
 

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

@@ -26 +26 @@
     private void InitializeComponent() {
       this.splitContainer = new System.Windows.Forms.SplitContainer();
-      this.panel1 = new System.Windows.Forms.Panel();
-      this.panel2 = new System.Windows.Forms.Panel();
+      this.genealogyGraphChart = new HeuristicLab.EvolutionTracking.Views.GenealogyGraphChart();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      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.panel1.SuspendLayout();
-      this.panel2.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -46 +42 @@
       // splitContainer.Panel1
       // 
-      this.splitContainer.Panel1.Controls.Add(this.panel1);
+      this.splitContainer.Panel1.Controls.Add(this.genealogyGraphChart);
       // 
       // splitContainer.Panel2
       // 
-      this.splitContainer.Panel2.Controls.Add(this.panel2);
-      this.splitContainer.Size = new System.Drawing.Size(1128, 700);
-      this.splitContainer.SplitterDistance = 500;
+      this.splitContainer.Panel2.Controls.Add(this.viewHost);
+      this.splitContainer.Size = new System.Drawing.Size(894, 678);
+      this.splitContainer.SplitterDistance = 417;
       this.splitContainer.TabIndex = 0;
-      // 
-      // panel1
-      // 
-      this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.panel1.Controls.Add(this.genealogyGraphChart);
-      this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.panel1.Location = new System.Drawing.Point(0, 0);
-      this.panel1.Name = "panel1";
-      this.panel1.Size = new System.Drawing.Size(500, 700);
-      this.panel1.TabIndex = 0;
-      // 
-      // panel2
-      // 
-      this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.panel2.Controls.Add(this.viewHost);
-      this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.panel2.Location = new System.Drawing.Point(0, 0);
-      this.panel2.Name = "panel2";
-      this.panel2.Size = new System.Drawing.Size(624, 700);
-      this.panel2.TabIndex = 0;
-      // 
-      // viewHost
-      // 
-      this.viewHost.Caption = "View";
-      this.viewHost.Content = null;
-      this.viewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.viewHost.Enabled = false;
-      this.viewHost.Location = new System.Drawing.Point(0, 0);
-      this.viewHost.Name = "viewHost";
-      this.viewHost.ReadOnly = false;
-      this.viewHost.Size = new System.Drawing.Size(622, 698);
-      this.viewHost.TabIndex = 0;
-      this.viewHost.ViewsLabelVisible = true;
-      this.viewHost.ViewType = null;
       // 
       // genealogyGraphChart
@@ -99 +61 @@
       this.genealogyGraphChart.ScaleOnResize = true;
       this.genealogyGraphChart.SimpleLineages = false;
-      this.genealogyGraphChart.Size = new System.Drawing.Size(498, 698);
+      this.genealogyGraphChart.Size = new System.Drawing.Size(417, 678);
       this.genealogyGraphChart.TabIndex = 2;
+      this.genealogyGraphChart.TraceFragments = false;
+      // 
+      // viewHost
+      // 
+      this.viewHost.Caption = "View";
+      this.viewHost.Content = null;
+      this.viewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.viewHost.Enabled = false;
+      this.viewHost.Location = new System.Drawing.Point(0, 0);
+      this.viewHost.Name = "viewHost";
+      this.viewHost.ReadOnly = false;
+      this.viewHost.Size = new System.Drawing.Size(473, 678);
+      this.viewHost.TabIndex = 0;
+      this.viewHost.ViewsLabelVisible = true;
+      this.viewHost.ViewType = null;
       // 
       // GenealogyGraphView
@@ -108 +85 @@
       this.Controls.Add(this.splitContainer);
       this.Name = "GenealogyGraphView";
-      this.Size = new System.Drawing.Size(1128, 700);
+      this.Size = new System.Drawing.Size(894, 678);
       this.splitContainer.Panel1.ResumeLayout(false);
       this.splitContainer.Panel2.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
       this.splitContainer.ResumeLayout(false);
-      this.panel1.ResumeLayout(false);
-      this.panel2.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -123 +98 @@
     protected System.Windows.Forms.SplitContainer splitContainer;
     protected MainForm.WindowsForms.ViewHost viewHost;
-    protected System.Windows.Forms.Panel panel1;
-    protected System.Windows.Forms.Panel panel2;
     protected GenealogyGraphChart genealogyGraphChart;