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

Timestamp:

01/20/16 13:08:13 (9 years ago)

Author:

gkronber

Message:

#1966: finished view for 3d packings

Location:

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

Files:

• PackingPlan3DView.Designer.cs (modified) (1 diff)
• PackingPlan3DView.cs (modified) (4 diffs)

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

@@ -82 +82 @@
       this.elementHost.Size = new System.Drawing.Size(229, 290);
       this.elementHost.TabIndex = 6;
-      this.elementHost.Text = "elementHost1";
+      this.elementHost.Text = "elementHost";
       this.elementHost.Child = this.packingPlan3D;
       // 

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

@@ -37 +37 @@
     }
 
-
-    protected override void DeregisterContentEvents() {
-      base.DeregisterContentEvents();
-    }
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-    }
-
     public new PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> Content {
       get { return (PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>)base.Content; }
@@ -55 +47 @@
       binSelection.Items.Clear();
       if (Content == null) {
-         packingPlan3D.Clear();
+        packingPlan3D.Packing = null;
       } else {
         int i = 0;
@@ -62 +54 @@
 
         binSelection.SelectedIndex = 0;
-        UpdateModel();
-        packingPlan3D.Focus(); // for mouse wheel?
-        // packingPlan3D.StartRendering();
+        ShowSelectedPacking();
       }
     }
 
-    private void UpdateModel() {
+    private void ShowSelectedPacking() {
       int currentBin = (binSelection != null) ? (int)(binSelection.SelectedIndex) : 0;
-      packingPlan3D.ShowContainer(Content.BinPackings[currentBin]);
-      // var bin = Content.BinPackings[currentBin].BinMeasures;
-      // // packingPlan3D.InitializeContainer(bin.Width, bin.Height, bin.Depth);
-      // 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);
-      // }
+      packingPlan3D.Packing = Content.BinPackings[currentBin];
     }
 
     private void binSelection_SelectedIndexChanged(object sender, EventArgs e) {
-      UpdateModel();
-
       itemSelection.SelectedIndex = -1;
       itemSelection.Items.Clear();
+
+      // add items of this container
       int currentBin = (binSelection != null) ? (int)(binSelection.SelectedIndex) : 0;
-      packingPlan3D.ShowContainer(Content.BinPackings[currentBin]);
+      var packing = Content.BinPackings[currentBin];
+      foreach (var item in packing.ItemMeasures) {
+        itemSelection.Items.Add(item.Key);
+      }
 
+      ShowSelectedPacking();
     }
 
     private void itemSelection_SelectedIndexChanged(object sender, EventArgs e) {
-      UpdateModel();
-
       int selectedItem = -1;
       if ((itemSelection != null && itemSelection.SelectedItem != null) && Int32.TryParse(itemSelection.SelectedItem.ToString(), out selectedItem)) {
@@ -102 +84 @@
         packingPlan3D.ClearSelection();
     }
-
-    // private void Content_QualityChanged(object sender, EventArgs e) {
-    //   if (InvokeRequired)
-    //     Invoke(new EventHandler(Content_QualityChanged), sender, e);
-    //   else {
-    //     binSelection.Items.Clear();
-    //     if (Content == null) {
-    //       packingPlan3D.InitializeContainer(0, 0, 0);
-    //     } else {
-    //       int i = 0;
-    //       foreach (var bp in Content.BinPackings)
-    //         binSelection.Items.Add(i++ + " (" + Math.Round(bp.PackingDensity * 100, 2) + "%)");
-    //       binSelection.SelectedIndex = 0;
-    //       UpdateModel();
-    //       // packingPlan3D.StartRendering();
-    //     }
-    //   }
-    // }
   }
 }