Changeset 3502 for trunk/sources

Timestamp:

04/23/10 00:31:02 (15 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893)

File:

• trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views/3.3/PathTSPTourView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views/3.3/PathTSPTourView.cs

@@ -104 +104 @@
 
             int border = 20;
-            double xStep = (pictureBox.Width - 2 * border) / (xMax - xMin);
-            double yStep = (pictureBox.Height - 2 * border) / (yMax - yMin);
+            double xStep = xMax != xMin ? (pictureBox.Width - 2 * border) / (xMax - xMin) : 1;
+            double yStep = yMax != yMin ? (pictureBox.Height - 2 * border) / (yMax - yMin) : 1;
 
             Point[] points = new Point[coordinates.Rows];
@@ -112 +112 @@
                                     bitmap.Height - (border + ((int)((coordinates[i, 1] - yMin) * yStep))));
 
-            Graphics graphics = Graphics.FromImage(bitmap);
-            if ((permutation != null) && (permutation.Length == coordinates.Rows) && (permutation.Validate())) {
-              Point[] tour = new Point[permutation.Length];
-              for (int i = 0; i < permutation.Length; i++) {
-                tour[i] = points[permutation[i]];
+            using (Graphics graphics = Graphics.FromImage(bitmap)) {
+              if ((permutation != null) && (permutation.Length == coordinates.Rows) && (permutation.Validate())) {
+                Point[] tour = new Point[permutation.Length];
+                for (int i = 0; i < permutation.Length; i++) {
+                  tour[i] = points[permutation[i]];
+                }
+                graphics.DrawPolygon(Pens.Black, tour);
               }
-              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);
             }
-            for (int i = 0; i < points.Length; i++)
-              graphics.FillRectangle(Brushes.Red, points[i].X - 2, points[i].Y - 2, 6, 6);
-            graphics.Dispose();
           }
           pictureBox.Image = bitmap;