Changeset 11530 for branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3

Timestamp:

11/10/14 04:24:04 (10 years ago)

Author:

swagner

Message:

#2205: Implemented review comments

• renamed GenericPort to MessagePort
• refactored CanConnectToPort
• refactored PrepareMessage
• removed IConnectedPort

Additional changes:

• added UserDefinedMessagePort
• refactored CloneConnectedPortParameters to CloneParametersFromPort and moved it to ParameterizedPort
• added ports to NetworkView

Location:

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3

Files:

• Core.Networks.Views/MessagePortView.Designer.cs (moved) (moved from branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/GenericPortView.Designer.cs) (3 diffs)
• Core.Networks.Views/MessagePortView.cs (moved) (moved from branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/GenericPortView.cs) (4 diffs)
• Core.Networks.Views/NetworkView.Designer.cs (modified) (3 diffs)
• Core.Networks.Views/NetworkView.cs (modified) (2 diffs)
• Core.Networks.Views/UserDefinedMessagePortView.Designer.cs (added)
• Core.Networks.Views/UserDefinedMessagePortView.cs (added)
• Core.Networks.Views/UserDefinedNetworkView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks.Views-3.3.csproj (modified) (3 diffs)
• Operators.Views/HookOperatorView.cs (modified) (2 diffs)

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/MessagePortView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Core.Networks.Views {
-  partial class GenericPortView {
+  partial class MessagePortView {
     /// <summary> 
     /// Required designer variable.
@@ -190 +190 @@
       this.logMessagesCheckBox.CheckedChanged += new System.EventHandler(this.logMessagesCheckBox_CheckedChanged);
       // 
-      // GenericPortView
+      // MessagePortView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
@@ -197 +197 @@
       this.Controls.Add(this.connectedPortGroupBox);
       this.Controls.Add(this.splitContainer);
-      this.Name = "GenericPortView";
+      this.Name = "MessagePortView";
       this.Controls.SetChildIndex(this.splitContainer, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/MessagePortView.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Core.Networks.Views {
-  [View("GenericPort View")]
-  [Content(typeof(GenericPort), true)]
-  [Content(typeof(IGenericPort), false)]
-  public partial class GenericPortView : PortView {
+  [View("MessagePort View")]
+  [Content(typeof(MessagePort), true)]
+  [Content(typeof(IMessagePort), false)]
+  public partial class MessagePortView : PortView {
     protected NetworkItemSelectorDialog networkItemSelectorDialog;
 
-    public new IGenericPort Content {
-      get { return (IGenericPort)base.Content; }
+    public new IMessagePort Content {
+      get { return (IMessagePort)base.Content; }
       set { base.Content = value; }
     }
 
-    public GenericPortView() {
+    public MessagePortView() {
       InitializeComponent();
       errorProvider.SetIconAlignment(connectedPortView, ErrorIconAlignment.MiddleRight);
@@ -128 +128 @@
           root,
           Content.ConnectedPort,
-          typeof(IConnectedPort)
+          typeof(IMessagePort)
         );
 
         if (networkItemSelectorDialog.ShowDialog(this) == DialogResult.OK) {
-          Content.ConnectedPort = networkItemSelectorDialog.NetworkItemSelector.SelectedNetworkItem as IConnectedPort;
+          Content.ConnectedPort = networkItemSelectorDialog.NetworkItemSelector.SelectedNetworkItem as IMessagePort;
         }
       }
@@ -145 +145 @@
     protected virtual void connectedPortView_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
-      var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IConnectedPort;
+      var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IMessagePort;
 
       if (!ReadOnly && (data != null) && (Content.CanConnectToPort(data))) {
@@ -153 +153 @@
     protected virtual void connectedPortView_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
-        var port = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IConnectedPort;
+        var port = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IMessagePort;
         Content.ConnectedPort = port;
       }
     }
     protected virtual void cloneConnectedPortParametersButton_Click(object sender, EventArgs e) {
-      Content.CloneConnectedPortParameters();
+      Content.CloneParametersFromPort(Content.ConnectedPort);
     }
     protected virtual void logMessagesCheckBox_CheckedChanged(object sender, EventArgs e) {

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/NetworkView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.nodeCollectionView = new HeuristicLab.Core.Networks.Views.NodeCollectionView();
+      this.tabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
+      this.nodesTabPage = new System.Windows.Forms.TabPage();
+      this.portsTabPage = new System.Windows.Forms.TabPage();
+      this.portCollectionView = new HeuristicLab.Core.Networks.Views.PortCollectionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
+      this.tabControl.SuspendLayout();
+      this.nodesTabPage.SuspendLayout();
+      this.portsTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -53 +60 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Location = new System.Drawing.Point(69, 0);
-      this.nameTextBox.Size = new System.Drawing.Size(551, 20);
-      // 
-      // infoLabel
-      // 
-      this.infoLabel.Location = new System.Drawing.Point(626, 3);
       // 
       // nodeCollectionView
       // 
-      this.nodeCollectionView.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.nodeCollectionView.Caption = "NodeCollection View";
       this.nodeCollectionView.Content = null;
-      this.nodeCollectionView.Location = new System.Drawing.Point(6, 26);
+      this.nodeCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.nodeCollectionView.Location = new System.Drawing.Point(3, 3);
       this.nodeCollectionView.Name = "nodeCollectionView";
       this.nodeCollectionView.ReadOnly = false;
       this.nodeCollectionView.ShowDetails = true;
-      this.nodeCollectionView.Size = new System.Drawing.Size(639, 491);
-      this.nodeCollectionView.TabIndex = 3;
+      this.nodeCollectionView.Size = new System.Drawing.Size(631, 459);
+      this.nodeCollectionView.TabIndex = 0;
+      // 
+      // tabControl
+      // 
+      this.tabControl.AllowDrop = true;
+      this.tabControl.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.tabControl.Controls.Add(this.nodesTabPage);
+      this.tabControl.Controls.Add(this.portsTabPage);
+      this.tabControl.Location = new System.Drawing.Point(0, 26);
+      this.tabControl.Name = "tabControl";
+      this.tabControl.SelectedIndex = 0;
+      this.tabControl.Size = new System.Drawing.Size(645, 491);
+      this.tabControl.TabIndex = 3;
+      // 
+      // nodesTabPage
+      // 
+      this.nodesTabPage.Controls.Add(this.nodeCollectionView);
+      this.nodesTabPage.Location = new System.Drawing.Point(4, 22);
+      this.nodesTabPage.Name = "nodesTabPage";
+      this.nodesTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.nodesTabPage.Size = new System.Drawing.Size(637, 465);
+      this.nodesTabPage.TabIndex = 0;
+      this.nodesTabPage.Text = "Nodes";
+      this.nodesTabPage.UseVisualStyleBackColor = true;
+      // 
+      // portsTabPage
+      // 
+      this.portsTabPage.Controls.Add(this.portCollectionView);
+      this.portsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.portsTabPage.Name = "portsTabPage";
+      this.portsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.portsTabPage.Size = new System.Drawing.Size(637, 465);
+      this.portsTabPage.TabIndex = 1;
+      this.portsTabPage.Text = "Ports";
+      this.portsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // portCollectionView
+      // 
+      this.portCollectionView.Caption = "PortCollection View";
+      this.portCollectionView.Content = null;
+      this.portCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.portCollectionView.Location = new System.Drawing.Point(3, 3);
+      this.portCollectionView.Name = "portCollectionView";
+      this.portCollectionView.ReadOnly = false;
+      this.portCollectionView.ShowDetails = true;
+      this.portCollectionView.Size = new System.Drawing.Size(631, 459);
+      this.portCollectionView.TabIndex = 0;
       // 
       // NetworkView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-      this.Controls.Add(this.nodeCollectionView);
+      this.Controls.Add(this.tabControl);
       this.Name = "NetworkView";
-      this.Size = new System.Drawing.Size(645, 517);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.infoLabel, 0);
-      this.Controls.SetChildIndex(this.nodeCollectionView, 0);
+      this.Controls.SetChildIndex(this.tabControl, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
+      this.tabControl.ResumeLayout(false);
+      this.nodesTabPage.ResumeLayout(false);
+      this.portsTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -93 +142 @@
 
     protected NodeCollectionView nodeCollectionView;
+    protected MainForm.WindowsForms.DragOverTabControl tabControl;
+    protected System.Windows.Forms.TabPage nodesTabPage;
+    protected System.Windows.Forms.TabPage portsTabPage;
+    protected PortCollectionView portCollectionView;
 
 

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/NetworkView.cs

@@ -50 +50 @@
       base.OnContentChanged();
       nodeCollectionView.Content = Content == null ? null : Content.Nodes;
+      portCollectionView.Content = Content == null ? null : Content.Ports;
     }
 
@@ -55 +56 @@
       base.SetEnabledStateOfControls();
       nodeCollectionView.Enabled = Content != null;
+      portCollectionView.Enabled = Content != null;
     }
   }

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/UserDefinedNetworkView.cs

@@ -40 +40 @@
       base.OnContentChanged();
       nodeCollectionView.Content = Content == null ? null : Content.Nodes;
+      portCollectionView.Content = Content == null ? null : Content.Ports;
     }
   }

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/HeuristicLab.Optimization.Networks.Views-3.3.csproj

@@ -91 +91 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Core.Networks.Views\GenericPortView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Core.Networks.Views\GenericPortView.Designer.cs">
-      <DependentUpon>GenericPortView.cs</DependentUpon>
-    </Compile>
     <Compile Include="Core.Networks.Views\MessageCollectionView.cs">
       <SubType>UserControl</SubType>
@@ -103 +97 @@
       <DependentUpon>MessageCollectionView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Core.Networks.Views\MessagePortView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Core.Networks.Views\MessagePortView.Designer.cs">
+      <DependentUpon>MessagePortView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Core.Networks.Views\MessageValueCollectionView.cs">
       <SubType>UserControl</SubType>
@@ -192 +192 @@
     <Compile Include="Core.Networks.Views\UserDefinedNetworkView.Designer.cs">
       <DependentUpon>UserDefinedNetworkView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Core.Networks.Views\UserDefinedMessagePortView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Core.Networks.Views\UserDefinedMessagePortView.Designer.cs">
+      <DependentUpon>UserDefinedMessagePortView.cs</DependentUpon>
     </Compile>
     <Compile Include="Core.Networks.Views\UserDefinedNodeView.cs">

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Operators.Views/HookOperatorView.cs

@@ -76 +76 @@
     protected virtual void portView_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
-      var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IGenericPort;
+      var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IMessagePort;
 
       if (!ReadOnly && (data != null)) {
@@ -84 +84 @@
     protected virtual void portView_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
-        var port = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IGenericPort;
+        var port = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IMessagePort;
         Content.Port = port;
       }