Changeset 7858 for branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPPDTWView.cs

Timestamp:

05/21/12 15:28:50 (12 years ago)

Author:

svonolfe

Message:

Added color palette (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPPDTWView.cs (modified) (5 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPPDTWView.cs

@@ -46 +46 @@
       int cities = Content.Cities.Value;
 
-      Pen[] pens = {new Pen(Color.FromArgb(92,20,237)), new Pen(Color.FromArgb(237,183,20)), new Pen(Color.FromArgb(237,20,219)), new Pen(Color.FromArgb(20,237,76)),
-                    new Pen(Color.FromArgb(237,61,20)), new Pen(Color.FromArgb(115,78,26)), new Pen(Color.FromArgb(20,237,229)), new Pen(Color.FromArgb(39,101,19)),
-                    new Pen(Color.FromArgb(230,170,229)), new Pen(Color.FromArgb(142,136,89)), new Pen(Color.FromArgb(157,217,166)), new Pen(Color.FromArgb(31,19,101)),
-                    new Pen(Color.FromArgb(173,237,20)), new Pen(Color.FromArgb(230,231,161)), new Pen(Color.FromArgb(142,89,89)), new Pen(Color.FromArgb(93,89,142)),
-                    new Pen(Color.FromArgb(146,203,217)), new Pen(Color.FromArgb(101,19,75)), new Pen(Color.FromArgb(198,20,237)), new Pen(Color.FromArgb(185,185,185)),
-                    new Pen(Color.FromArgb(179,32,32)), new Pen(Color.FromArgb(18,119,115)), new Pen(Color.FromArgb(104,158,239)), new Pen(Color.Black)};
-
       Pen flowPen = new Pen(Brushes.Red, 3);
       flowPen.EndCap = System.Drawing.Drawing2D.LineCap.ArrowAnchor;
@@ -79 +72 @@
 
             int currentTour = 0;
-            foreach (Tour tour in Solution.GetTours()) {
+
+            List<Tour> tours = Solution.GetTours();
+            List<Pen> pens = GetColors(tours.Count);
+
+            foreach (Tour tour in tours) {
               int tourIndex = Solution.GetTourIndex(tour);
               int vehicle = Solution.GetVehicleAssignment(tourIndex);
@@ -148 +145 @@
 
               if (!drawFlow)
-                graphics.DrawPolygon(pens[((currentTour >= pens.Length) ? (pens.Length - 1) : (currentTour))], tourPoints);
+                graphics.DrawPolygon(pens[currentTour], tourPoints);
 
               for (int i = 0; i < tour.Stops.Count; i++) {
@@ -168 +165 @@
               currentTour++;
             }
+
+            for (int i = 0; i < pens.Count; i++)
+              pens[i].Dispose();
           } else {
             {
@@ -197 +197 @@
       }
 
-      for (int i = 0; i < pens.Length; i++)
-        pens[i].Dispose();
-
       flowPen.Dispose();
     }