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

Timestamp:

10/07/14 08:32:58 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

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

Files:

• HeuristicLab.Optimization.Networks.Views-3.3.csproj (modified) (2 diffs)
• InputPortView.cs (modified) (1 diff)
• PortView.Designer.cs (modified) (4 diffs)
• PortView.cs (modified) (2 diffs)
• ValuePortView.Designer.cs (added)
• ValuePortView.cs (added)

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

@@ -49 +49 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="PortView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="PortView.Designer.cs">
+      <DependentUpon>PortView.cs</DependentUpon>
+    </Compile>
     <Compile Include="VariablesNodeView.cs">
       <SubType>UserControl</SubType>
@@ -67 +73 @@
       <DependentUpon>InputPortView.cs</DependentUpon>
     </Compile>
-    <Compile Include="PortView.cs">
+    <Compile Include="ValuePortView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="PortView.Designer.cs">
-      <DependentUpon>PortView.cs</DependentUpon>
+    <Compile Include="ValuePortView.Designer.cs">
+      <DependentUpon>ValuePortView.cs</DependentUpon>
     </Compile>
     <Compile Include="NodeView.cs">

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

@@ -29 +29 @@
   [Content(typeof(IInputPort<>), false)]
   [Content(typeof(IInputPort), false)]
-  public partial class InputPortView : PortView {
+  public partial class InputPortView : ValuePortView {
     public new IInputPort Content {
       get { return (IInputPort)base.Content; }

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.valueGroupBox = new System.Windows.Forms.GroupBox();
-      this.valuePanel = new System.Windows.Forms.Panel();
-      this.valueViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
-      this.valueGroupBox.SuspendLayout();
-      this.valuePanel.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -64 +59 @@
       this.infoLabel.Location = new System.Drawing.Point(626, 3);
       // 
-      // valueGroupBox
-      // 
-      this.valueGroupBox.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.valueGroupBox.Controls.Add(this.valuePanel);
-      this.valueGroupBox.Location = new System.Drawing.Point(0, 26);
-      this.valueGroupBox.Name = "valueGroupBox";
-      this.valueGroupBox.Size = new System.Drawing.Size(645, 491);
-      this.valueGroupBox.TabIndex = 3;
-      this.valueGroupBox.TabStop = false;
-      this.valueGroupBox.Text = "Value";
-      // 
-      // valuePanel
-      // 
-      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.Name = "valuePanel";
-      this.valuePanel.Size = new System.Drawing.Size(633, 466);
-      this.valuePanel.TabIndex = 0;
-      // 
-      // valueViewHost
-      // 
-      this.valueViewHost.Caption = "View";
-      this.valueViewHost.Content = null;
-      this.valueViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.valueViewHost.Enabled = false;
-      this.valueViewHost.Location = new System.Drawing.Point(0, 0);
-      this.valueViewHost.Name = "valueViewHost";
-      this.valueViewHost.ReadOnly = false;
-      this.valueViewHost.Size = new System.Drawing.Size(633, 466);
-      this.valueViewHost.TabIndex = 0;
-      this.valueViewHost.ViewsLabelVisible = true;
-      this.valueViewHost.ViewType = null;
-      // 
       // PortView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-      this.Controls.Add(this.valueGroupBox);
       this.Name = "PortView";
       this.Size = new System.Drawing.Size(645, 517);
@@ -111 +67 @@
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.infoLabel, 0);
-      this.Controls.SetChildIndex(this.valueGroupBox, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
-      this.valueGroupBox.ResumeLayout(false);
-      this.valuePanel.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -122 +75 @@
     #endregion
 
-    protected System.Windows.Forms.GroupBox valueGroupBox;
-    protected System.Windows.Forms.Panel valuePanel;
-    protected MainForm.WindowsForms.ViewHost valueViewHost;
-
-
-
 
   }

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

@@ -28 +28 @@
 namespace HeuristicLab.Optimization.Networks.Views {
   [View("Port View")]
-  [Content(typeof(Port<>), true)]
-  [Content(typeof(IPort<>), false)]
+  [Content(typeof(Port), true)]
   [Content(typeof(IPort), false)]
   public partial class PortView : NamedItemView {
@@ -40 +39 @@
       InitializeComponent();
     }
-
-    protected override void DeregisterContentEvents() {
-      Content.ValueChanged -= Content_ValueChanged;
-      base.DeregisterContentEvents();
-    }
-
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-      Content.ValueChanged += Content_ValueChanged;
-    }
-
-    protected override void OnContentChanged() {
-      base.OnContentChanged();
-      if (Content == null) {
-        valueViewHost.Content = null;
-      } else {
-        valueViewHost.ViewType = null;
-        valueViewHost.Content = Content.Value as IContent;
-      }
-    }
-
-    protected override void SetEnabledStateOfControls() {
-      base.SetEnabledStateOfControls();
-      valueGroupBox.Enabled = (Content as IContent) != null;
-    }
-    protected virtual void Content_ValueChanged(object sender, System.EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(Content_ValueChanged), sender, e);
-      else {
-        valueViewHost.ViewType = null;
-        valueViewHost.Content = Content.Value as IContent;
-
-      }
-    }
   }
 }