Changeset 11481 for branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views

Timestamp:

10/18/14 03:25:58 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

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

Files:

• AlgorithmServiceNodeView.Designer.cs (modified) (1 diff)
• ClientNodeView.Designer.cs (modified) (5 diffs)
• ClientNodeView.cs (modified) (5 diffs)
• ClientPortView.Designer.cs (modified) (4 diffs)
• ClientPortView.cs (modified) (3 diffs)
• ServiceParameterView.Designer.cs (modified) (6 diffs)
• ServiceParameterView.cs (modified) (7 diffs)
• ValuePortView.cs (modified) (4 diffs)

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/AlgorithmServiceNodeView.Designer.cs

@@ -214 +214 @@
     protected MainForm.WindowsForms.ViewHost templateViewHost;
     protected System.Windows.Forms.TabPage runsTabPage;
-    private Optimization.Views.RunCollectionView runCollectionView;
+    protected Optimization.Views.RunCollectionView runCollectionView;
 
 

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/ClientNodeView.Designer.cs

@@ -74 +74 @@
       this.portCollectionView.ReadOnly = false;
       this.portCollectionView.ShowDetails = true;
-      this.portCollectionView.Size = new System.Drawing.Size(625, 416);
+      this.portCollectionView.Size = new System.Drawing.Size(625, 424);
       this.portCollectionView.TabIndex = 0;
       // 
@@ -85 +85 @@
       this.tabControl.Controls.Add(this.portsTabPage);
       this.tabControl.Controls.Add(this.serviceCallsTabPage);
-      this.tabControl.Location = new System.Drawing.Point(0, 63);
+      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, 454);
-      this.tabControl.TabIndex = 5;
+      this.tabControl.Size = new System.Drawing.Size(645, 462);
+      this.tabControl.TabIndex = 3;
       // 
       // portsTabPage
@@ -97 +97 @@
       this.portsTabPage.Name = "portsTabPage";
       this.portsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.portsTabPage.Size = new System.Drawing.Size(637, 428);
+      this.portsTabPage.Size = new System.Drawing.Size(637, 436);
       this.portsTabPage.TabIndex = 0;
       this.portsTabPage.Text = "Ports";
@@ -128 +128 @@
       // callServicesButton
       // 
-      this.callServicesButton.Location = new System.Drawing.Point(69, 26);
+      this.callServicesButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.callServicesButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Play;
+      this.callServicesButton.Location = new System.Drawing.Point(0, 494);
       this.callServicesButton.Name = "callServicesButton";
-      this.callServicesButton.Size = new System.Drawing.Size(101, 23);
-      this.callServicesButton.TabIndex = 3;
-      this.callServicesButton.Text = "&Call Services";
+      this.callServicesButton.Size = new System.Drawing.Size(23, 23);
+      this.callServicesButton.TabIndex = 4;
       this.callServicesButton.UseVisualStyleBackColor = true;
       this.callServicesButton.Click += new System.EventHandler(this.callServicesButton_Click);
@@ -138 +139 @@
       // cancelServicesButton
       // 
-      this.cancelServicesButton.Location = new System.Drawing.Point(176, 26);
+      this.cancelServicesButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.cancelServicesButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Stop;
+      this.cancelServicesButton.Location = new System.Drawing.Point(29, 494);
       this.cancelServicesButton.Name = "cancelServicesButton";
-      this.cancelServicesButton.Size = new System.Drawing.Size(101, 23);
-      this.cancelServicesButton.TabIndex = 4;
-      this.cancelServicesButton.Text = "&Cancel Services";
+      this.cancelServicesButton.Size = new System.Drawing.Size(23, 23);
+      this.cancelServicesButton.TabIndex = 5;
       this.cancelServicesButton.UseVisualStyleBackColor = true;
       this.cancelServicesButton.Click += new System.EventHandler(this.cancelServicesButton_Click);

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

@@ -21 +21 @@
 
 using HeuristicLab.MainForm;
+using HeuristicLab.PluginInfrastructure;
 using System;
 using System.Threading;
@@ -30 +31 @@
   [Content(typeof(IClientNode), false)]
   public partial class ClientNodeView : EntityView {
-    protected CancellationTokenSource tokenSource = new CancellationTokenSource();
+    protected CancellationTokenSource tokenSource;
+    protected int openCalls = 0;
 
     public new IClientNode Content {
@@ -43 +45 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+
+      if (tokenSource != null) tokenSource.Cancel();
+
       if (Content == null) {
+        tokenSource = null;
         portCollectionView.Content = null;
         serviceParameterCollectionCollectionView.Content = null;
       } else {
+        tokenSource = new CancellationTokenSource();
         portCollectionView.Content = Content.Ports;
         serviceParameterCollectionCollectionView.Content = Content.Calls;
@@ -55 +62 @@
       base.SetEnabledStateOfControls();
       callServicesButton.Enabled = Content != null && !ReadOnly;
+      cancelServicesButton.Enabled = Content != null && !ReadOnly && openCalls > 0;
       portCollectionView.Enabled = Content != null && !ReadOnly;
       serviceParameterCollectionCollectionView.Enabled = Content != null && !ReadOnly;
@@ -60 +68 @@
 
     protected virtual void callServicesButton_Click(object sender, EventArgs e) {
-      Content.CallServicesAsync(tokenSource.Token);
+      openCalls++;
+      cancelServicesButton.Enabled = Content != null && !ReadOnly && openCalls > 0;
+      Content.CallServicesAsync(tokenSource.Token).ContinueWith(t => {
+        Invoke(new Action(() => {
+          openCalls--;
+          cancelServicesButton.Enabled = Content != null && !ReadOnly && openCalls > 0;
+
+          try {
+            t.Wait();
+          }
+          catch (Exception ex) {
+            ErrorHandling.ShowErrorDialog(this, ex);
+          }
+        }));
+      });
     }
     protected virtual void cancelServicesButton_Click(object sender, EventArgs e) {
       tokenSource.Cancel();
+      tokenSource = new CancellationTokenSource();
     }
   }

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/ClientPortView.Designer.cs

@@ -34 +34 @@
     /// </summary>
     private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ClientPortView));
       this.servicePortGroupBox = new System.Windows.Forms.GroupBox();
       this.setServicePortButton = new System.Windows.Forms.Button();
       this.clearServicePortButton = new System.Windows.Forms.Button();
       this.servicePortView = new HeuristicLab.Optimization.Networks.Views.PortView();
+      this.cloneServicePortParametersButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.servicePortGroupBox.SuspendLayout();
@@ -107 +107 @@
       this.servicePortView.DragOver += new System.Windows.Forms.DragEventHandler(this.servicePortView_DragEnterOver);
       // 
+      // cloneServicePortParametersButton
+      // 
+      this.cloneServicePortParametersButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Clone;
+      this.cloneServicePortParametersButton.Location = new System.Drawing.Point(156, 101);
+      this.cloneServicePortParametersButton.Name = "cloneServicePortParametersButton";
+      this.cloneServicePortParametersButton.Size = new System.Drawing.Size(24, 24);
+      this.cloneServicePortParametersButton.TabIndex = 5;
+      this.toolTip.SetToolTip(this.cloneServicePortParametersButton, "Clone Parameters from Service Port");
+      this.cloneServicePortParametersButton.UseVisualStyleBackColor = true;
+      this.cloneServicePortParametersButton.Click += new System.EventHandler(this.cloneServicePortParametersButton_Click);
+      // 
       // ClientPortView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.cloneServicePortParametersButton);
       this.Controls.Add(this.servicePortGroupBox);
       this.Name = "ClientPortView";
@@ -117 +129 @@
       this.Controls.SetChildIndex(this.infoLabel, 0);
       this.Controls.SetChildIndex(this.servicePortGroupBox, 0);
+      this.Controls.SetChildIndex(this.cloneServicePortParametersButton, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.servicePortGroupBox.ResumeLayout(false);
@@ -130 +143 @@
     protected System.Windows.Forms.Button clearServicePortButton;
     protected System.Windows.Forms.Button setServicePortButton;
+    protected System.Windows.Forms.Button cloneServicePortParametersButton;
 
 

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

@@ -71 +71 @@
       setServicePortButton.Enabled = Content != null && !ReadOnly;
       clearServicePortButton.Enabled = Content != null && Content.ServicePort != null && !ReadOnly;
+      cloneServicePortParametersButton.Enabled = Content != null && Content.ServicePort != null && !ReadOnly;
     }
 
@@ -78 +79 @@
       else {
         clearServicePortButton.Enabled = Content.ServicePort != null && !ReadOnly;
+        cloneServicePortParametersButton.Enabled = Content.ServicePort != null && !ReadOnly;
         servicePortView.Content = Content.ServicePort;
       }
@@ -133 +135 @@
       }
     }
+    protected virtual void cloneServicePortParametersButton_Click(object sender, EventArgs e) {
+      Content.CloneServicePortParameters();
+    }
   }
 }

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/ServiceParameterView.Designer.cs

@@ -27 +27 @@
     private System.ComponentModel.IContainer components = null;
 
-    /// <summary> 
-    /// Clean up any resources being used.
-    /// </summary>
-    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-    protected override void Dispose(bool disposing) {
-      if (disposing) {
-        if (components != null) components.Dispose();
-      }
-      base.Dispose(disposing);
-    }
-
     #region Component Designer generated code
 
@@ -46 +35 @@
     private void InitializeComponent() {
       this.valueGroupBox = new System.Windows.Forms.GroupBox();
+      this.clearValueButton = new System.Windows.Forms.Button();
+      this.setValueButton = new System.Windows.Forms.Button();
       this.valuePanel = new System.Windows.Forms.Panel();
       this.valueViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
@@ -67 +58 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+      this.valueGroupBox.Controls.Add(this.clearValueButton);
+      this.valueGroupBox.Controls.Add(this.setValueButton);
       this.valueGroupBox.Controls.Add(this.valuePanel);
       this.valueGroupBox.Location = new System.Drawing.Point(0, 79);
@@ -75 +68 @@
       this.valueGroupBox.Text = "Value";
       // 
+      // clearValueButton
+      // 
+      this.clearValueButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Remove;
+      this.clearValueButton.Location = new System.Drawing.Point(35, 19);
+      this.clearValueButton.Name = "clearValueButton";
+      this.clearValueButton.Size = new System.Drawing.Size(23, 23);
+      this.clearValueButton.TabIndex = 1;
+      this.clearValueButton.UseVisualStyleBackColor = true;
+      this.clearValueButton.Click += new System.EventHandler(this.clearValueButton_Click);
+      // 
+      // setValueButton
+      // 
+      this.setValueButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Edit;
+      this.setValueButton.Location = new System.Drawing.Point(6, 19);
+      this.setValueButton.Name = "setValueButton";
+      this.setValueButton.Size = new System.Drawing.Size(23, 23);
+      this.setValueButton.TabIndex = 0;
+      this.setValueButton.UseVisualStyleBackColor = true;
+      this.setValueButton.Click += new System.EventHandler(this.setValueButton_Click);
+      // 
       // valuePanel
       // 
+      this.valuePanel.AllowDrop = true;
       this.valuePanel.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.valuePanel.Controls.Add(this.valueViewHost);
-      this.valuePanel.Location = new System.Drawing.Point(6, 19);
+      this.valuePanel.Location = new System.Drawing.Point(6, 48);
       this.valuePanel.Name = "valuePanel";
-      this.valuePanel.Size = new System.Drawing.Size(633, 413);
+      this.valuePanel.Size = new System.Drawing.Size(633, 384);
       this.valuePanel.TabIndex = 0;
+      this.valuePanel.DragDrop += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragDrop);
+      this.valuePanel.DragEnter += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragEnterOver);
+      this.valuePanel.DragOver += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragEnterOver);
       // 
       // valueViewHost
@@ -95 +112 @@
       this.valueViewHost.Name = "valueViewHost";
       this.valueViewHost.ReadOnly = false;
-      this.valueViewHost.Size = new System.Drawing.Size(633, 413);
+      this.valueViewHost.Size = new System.Drawing.Size(633, 384);
       this.valueViewHost.TabIndex = 0;
       this.valueViewHost.ViewsLabelVisible = true;
@@ -175 +192 @@
     protected System.Windows.Forms.TextBox dataTypeTextBox;
     protected System.Windows.Forms.ComboBox typeComboBox;
+    protected System.Windows.Forms.Button setValueButton;
+    protected System.Windows.Forms.Button clearValueButton;
 
 

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

@@ -21 +21 @@
 
 using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
+using HeuristicLab.PluginInfrastructure;
 using System;
 using System.Windows.Forms;
@@ -32 +34 @@
   [Content(typeof(IServiceParameter), false)]
   public partial class ServiceParameterView : EntityView {
+    protected TypeSelectorDialog typeSelectorDialog;
+
     public new IServiceParameter Content {
       get { return (IServiceParameter)base.Content; }
@@ -39 +43 @@
     public ServiceParameterView() {
       InitializeComponent();
+    }
+
+    protected override void Dispose(bool disposing) {
+      if (disposing) {
+        if (typeSelectorDialog != null) typeSelectorDialog.Dispose();
+        if (components != null) components.Dispose();
+      }
+      base.Dispose(disposing);
     }
 
@@ -63 +75 @@
         typeComboBox.SelectedIndex = Content.Type == ServiceParameterType.Input ? 0 : 1;
         valueViewHost.ViewType = null;
-        valueViewHost.Content = Content.Value as IContent;
+        valueViewHost.Content = Content.Value;
       }
     }
@@ -71 +83 @@
       dataTypeTextBox.Enabled = Content != null;
       typeComboBox.Enabled = Content != null && !ReadOnly;
-      valueGroupBox.Enabled = (Content as IContent) != null;
+      valueGroupBox.Enabled = Content != null;
+      setValueButton.Enabled = Content != null && !ReadOnly;
+      clearValueButton.Enabled = Content != null && Content.Value != null && !ReadOnly;
     }
     protected virtual void Content_TypeChanged(object sender, EventArgs e) {
@@ -84 +98 @@
         Invoke(new EventHandler(Content_ValueChanged), sender, e);
       else {
+        clearValueButton.Enabled = Content.Value != null;
         valueViewHost.ViewType = null;
-        valueViewHost.Content = Content.Value as IContent;
+        valueViewHost.Content = Content.Value;
       }
     }
@@ -92 +107 @@
       Content.Type = typeComboBox.SelectedIndex == 0 ? ServiceParameterType.Input : ServiceParameterType.Output;
     }
+
+    protected virtual void setValueButton_Click(object sender, EventArgs e) {
+      if (typeSelectorDialog == null) {
+        typeSelectorDialog = new TypeSelectorDialog();
+        typeSelectorDialog.Caption = "Select Value";
+        typeSelectorDialog.TypeSelector.Configure(Content.DataType, false, true);
+      }
+      if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
+        try {
+          Content.Value = (IItem)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
+        }
+        catch (Exception ex) {
+          ErrorHandling.ShowErrorDialog(this, ex);
+        }
+      }
+    }
+    protected virtual void clearValueButton_Click(object sender, EventArgs e) {
+      Content.Value = null;
+    }
+    protected virtual void valuePanel_DragEnterOver(object sender, DragEventArgs e) {
+      e.Effect = DragDropEffects.None;
+      if (!ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IItem)) {
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
+        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
+        else if (e.AllowedEffect.HasFlag(DragDropEffects.Copy)) e.Effect = DragDropEffects.Copy;
+        else if (e.AllowedEffect.HasFlag(DragDropEffects.Move)) e.Effect = DragDropEffects.Move;
+        else if (e.AllowedEffect.HasFlag(DragDropEffects.Link)) e.Effect = DragDropEffects.Link;
+      }
+    }
+    protected virtual void valuePanel_DragDrop(object sender, DragEventArgs e) {
+      if (e.Effect != DragDropEffects.None) {
+        IItem item = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IItem;
+        if (e.Effect.HasFlag(DragDropEffects.Copy)) item = (IItem)item.Clone();
+        Content.Value = item;
+      }
+    }
   }
 }

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

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using System;
@@ -57 +55 @@
       } else {
         valueViewHost.ViewType = null;
-        valueViewHost.Content = Content.Value as IContent;
+        valueViewHost.Content = Content.Value;
       }
     }
@@ -63 +61 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      valueGroupBox.Enabled = (Content as IContent) != null;
+      valueGroupBox.Enabled = Content != null;
     }
     protected virtual void Content_ValueChanged(object sender, System.EventArgs e) {
@@ -70 +68 @@
       else {
         valueViewHost.ViewType = null;
-        valueViewHost.Content = Content.Value as IContent;
+        valueViewHost.Content = Content.Value;
       }
     }