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

Timestamp:

01/28/16 19:35:42 (8 years ago)

Author:

gkronber

Message:

#1966: implemented visualization for 2d packings

File:

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

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

@@ -37 +37 @@
     }
 
-    protected override void DeregisterContentEvents() {
-      Content.QualityChanged -= new EventHandler(Content_QualityChanged);
-      base.DeregisterContentEvents();
-    }
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-      Content.QualityChanged += new EventHandler(Content_QualityChanged);
-    }
-
-
     public new PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> Content {
       get { return (PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem>)base.Content; }
       set { base.Content = value; }
     }
-
 
     protected override void OnContentChanged() {
@@ -65 +54 @@
     }
 
-
     private void ClearState() {
-      packingPlan2D.InitializeContainer(0, 0);
+      container2DView.Packing = null;
     }
 
-    private void UpdateState(PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> plan) {     
+    private void UpdateState(PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> plan) {
       int currentBin = (binSelection != null && binSelection.SelectedItem != null) ? (int)(binSelection.SelectedItem) : 0;
-      var bin = plan.BinPackings[currentBin].BinMeasures;
-      packingPlan2D.InitializeContainer(bin.Width, bin.Height);
-      foreach (var entry in plan.BinPackings[currentBin].ItemMeasures) {
-        var position = plan.BinPackings[currentBin].ItemPositions[entry.Key];
-          packingPlan2D.AddItemToContainer(
-            position.Rotated ? entry.Value.Height : entry.Value.Width,
-            position.Rotated ? entry.Value.Width : entry.Value.Height, 
-            position.X, position.Y, entry.Key.ToString());
-      }
+      container2DView.Packing = plan.BinPackings[currentBin];
     }
 
     private void binSelection_SelectedIndexChanged(object sender, EventArgs e) {
       UpdateState(Content);
-      packingPlan2D.Refresh();
     }
-
-
-
-    private void Content_QualityChanged(object sender, EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(Content_QualityChanged), sender, e);
-      else {
-        binSelection.Items.Clear();
-        if (Content == null) {
-          ClearState();
-        } else {
-          for (int i = 0; i < Content.NrOfBins; i++)
-            binSelection.Items.Add(i);
-          UpdateState(Content);
-        }
-        packingPlan2D.Refresh();
-      }
-    }  
   }
 }