Changeset 5419 for trunk/sources/HeuristicLab.Optimization.Views

Timestamp:

02/04/11 01:29:43 (13 years ago)

Author:

mkommend

Message:

#1402 - Implemented IOptmizer.NestedOptimizers and adapted optimizer views to stop their content only if no way to display the content is available.

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• AlgorithmView.cs (modified) (2 diffs)
• BatchRunView.cs (modified) (2 diffs)
• ExperimentView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -133 +134 @@
 
     protected override void OnClosed(FormClosedEventArgs e) {
-      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) Content.Stop();
+      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) {
+        //The content must be stopped if no other view showing the content is available
+        var optimizers = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v != this).Select(v => v.Content).OfType<IOptimizer>();
+        //add nested optimizers
+        optimizers = optimizers.SelectMany(opt => opt.NestedOptimizers).Union(optimizers);
+
+        if (!optimizers.Contains(Content)) Content.Stop();
+      }
       base.OnClosed(e);
     }

trunk/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -109 +110 @@
 
     protected override void OnClosed(FormClosedEventArgs e) {
-      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) Content.Stop();
+      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) {
+        //The content must be stopped if no other view showing the content is available
+        var optimizers = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v != this).Select(v => v.Content).OfType<IOptimizer>();
+        //add nested optimizers
+        optimizers = optimizers.SelectMany(opt => opt.NestedOptimizers).Union(optimizers);
+
+        if (!optimizers.Contains(Content)) Content.Stop();
+      }
       base.OnClosed(e);
     }

trunk/sources/HeuristicLab.Optimization.Views/3.3/ExperimentView.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -91 +92 @@
 
     protected override void OnClosed(FormClosedEventArgs e) {
-      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) Content.Stop();
+      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) {
+        //The content must be stopped if no other view showing the content is available
+        var optimizers = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v != this).Select(v => v.Content).OfType<IOptimizer>();
+        //add nested optimizers
+        optimizers = optimizers.SelectMany(opt => opt.NestedOptimizers).Union(optimizers);
+
+        if (!optimizers.Contains(Content)) Content.Stop();
+      }
       base.OnClosed(e);
     }