Changeset 11240 for branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringSolutionView.cs

Timestamp:

07/30/14 14:59:20 (10 years ago)

Author:

pfleck

Message:

#2208 improved visualization of orienteering solution

File:

• branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringSolutionView.cs (modified) (6 diffs)

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringSolutionView.cs

@@ -22 +22 @@
 using System;
 using System.Drawing;
+using System.Linq;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -41 +42 @@
       Content.QualityChanged -= new EventHandler(Content_QualityChanged);
       Content.CoordinatesChanged -= new EventHandler(Content_CoordinatesChanged);
+      Content.ScoresChanged -= new EventHandler(Content_ScoresChanged);
       Content.IntegerVectorChanged -= new EventHandler(Content_IntegerVectorChanged);
       base.DeregisterContentEvents();
@@ -48 +50 @@
       Content.QualityChanged += new EventHandler(Content_QualityChanged);
       Content.CoordinatesChanged += new EventHandler(Content_CoordinatesChanged);
+      Content.ScoresChanged += new EventHandler(Content_ScoresChanged);
       Content.IntegerVectorChanged += new EventHandler(Content_IntegerVectorChanged);
     }
@@ -77 +80 @@
         } else {
           var coordinates = Content.Coordinates;
+          var scores = Content.Scores;
           var integerVector = Content.IntegerVector;
           var bitmap = new Bitmap(pictureBox.Width, pictureBox.Height);
@@ -106 +110 @@
                 graphics.DrawPolygon(Pens.Black, tour);
               }
-              for (int i = 0; i < points.Length; i++)
-                graphics.FillRectangle(Brushes.Red, points[i].X - 2, points[i].Y - 2, 6, 6);
+
+              double scoreMin = scores.Min();
+              double scoreMax = scores.Max();
+              double scoreRange = scoreMax - scoreMin;
+              for (int i = 0; i < points.Length; i++) {
+                double score = scores[i];
+                int size = (int)Math.Round(((score - scoreMin) / scoreRange) * 9 + 1);
+                graphics.FillRectangle(Brushes.Red, points[i].X - size / 2, points[i].Y - size / 2, size, size);
+              }
             }
           } else {
@@ -135 +146 @@
         GenerateImage();
     }
+    private void Content_ScoresChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_ScoresChanged), sender, e);
+      else
+        GenerateImage();
+    }
     private void Content_IntegerVectorChanged(object sender, EventArgs e) {
       if (InvokeRequired)