Changeset 11539

Timestamp:

11/12/14 03:02:33 (10 years ago)

Author:

swagner

Message:

#2205: Small UI tweaks and bug fixes

Location:

branches/OptimizationNetworks

Files:

• HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/MessagePortView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/MessagePortView.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/UserDefinedMessagePortView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Networks/3.3/Core.Networks/MessagePort.cs (modified) (3 diffs)

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

@@ -180 +180 @@
       // lastMessageView
       // 
+      this.lastMessageView.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.lastMessageView.Caption = "Message View";
       this.lastMessageView.Content = null;
-      this.lastMessageView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.lastMessageView.Location = new System.Drawing.Point(3, 16);
+      this.lastMessageView.Location = new System.Drawing.Point(6, 19);
       this.lastMessageView.Name = "lastMessageView";
       this.lastMessageView.ReadOnly = true;
-      this.lastMessageView.Size = new System.Drawing.Size(639, 194);
+      this.lastMessageView.Size = new System.Drawing.Size(633, 188);
       this.lastMessageView.TabIndex = 0;
       // 

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

@@ -80 +80 @@
       clearConnectedPortButton.Enabled = Content != null && Content.ConnectedPort != null && !ReadOnly;
       portParameterCollectionView.Enabled = Content != null && !ReadOnly;
-      cloneParametersFromPortButton.Enabled = Content != null && Content.ConnectedPort != null && !ReadOnly;
+      cloneParametersFromPortButton.Enabled = Content != null && !Content.Parameters.IsReadOnly && !ReadOnly;
       lastMessageView.Enabled = Content != null && !ReadOnly;
     }
@@ -89 +89 @@
       else {
         clearConnectedPortButton.Enabled = Content.ConnectedPort != null && !ReadOnly;
-        cloneParametersFromPortButton.Enabled = Content.ConnectedPort != null && !ReadOnly;
         connectedPortView.Content = Content.ConnectedPort;
       }
@@ -163 +162 @@
       networkItemSelectorDialog.NetworkItemSelector.Configure(
         root,
-        null,
+        Content,
         typeof(IParameterizedPort)
       );

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

@@ -41 +41 @@
       portParameterCollectionView.Content = Content == null ? null : Content.Parameters;
     }
+
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      cloneParametersFromPortButton.Enabled = Content != null && !ReadOnly;
+    }
   }
 }

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Core.Networks/MessagePort.cs

@@ -132 +132 @@
       var message = new Message();
 
-      // collect parameters from local port
-      message.Values.AddRange(Parameters.Select(p => p.CreateMessageValue()));
+      // collect output parameters from local port
+      message.Values.AddRange(
+        Parameters
+          .Where(p => p.Type.HasFlag(PortParameterType.Output))
+          .Select(p => p.CreateMessageValue())
+      );
 
       // collect remaining parameters from connected port
@@ -144 +148 @@
       }
 
+      // collect remaining input parameters from local port
+      message.Values.AddRange(
+        Parameters
+          .Where(p => p.Type.HasFlag(PortParameterType.Input) && !message.Values.ContainsKey(p.Name))
+          .Select(p => p.CreateMessageValue())
+      );
+
       return message;
     }
@@ -151 +162 @@
     public void SendMessage(IMessage message, CancellationToken token) {
       if (!PortConnectionValid) throw new InvalidOperationException("Port connection is not valid");
+      if (ConnectedPort != null) ConnectedPort.ReceiveMessage(message, token);
       LastMessage = message;
-      if (ConnectedPort != null) ConnectedPort.ReceiveMessage(message, token);
       OnMessageSent(message, token);
     }