Changeset 2676 for trunk/sources/HeuristicLab.Operators.Views/3.3

Timestamp:

01/25/10 02:34:23 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• continued work on adapting and refactoring HeuristicLab.Data according to the changes in HeuristicLab.Core
• unified visual appearance of views

Location:

trunk/sources/HeuristicLab.Operators.Views/3.3

Files:

• OperatorView.Designer.cs (modified) (3 diffs)
• OperatorView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
       // 
       // nameTextBox
       // 
+      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
+      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
       this.nameTextBox.Size = new System.Drawing.Size(418, 20);
       // 
@@ -56 +59 @@
       this.descriptionTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.descriptionTextBox.Size = new System.Drawing.Size(418, 90);
+      this.descriptionTextBox.Size = new System.Drawing.Size(418, 87);
       // 
       // parameterCollectionView
@@ -65 +68 @@
       this.parameterCollectionView.Caption = "ParameterCollection";
       this.parameterCollectionView.ItemCollection = null;
-      this.parameterCollectionView.Location = new System.Drawing.Point(0, 122);
+      this.parameterCollectionView.Location = new System.Drawing.Point(0, 119);
       this.parameterCollectionView.Name = "parameterCollectionView";
       this.parameterCollectionView.NamedItemCollection = null;
-      this.parameterCollectionView.Size = new System.Drawing.Size(490, 231);
+      this.parameterCollectionView.Object = null;
+      this.parameterCollectionView.Size = new System.Drawing.Size(490, 234);
       this.parameterCollectionView.TabIndex = 4;
       // 
-      // OperatorBaseView
+      // OperatorView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.parameterCollectionView);
-      this.Name = "OperatorBaseView";
+      this.Name = "OperatorView";
       this.Size = new System.Drawing.Size(490, 353);
-      this.Controls.SetChildIndex(this.parameterCollectionView, 0);
+      this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.descriptionLabel, 0);
-      this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.descriptionTextBox, 0);
+      this.Controls.SetChildIndex(this.parameterCollectionView, 0);
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
       this.PerformLayout();

trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorView.cs

@@ -37 +37 @@
   [Content(typeof(Operator), true)]
   public partial class OperatorView : NamedItemView {
-    public Operator OperatorBase {
+    public Operator Operator {
       get { return (Operator)base.Item; }
       set { base.Item = value; }
@@ -52 +52 @@
     /// </summary>
     /// <param name="item">The item that should be displayed.</param>
-    public OperatorView(Operator operatorBase)
+    public OperatorView(Operator op)
       : this() {
-      OperatorBase = operatorBase;
+      Operator = op;
     }
 
     protected override void OnObjectChanged() {
       base.OnObjectChanged();
-      if (OperatorBase == null) {
+      if (Operator == null) {
         parameterCollectionView.NamedItemCollection = null;
       } else {
-        parameterCollectionView.NamedItemCollection = ((IOperator)OperatorBase).Parameters;
+        parameterCollectionView.NamedItemCollection = ((IOperator)Operator).Parameters;
       }
     }