Changeset 13462


Ignore:
Timestamp:
12/14/15 20:03:59 (4 years ago)
Author:
gkronber
Message:

#1966: PackingPlan is just an Item not a ParameterizedNamedItem

Location:
branches/HeuristicLab.BinPacking
Files:
6 edited

Legend:

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

    r13032 r13462  
    4747      this.packingPlan2D = new PackingPlanVisualizations.PackingPlan2D();
    4848      this.binSelection = new System.Windows.Forms.ListBox();
    49       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5049      this.SuspendLayout();
    51       //
    52       // nameTextBox
    53       //
    54       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    55       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
    5650      //
    5751      // packingPlan2D
     
    8478      this.Name = "PackingPlan2DView";
    8579      this.Size = new System.Drawing.Size(351, 299);
    86       this.Controls.SetChildIndex(this.nameLabel, 0);
    87       this.Controls.SetChildIndex(this.nameTextBox, 0);
    88       this.Controls.SetChildIndex(this.infoLabel, 0);
    8980      this.Controls.SetChildIndex(this.packingPlan2D, 0);
    9081      this.Controls.SetChildIndex(this.binSelection, 0);
    91       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    9282      this.ResumeLayout(false);
    9383      this.PerformLayout();
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlans/PackingPlan2DView.cs

    r13032 r13462  
    2929
    3030namespace HeuristicLab.Problems.BinPacking.Views {
    31   [View("2-dimensional packing plan View")]
     31  [View("2-dimensional packing plan view")]
    3232  [Content(typeof(PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem>), true)]
    33   public partial class PackingPlan2DView : NamedItemView {
     33  public partial class PackingPlan2DView : ItemView {
    3434
    3535    public PackingPlan2DView() {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlans/PackingPlan3DView.Designer.cs

    r13032 r13462  
    4848      this.binSelection = new System.Windows.Forms.ListBox();
    4949      this.itemSelection = new System.Windows.Forms.ListBox();
    50       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5150      this.SuspendLayout();
    52       //
    53       // nameTextBox
    54       //
    55       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    56       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
    5751      //
    5852      // packingPlan3D
     
    9791      this.Name = "PackingPlan3DView";
    9892      this.Size = new System.Drawing.Size(351, 299);
    99       this.Controls.SetChildIndex(this.nameLabel, 0);
    100       this.Controls.SetChildIndex(this.nameTextBox, 0);
    101       this.Controls.SetChildIndex(this.infoLabel, 0);
    10293      this.Controls.SetChildIndex(this.packingPlan3D, 0);
    10394      this.Controls.SetChildIndex(this.binSelection, 0);
    10495      this.Controls.SetChildIndex(this.itemSelection, 0);
    105       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    10696      this.ResumeLayout(false);
    10797      this.PerformLayout();
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlans/PackingPlan3DView.cs

    r13032 r13462  
    3131  [View("3-dimensional packing plan View")]
    3232  [Content(typeof(PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>), true)]
    33   public partial class PackingPlan3DView : NamedItemView {
     33  public partial class PackingPlan3DView : ItemView {
    3434
    3535    public PackingPlan3DView() {
    3636      InitializeComponent();
    37       this.nameTextBox.Text = "Packing Plan";
    3837    }
    3938
     
    6059        packingPlan3D.InitializeContainer(0, 0, 0);
    6160      } else {
    62         Content.Name = "Packing Plan";
    6361        int i = 0;
    6462        foreach (var bp in Content.BinPackings)
     
    124122          packingPlan3D.InitializeContainer(0, 0, 0);
    125123        } else {
    126           Content.Name = "Packing Plan";
    127124          int i = 0;
    128125          foreach (var bp in Content.BinPackings)
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/PackingPlan.cs

    r13032 r13462  
    4141  [Item("PackingPlan", "Represents a concrete solution for a bin-packing problem.")]
    4242  [StorableClass]
    43   public abstract class PackingPlan<D, B, I> : ParameterizedNamedItem, IPackingPlan
     43  public abstract class PackingPlan<D, B, I> :Item, IPackingPlan
    4444    where D : class, IPackingDimensions
    4545    where B : PackingShape<D>, IPackingBin
     
    8080    #endregion
    8181
    82     public PackingPlan(B binMeasures, bool useExtremePoints, bool stackingConstraints)
     82    protected PackingPlan(B binMeasures, bool useExtremePoints, bool stackingConstraints)
    8383      : base(){
    8484        BinMeasures = (B)binMeasures.Clone();
     
    253253
    254254
    255   [Item("PackingPlan2D", "Represents a concrete solution for a 2D bin-packing problem.")]
     255  [Item("PackingPlan2D", "Represents a solution for a 2D bin packing problem.")]
    256256  [StorableClass]
    257257  public class PackingPlan2D : PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> {
     
    275275
    276276
    277   [Item("PackingPlan3D", "Represents a concrete solution for a 3D bin-packing problem.")]
     277  [Item("PackingPlan3D", "Represents a solution for a 3D bin packing problem.")]
    278278  [StorableClass]
    279279  public class PackingPlan3D : PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingPlan.cs

    r13032 r13462  
    2323
    2424namespace HeuristicLab.Problems.BinPacking.Interfaces {
    25   public interface IPackingPlan : INamedItem {
     25  public interface IPackingPlan : IItem {
    2626    int NrOfBins { get; }
    2727  }
Note: See TracChangeset for help on using the changeset viewer.