Changeset 14154 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Container2DView.xaml.cs

Timestamp:

07/21/16 15:08:21 (8 years ago)

Author:

gkronber

Message:

#1966: refactoring

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Container2DView.xaml.cs (modified) (2 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Container2DView.xaml.cs

@@ -71 +71 @@
       if (packing == null) return;
       // the container should fill the whole size
-      var scalingX = renderSize.Width / Packing.BinMeasures.Width;
-      var scalingY = renderSize.Height / Packing.BinMeasures.Width;
+      var scalingX = renderSize.Width / Packing.BinShape.Width;
+      var scalingY = renderSize.Height / Packing.BinShape.Width;
       // draw container
       drawingContext.DrawRectangle(Brushes.LightGray, new Pen(Brushes.Black, 1), new Rect(new Point(0, 0), renderSize));
@@ -79 +79 @@
       var unselectedBrush = selectedItemKey < 0 ? selectedBrush : Brushes.DarkGray;
 
-      foreach (var t in Packing.ItemMeasures) {
+      foreach (var t in Packing.Items) {
         var key = t.Key;
         var item = t.Value;
-        var pos = Packing.ItemPositions[key];
+        var pos = Packing.Positions[key];
 
         var scaledPos = new Point(pos.X * scalingX, pos.Y * scalingY);