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

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;

Location:

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

Files:

• PackingPlan2DView.cs (modified) (3 diffs)
• PackingPlan3DView.cs (modified) (2 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();
       }
     }  

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

@@ -54 +54 @@
     private void UpdateModel() {
       int currentBin = (binSelection != null && binSelection.SelectedItem != null) ? (int)(binSelection.SelectedItem) : 0;
-      var bin = Content.GetPackingBinMeasuresForBinNr(currentBin);
+      var bin = Content.BinPackings[currentBin].BinMeasures;
       packingPlan3D.InitializeContainer(bin.Width, bin.Height, bin.Depth);
-      int i = 0;
-      foreach (var item in Content.PackingItemMeasures) {
-        var position = Content.PackingItemPositions[i];
-        if (position.AssignedBin == currentBin) 
-          packingPlan3D.AddItemToContainer(
-            position.Rotated ? item.Depth : item.Width, 
-            item.Height, 
-            position.Rotated ? item.Width : item.Depth, 
-            position.X, position.Y, position.Z, i);
-        i++;
+      foreach (var entry in Content.BinPackings[currentBin].ItemMeasures) {
+        var position = Content.BinPackings[currentBin].ItemPositions[entry.Key];
+        packingPlan3D.AddItemToContainer(
+        position.Rotated ? entry.Value.Depth : entry.Value.Width,
+        entry.Value.Height,
+        position.Rotated ? entry.Value.Width : entry.Value.Depth,
+        position.X, position.Y, position.Z, entry.Key, entry.Value.Material);
       }
     }
@@ -75 +72 @@
       itemSelection.Items.Clear();
       int currentBin = (binSelection != null && binSelection.SelectedItem != null) ? (int)(binSelection.SelectedItem) : 0;
-      for (int i = 0; i < Content.PackingItemPositions.Count; i++) {
-        if (Content.PackingItemPositions[i].AssignedBin == currentBin)
-          itemSelection.Items.Add(i);
+      //for (int i = 0; i < Content.PackingItemPositions.Count; i++) {
+      //  if (Content.PackingItemPositions[i].AssignedBin == currentBin)
+      //    itemSelection.Items.Add(i);
+      //}
+      foreach (var entry in Content.BinPackings[currentBin].ItemMeasures) {
+        itemSelection.Items.Add(entry.Key);
       }