Changeset 13061 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs

Timestamp:

10/23/15 16:22:22 (8 years ago)

Author:

bburlacu

Message:

#1772: Adapted visualization code according to the changes in the HeuristicLab.Visualization branch.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs (modified) (9 diffs)

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

@@ -80 +80 @@
     }
 
-    public bool UpdateEnabled {
-      get { return Chart.UpdateEnabled; }
-      set { Chart.UpdateEnabled = value; }
-    }
-
-    public void EnforceUpdate() {
-      Chart.EnforceUpdate();
-    }
+    //    public bool UpdateEnabled {
+    //      get { return Chart.UpdateEnabled; }
+    //      set { Chart.UpdateEnabled = value; }
+    //    }
+
+    //    public void EnforceUpdate() {
+    //      Chart.EnforceUpdate();
+    //    }
 
     private Visualization.Rectangle TargetRectangle { get; set; }
@@ -118 +118 @@
 
     protected virtual void DrawGraph(double xIncrement, double yIncrement, double diameter) {
-      Chart.UpdateEnabled = false;
+      this.SuspendRendering();
       DrawInProgress = true;
 
@@ -160 +160 @@
           var pen = Pens.Transparent;
           var visualArc = AddArc(Chart, visualParent, visualNode, pen);
-          visualArc.OneLayerDown(); // send it behind the visual nodes
+          Chart.OneLayerDown(visualArc); // send it behind the visual nodes
           if (!arcMap.ContainsKey(Tuple.Create(visualParent, visualNode))) {
             arcMap.Add(Tuple.Create(visualParent, visualNode), visualArc);
@@ -167 +167 @@
       }
 
-      Chart.UpdateEnabled = true;
-      Chart.EnforceUpdate();
-
+      ResumeRendering();
       DrawInProgress = false;
     }
@@ -187 +185 @@
     #region event handlers
 
-    protected override void pictureBox_MouseMove(object sender, MouseEventArgs e) {
+    protected override void PictureBoxOnMouseMove(object sender, MouseEventArgs e) {
       if (!DrawInProgress) {
         switch (e.Button) {
           case MouseButtons.Left:
-            Chart.Mode = ChartMode.Select;
+            Mode = ChartMode.Select;
             Cursor = Cursors.Default;
             break;
           case MouseButtons.Middle:
-            Chart.Mode = ChartMode.Move;
+            Mode = ChartMode.Move;
             Cursor = Cursors.Hand;
             break;
         }
       }
-      base.pictureBox_MouseMove(sender, e);
-    }
-
-    protected override void pictureBox_MouseUp(object sender, MouseEventArgs e) {
+      base.PictureBoxOnMouseMove(sender, e);
+    }
+
+    protected override void PictureBoxOnMouseUp(object sender, MouseEventArgs e) {
       Cursor = Cursors.Default;
-      if (Chart.Mode == ChartMode.Move) {
-        Chart.Mode = ChartMode.Select;
+      if (Mode == ChartMode.Move) {
+        Mode = ChartMode.Select;
         return;
       }
-      if (Chart.Mode != ChartMode.Select) {
-        base.pictureBox_MouseUp(sender, e);
+      if (Mode != ChartMode.Select) {
+        base.PictureBoxOnMouseUp(sender, e);
         return;
       }
@@ -224 +222 @@
       UpdateSelectedVisualNode(); // redraw ancestries, mark node etc.
 
-      base.pictureBox_MouseUp(sender, e);
+      base.PictureBoxOnMouseUp(sender, e);
     }
 
@@ -230 +228 @@
       if (!LockGenealogy) {
         // new node has been selected, clean up
-        Chart.UpdateEnabled = false;
+        SuspendRendering();
         if (ModifierKeys != Keys.Shift) {
           // clear colors
@@ -247 +245 @@
 
       // update
-      UpdateEnabled = true;
-      EnforceUpdate();
+      ResumeRendering();
 
       if (SelectedVisualNode != null)
@@ -281 +278 @@
       double y2 = y1 + size.Height;
       if (TargetRectangle == null) {
-        TargetRectangle = new Visualization.Rectangle(Chart, x1, y1, x2, y2, new Pen(Color.Black), null);
+        var lowerLeft = new PointD(x1, y1);
+        var upperRight = new PointD(x2, y2);
+        TargetRectangle = new Visualization.Rectangle(Chart, lowerLeft, upperRight, new Pen(Color.Black), null);
         Chart.Group.Add(TargetRectangle);
       } else {
-        TargetRectangle.SetPosition(x1, y1, x2, y2);
+        var lowerLeft = new PointD(x1, y1);
+        var upperRight = new PointD(x2, y2);
+        TargetRectangle.SetPosition(lowerLeft, upperRight);
       }
     }