- Timestamp:
- 12/20/17 16:15:38 (7 years ago)
- Location:
- branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml.cs
r15520 r15554 74 74 private Dictionary<int, DiffuseMaterial> materials; 75 75 76 public ObservableDictionary<BinPacking3D.PackingPosition, ResidualSpace> ResidualSpaces { get; set; }76 public ObservableDictionary<BinPacking3D.PackingPosition, IList<ResidualSpace>> ResidualSpaces { get; set; } 77 77 public ObservableCollection<BinPacking3D.PackingPosition> ExtremePoints { get; set; } 78 78 … … 81 81 camMain.Position = new Point3D(0.5, 3, 3); // for design time we use a different camera position 82 82 materials = new Dictionary<int, DiffuseMaterial>(); 83 ResidualSpaces = new ObservableDictionary<BinPacking3D.PackingPosition, ResidualSpace>();83 ResidualSpaces = new ObservableDictionary<BinPacking3D.PackingPosition, IList<ResidualSpace>>(); 84 84 ExtremePoints = new ObservableCollection<BinPacking3D.PackingPosition>(); 85 85 selectedExtremePointIndex = -1; … … 240 240 private void AddResidualSpacesForExtremePoint(Model3DGroup modelGroup, BinPacking3D.PackingPosition extremePoint) { 241 241 if (showResidualSpaces) { 242 var rs = ResidualSpaces[extremePoint]; 243 var containerModel1 = new GeometryModel3D(new MeshGeometry3D(), new DiffuseMaterial(new SolidColorBrush(residualSpaceColor))); 244 245 modelGroup.Children.Add(containerModel1); 246 AddWireframeCube((MeshGeometry3D)containerModel1.Geometry, 247 extremePoint.X, 248 extremePoint.Y, 249 extremePoint.Z, 250 rs.Width, 251 rs.Height, 252 rs.Depth); 253 242 foreach (var rs in ResidualSpaces[extremePoint]) { 243 var containerModel1 = new GeometryModel3D(new MeshGeometry3D(), new DiffuseMaterial(new SolidColorBrush(residualSpaceColor))); 244 245 modelGroup.Children.Add(containerModel1); 246 247 AddWireframeCube((MeshGeometry3D)containerModel1.Geometry, 248 extremePoint.X, 249 extremePoint.Y, 250 extremePoint.Z, 251 rs.Width, 252 rs.Height, 253 rs.Depth); 254 } 254 255 } 256 255 257 } 256 258 -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan3DView.cs
r15520 r15554 24 24 using HeuristicLab.MainForm; 25 25 using HeuristicLab.Problems.BinPacking3D; 26 using System.Collections.Generic; 26 27 27 28 namespace HeuristicLab.Problems.BinPacking.Views { … … 75 76 itemSelection.Items.Add(item.Key); 76 77 } 77 foreach (var e pin ((BinPacking3D.BinPacking3D)packing).ExtremePoints) {78 var rs = ((BinPacking3D.BinPacking3D)packing).ResidualSpaces[ep];78 foreach (var extremPoint in ((BinPacking3D.BinPacking3D)packing).ExtremePoints) { 79 var ep = extremPoint.Key; 79 80 extremePointsSelection.Items.Add($"({ep.X}, {ep.Y}, {ep.Z})"); 80 81 packingPlan3D.ExtremePoints.Add(ep); 81 packingPlan3D.ResidualSpaces.Add(ep, rs);82 packingPlan3D.ResidualSpaces.Add(ep, extremPoint.Value as IList<ResidualSpace>); 82 83 } 83 84
Note: See TracChangeset
for help on using the changeset viewer.