- Timestamp:
- 07/12/16 20:03:45 (8 years ago)
- Location:
- branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Container2DView.xaml.cs
r14048 r14049 33 33 private int selectedItemKey; 34 34 private Size renderSize; 35 private BinPacking<BinPacking2D.PackingPosition, RectangularPackingShape, RectangularPackingItem> packing;36 public BinPacking<BinPacking2D.PackingPosition, RectangularPackingShape, RectangularPackingItem> Packing {35 private BinPacking<BinPacking2D.PackingPosition, PackingShape, PackingItem> packing; 36 public BinPacking<BinPacking2D.PackingPosition, PackingShape, PackingItem> Packing { 37 37 get { return packing; } 38 38 set { -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml.cs
r14048 r14049 35 35 private int selectedItemKey; 36 36 37 private BinPacking<BinPacking3D.PackingPosition, CuboidPackingShape, CuboidPackingItem> packing;38 public BinPacking<BinPacking3D.PackingPosition, CuboidPackingShape, CuboidPackingItem> Packing {37 private BinPacking<BinPacking3D.PackingPosition, PackingShape, PackingItem> packing; 38 public BinPacking<BinPacking3D.PackingPosition, PackingShape, PackingItem> Packing { 39 39 get { return packing; } 40 40 set { -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan2DView.cs
r14048 r14049 28 28 namespace HeuristicLab.Problems.BinPacking.Views { 29 29 [View("2-dimensional packing plan view")] 30 [Content(typeof(PackingPlan<BinPacking2D.PackingPosition, RectangularPackingShape, RectangularPackingItem>), true)]30 [Content(typeof(PackingPlan<BinPacking2D.PackingPosition, PackingShape, PackingItem>), true)] 31 31 public partial class PackingPlan2DView : ItemView { 32 32 … … 35 35 } 36 36 37 public new PackingPlan<BinPacking2D.PackingPosition, RectangularPackingShape, RectangularPackingItem> Content {38 get { return (PackingPlan<BinPacking2D.PackingPosition, RectangularPackingShape, RectangularPackingItem>)base.Content; }37 public new PackingPlan<BinPacking2D.PackingPosition, PackingShape, PackingItem> Content { 38 get { return (PackingPlan<BinPacking2D.PackingPosition, PackingShape, PackingItem>)base.Content; } 39 39 set { base.Content = value; } 40 40 } … … 56 56 } 57 57 58 private void UpdateState(PackingPlan<BinPacking2D.PackingPosition, RectangularPackingShape, RectangularPackingItem> plan) {58 private void UpdateState(PackingPlan<BinPacking2D.PackingPosition, PackingShape, PackingItem> plan) { 59 59 int currentBin = (binSelection != null && binSelection.SelectedItem != null) ? (int)(binSelection.SelectedItem) : 0; 60 60 container2DView.Packing = plan.BinPackings[currentBin]; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan3DView.cs
r14048 r14049 28 28 namespace HeuristicLab.Problems.BinPacking.Views { 29 29 [View("3-dimensional packing plan View")] 30 [Content(typeof(PackingPlan<BinPacking3D.PackingPosition, CuboidPackingShape, CuboidPackingItem>), true)]30 [Content(typeof(PackingPlan<BinPacking3D.PackingPosition, PackingShape, PackingItem>), true)] 31 31 public partial class PackingPlan3DView : ItemView { 32 32 … … 35 35 } 36 36 37 public new PackingPlan<BinPacking3D.PackingPosition, CuboidPackingShape, CuboidPackingItem> Content {38 get { return (PackingPlan<BinPacking3D.PackingPosition, CuboidPackingShape, CuboidPackingItem>)base.Content; }37 public new PackingPlan<BinPacking3D.PackingPosition, PackingShape, PackingItem> Content { 38 get { return (PackingPlan<BinPacking3D.PackingPosition, PackingShape, PackingItem>)base.Content; } 39 39 set { base.Content = value; } 40 40 }
Note: See TracChangeset
for help on using the changeset viewer.