- Timestamp:
- 01/16/18 15:40:43 (6 years ago)
- Location:
- branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3/Container2DView.xaml.cs
r14162 r15617 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6 Joseph Helm andHeuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml.cs
r15554 r15617 1 /* HeuristicLab 2 * Copyright (C) 2002-2016 Joseph Helm and Heuristic and Evolutionary Algorithms Laboratory (HEAL) 1 #region License Information 2 /* HeuristicLab 3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 3 4 * 4 5 * This file is part of HeuristicLab. … … 15 16 * 16 17 * You should have received a copy of the GNU General Public License 17 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 18 19 */ 20 #endregion 19 21 20 22 using System; … … 139 141 var selectedModel = new GeometryModel3D { Geometry = new MeshGeometry3D(), Material = material }; 140 142 AddSolidCube((MeshGeometry3D)selectedModel.Geometry, selectedPos.X, selectedPos.Y, selectedPos.Z, 141 selected Pos.Rotated ? selectedItem.Value.Depth : selectedItem.Value.Width,142 selectedItem.Value.Height ,143 selected Pos.Rotated ? selectedItem.Value.Width : selectedItem.Value.Depth);143 selectedItem.Value.DepthInView, 144 selectedItem.Value.HeightInView, 145 selectedItem.Value.DepthInView); 144 146 modelGroup.Children.Add(selectedModel); 145 147 … … 147 149 var position = packing.Positions[item.Key]; 148 150 149 var w = position.Rotated ? item.Value.Depth : item.Value.Width;150 var h = item.Value.Height ;151 var d = position.Rotated ? item.Value.Width : item.Value.Depth;151 var w = item.Value.WidthInView; 152 var h = item.Value.HeightInView; 153 var d = item.Value.DepthInView; 152 154 153 155 var model = new GeometryModel3D { Geometry = new MeshGeometry3D(), Material = hiddenMaterial }; … … 161 163 var position = packing.Positions[item.Key]; 162 164 163 var w = position.Rotated ? item.Value.Depth : item.Value.Width;164 var h = item.Value.Height ;165 var d = position.Rotated ? item.Value.Width : item.Value.Depth;165 var w = item.Value.WidthInView; 166 var h = item.Value.HeightInView; 167 var d = item.Value.DepthInView; 166 168 167 169 var model = new GeometryModel3D { Geometry = new MeshGeometry3D() }; -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan2DView.Designer.cs
r14162 r15617 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6 Joseph Helm andHeuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan3DView.Designer.cs
r15488 r15617 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6 Joseph Helm andHeuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.