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

Timestamp:

02/10/10 03:39:02 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on parameters and operators

Location:

trunk/sources/HeuristicLab.Operators.Views/3.3

Files:

• HeuristicLab.Operators.Views-3.3.csproj (modified) (1 diff)
• MultipleCallsOperatorView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Operators.Views/3.3/MultipleSuccessorsOperatorView.Designer.cs) (7 diffs)
• MultipleCallsOperatorView.cs (moved) (moved from trunk/sources/HeuristicLab.Operators.Views/3.3/MultipleSuccessorsOperatorView.cs) (4 diffs)
• ValuesCollectorView.Designer.cs (added)
• ValuesCollectorView.cs (added)

trunk/sources/HeuristicLab.Operators.Views/3.3/HeuristicLab.Operators.Views-3.3.csproj

@@ -58 +58 @@
     </Compile>
     <None Include="HeuristicLabOperatorsViewsPlugin.cs.frame" />
-    <Compile Include="MultipleSuccessorsOperatorView.cs">
+    <Compile Include="MultipleCallsOperatorView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="MultipleSuccessorsOperatorView.Designer.cs">
-      <DependentUpon>MultipleSuccessorsOperatorView.cs</DependentUpon>
+    <Compile Include="MultipleCallsOperatorView.Designer.cs">
+      <DependentUpon>MultipleCallsOperatorView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ValuesCollectorView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ValuesCollectorView.Designer.cs">
+      <DependentUpon>ValuesCollectorView.cs</DependentUpon>
     </Compile>
     <Compile Include="HeuristicLabOperatorsViewsPlugin.cs" />

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

@@ -21 +21 @@
 
 namespace HeuristicLab.Operators.Views {
-  partial class MultipleSuccessorsOperatorView {
+  partial class MultipleCallsOperatorView {
     /// <summary> 
     /// Required designer variable.
@@ -46 +46 @@
     private void InitializeComponent() {
       this.tabControl = new System.Windows.Forms.TabControl();
-      this.successorsTabPage = new System.Windows.Forms.TabPage();
-      this.successorsListView = new HeuristicLab.Core.Views.OperatorListView();
+      this.operatorsTabPage = new System.Windows.Forms.TabPage();
+      this.operatorListView = new HeuristicLab.Core.Views.OperatorListView();
       this.parametersTabPage = new System.Windows.Forms.TabPage();
       this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
-      this.successorsTabPage.SuspendLayout();
+      this.operatorsTabPage.SuspendLayout();
       this.parametersTabPage.SuspendLayout();
       this.SuspendLayout();
@@ -73 +73 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.tabControl.Controls.Add(this.successorsTabPage);
+      this.tabControl.Controls.Add(this.operatorsTabPage);
       this.tabControl.Controls.Add(this.parametersTabPage);
       this.tabControl.Location = new System.Drawing.Point(0, 118);
@@ -81 +81 @@
       this.tabControl.TabIndex = 4;
       // 
-      // successorsTabPage
+      // operatorsTabPage
       // 
-      this.successorsTabPage.Controls.Add(this.successorsListView);
-      this.successorsTabPage.Location = new System.Drawing.Point(4, 22);
-      this.successorsTabPage.Name = "successorsTabPage";
-      this.successorsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.successorsTabPage.Size = new System.Drawing.Size(478, 338);
-      this.successorsTabPage.TabIndex = 0;
-      this.successorsTabPage.Text = "Successors";
-      this.successorsTabPage.UseVisualStyleBackColor = true;
+      this.operatorsTabPage.Controls.Add(this.operatorListView);
+      this.operatorsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.operatorsTabPage.Name = "operatorsTabPage";
+      this.operatorsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.operatorsTabPage.Size = new System.Drawing.Size(478, 338);
+      this.operatorsTabPage.TabIndex = 0;
+      this.operatorsTabPage.Text = "Operators";
+      this.operatorsTabPage.UseVisualStyleBackColor = true;
       // 
-      // successorsListView
+      // operatorListView
       // 
-      this.successorsListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+      this.operatorListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.successorsListView.Caption = "Operator List";
-      this.successorsListView.Content = null;
-      this.successorsListView.Location = new System.Drawing.Point(6, 6);
-      this.successorsListView.Name = "successorsListView";
-      this.successorsListView.Size = new System.Drawing.Size(466, 326);
-      this.successorsListView.TabIndex = 0;
+      this.operatorListView.Caption = "Operator List";
+      this.operatorListView.Content = null;
+      this.operatorListView.Location = new System.Drawing.Point(6, 6);
+      this.operatorListView.Name = "operatorListView";
+      this.operatorListView.Size = new System.Drawing.Size(466, 326);
+      this.operatorListView.TabIndex = 0;
       // 
       // parametersTabPage
@@ -127 +127 @@
       this.parameterCollectionView.TabIndex = 0;
       // 
-      // MultipleSuccessorsOperatorView
+      // MultipleCallsOperatorView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.tabControl);
-      this.Name = "MultipleSuccessorsOperatorView";
+      this.Name = "MultipleCallsOperatorView";
       this.Size = new System.Drawing.Size(486, 482);
       this.Controls.SetChildIndex(this.tabControl, 0);
@@ -141 +141 @@
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.tabControl.ResumeLayout(false);
-      this.successorsTabPage.ResumeLayout(false);
+      this.operatorsTabPage.ResumeLayout(false);
       this.parametersTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
@@ -151 +151 @@
 
     protected System.Windows.Forms.TabControl tabControl;
-    protected System.Windows.Forms.TabPage successorsTabPage;
+    protected System.Windows.Forms.TabPage operatorsTabPage;
     protected System.Windows.Forms.TabPage parametersTabPage;
     private HeuristicLab.Core.Views.ParameterCollectionView parameterCollectionView;
-    private HeuristicLab.Core.Views.OperatorListView successorsListView;
+    private HeuristicLab.Core.Views.OperatorListView operatorListView;
   }
 }

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

@@ -35 +35 @@
   /// The base class for visual representations of items.
   /// </summary>
-  [Content(typeof(MultipleSuccessorsOperator), true)]
-  public partial class MultipleSuccessorsOperatorView : NamedItemView {
-    public new MultipleSuccessorsOperator Content {
-      get { return (MultipleSuccessorsOperator)base.Content; }
+  [Content(typeof(MultipleCallsOperator), true)]
+  public partial class MultipleCallsOperatorView : NamedItemView {
+    public new MultipleCallsOperator Content {
+      get { return (MultipleCallsOperator)base.Content; }
       set { base.Content = value; }
     }
@@ -45 +45 @@
     /// Initializes a new instance of <see cref="ItemBaseView"/>.
     /// </summary>
-    public MultipleSuccessorsOperatorView() {
+    public MultipleCallsOperatorView() {
       InitializeComponent();
     }
@@ -52 +52 @@
     /// </summary>
     /// <param name="item">The item that should be displayed.</param>
-    public MultipleSuccessorsOperatorView(MultipleSuccessorsOperator content)
+    public MultipleCallsOperatorView(MultipleCallsOperator content)
       : this() {
       Content = content;
@@ -60 +60 @@
       base.OnContentChanged();
       if (Content == null) {
-        successorsListView.Content = null;
+        operatorListView.Content = null;
         parameterCollectionView.Content = null;
         tabControl.Enabled = false;
       } else {
-        successorsListView.Content = Content.Successors;
+        operatorListView.Content = Content.Operators;
         parameterCollectionView.Content = ((IOperator)Content).Parameters;
         tabControl.Enabled = true;