Changeset 13578

Timestamp:

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

Author:

gkronber

Message:

#1966: implemented visualization for 2d packings

Location:

branches/HeuristicLab.BinPacking

Files:

• HeuristicLab.Problems.BinPacking.Views/3.3/Container2DView.xaml (added)
• HeuristicLab.Problems.BinPacking.Views/3.3/Container2DView.xaml.cs (added)
• HeuristicLab.Problems.BinPacking.Views/3.3/HeuristicLab.Problems.BinPacking.Views-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan2DView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan2DView.cs (modified) (2 diffs)
• HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/BinPacking.cs (modified) (3 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/HeuristicLab.Problems.BinPacking.Views-3.3.csproj

@@ -155 +155 @@
       <DependentUpon>Container3DView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Container2DView.xaml.cs">
+      <DependentUpon>Container2DView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="PackingPlan2DView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="PackingPlan2DView.Designer.cs">
+      <DependentUpon>PackingPlan2DView.cs</DependentUpon>
+    </Compile>
     <Compile Include="PackingPlan3DView.cs">
       <SubType>UserControl</SubType>
@@ -175 +184 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="PackingPlan2DView.resx">
+      <DependentUpon>PackingPlan2DView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="PackingPlan3DView.resx">
       <DependentUpon>PackingPlan3DView.cs</DependentUpon>
@@ -181 +193 @@
   <ItemGroup>
     <Page Include="Container3DView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Container2DView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.packingPlan2D = new PackingPlanVisualizations.PackingPlan2D();
       this.binSelection = new System.Windows.Forms.ListBox();
+      this.elementHost = new System.Windows.Forms.Integration.ElementHost();
+      this.container2DView = new HeuristicLab.Problems.BinPacking.Views.Container2DView();
       this.SuspendLayout();
-      // 
-      // packingPlan2D
-      // 
-      this.packingPlan2D.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.packingPlan2D.Location = new System.Drawing.Point(67, 3);
-      this.packingPlan2D.Name = "packingPlan2D";
-      this.packingPlan2D.Size = new System.Drawing.Size(383, 340);
-      this.packingPlan2D.TabIndex = 3;
       // 
       // binSelection
@@ -70 +61 @@
       this.binSelection.SelectedIndexChanged += new System.EventHandler(this.binSelection_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(67, 3);
+      this.elementHost.Name = "elementHost";
+      this.elementHost.Size = new System.Drawing.Size(383, 329);
+      this.elementHost.TabIndex = 5;
+      this.elementHost.Text = "elementHost";
+      this.elementHost.Child = this.container2DView;
+      // 
       // PackingPlan2DView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.elementHost);
       this.Controls.Add(this.binSelection);
-      this.Controls.Add(this.packingPlan2D);
       this.Name = "PackingPlan2DView";
       this.Size = new System.Drawing.Size(453, 346);
@@ -83 +86 @@
 
     #endregion
-
-    private PackingPlanVisualizations.PackingPlan2D packingPlan2D;
+    
     private System.Windows.Forms.ListBox binSelection;
+    private System.Windows.Forms.Integration.ElementHost elementHost;
+    private Container2DView container2DView;
   }
 }

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();
-      }
-    }  
   }
 }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/BinPacking.cs

@@ -41 +41 @@
 
     [Storable]
-    public ObservableDictionary<int, I> ItemMeasures { get; private set; }
+    public ObservableDictionary<int, I> ItemMeasures { get; private set; } // TODO: renamed to item
 
     [Storable]
@@ -47 +47 @@
 
     [Storable]
-    //public HashSet<D> ExtremePoints { get; protected set; }
     public SortedSet<D> ExtremePoints { get; protected set; }
 
@@ -55 +54 @@
     #endregion Properties
 
-    public BinPacking(B binMeasures) : base() {   
+    protected BinPacking(B binMeasures) : base() {   
       ItemPositions = new ObservableDictionary<int, D>();
       ItemMeasures = new ObservableDictionary<int, I>();
       BinMeasures = (B)binMeasures.Clone();
       OccupationLayers = new Dictionary<int, List<int>>();
-      InitializeOccupationLayers();
+      InitializeOccupationLayers(); // TODO
     }