Changeset 14170 for stable/HeuristicLab.Problems.BinPacking.Views

Timestamp:

07/21/16 21:57:36 (8 years ago)

Author:

gkronber

Message:

#2641: merged r14162,r14163,r14167,r14168,r14169 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.BinPacking.Views (copied) (copied from trunk/sources/HeuristicLab.Problems.BinPacking.Views)
• HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan2DView.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan3DView.cs (modified) (3 diffs)

stable/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan2DView.cs

@@ -57 +57 @@
     private void UpdateState(PackingPlan<BinPacking2D.PackingPosition, PackingShape, PackingItem> plan) {
       int currentBin = (binSelection != null && binSelection.SelectedItem != null) ? (int)(binSelection.SelectedItem) : 0;
-      container2DView.Packing = plan.BinPackings[currentBin];
+      container2DView.Packing = plan.Bins[currentBin];
     }
 

stable/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan3DView.cs

@@ -47 +47 @@
       } else {
         int i = 0;
-        foreach (var bp in Content.BinPackings)
+        foreach (var bp in Content.Bins)
           binSelection.Items.Add(i++ + " (" + Math.Round(bp.PackingDensity * 100, 2) + "%)");
 
@@ -57 +57 @@
     private void ShowSelectedPacking() {
       int currentBin = (binSelection != null) ? (int)(binSelection.SelectedIndex) : 0;
-      packingPlan3D.Packing = Content.BinPackings[currentBin];
+      packingPlan3D.Packing = Content.Bins[currentBin];
     }
 
@@ -66 +66 @@
       // add items of this container
       int currentBin = (binSelection != null) ? (int)(binSelection.SelectedIndex) : 0;
-      var packing = Content.BinPackings[currentBin];
+      var packing = Content.Bins[currentBin];
       foreach (var item in packing.Items) {
         itemSelection.Items.Add(item.Key);