Changeset 2801 for trunk/sources/HeuristicLab.Core.Views

Timestamp:

02/15/10 15:39:26 (14 years ago)

Author:

mkommend

Message:

added first version of OperatorGraphVisualization (ticket #867)

Location:

trunk/sources/HeuristicLab.Core.Views/3.3

Files:

• OperatorGraphView.Designer.cs (modified) (6 diffs)
• OperatorGraphView.cs (modified) (4 diffs)
• OperatorGraphView.resx (added)

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

@@ -49 +49 @@
       this.initialOperatorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.operatorsView = new HeuristicLab.Core.Views.OperatorSetView();
-      this.graphView = new HeuristicLab.Core.Views.OperatorTreeView();
       this.splitContainer = new System.Windows.Forms.SplitContainer();
       this.graphGroupBox = new System.Windows.Forms.GroupBox();
+      this.viewHost = new HeuristicLab.Core.Views.ViewHost();
       this.operatorsContextMenuStrip.SuspendLayout();
       this.splitContainer.Panel1.SuspendLayout();
@@ -82 +82 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.operatorsView.Caption = "Operator Set";
+      this.operatorsView.Content = null;
       this.operatorsView.Location = new System.Drawing.Point(3, 3);
       this.operatorsView.Name = "operatorsView";
@@ -87 +88 @@
       this.operatorsView.TabIndex = 0;
       this.operatorsView.Load += new System.EventHandler(this.operatorsView_Load);
-      // 
-      // graphView
-      // 
-      this.graphView.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.graphView.Caption = "Operator";
-      this.graphView.Location = new System.Drawing.Point(6, 19);
-      this.graphView.Name = "graphView";
-      this.graphView.Size = new System.Drawing.Size(590, 183);
-      this.graphView.TabIndex = 0;
       // 
       // splitContainer
@@ -122 +112 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.graphGroupBox.Controls.Add(this.graphView);
+      this.graphGroupBox.Controls.Add(this.viewHost);
       this.graphGroupBox.Location = new System.Drawing.Point(3, 3);
       this.graphGroupBox.Name = "graphGroupBox";
@@ -129 +119 @@
       this.graphGroupBox.TabStop = false;
       this.graphGroupBox.Text = "Operator &Graph";
+      // 
+      // viewHost
+      // 
+      this.viewHost.Content = null;
+      this.viewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.viewHost.Location = new System.Drawing.Point(3, 16);
+      this.viewHost.Name = "viewHost";
+      this.viewHost.Size = new System.Drawing.Size(596, 189);
+      this.viewHost.TabIndex = 0;
       // 
       // OperatorGraphView
@@ -151 +150 @@
     protected System.Windows.Forms.ToolStripMenuItem initialOperatorToolStripMenuItem;
     protected OperatorSetView operatorsView;
-    protected OperatorTreeView graphView;
     protected System.Windows.Forms.SplitContainer splitContainer;
     protected System.Windows.Forms.GroupBox graphGroupBox;
+    private ViewHost viewHost;
   }
 }

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

@@ -25 +25 @@
 using System.Drawing;
 using System.Data;
+using System.Linq;
 using System.Text;
 using System.Windows.Forms;
@@ -54 +55 @@
       InitializeComponent();
       Caption = "Operator Graph";
+      this.viewHost.ViewType = typeof(OperatorTreeView);
     }
     /// <summary>
@@ -90 +92 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+      Caption = "Operator Graph";
       operatorsView.Content = null;
       operatorsView.Enabled = false;
-      graphView.Content = null;
-      graphView.Enabled = false;
-      if (Content == null) {
-        Caption = "Operator Graph";
-        operatorsView.Content = null;
-        operatorsView.Enabled = false;
-        graphView.Content = null;
-        graphView.Enabled = false;
-      } else {
+      viewHost.Content = null;
+      viewHost.Enabled = false;
+
+      if (Content != null) {
         Caption = Content.ItemName + " (" + Content.GetType().Name + ")";
         operatorsView.Content = Content.Operators;
         operatorsView.Enabled = true;
         MarkInitialOperator();
-        graphView.Content = Content.InitialOperator;
-        graphView.Enabled = true;
+        viewHost.Content = Content.InitialOperator;
+        viewHost.Enabled = true;
       }
     }
@@ -148 +146 @@
       else {
         MarkInitialOperator();
-        graphView.Content = Content.InitialOperator;
+        viewHost.Content = Content.InitialOperator;
       }
     }