Changeset 11438 for branches/OptimizationNetworks

Timestamp:

10/10/14 02:35:44 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

branches/OptimizationNetworks

Files:

• HeuristicLab.Optimization.Networks.Views/3.3/InputPortView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/InputPortView.cs (modified) (4 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/PortView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/PortView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Networks.Views/3.3/ValuePortView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Networks/3.3/InputPort.cs (modified) (3 diffs)

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.outputPortLabel = new System.Windows.Forms.Label();
-      this.outputPortTextBox = new System.Windows.Forms.TextBox();
+      this.outputPortGroupBox = new System.Windows.Forms.GroupBox();
+      this.outputPortView = new HeuristicLab.Optimization.Networks.Views.PortView();
       this.valueGroupBox.SuspendLayout();
       this.valuePanel.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
+      this.outputPortGroupBox.SuspendLayout();
       this.SuspendLayout();
       // 
       // valueGroupBox
       // 
-      this.valueGroupBox.Location = new System.Drawing.Point(0, 52);
-      this.valueGroupBox.Size = new System.Drawing.Size(645, 465);
-      this.valueGroupBox.TabIndex = 5;
+      this.valueGroupBox.Location = new System.Drawing.Point(0, 129);
+      this.valueGroupBox.Size = new System.Drawing.Size(645, 388);
+      this.valueGroupBox.TabIndex = 6;
       // 
       // valuePanel
       // 
-      this.valuePanel.Size = new System.Drawing.Size(633, 440);
+      this.valuePanel.Size = new System.Drawing.Size(633, 363);
       // 
       // valueViewHost
       // 
-      this.valueViewHost.Size = new System.Drawing.Size(633, 440);
+      this.valueViewHost.Size = new System.Drawing.Size(633, 363);
+      // 
+      // pathTextBox
+      // 
+      this.pathTextBox.Location = new System.Drawing.Point(71, 26);
+      this.pathTextBox.Size = new System.Drawing.Size(549, 20);
       // 
       // nameTextBox
@@ -70 +76 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Location = new System.Drawing.Point(73, 0);
-      this.nameTextBox.Size = new System.Drawing.Size(547, 20);
+      this.nameTextBox.Location = new System.Drawing.Point(71, 0);
+      this.nameTextBox.Size = new System.Drawing.Size(549, 20);
       // 
-      // outputPortLabel
+      // outputPortGroupBox
       // 
-      this.outputPortLabel.AutoSize = true;
-      this.outputPortLabel.Location = new System.Drawing.Point(3, 29);
-      this.outputPortLabel.Name = "outputPortLabel";
-      this.outputPortLabel.Size = new System.Drawing.Size(64, 13);
-      this.outputPortLabel.TabIndex = 3;
-      this.outputPortLabel.Text = "&Output Port:";
+      this.outputPortGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.outputPortGroupBox.Controls.Add(this.outputPortView);
+      this.outputPortGroupBox.Location = new System.Drawing.Point(0, 52);
+      this.outputPortGroupBox.Name = "outputPortGroupBox";
+      this.outputPortGroupBox.Size = new System.Drawing.Size(645, 71);
+      this.outputPortGroupBox.TabIndex = 5;
+      this.outputPortGroupBox.TabStop = false;
+      this.outputPortGroupBox.Text = "&Output Port";
+      this.outputPortGroupBox.DragDrop += new System.Windows.Forms.DragEventHandler(this.outputPortGroupBox_DragDrop);
+      this.outputPortGroupBox.DragEnter += new System.Windows.Forms.DragEventHandler(this.outputPortGroupBox_DragEnterOver);
+      this.outputPortGroupBox.DragOver += new System.Windows.Forms.DragEventHandler(this.outputPortGroupBox_DragEnterOver);
       // 
-      // outputPortTextBox
+      // outputPortView
       // 
-      this.outputPortTextBox.AllowDrop = true;
-      this.outputPortTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.outputPortTextBox.Location = new System.Drawing.Point(73, 26);
-      this.outputPortTextBox.Name = "outputPortTextBox";
-      this.outputPortTextBox.ReadOnly = true;
-      this.outputPortTextBox.Size = new System.Drawing.Size(547, 20);
-      this.outputPortTextBox.TabIndex = 4;
-      this.outputPortTextBox.DragDrop += new System.Windows.Forms.DragEventHandler(this.outputPortTextBox_DragDrop);
-      this.outputPortTextBox.DragEnter += new System.Windows.Forms.DragEventHandler(this.outputPortTextBox_DragEnterOver);
-      this.outputPortTextBox.DragOver += new System.Windows.Forms.DragEventHandler(this.outputPortTextBox_DragEnterOver);
+      this.outputPortView.Caption = "Port View";
+      this.outputPortView.Content = null;
+      this.outputPortView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.outputPortView.Location = new System.Drawing.Point(3, 16);
+      this.outputPortView.Name = "outputPortView";
+      this.outputPortView.ReadOnly = true;
+      this.outputPortView.Size = new System.Drawing.Size(639, 52);
+      this.outputPortView.TabIndex = 0;
       // 
       // InputPortView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-      this.Controls.Add(this.outputPortTextBox);
-      this.Controls.Add(this.outputPortLabel);
+      this.Controls.Add(this.outputPortGroupBox);
       this.Name = "InputPortView";
+      this.Controls.SetChildIndex(this.pathLabel, 0);
+      this.Controls.SetChildIndex(this.pathTextBox, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.infoLabel, 0);
       this.Controls.SetChildIndex(this.valueGroupBox, 0);
-      this.Controls.SetChildIndex(this.outputPortLabel, 0);
-      this.Controls.SetChildIndex(this.outputPortTextBox, 0);
+      this.Controls.SetChildIndex(this.outputPortGroupBox, 0);
       this.valueGroupBox.ResumeLayout(false);
       this.valuePanel.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
+      this.outputPortGroupBox.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -118 +128 @@
     #endregion
 
-    protected System.Windows.Forms.Label outputPortLabel;
-    protected System.Windows.Forms.TextBox outputPortTextBox;
+    protected System.Windows.Forms.GroupBox outputPortGroupBox;
+    protected PortView outputPortView;
 
 

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

@@ -39 +39 @@
     }
 
-    private void UpdateOutputPortTextBoxText() {
-      if ((Content == null) || (Content.OutputPort == null)) {
-        outputPortTextBox.Text = string.Empty;
-      } else {
-        outputPortTextBox.Text = Content.OutputPort.Path + "." + Content.OutputPort.ToString();
-      }
-    }
-
     protected override void DeregisterContentEvents() {
       Content.OutputPortChanged -= Content_OutputPortChanged;
@@ -58 +50 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      UpdateOutputPortTextBoxText();
+      outputPortView.Content = Content == null ? null : Content.OutputPort;
     }
 
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      outputPortTextBox.Enabled = Content != null && !ReadOnly;
+      outputPortGroupBox.Enabled = Content != null && !ReadOnly;
     }
 
@@ -70 +62 @@
         Invoke(new EventHandler(Content_OutputPortChanged), sender, e);
       else {
-        UpdateOutputPortTextBoxText();
+        outputPortView.Content = Content.OutputPort;
       }
     }
 
-    protected virtual void outputPortTextBox_DragEnterOver(object sender, DragEventArgs e) {
+    protected virtual void outputPortGroupBox_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
       if (!ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IOutputPort)) {
@@ -80 +72 @@
       }
     }
-    protected virtual void outputPortTextBox_DragDrop(object sender, DragEventArgs e) {
+    protected virtual void outputPortGroupBox_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
         IOutputPort port = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IOutputPort;

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
+      this.pathLabel = new System.Windows.Forms.Label();
+      this.pathTextBox = new System.Windows.Forms.TextBox();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
@@ -59 +61 @@
       this.infoLabel.Location = new System.Drawing.Point(626, 3);
       // 
+      // pathLabel
+      // 
+      this.pathLabel.AutoSize = true;
+      this.pathLabel.Location = new System.Drawing.Point(3, 29);
+      this.pathLabel.Name = "pathLabel";
+      this.pathLabel.Size = new System.Drawing.Size(32, 13);
+      this.pathLabel.TabIndex = 3;
+      this.pathLabel.Text = "&Path:";
+      // 
+      // pathTextBox
+      // 
+      this.pathTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.pathTextBox.Location = new System.Drawing.Point(69, 26);
+      this.pathTextBox.Name = "pathTextBox";
+      this.pathTextBox.ReadOnly = true;
+      this.pathTextBox.Size = new System.Drawing.Size(551, 20);
+      this.pathTextBox.TabIndex = 4;
+      // 
       // PortView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.pathTextBox);
+      this.Controls.Add(this.pathLabel);
       this.Name = "PortView";
       this.Size = new System.Drawing.Size(645, 517);
@@ -67 +90 @@
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.infoLabel, 0);
+      this.Controls.SetChildIndex(this.pathLabel, 0);
+      this.Controls.SetChildIndex(this.pathTextBox, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
@@ -75 +100 @@
     #endregion
 
+    protected System.Windows.Forms.Label pathLabel;
+    protected System.Windows.Forms.TextBox pathTextBox;
+
 
   }

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

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -39 +38 @@
       InitializeComponent();
     }
+
+    protected override void DeregisterContentEvents() {
+      Content.PathChanged -= Content_PathChanged;
+      base.DeregisterContentEvents();
+    }
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+      Content.PathChanged += Content_PathChanged;
+    }
+
+    protected override void OnContentChanged() {
+      base.OnContentChanged();
+      pathTextBox.Text = Content == null ? string.Empty : Content.Path;
+    }
+
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      pathTextBox.Enabled = Content != null;
+    }
+
+    protected virtual void Content_PathChanged(object sender, System.EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_PathChanged), sender, e);
+      else {
+        pathTextBox.Text = Content.Path;
+      }
+    }
   }
 }

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

@@ -57 +57 @@
       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);
       // 
       // valueGroupBox
@@ -70 +64 @@
             | System.Windows.Forms.AnchorStyles.Right)));
       this.valueGroupBox.Controls.Add(this.valuePanel);
-      this.valueGroupBox.Location = new System.Drawing.Point(0, 26);
+      this.valueGroupBox.Location = new System.Drawing.Point(0, 52);
       this.valueGroupBox.Name = "valueGroupBox";
-      this.valueGroupBox.Size = new System.Drawing.Size(645, 491);
-      this.valueGroupBox.TabIndex = 3;
+      this.valueGroupBox.Size = new System.Drawing.Size(645, 465);
+      this.valueGroupBox.TabIndex = 5;
       this.valueGroupBox.TabStop = false;
       this.valueGroupBox.Text = "Value";
@@ -85 +79 @@
       this.valuePanel.Location = new System.Drawing.Point(6, 19);
       this.valuePanel.Name = "valuePanel";
-      this.valuePanel.Size = new System.Drawing.Size(633, 466);
+      this.valuePanel.Size = new System.Drawing.Size(633, 440);
       this.valuePanel.TabIndex = 0;
       // 
@@ -97 +91 @@
       this.valueViewHost.Name = "valueViewHost";
       this.valueViewHost.ReadOnly = false;
-      this.valueViewHost.Size = new System.Drawing.Size(633, 466);
+      this.valueViewHost.Size = new System.Drawing.Size(633, 440);
       this.valueViewHost.TabIndex = 0;
       this.valueViewHost.ViewsLabelVisible = true;
@@ -107 +101 @@
       this.Controls.Add(this.valueGroupBox);
       this.Name = "ValuePortView";
-      this.Size = new System.Drawing.Size(645, 517);
+      this.Controls.SetChildIndex(this.pathLabel, 0);
+      this.Controls.SetChildIndex(this.pathTextBox, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/InputPort.cs

@@ -88 +88 @@
       if (outputPort != null) {
         outputPort.ValueChanged += OutputPort_ValueChanged;
-        outputPort.PathChanged += OutputPort_PathChanged;
       }
     }
@@ -94 +93 @@
       if (outputPort != null) {
         outputPort.ValueChanged -= OutputPort_ValueChanged;
-        outputPort.PathChanged -= OutputPort_PathChanged;
       }
     }
@@ -105 +103 @@
       //DISCUSS: switch threads to decouple value propagation and to make communication asynchronous -> should be done in Node?
     }
-    protected void OutputPort_PathChanged(object sender, EventArgs e) {
-      OnOutputPortChanged();
-    }
   }
 }