Changeset 2826 for trunk/sources/HeuristicLab.Core.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.Core.Views/3.3

Files:

• EngineView.Designer.cs (modified) (7 diffs)
• EngineView.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.Designer.cs

@@ -49 +49 @@
       this.executionTimeTextBox = new System.Windows.Forms.TextBox();
       this.executionTimeLabel = new System.Windows.Forms.Label();
-      this.operatorGraphView = new HeuristicLab.Core.Views.OperatorGraphView();
       this.scopeView = new HeuristicLab.Core.Views.ScopeView();
       this.resetButton = new System.Windows.Forms.Button();
@@ -63 +62 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.operatorGraphTabPage = new System.Windows.Forms.TabPage();
+      this.operatorGraphViewHost = new HeuristicLab.Core.Views.ViewHost();
       this.globalScopeTabPage = new System.Windows.Forms.TabPage();
       this.problemTabPage = new System.Windows.Forms.TabPage();
@@ -92 +92 @@
       this.executionTimeLabel.TabIndex = 4;
       this.executionTimeLabel.Text = "&Execution Time:";
-      // 
-      // 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.Content = null;
-      this.operatorGraphView.Location = new System.Drawing.Point(6, 36);
-      this.operatorGraphView.Name = "operatorGraphView";
-      this.operatorGraphView.Size = new System.Drawing.Size(782, 542);
-      this.operatorGraphView.TabIndex = 3;
       // 
       // scopeView
@@ -236 +224 @@
       // operatorGraphTabPage
       // 
+      this.operatorGraphTabPage.Controls.Add(this.operatorGraphViewHost);
       this.operatorGraphTabPage.Controls.Add(this.saveOperatorGraphButton);
       this.operatorGraphTabPage.Controls.Add(this.openOperatorGraphButton);
       this.operatorGraphTabPage.Controls.Add(this.newOperatorGraphButton);
-      this.operatorGraphTabPage.Controls.Add(this.operatorGraphView);
       this.operatorGraphTabPage.Location = new System.Drawing.Point(4, 22);
       this.operatorGraphTabPage.Name = "operatorGraphTabPage";
@@ -247 +235 @@
       this.operatorGraphTabPage.Text = "Operator Graph";
       this.operatorGraphTabPage.UseVisualStyleBackColor = true;
+      // 
+      // operatorGraphViewHost
+      // 
+      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.operatorGraphViewHost.Content = null;
+      this.operatorGraphViewHost.Location = new System.Drawing.Point(6, 36);
+      this.operatorGraphViewHost.Name = "operatorGraphViewHost";
+      this.operatorGraphViewHost.Size = new System.Drawing.Size(782, 542);
+      this.operatorGraphViewHost.TabIndex = 3;
+      this.operatorGraphViewHost.ViewType = null;
       // 
       // globalScopeTabPage
@@ -283 +283 @@
       this.problemViewHost.Size = new System.Drawing.Size(782, 542);
       this.problemViewHost.TabIndex = 3;
+      this.problemViewHost.ViewType = null;
       // 
       // openFileDialog
@@ -327 +328 @@
     protected System.Windows.Forms.Button stopButton;
     protected System.Windows.Forms.Button startButton;
-    protected HeuristicLab.Core.Views.OperatorGraphView operatorGraphView;
     protected HeuristicLab.Core.Views.ScopeView scopeView;
     protected System.Windows.Forms.ToolTip toolTip;
     protected System.Windows.Forms.TabControl tabControl;
-    protected System.Windows.Forms.TabPage operatorGraphTabPage;
     protected System.Windows.Forms.TabPage globalScopeTabPage;
     protected System.Windows.Forms.TabPage problemTabPage;
     protected ViewHost problemViewHost;
     protected System.Windows.Forms.Button newProblemButton;
-    protected System.Windows.Forms.Button saveOperatorGraphButton;
-    protected System.Windows.Forms.Button openOperatorGraphButton;
-    protected System.Windows.Forms.Button newOperatorGraphButton;
     protected System.Windows.Forms.Button saveProblemButton;
     protected System.Windows.Forms.Button openProblemButton;
     protected System.Windows.Forms.OpenFileDialog openFileDialog;
     protected System.Windows.Forms.SaveFileDialog saveFileDialog;
+    protected System.Windows.Forms.TabPage operatorGraphTabPage;
+    protected System.Windows.Forms.Button saveOperatorGraphButton;
+    protected System.Windows.Forms.Button openOperatorGraphButton;
+    protected System.Windows.Forms.Button newOperatorGraphButton;
+    protected ViewHost operatorGraphViewHost;
 
   }

trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.cs

@@ -95 +95 @@
       if (Content == null) {
         newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = false;
-        operatorGraphView.Enabled = false;
+        operatorGraphViewHost.Enabled = false;
         scopeView.Enabled = false;
         newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false;
@@ -103 +103 @@
       } else {
         newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
-        operatorGraphView.Content = Content.OperatorGraph;
-        operatorGraphView.Enabled = true;
+        operatorGraphViewHost.Content = Content.OperatorGraph;
+        operatorGraphViewHost.Enabled = true;
         scopeView.Content = Content.GlobalScope;
         scopeView.Enabled = true;
@@ -123 +123 @@
         Invoke(new EventHandler(Content_OperatorGraphChanged), sender, e);
       else
-        operatorGraphView.Content = Content.OperatorGraph;
+        operatorGraphViewHost.Content = Content.OperatorGraph;
     }
     protected void Content_ProblemChanged(object sender, EventArgs e) {
@@ -138 +138 @@
       else {
         newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
-        operatorGraphView.Enabled = true;
+        operatorGraphViewHost.Enabled = true;
         scopeView.Enabled = true;
         newProblemButton.Enabled = openProblemButton.Enabled = true;
@@ -155 +155 @@
       else {
         newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = false;
-        operatorGraphView.Enabled = false;
+        operatorGraphViewHost.Enabled = false;
         scopeView.Enabled = false;
         newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false;
@@ -170 +170 @@
       else {
         newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
-        operatorGraphView.Enabled = true;
+        operatorGraphViewHost.Enabled = true;
         scopeView.Enabled = true;
         newProblemButton.Enabled = openProblemButton.Enabled = true;