Changeset 9593 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlans/PackingPlan2DView.cs

Timestamp:

06/06/13 03:12:42 (11 years ago)

Author:

jhelm

Message:

#1966: Applied some heavy refactoring on the decoder-classes and cleaned up the code a bit;

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlans/PackingPlan2DView.cs (modified) (3 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlans/PackingPlan2DView.cs

@@ -55 +55 @@
     private void Redraw(PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> plan) {     
       int currentBin = (binSelection != null && binSelection.SelectedItem != null) ? (int)(binSelection.SelectedItem) : 0;
-      var bin = plan.GetPackingBinMeasuresForBinNr(currentBin);
+      var bin = plan.BinPackings[currentBin].BinMeasures;
       packingPlan2D.InitializeContainer(bin.Width, bin.Height);
-      int i = 0;
-      foreach (var item in plan.PackingItemMeasures) {
-        var position = plan.PackingItemPositions[i++];
-        if (position.AssignedBin == currentBin)
+      foreach (var entry in plan.BinPackings[currentBin].ItemMeasures) {
+        var position = plan.BinPackings[currentBin].ItemPositions[entry.Key];
           packingPlan2D.AddItemToContainer(
-            position.Rotated ? item.Height : item.Width,
-            position.Rotated ? item.Width : item.Height, 
-            position.X, position.Y, i.ToString());
+            position.Rotated ? entry.Value.Height : entry.Value.Width,
+            position.Rotated ? entry.Value.Width : entry.Value.Height, 
+            position.X, position.Y, entry.Key.ToString());
       }
     }
@@ -70 +68 @@
     private void binSelection_SelectedIndexChanged(object sender, EventArgs e) {
       Redraw(Content);
-      packingPlan2D.Invalidate();
-      packingPlan2D.Update();
+      packingPlan2D.Refresh();
+      packingPlan2D.Refresh();
+      packingPlan2D.Refresh();
+      packingPlan2D.Refresh();
+      packingPlan2D.Refresh();
     }
 
@@ -88 +89 @@
           Redraw(Content);
         }
-        packingPlan2D.Invalidate();
-        packingPlan2D.Update();
+        packingPlan2D.Refresh();
+        packingPlan2D.Refresh();
+        packingPlan2D.Refresh();
+        packingPlan2D.Refresh();
+        packingPlan2D.Refresh();
       }
     }