Changeset 15705 for branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml.cs

Timestamp:

02/01/18 12:21:34 (6 years ago)

Author:

rhanghof

Message:

#2817

• Former material is now the layer.
• Added material enumeration
• Modification at the minimum residual space left bin packer

File:

• branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml.cs (modified) (4 diffs)

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml.cs

@@ -131 +131 @@
         var selectedPos = packing.Positions[selectedItem.Key];
 
-        var colorIdx = selectedItem.Value.Material;
+        var colorIdx = selectedItem.Value.Layer;
         while (colorIdx < 0)
           colorIdx += colors.Length;
@@ -137 +137 @@
         var color = colors[colorIdx];
         var material = new DiffuseMaterial { Brush = new SolidColorBrush(color) };
-        materials[selectedItem.Value.Material] = material;
+        materials[selectedItem.Value.Layer] = material;
 
         var selectedModel = new GeometryModel3D { Geometry = new MeshGeometry3D(), Material = material };
@@ -169 +169 @@
           var model = new GeometryModel3D { Geometry = new MeshGeometry3D() };
           DiffuseMaterial material;
-          if (!materials.TryGetValue(item.Value.Material, out material)) {
-            var colorIdx = item.Value.Material;
+          if (!materials.TryGetValue(item.Value.Layer, out material)) {
+            var colorIdx = item.Value.Layer;
             while (colorIdx < 0)
               colorIdx += colors.Length;
@@ -176 +176 @@
             var color = colors[colorIdx];
             material = new DiffuseMaterial { Brush = new SolidColorBrush(color) };
-            materials[item.Value.Material] = material;
+            materials[item.Value.Layer] = material;
           }
           var selectedModel = new GeometryModel3D { Geometry = new MeshGeometry3D(), Material = material };