Changeset 7202 for branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape

Timestamp:

12/19/11 09:41:39 (13 years ago)

Author:

epitzer

Message:

#1696: Add static item image according to #1651

Location:

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape

Files:

• Analysis/Aggregators/Aggregator.cs (modified) (1 diff)
• Analysis/Aggregators/EvolvabilityAggregator.cs (modified) (1 diff)
• Analysis/Aggregators/InformationAnalysisValueAggregator.cs (modified) (1 diff)
• Analysis/Aggregators/RuggednessAggregator.cs (modified) (1 diff)
• BoxChart/ColorValue.cs (modified) (2 diffs)
• DistanceCalculators/BinaryVectorDistanceCalculator.cs (modified) (2 diffs)
• DistanceCalculators/PermutationDistanceCalculator.cs (modified) (1 diff)
• FDC/HeatMap.cs (modified) (2 diffs)
• FDC/ScatterPlot.cs (modified) (2 diffs)
• MultiTrajectory/MultiTrajectoryAnalysis.cs (modified) (2 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Analysis/Aggregators/Aggregator.cs

@@ -14 +14 @@
   public abstract class Aggregator<T> : NamedItem, IAggregator where T : class, IItem {
 
-    public override Image ItemImage { get { return VSImageLibrary.Database; } }
+    public static new Image StaticItemImage { get { return VSImageLibrary.Database;  } }
     public override bool CanChangeName { get { return false; } }
 

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Analysis/Aggregators/EvolvabilityAggregator.cs

@@ -34 +34 @@
 
     #region Properties
-    public override Image ItemImage { get { return VSImageLibrary.Database; } }
+    public static new Image StaticItemImage { get { return VSImageLibrary.Database; } }
     public override bool CanChangeName { get { return false; } }
     #endregion

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Analysis/Aggregators/InformationAnalysisValueAggregator.cs

@@ -29 +29 @@
 
     #region Properties
-    public override Image ItemImage { get { return VSImageLibrary.Database; } }
+    public static new Image StaticItemImage { get { return VSImageLibrary.Database; } }
     public override bool CanChangeName { get { return false; } }
     #endregion

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Analysis/Aggregators/RuggednessAggregator.cs

@@ -19 +19 @@
   public class RuggednessAggregator : NamedItem, IAggregator {
 
-    public override Image ItemImage { get { return VSImageLibrary.Database; } }
+    public static new Image StaticItemImage { get { return VSImageLibrary.Database; } }
     public override bool CanChangeName { get { return false; } }
 

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/BoxChart/ColorValue.cs

@@ -8 +8 @@
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common.Resources;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.BoxChart {
@@ -45 +46 @@
     public override bool CanChangeName { get { return false; } }
     public override bool CanChangeDescription { get { return false; } }
+    public static new Image StaticItemImage { get { return VSImageLibrary.DisplayInColorVertical; } }
     public override Image ItemImage {
       get {

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/DistanceCalculators/BinaryVectorDistanceCalculator.cs

@@ -8 +8 @@
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
+using System.Drawing;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators {
@@ -19 +20 @@
     public override bool CanChangeName { get { return false; } }
     public override bool CanChangeDescription { get { return false; } }
-    public override System.Drawing.Image ItemImage { get { return VSImageLibrary.Function; } }
+    public static new Image StaticItemImage { get { return VSImageLibrary.Function; } }
 
     #endregion

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/DistanceCalculators/PermutationDistanceCalculator.cs

@@ -21 +21 @@
     public override bool CanChangeName { get { return false; } }
     public override bool CanChangeDescription { get { return false; } }
-    public override System.Drawing.Image ItemImage { get { return VSImageLibrary.Function; } }
+    public static new Image StaticItemImage { get { return VSImageLibrary.Function; } }
 
     #endregion

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/FDC/HeatMap.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common.Resources;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
@@ -33 +34 @@
   public class HeatMap : NamedItem {
 
-    public override Image ItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Image; }
-    }
+    public static new Image StaticItemImage { get { return VSImageLibrary.Image; } }
 
     #region Persistence

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/FDC/ScatterPlot.cs

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common.Resources;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
@@ -42 +43 @@
   public class ScatterPlot : NamedItem {
 
-    public override Image ItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Image; }
-    }
+    public static new Image StaticItemImage { get { return VSImageLibrary.Image; } }
 
     public event EventHandler<PointsEventArgs> PixelsChanged;

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/MultiTrajectory/MultiTrajectoryAnalysis.cs

@@ -12 +12 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Encodings.PermutationEncoding;
+using HeuristicLab.Common.Resources;
+using System.Drawing;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.MultiTrajectory {
@@ -132 +134 @@
     #region Fields & Properties
 
-    public override System.Drawing.Image ItemImage {
+    public new static Image StaticItemImage { get { return VSImageLibrary.Event; } }
+
+    public override Image ItemImage {
       get {
-        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
-        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
-        else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePaused;
-        else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
-        else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
+        switch (ExecutionState) {
+          case ExecutionState.Prepared: return VSImageLibrary.ExecutablePrepared;
+          case ExecutionState.Started: return VSImageLibrary.ExecutableStarted;
+          case ExecutionState.Paused: return VSImageLibrary.ExecutablePaused;
+          case ExecutionState.Stopped: return VSImageLibrary.ExecutableStopped;
+          default: return base.ItemImage;
+        }
       }
     }