Changeset 9598 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3

Timestamp:

06/07/13 15:35:12 (11 years ago)

Author:

jhelm

Message:

#1966: Fixed a bug which caused the stacking-contraint to be wrongly enforced; Did some cleanup;

Location:

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

Files:

• PackingPlans/PackingPlan3DView.cs (modified) (4 diffs)
• Plugin.cs (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (1 diff)

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

@@ -44 +44 @@
       } else {
         Content.Name = "Packing Plan";
-        for (int i = 0; i < Content.NrOfBins; i++)
-          binSelection.Items.Add(i);
+        int i = 0;
+        foreach (var bp in Content.BinPackings)
+          binSelection.Items.Add(i++ + " (" + Math.Round(bp.PackingDensity * 100, 2) + "%)");
+
         binSelection.SelectedIndex = 0;
         UpdateModel();
@@ -53 +55 @@
 
     private void UpdateModel() {
-      int currentBin = (binSelection != null && binSelection.SelectedItem != null) ? (int)(binSelection.SelectedItem) : 0;
+      int currentBin = (binSelection != null) ? (int)(binSelection.SelectedIndex) : 0;
       var bin = Content.BinPackings[currentBin].BinMeasures;
       packingPlan3D.InitializeContainer(bin.Width, bin.Height, bin.Depth);
@@ -71 +73 @@
       itemSelection.SelectedIndex = -1;
       itemSelection.Items.Clear();
-      int currentBin = (binSelection != null && binSelection.SelectedItem != null) ? (int)(binSelection.SelectedItem) : 0;
+      int currentBin = (binSelection != null) ? (int)(binSelection.SelectedIndex) : 0;
       //for (int i = 0; i < Content.PackingItemPositions.Count; i++) {
       //  if (Content.PackingItemPositions[i].AssignedBin == currentBin)
@@ -106 +108 @@
         } else {
           Content.Name = "Packing Plan";
-          for (int i = 0; i < Content.NrOfBins; i++)
-            binSelection.Items.Add(i);
+          int i = 0;
+          foreach (var bp in Content.BinPackings)
+            binSelection.Items.Add(i++ + " (" + Math.Round(bp.PackingDensity * 100, 2) + "%)");
           binSelection.SelectedIndex = 0;
           UpdateModel();

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

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Problems.BinPacking.Views plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Problems.BinPacking.Views", "3.3.7.9593")]
+  [Plugin("HeuristicLab.Problems.BinPacking.Views", "3.3.7.9596")]
   [PluginFile("HeuristicLab.Problems.BinPacking.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Properties/AssemblyInfo.cs

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.7.9593")]
+[assembly: AssemblyFileVersion("3.3.7.9596")]