Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/12/16 18:23:13 (8 years ago)
Author:
gkronber
Message:

#1966: removed types for *PackingBin because PackingBins and PackingShapes have the same capabilities

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan2DView.cs

    r14038 r14045  
    2525using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    2626using HeuristicLab.Problems.BinPacking.Dimensions;
    27 using HeuristicLab.Problems.BinPacking.PackingBin;
     27
    2828using HeuristicLab.Problems.BinPacking.PackingItem;
     29using HeuristicLab.Problems.BinPacking.Shapes;
    2930
    3031namespace HeuristicLab.Problems.BinPacking.Views {
    3132  [View("2-dimensional packing plan view")]
    32   [Content(typeof(PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem>), true)]
     33  [Content(typeof(PackingPlan<TwoDimensionalPacking, RectangularPackingShape, RectangularPackingItem>), true)]
    3334  public partial class PackingPlan2DView : ItemView {
    3435
     
    3738    }
    3839
    39     public new PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> Content {
    40       get { return (PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem>)base.Content; }
     40    public new PackingPlan<TwoDimensionalPacking, RectangularPackingShape, RectangularPackingItem> Content {
     41      get { return (PackingPlan<TwoDimensionalPacking, RectangularPackingShape, RectangularPackingItem>)base.Content; }
    4142      set { base.Content = value; }
    4243    }
     
    5859    }
    5960
    60     private void UpdateState(PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> plan) {
     61    private void UpdateState(PackingPlan<TwoDimensionalPacking, RectangularPackingShape, RectangularPackingItem> plan) {
    6162      int currentBin = (binSelection != null && binSelection.SelectedItem != null) ? (int)(binSelection.SelectedItem) : 0;
    6263      container2DView.Packing = plan.BinPackings[currentBin];
Note: See TracChangeset for help on using the changeset viewer.