Changeset 13061

Timestamp:

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

Author:

bburlacu

Message:

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

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeTile.cs (modified) (5 diffs)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs (modified) (9 diffs)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/SymbolicDataAnalysisGenealogyGraphView.cs (modified) (4 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeTile.cs

@@ -109 +109 @@
 
     new private void Clear() {
-      Group.Clear();
+      base.Clear();
       primitivesToNodes.Clear();
       nodesToPrimitives.Clear();
@@ -129 +129 @@
       PreferredNodeWidth = 80;
       PreferredNodeHeight = 40;
-      Group = new Group(chart);
+      //      Group = new Group(chart);
 
       defaultBrush = new SolidBrush(Color.Transparent);
@@ -160 +160 @@
         if (node.SubtreeCount == 0) {
           rectangularPrimitive = new Rectangle(Chart, lowerLeft, upperRight) {
-            Font = defaultFont, Text = shortenedLabel, Brush = defaultBrush, Pen = defaultPen, MaximumFontSize = 12f
+            //            Font = defaultFont, Text = shortenedLabel, Brush = defaultBrush, Pen = defaultPen, MaximumFontSize = 12f
           };
         } else {
           rectangularPrimitive = new Ellipse(Chart, lowerLeft, upperRight) {
-            Font = defaultFont, Text = shortenedLabel, Brush = defaultBrush, Pen = defaultPen, MaximumFontSize = 12f
+            //            Font = defaultFont, Text = shortenedLabel, Brush = defaultBrush, Pen = defaultPen, MaximumFontSize = 12f
           };
         }
@@ -200 +200 @@
         Pen = defaultPen,
         Brush = defaultBrush,
-        Text = Label,
-        Font = defaultFont
+        //        Text = Label,
+        //        Font = defaultFont
       };
       this.Add(labelRect);
@@ -218 +218 @@
         var rpb = primitive as RectangularPrimitiveBase;
         if (rpb != null) {
-          rpb.SetPosition(rpb.LowerLeft.X, Size.Height - rpb.UpperRight.Y, rpb.UpperRight.X, Size.Height - rpb.LowerLeft.Y);
+          var lowerLeft = new PointD(rpb.LowerLeft.X, Size.Height - rpb.UpperRight.Y);
+          var upperRight = new PointD(rpb.UpperRight.X, Size.Height - rpb.LowerLeft.Y);
+          rpb.SetPosition(lowerLeft, upperRight);
 
         } else {
           var line = primitive as LinearPrimitiveBase;
           if (line != null) {
-            line.SetPosition(line.Start.X, Size.Height - line.Start.Y, line.End.X, Size.Height - line.End.Y);
+            var lowerLeft = new PointD(line.Start.X, Size.Height - line.Start.Y);
+            var upperRight = new PointD(line.End.X, Size.Height - line.End.Y);
+            line.SetPosition(lowerLeft, upperRight);
           }
         }

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);
       }
     }

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

@@ -42 +42 @@
       // splitContainer
       // 
-      this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.splitContainer.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.splitContainer.Location = new System.Drawing.Point(3, 55);
@@ -61 +61 @@
       // viewHost
       // 
-      this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.viewHost.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.viewHost.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -137 +137 @@
       // genealogyGraphChart
       // 
-      this.genealogyGraphChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      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;
@@ -151 +151 @@
       this.genealogyGraphChart.TabIndex = 0;
       this.genealogyGraphChart.TraceFragments = false;
-      this.genealogyGraphChart.UpdateEnabled = true;
       // 
       // GenealogyGraphView

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/SymbolicDataAnalysisGenealogyGraphView.cs

@@ -139 +139 @@
         var subtreeIndex = graphNode.Data.IterateNodesPrefix().ToList().IndexOf(node);
         var traceGraph = TraceCalculator.TraceSubtree(graphNode, subtreeIndex, updateVertexWeights: false, updateSubtreeWeights: false, cacheTraceNodes: true);
-        genealogyGraphChart.UpdateEnabled = false;
+        genealogyGraphChart.SuspendRendering();
         genealogyGraphChart.ClearPrimitives(); // clear everything
         var rankMaximums = new Dictionary<double, double>();
@@ -177 +177 @@
           }
         }
-        genealogyGraphChart.UpdateEnabled = true;
-        genealogyGraphChart.EnforceUpdate();
+        genealogyGraphChart.ResumeRendering();
       } else {
         // perform matching like it was done before
@@ -218 +217 @@
 
       switch (args.Button) {
-        case MouseButtons.Left: {
+        case MouseButtons.Left:
+          {
             OnTreeNodeLeftClicked(subtree);
             break;
           }
-        case MouseButtons.Middle: {
+        case MouseButtons.Middle:
+          {
             OnTreeNodeMiddleClicked(subtree);
             break;
@@ -243 +244 @@
 
     private void graphChart_HighlightMatchingVertices(IEnumerable<IGenealogyGraphNode> vertices) {
-      genealogyGraphChart.Chart.UpdateEnabled = false;
+      genealogyGraphChart.SuspendRendering();
       genealogyGraphChart.ClearPrimitives();
       genealogyGraphChart.HighlightNodes(vertices);
-      genealogyGraphChart.Chart.UpdateEnabled = true;
-      genealogyGraphChart.Chart.EnforceUpdate();
+      genealogyGraphChart.ResumeRendering();
     }