Ignore:
Timestamp:
07/12/16 20:03:45 (5 years ago)
Author:
gkronber
Message:

#1966: simplified class names

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  
    3333    private int selectedItemKey;
    3434    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 {
    3737      get { return packing; }
    3838      set {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml.cs

    r14048 r14049  
    3535    private int selectedItemKey;
    3636
    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 {
    3939      get { return packing; }
    4040      set {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan2DView.cs

    r14048 r14049  
    2828namespace HeuristicLab.Problems.BinPacking.Views {
    2929  [View("2-dimensional packing plan view")]
    30   [Content(typeof(PackingPlan<BinPacking2D.PackingPosition, RectangularPackingShape, RectangularPackingItem>), true)]
     30  [Content(typeof(PackingPlan<BinPacking2D.PackingPosition, PackingShape, PackingItem>), true)]
    3131  public partial class PackingPlan2DView : ItemView {
    3232
     
    3535    }
    3636
    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; }
    3939      set { base.Content = value; }
    4040    }
     
    5656    }
    5757
    58     private void UpdateState(PackingPlan<BinPacking2D.PackingPosition, RectangularPackingShape, RectangularPackingItem> plan) {
     58    private void UpdateState(PackingPlan<BinPacking2D.PackingPosition, PackingShape, PackingItem> plan) {
    5959      int currentBin = (binSelection != null && binSelection.SelectedItem != null) ? (int)(binSelection.SelectedItem) : 0;
    6060      container2DView.Packing = plan.BinPackings[currentBin];
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan3DView.cs

    r14048 r14049  
    2828namespace HeuristicLab.Problems.BinPacking.Views {
    2929  [View("3-dimensional packing plan View")]
    30   [Content(typeof(PackingPlan<BinPacking3D.PackingPosition, CuboidPackingShape, CuboidPackingItem>), true)]
     30  [Content(typeof(PackingPlan<BinPacking3D.PackingPosition, PackingShape, PackingItem>), true)]
    3131  public partial class PackingPlan3DView : ItemView {
    3232
     
    3535    }
    3636
    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; }
    3939      set { base.Content = value; }
    4040    }
Note: See TracChangeset for help on using the changeset viewer.