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

Timestamp:

01/17/16 18:21:19 (9 years ago)

Author:

gkronber

Message:

#1966 work in progress WPF control to visualize packings

Location:

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

Files:

• PackingPlan2DView.resx (added)
• PackingPlan3DView.Designer.cs (modified) (3 diffs)
• PackingPlan3DView.cs (modified) (6 diffs)
• PackingPlan3DView.resx (added)

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.packingPlan3D = new PackingPlanVisualizations.PackingPlan3D();
       this.binSelection = new System.Windows.Forms.ListBox();
       this.itemSelection = new System.Windows.Forms.ListBox();
+      this.elementHost = new System.Windows.Forms.Integration.ElementHost();
+      this.packingPlan3D = new HeuristicLab.Problems.BinPacking.Views.Shapes.Container3DView();
       this.SuspendLayout();
-      // 
-      // packingPlan3D
-      // 
-      this.packingPlan3D.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.packingPlan3D.Location = new System.Drawing.Point(119, 3);
-      this.packingPlan3D.Name = "packingPlan3D";
-      this.packingPlan3D.Size = new System.Drawing.Size(229, 293);
-      this.packingPlan3D.TabIndex = 3;
       // 
       // binSelection
@@ -82 +73 @@
       this.itemSelection.SelectedIndexChanged += new System.EventHandler(this.itemSelection_SelectedIndexChanged);
       // 
+      // elementHost
+      // 
+      this.elementHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.elementHost.Location = new System.Drawing.Point(119, 3);
+      this.elementHost.Name = "elementHost";
+      this.elementHost.Size = new System.Drawing.Size(229, 290);
+      this.elementHost.TabIndex = 6;
+      this.elementHost.Text = "elementHost1";
+      this.elementHost.Child = this.packingPlan3D;
+      // 
       // PackingPlan3DView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.elementHost);
       this.Controls.Add(this.itemSelection);
       this.Controls.Add(this.binSelection);
-      this.Controls.Add(this.packingPlan3D);
       this.Name = "PackingPlan3DView";
       this.Size = new System.Drawing.Size(351, 299);
@@ -97 +100 @@
     #endregion
 
-    private PackingPlanVisualizations.PackingPlan3D packingPlan3D;
     private System.Windows.Forms.ListBox binSelection;
     private System.Windows.Forms.ListBox itemSelection;
+    private System.Windows.Forms.Integration.ElementHost elementHost;
+    private Shapes.Container3DView packingPlan3D;
   }
 }

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

@@ -39 +39 @@
 
     protected override void DeregisterContentEvents() {
-      Content.QualityChanged -= new EventHandler(Content_QualityChanged);
       base.DeregisterContentEvents();
     }
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.QualityChanged += new EventHandler(Content_QualityChanged);
     }
 
@@ -56 +54 @@
       base.OnContentChanged();
       binSelection.Items.Clear();
-      if (Content == null) { 
-        packingPlan3D.InitializeContainer(0, 0, 0);
+      if (Content == null) {
+         packingPlan3D.Clear();
       } else {
         int i = 0;
@@ -65 +63 @@
         binSelection.SelectedIndex = 0;
         UpdateModel();
-        packingPlan3D.StartRendering();
+        packingPlan3D.Focus(); // for mouse wheel?
+        // packingPlan3D.StartRendering();
       }
     }
@@ -71 +70 @@
     private void UpdateModel() {
       int currentBin = (binSelection != null) ? (int)(binSelection.SelectedIndex) : 0;
-      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.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);
+      // }
     }
 
@@ -89 +89 @@
       itemSelection.Items.Clear();
       int currentBin = (binSelection != null) ? (int)(binSelection.SelectedIndex) : 0;
-      foreach (var entry in Content.BinPackings[currentBin].ItemMeasures) {
-        itemSelection.Items.Add(entry.Key);
-      }
+      packingPlan3D.ShowContainer(Content.BinPackings[currentBin]);
 
-      packingPlan3D.Invalidate();
-      packingPlan3D.Update();
     }
 
@@ -103 +99 @@
       if ((itemSelection != null && itemSelection.SelectedItem != null) && Int32.TryParse(itemSelection.SelectedItem.ToString(), out selectedItem)) {
         packingPlan3D.SelectItem(selectedItem);
-      } else      
-        packingPlan3D.UnselectItem();
-
-      packingPlan3D.Invalidate();
-      packingPlan3D.Update();
+      } else
+        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();
-        }
-      }
-    }  
+    // 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();
+    //     }
+    //   }
+    // }
   }
 }