Changeset 13477 for branches

Timestamp:

12/17/15 19:18:54 (9 years ago)

Author:

gkronber

Message:

#1966 fixed visualization of 2d packing

Location:

branches/HeuristicLab.BinPacking/PackingPlanVisualizations/2D

Files:

• CenteredContainer2D.cs (modified) (5 diffs)
• PackingPlan2D.cs (modified) (3 diffs)

branches/HeuristicLab.BinPacking/PackingPlanVisualizations/2D/CenteredContainer2D.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Linq;
 using SharpDX;
 
@@ -27 +28 @@
   public class CenteredContainer2D {
     private Vector2 containerSize;
-    private Vector2 controlSize;
     private float xScaling;
     private float yScaling;
     private readonly List<PackingItem> packingItems = new List<PackingItem>();
 
-    public Vector2 ContainerCenter {
-      get { return new Vector2(controlSize.X / 2, controlSize.Y / 2); }
-    }
+    //public Vector2 ContainerCenter {
+    //  get { return new Vector2(controlSize.X / 2, controlSize.Y / 2); }
+    //}
 
     private struct PackingItem {
-      private Vector2 position;
-      private Vector2 size;
-      private readonly string label;
+      internal readonly Vector2 position;
+      internal readonly Vector2 size;
+      internal readonly string label;
       public PackingItem(Vector2 size, Vector2 position, string label) {
         this.size = size;
         this.position = position;
         this.label = label;
-      }
-      public RectangleF GetRectangle(Vector2 topLeft, float sx, float sy) {
-        return new RectangleF(
-          topLeft.X + position.X * sx + 2,
-          topLeft.Y + position.Y * sy + 2,
-          topLeft.X + position.X * sx + size.X * sx - 2,
-          topLeft.Y + position.Y * sy + size.Y * sy - 2
-        );
-      }
-      public string GetLabel() {
-        return label;
       }
     }
@@ -74 +63 @@
 
     public void UpdateContainer(Vector2 controlSize) {
-      this.controlSize = controlSize;
-      xScaling = controlSize.X / (containerSize.X + 5);
-      yScaling = controlSize.Y / (containerSize.Y + 5);
+      xScaling = (controlSize.X - 4) / (containerSize.X); // leave 2 pixel space on each side
+      yScaling = (controlSize.Y - 4) / (containerSize.Y);
     }
     public void UpdateContainer(float controlWidth, float controlHeight) {
@@ -85 +73 @@
     public RectangleF GetContainerData() {
       //Compute centered rectangle
-      SharpDX.RectangleF result = new SharpDX.RectangleF(
-        ContainerCenter.X - containerSize.X * xScaling / 2 - 2,
-        ContainerCenter.Y - containerSize.Y * yScaling / 2 - 2,
-        ContainerCenter.X + containerSize.X * xScaling / 2 + 2,
-        ContainerCenter.Y + containerSize.Y * yScaling / 2 + 2);
-
-      return result;
+      return new RectangleF(2, 2, containerSize.X * xScaling, containerSize.Y * yScaling);
     }
 
@@ -105 +87 @@
 
     public List<LabeledRectangle> GetItemRectangles() {
-      List<LabeledRectangle> result = new List<LabeledRectangle>();
-
-      foreach (PackingItem item in packingItems) {
-        result.Add(new LabeledRectangle(item.GetLabel(),
-          item.GetRectangle(new Vector2(ContainerCenter.X - containerSize.X * xScaling / 2,
-                                        ContainerCenter.Y - containerSize.Y * yScaling / 2), xScaling, yScaling)));
-      }
-
-      return result;
+      return packingItems.Select(item =>
+        new LabeledRectangle(item.label,
+          new RectangleF(item.position.X * xScaling + 2, item.position.Y * yScaling + 2, item.size.X * xScaling, item.size.Y * yScaling)))
+      .ToList();
     }
   }

branches/HeuristicLab.BinPacking/PackingPlanVisualizations/2D/PackingPlan2D.cs

@@ -49 +49 @@
 
     CenteredContainer2D container;
-    #endregion Packing members END
-
+    #endregion
 
     //Initialization-Methods
@@ -81 +80 @@
     //Packing-Methods
     public void InitializeContainer(float width, float height) {
-      container = new CenteredContainer2D(new Vector2(this.Width, this.Height), new Vector2(width, height));
+      container = new CenteredContainer2D(new Vector2(Math.Max(this.Width - 12, 1), Math.Max(this.Height - 12, 1)), new Vector2(width, height));
     }
 
@@ -103 +102 @@
         wndRender.FillRectangle(container.GetContainerData(), containerFillingBrush);
 
-        foreach (PackingPlanVisualizations.CenteredContainer2D.LabeledRectangle item in container.GetItemRectangles()) {
+        foreach (var item in container.GetItemRectangles()) {
           wndRender.DrawRectangle(item.rectangle, itemBrush, 2f);
           wndRender.FillRectangle(item.rectangle, itemFillingBrush);