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

Timestamp:

11/02/14 03:03:21 (10 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

Location:

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

Files:

• ### obsolete/ServiceParameterView.cs (modified) (1 diff)
• AlgorithmNodeView.Designer.cs (modified) (9 diffs)
• AlgorithmNodeView.cs (modified) (2 diffs)
• AlgorithmServiceNodeView.Designer.cs (deleted)
• AlgorithmServiceNodeView.cs (deleted)
• GenericPortView.Designer.cs (modified) (7 diffs)
• GenericPortView.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Networks.Views-3.3.csproj (modified) (3 diffs)
• HookOperatorView.Designer.cs (added)
• HookOperatorView.cs (added)
• Plugin.cs.frame (modified) (1 diff)
• PortParameterView.cs (modified) (1 diff)

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

@@ -112 +112 @@
         typeSelectorDialog = new TypeSelectorDialog();
         typeSelectorDialog.Caption = "Select Value";
-        typeSelectorDialog.TypeSelector.Configure(Content.DataType, false, true);
       }
+      typeSelectorDialog.TypeSelector.Configure(Content.DataType, false, true);
       if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
         try {

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

@@ -34 +34 @@
     /// </summary>
     private void InitializeComponent() {
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AlgorithmNodeView));
       this.portCollectionView = new HeuristicLab.Optimization.Networks.Views.PortCollectionView();
       this.tabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
@@ -42 +43 @@
       this.clearAlgorithmButton = new System.Windows.Forms.Button();
       this.setAlgorithmButton = new System.Windows.Forms.Button();
+      this.runsTabPage = new System.Windows.Forms.TabPage();
+      this.runCollectionView = new HeuristicLab.Optimization.Views.RunCollectionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
@@ -47 +50 @@
       this.algorithmTabPage.SuspendLayout();
       this.algorithmPanel.SuspendLayout();
+      this.runsTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -56 +60 @@
       // portCollectionView
       // 
-      this.portCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.portCollectionView.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.portCollectionView.Caption = "PortCollection View";
@@ -70 +74 @@
       // tabControl
       // 
-      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      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.portsTabPage);
       this.tabControl.Controls.Add(this.algorithmTabPage);
+      this.tabControl.Controls.Add(this.runsTabPage);
       this.tabControl.Location = new System.Drawing.Point(0, 26);
       this.tabControl.Name = "tabControl";
@@ -108 +114 @@
       // 
       this.algorithmPanel.AllowDrop = true;
-      this.algorithmPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.algorithmPanel.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.algorithmPanel.Controls.Add(this.algorithmViewHost);
@@ -153 +159 @@
       this.setAlgorithmButton.UseVisualStyleBackColor = true;
       this.setAlgorithmButton.Click += new System.EventHandler(this.setAlgorithmButton_Click);
+      // 
+      // runsTabPage
+      // 
+      this.runsTabPage.Controls.Add(this.runCollectionView);
+      this.runsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.runsTabPage.Name = "runsTabPage";
+      this.runsTabPage.Size = new System.Drawing.Size(637, 465);
+      this.runsTabPage.TabIndex = 2;
+      this.runsTabPage.Text = "Runs";
+      this.runsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // runCollectionView
+      // 
+      this.runCollectionView.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.runCollectionView.Caption = "RunCollection View";
+      this.runCollectionView.Content = null;
+      this.runCollectionView.Location = new System.Drawing.Point(3, 3);
+      this.runCollectionView.Name = "runCollectionView";
+      this.runCollectionView.ReadOnly = false;
+      this.runCollectionView.Size = new System.Drawing.Size(631, 459);
+      this.runCollectionView.TabIndex = 0;
       // 
       // AlgorithmNodeView
@@ -168 +197 @@
       this.algorithmTabPage.ResumeLayout(false);
       this.algorithmPanel.ResumeLayout(false);
+      this.runsTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -183 +213 @@
     protected System.Windows.Forms.TabPage algorithmTabPage;
     protected MainForm.WindowsForms.ViewHost algorithmViewHost;
+    protected System.Windows.Forms.TabPage runsTabPage;
+    protected Optimization.Views.RunCollectionView runCollectionView;
 
 

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

@@ -64 +64 @@
         portCollectionView.Content = null;
         algorithmViewHost.Content = null;
+        runCollectionView.Content = null;
       } else {
         portCollectionView.Content = Content.Ports;
         algorithmViewHost.ViewType = null;
         algorithmViewHost.Content = Content.Algorithm;
+        runCollectionView.Content = Content.Runs;
       }
     }
@@ -77 +79 @@
       clearAlgorithmButton.Enabled = Content != null && Content.Algorithm != null && !ReadOnly;
       algorithmPanel.Enabled = Content != null;
+      runCollectionView.Enabled = Content != null && !ReadOnly;
     }
 

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

@@ -43 +43 @@
       this.portParameterCollectionView = new HeuristicLab.Optimization.Networks.Views.PortParameterCollectionView();
       this.messageCollectionView = new HeuristicLab.Optimization.Networks.Views.MessageCollectionView();
+      this.logMessagesCheckBox = new System.Windows.Forms.CheckBox();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.connectedPortGroupBox.SuspendLayout();
@@ -79 +80 @@
       this.setConnectedPortButton.Size = new System.Drawing.Size(24, 24);
       this.setConnectedPortButton.TabIndex = 0;
+      this.toolTip.SetToolTip(this.setConnectedPortButton, "Set Connected Port");
       this.setConnectedPortButton.UseVisualStyleBackColor = true;
       this.setConnectedPortButton.Click += new System.EventHandler(this.setConnectedPortButton_Click);
@@ -89 +91 @@
       this.clearConnectedPortButton.Size = new System.Drawing.Size(24, 24);
       this.clearConnectedPortButton.TabIndex = 1;
+      this.toolTip.SetToolTip(this.clearConnectedPortButton, "Remove Connected Port");
       this.clearConnectedPortButton.UseVisualStyleBackColor = true;
       this.clearConnectedPortButton.Click += new System.EventHandler(this.clearConnectedPortButton_Click);
@@ -146 +149 @@
       // splitContainer.Panel2
       // 
+      this.splitContainer.Panel2.Controls.Add(this.logMessagesCheckBox);
       this.splitContainer.Panel2.Controls.Add(this.messageCollectionView);
       this.splitContainer.Size = new System.Drawing.Size(645, 435);
@@ -174 +178 @@
       this.messageCollectionView.Size = new System.Drawing.Size(645, 213);
       this.messageCollectionView.TabIndex = 0;
+      // 
+      // logMessagesCheckBox
+      // 
+      this.logMessagesCheckBox.AutoSize = true;
+      this.logMessagesCheckBox.Location = new System.Drawing.Point(156, 24);
+      this.logMessagesCheckBox.Name = "logMessagesCheckBox";
+      this.logMessagesCheckBox.Size = new System.Drawing.Size(95, 17);
+      this.logMessagesCheckBox.TabIndex = 1;
+      this.logMessagesCheckBox.Text = "&Log Messages";
+      this.logMessagesCheckBox.UseVisualStyleBackColor = true;
+      this.logMessagesCheckBox.CheckedChanged += new System.EventHandler(this.logMessagesCheckBox_CheckedChanged);
       // 
       // GenericPortView
@@ -194 +209 @@
       this.splitContainer.Panel1.ResumeLayout(false);
       this.splitContainer.Panel2.ResumeLayout(false);
+      this.splitContainer.Panel2.PerformLayout();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
       this.splitContainer.ResumeLayout(false);
@@ -212 +228 @@
     protected PortParameterCollectionView portParameterCollectionView;
     protected MessageCollectionView messageCollectionView;
+    protected System.Windows.Forms.CheckBox logMessagesCheckBox;
 
 

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

@@ -52 +52 @@
 
     protected override void DeregisterContentEvents() {
-      Content.InterfaceChanged -= Content_InterfaceChanged;
       Content.ConnectedPortChanged -= Content_ConnectedPortChanged;
+      Content.PortConnectionValidChanged -= Content_PortConnectionValidChanged;
+      Content.LogMessagesChanged -= Content_LogMessagesChanged;
       base.DeregisterContentEvents();
     }
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.InterfaceChanged += Content_InterfaceChanged;
       Content.ConnectedPortChanged += Content_ConnectedPortChanged;
+      Content.PortConnectionValidChanged += Content_PortConnectionValidChanged;
+      Content.LogMessagesChanged += Content_LogMessagesChanged;
     }
 
@@ -66 +68 @@
       connectedPortView.Content = Content == null ? null : Content.ConnectedPort;
       portParameterCollectionView.Content = Content == null ? null : Content.Parameters;
+      logMessagesCheckBox.Checked = Content == null ? false : Content.LogMessages;
       messageCollectionView.Content = Content == null ? null : Content.Messages;
       errorProvider.SetError(connectedPortView, ((Content == null) || Content.PortConnectionValid) ? string.Empty : "Port connection is not valid");
@@ -78 +81 @@
       portParameterCollectionView.Enabled = Content != null && !ReadOnly;
       cloneConnectedPortParametersButton.Enabled = Content != null && Content.ConnectedPort != null && !ReadOnly;
+      logMessagesCheckBox.Enabled = Content != null && !ReadOnly;
       messageCollectionView.Enabled = Content != null && !ReadOnly;
     }
@@ -90 +94 @@
       }
     }
-    protected virtual void Content_InterfaceChanged(object sender, EventArgs e) {
+    protected virtual void Content_PortConnectionValidChanged(object sender, EventArgs e) {
       if (InvokeRequired)
-        Invoke(new EventHandler(Content_InterfaceChanged), sender, e);
+        Invoke(new EventHandler(Content_PortConnectionValidChanged), sender, e);
       else {
         errorProvider.SetError(connectedPortView, Content.PortConnectionValid ? string.Empty : "Port connection is not valid");
+      }
+    }
+    protected virtual void Content_LogMessagesChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_LogMessagesChanged), sender, e);
+      else {
+        logMessagesCheckBox.Checked = Content.LogMessages;
       }
     }
@@ -148 +159 @@
       Content.CloneConnectedPortParameters();
     }
+    protected virtual void logMessagesCheckBox_CheckedChanged(object sender, EventArgs e) {
+      Content.LogMessages = logMessagesCheckBox.Checked;
+    }
   }
 }

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

@@ -151 +151 @@
       <DependentUpon>ClientNodeView.cs</DependentUpon>
     </Compile>
-    <Compile Include="AlgorithmServiceNodeView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="AlgorithmServiceNodeView.Designer.cs">
-      <DependentUpon>AlgorithmServiceNodeView.cs</DependentUpon>
-    </Compile>
     <Compile Include="GenericPortView.cs">
       <SubType>UserControl</SubType>
@@ -180 +174 @@
     <Compile Include="GenericNodeView.Designer.cs">
       <DependentUpon>GenericNodeView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="HookOperatorView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="HookOperatorView.Designer.cs">
+      <DependentUpon>HookOperatorView.cs</DependentUpon>
     </Compile>
     <Compile Include="ParameterizedPortView.cs">
@@ -306 +306 @@
       <Name>HeuristicLab.MainForm-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Operators.Views\3.3\HeuristicLab.Operators.Views-3.3.csproj">
+      <Project>{c49cb749-8b24-4628-8003-e86475749410}</Project>
+      <Name>HeuristicLab.Operators.Views-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
+      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
+      <Name>HeuristicLab.Operators-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization.Networks\3.3\HeuristicLab.Optimization.Networks-3.3.csproj">
       <Project>{7cf51332-0e37-447c-8017-82a258c59ef2}</Project>

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Plugin.cs.frame

@@ -36 +36 @@
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+  [PluginDependency("HeuristicLab.Operators", "3.3")]
+  [PluginDependency("HeuristicLab.Operators.Views", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]

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

@@ -119 +119 @@
         typeSelectorDialog = new TypeSelectorDialog();
         typeSelectorDialog.Caption = "Select Default Value";
-        typeSelectorDialog.TypeSelector.Configure(Content.DataType, false, true);
       }
+      typeSelectorDialog.TypeSelector.Configure(Content.DataType, false, true);
       if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
         try {