Changeset 2947 for trunk/sources/HeuristicLab.Core.Views/3.3

Timestamp:

03/06/10 00:26:13 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• implemented reviewers' comments on version r2917.

Location:

trunk/sources/HeuristicLab.Core.Views/3.3

Files:

• HeuristicLab.Core.Views-3.3.csproj (modified) (1 diff)
• NamedItemCollectionView.cs (modified) (1 diff)
• OperatorGraphView.Designer.cs (modified) (4 diffs)
• OperatorGraphView.cs (modified) (4 diffs)
• OperatorGraphView.resx (deleted)

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

@@ -285 +285 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="OperatorGraphView.resx">
-      <DependentUpon>OperatorGraphView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

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

@@ -65 +65 @@
       return item;
     }
+    protected override ListViewItem CreateListViewItem(T item) {
+      ListViewItem listViewItem = base.CreateListViewItem(item);
+      listViewItem.ToolTipText = item.ItemName + ": " + item.Description;
+      return listViewItem;
+    }
     protected override void AddListViewItem(ListViewItem listViewItem) {
       ListViewItemDictionary.Add((T)listViewItem.Tag, listViewItem);

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

@@ -51 +51 @@
       this.splitContainer = new System.Windows.Forms.SplitContainer();
       this.graphGroupBox = new System.Windows.Forms.GroupBox();
-      this.viewHost = new HeuristicLab.Core.Views.ViewHost();
+      this.operatorTreeView = new HeuristicLab.Core.Views.OperatorTreeView();
       this.operatorsContextMenuStrip.SuspendLayout();
       this.splitContainer.Panel1.SuspendLayout();
@@ -112 +112 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.graphGroupBox.Controls.Add(this.viewHost);
+      this.graphGroupBox.Controls.Add(this.operatorTreeView);
       this.graphGroupBox.Location = new System.Drawing.Point(3, 3);
       this.graphGroupBox.Name = "graphGroupBox";
@@ -120 +120 @@
       this.graphGroupBox.Text = "Operator Graph";
       // 
-      // viewHost
+      // operatorTreeView
       // 
-      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;
+      this.operatorTreeView.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.operatorTreeView.Caption = "Operator";
+      this.operatorTreeView.Content = null;
+      this.operatorTreeView.Location = new System.Drawing.Point(6, 19);
+      this.operatorTreeView.Name = "operatorTreeView";
+      this.operatorTreeView.Size = new System.Drawing.Size(590, 183);
+      this.operatorTreeView.TabIndex = 0;
       // 
       // OperatorGraphView
@@ -152 +155 @@
     protected System.Windows.Forms.SplitContainer splitContainer;
     protected System.Windows.Forms.GroupBox graphGroupBox;
-    private ViewHost viewHost;
+    private OperatorTreeView operatorTreeView;
   }
 }

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

@@ -49 +49 @@
       InitializeComponent();
       Caption = "Operator Graph";
-      this.viewHost.ViewType = typeof(OperatorTreeView);
     }
     /// <summary>
@@ -89 +88 @@
       operatorsView.Content = null;
       operatorsView.Enabled = false;
-      viewHost.Content = null;
-      viewHost.Enabled = false;
+      operatorTreeView.Content = null;
+      operatorTreeView.Enabled = false;
 
       if (Content != null) {
@@ -97 +96 @@
         operatorsView.Enabled = true;
         MarkInitialOperator();
-        viewHost.Content = Content.InitialOperator;
-        viewHost.Enabled = true;
+        operatorTreeView.Content = Content.InitialOperator;
+        operatorTreeView.Enabled = true;
       }
     }
@@ -140 +139 @@
       else {
         MarkInitialOperator();
-        viewHost.Content = Content.InitialOperator;
+        operatorTreeView.Content = Content.InitialOperator;
       }
     }