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

Timestamp:

02/18/10 13:51:21 (14 years ago)

Author:

mkommend

Message:

changed OperatorGraphView in EngineView and CombinedOperatorView to ViewHost (ticket #867)

Location:

trunk/sources/HeuristicLab.Operators.Views/3.3

Files:

• CombinedOperatorView.Designer.cs (modified) (4 diffs)
• CombinedOperatorView.cs (modified) (1 diff)

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

@@ -47 +47 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.parametersTabPage = new System.Windows.Forms.TabPage();
+      this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
       this.operatorGraphTabPage = new System.Windows.Forms.TabPage();
-      this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
-      this.operatorGraphView = new HeuristicLab.Core.Views.OperatorGraphView();
+      this.operatorGraphViewHost = new HeuristicLab.Core.Views.ViewHost();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
@@ -92 +92 @@
       this.parametersTabPage.UseVisualStyleBackColor = true;
       // 
+      // parameterCollectionView
+      // 
+      this.parameterCollectionView.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.parameterCollectionView.Caption = "ParameterCollection";
+      this.parameterCollectionView.Content = null;
+      this.parameterCollectionView.Location = new System.Drawing.Point(6, 6);
+      this.parameterCollectionView.Name = "parameterCollectionView";
+      this.parameterCollectionView.Size = new System.Drawing.Size(466, 326);
+      this.parameterCollectionView.TabIndex = 0;
+      // 
       // operatorGraphTabPage
       // 
-      this.operatorGraphTabPage.Controls.Add(this.operatorGraphView);
+      this.operatorGraphTabPage.Controls.Add(this.operatorGraphViewHost);
       this.operatorGraphTabPage.Location = new System.Drawing.Point(4, 22);
       this.operatorGraphTabPage.Name = "operatorGraphTabPage";
@@ -103 +115 @@
       this.operatorGraphTabPage.UseVisualStyleBackColor = true;
       // 
-      // parameterCollectionView
+      // operatorGraphViewHost
       // 
-      this.parameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+      this.operatorGraphViewHost.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.parameterCollectionView.Caption = "ParameterCollection";
-      this.parameterCollectionView.Location = new System.Drawing.Point(6, 6);
-      this.parameterCollectionView.Name = "parameterCollectionView";
-      this.parameterCollectionView.Size = new System.Drawing.Size(466, 326);
-      this.parameterCollectionView.TabIndex = 0;
-      // 
-      // operatorGraphView
-      // 
-      this.operatorGraphView.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.operatorGraphView.Caption = "Operator Graph";
-      this.operatorGraphView.Location = new System.Drawing.Point(6, 6);
-      this.operatorGraphView.Name = "operatorGraphView";
-      this.operatorGraphView.Size = new System.Drawing.Size(466, 326);
-      this.operatorGraphView.TabIndex = 0;
+      this.operatorGraphViewHost.Content = null;
+      this.operatorGraphViewHost.Location = new System.Drawing.Point(6, 6);
+      this.operatorGraphViewHost.Name = "operatorGraphViewHost";
+      this.operatorGraphViewHost.Size = new System.Drawing.Size(466, 326);
+      this.operatorGraphViewHost.TabIndex = 0;
+      this.operatorGraphViewHost.ViewType = null;
       // 
       // CombinedOperatorView
@@ -152 +154 @@
     protected System.Windows.Forms.TabPage operatorGraphTabPage;
     protected HeuristicLab.Core.Views.ParameterCollectionView parameterCollectionView;
-    protected HeuristicLab.Core.Views.OperatorGraphView operatorGraphView;
+    protected HeuristicLab.Core.Views.ViewHost operatorGraphViewHost;
   }
 }

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

@@ -54 +54 @@
       if (Content == null) {
         parameterCollectionView.Content = null;
-        operatorGraphView.Content = null;
+        operatorGraphViewHost.Content = null;
         tabControl.Enabled = false;
       } else {
         parameterCollectionView.Content = ((IOperator)Content).Parameters;
-        operatorGraphView.Content = Content.OperatorGraph;
+        operatorGraphViewHost.Content = Content.OperatorGraph;
         tabControl.Enabled = true;
       }