Changeset 3351 for trunk

Timestamp:

04/15/10 04:37:36 (14 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893).

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/Clipboard.Designer.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemArrayView.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemListView.Designer.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Executable.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Algorithm.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/BatchRun.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Experiment.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/Clipboard.Designer.cs

@@ -19 +19 @@
  */
 #endregion
+
+using System;
+using System.Windows.Forms;
 
 namespace HeuristicLab.Core.Views {
@@ -34 +37 @@
       if (disposing) {
         if (typeSelectorDialog != null) typeSelectorDialog.Dispose();
+        foreach (ListViewItem item in listView.Items) {
+          ((T)item.Tag).ItemImageChanged -= new EventHandler(Item_ItemImageChanged);
+          ((T)item.Tag).ToStringChanged -= new EventHandler(Item_ToStringChanged);
+        }
         if (components != null) components.Dispose();
       }

trunk/sources/HeuristicLab.Core.Views/3.3/ItemArrayView.Designer.cs

@@ -38 +38 @@
         foreach (ListViewItem listViewItem in itemsListView.Items) {
           T item = listViewItem.Tag as T;
+          if (item != null) item.ItemImageChanged -= new EventHandler(Item_ItemImageChanged);
           if (item != null) item.ToStringChanged -= new EventHandler(Item_ToStringChanged);
         }

trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.Designer.cs

@@ -37 +37 @@
     protected override void Dispose(bool disposing) {
       if (disposing) {
-        foreach (ListViewItem item in itemsListView.Items)
+        foreach (ListViewItem item in itemsListView.Items) {
+          ((T)item.Tag).ItemImageChanged -= new EventHandler(Item_ItemImageChanged);
           ((T)item.Tag).ToStringChanged -= new EventHandler(Item_ToStringChanged);
+        }
         if (components != null) components.Dispose();
       }

trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.Designer.cs

@@ -36 +36 @@
     protected override void Dispose(bool disposing) {
       if (disposing) {
-        foreach (ListViewItem item in itemsListView.Items)
+        foreach (ListViewItem item in itemsListView.Items) {
+          ((T)item.Tag).ItemImageChanged -= new EventHandler(Item_ItemImageChanged);
           ((T)item.Tag).ToStringChanged -= new EventHandler(Item_ToStringChanged);
+        }
         if (components != null) components.Dispose();
       }

trunk/sources/HeuristicLab.Core/3.3/Executable.cs

@@ -30 +30 @@
   public abstract class Executable : Item, IExecutable {
     public override Image ItemImage {
-      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event; }
+      get {
+        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
+        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Play;
+        else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Pause;
+        else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Stop;
+        else return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
+      }
     }
 
@@ -41 +47 @@
           executionState = value;
           OnExecutionStateChanged();
+          OnItemImageChanged();
         }
       }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.Designer.cs

@@ -37 +37 @@
     protected override void Dispose(bool disposing) {
       if (disposing) {
-        foreach (ListViewItem item in itemsListView.Items)
+        foreach (ListViewItem item in itemsListView.Items) {
+          ((IRun)item.Tag).ItemImageChanged -= new EventHandler(Item_ItemImageChanged);
           ((IRun)item.Tag).ToStringChanged -= new EventHandler(Item_ToStringChanged);
+        }
         if (components != null) components.Dispose();
       }

trunk/sources/HeuristicLab.Optimization/3.3/Algorithm.cs

@@ -35 +35 @@
   public abstract class Algorithm : ParameterizedNamedItem, IAlgorithm {
     public override Image ItemImage {
-      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event; }
+      get {
+        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
+        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Play;
+        else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Pause;
+        else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Stop;
+        else return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
+      }
     }
 
@@ -46 +52 @@
           executionState = value;
           OnExecutionStateChanged();
+          OnItemImageChanged();
         }
       }

trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.cs

@@ -36 +36 @@
   public sealed class BatchRun : NamedItem, IOptimizer {
     public override Image ItemImage {
-      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event; }
+      get {
+        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
+        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Play;
+        else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Pause;
+        else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Stop;
+        else return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
+      }
     }
 
@@ -47 +53 @@
           executionState = value;
           OnExecutionStateChanged();
+          OnItemImageChanged();
         }
       }

trunk/sources/HeuristicLab.Optimization/3.3/Experiment.cs

@@ -37 +37 @@
   public sealed class Experiment : NamedItem, IOptimizer {
     public override Image ItemImage {
-      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event; }
+      get {
+        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
+        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Play;
+        else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Pause;
+        else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Stop;
+        else return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
+      }
     }
 
@@ -48 +54 @@
           executionState = value;
           OnExecutionStateChanged();
+          OnItemImageChanged();
         }
       }