Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/29/10 01:44:57 (14 years ago)
Author:
swagner
Message:

Adapted HL 3.3 plugins according to changes in MainForm (#857)

Location:
trunk/sources/HeuristicLab.Operators.Views/3.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Operators.Views/3.3/CombinedOperatorView.Designer.cs

    r2684 r2713  
    109109                  | System.Windows.Forms.AnchorStyles.Right)));
    110110      this.parameterCollectionView.Caption = "ParameterCollection";
    111       this.parameterCollectionView.ItemCollection = null;
    112111      this.parameterCollectionView.Location = new System.Drawing.Point(6, 6);
    113112      this.parameterCollectionView.Name = "parameterCollectionView";
    114       this.parameterCollectionView.NamedItemCollection = null;
    115       this.parameterCollectionView.Object = null;
    116113      this.parameterCollectionView.Size = new System.Drawing.Size(466, 326);
    117114      this.parameterCollectionView.TabIndex = 0;
     
    123120                  | System.Windows.Forms.AnchorStyles.Right)));
    124121      this.operatorGraphView.Caption = "Operator Graph";
    125       this.operatorGraphView.Item = null;
    126122      this.operatorGraphView.Location = new System.Drawing.Point(6, 6);
    127123      this.operatorGraphView.Name = "operatorGraphView";
    128       this.operatorGraphView.Object = null;
    129       this.operatorGraphView.OperatorGraph = null;
    130124      this.operatorGraphView.Size = new System.Drawing.Size(466, 326);
    131125      this.operatorGraphView.TabIndex = 0;
  • trunk/sources/HeuristicLab.Operators.Views/3.3/CombinedOperatorView.cs

    r2684 r2713  
    3737  [Content(typeof(CombinedOperator), true)]
    3838  public partial class CombinedOperatorView : NamedItemView {
    39     public CombinedOperator CombinedOperator {
    40       get { return (CombinedOperator)base.Item; }
    41       set { base.Item = value; }
     39    public new CombinedOperator Content {
     40      get { return (CombinedOperator)base.Content; }
     41      set { base.Content = value; }
    4242    }
    4343
     
    5454    public CombinedOperatorView(CombinedOperator combinedOperator)
    5555      : this() {
    56       CombinedOperator = combinedOperator;
     56      Content = combinedOperator;
    5757    }
    5858
    59     protected override void OnObjectChanged() {
    60       base.OnObjectChanged();
    61       if (CombinedOperator == null) {
    62         parameterCollectionView.NamedItemCollection = null;
    63         operatorGraphView.OperatorGraph = null;
     59    protected override void OnContentChanged() {
     60      base.OnContentChanged();
     61      if (Content == null) {
     62        parameterCollectionView.Content = null;
     63        operatorGraphView.Content = null;
    6464        tabControl.Enabled = false;
    6565      } else {
    66         parameterCollectionView.NamedItemCollection = ((IOperator)CombinedOperator).Parameters;
    67         operatorGraphView.OperatorGraph = CombinedOperator.OperatorGraph;
     66        parameterCollectionView.Content = ((IOperator)Content).Parameters;
     67        operatorGraphView.Content = Content.OperatorGraph;
    6868        tabControl.Enabled = true;
    6969      }
  • trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorView.Designer.cs

    r2676 r2713  
    6767                  | System.Windows.Forms.AnchorStyles.Right)));
    6868      this.parameterCollectionView.Caption = "ParameterCollection";
    69       this.parameterCollectionView.ItemCollection = null;
    7069      this.parameterCollectionView.Location = new System.Drawing.Point(0, 119);
    7170      this.parameterCollectionView.Name = "parameterCollectionView";
    72       this.parameterCollectionView.NamedItemCollection = null;
    73       this.parameterCollectionView.Object = null;
    7471      this.parameterCollectionView.Size = new System.Drawing.Size(490, 234);
    7572      this.parameterCollectionView.TabIndex = 4;
  • trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorView.cs

    r2676 r2713  
    3737  [Content(typeof(Operator), true)]
    3838  public partial class OperatorView : NamedItemView {
    39     public Operator Operator {
    40       get { return (Operator)base.Item; }
    41       set { base.Item = value; }
     39    public new Operator Content {
     40      get { return (Operator)base.Content; }
     41      set { base.Content = value; }
    4242    }
    4343
     
    5454    public OperatorView(Operator op)
    5555      : this() {
    56       Operator = op;
     56      Content = op;
    5757    }
    5858
    59     protected override void OnObjectChanged() {
    60       base.OnObjectChanged();
    61       if (Operator == null) {
    62         parameterCollectionView.NamedItemCollection = null;
     59    protected override void OnContentChanged() {
     60      base.OnContentChanged();
     61      if (Content == null) {
     62        parameterCollectionView.Content = null;
    6363      } else {
    64         parameterCollectionView.NamedItemCollection = ((IOperator)Operator).Parameters;
     64        parameterCollectionView.Content = ((IOperator)Content).Parameters;
    6565      }
    6666    }
Note: See TracChangeset for help on using the changeset viewer.