Changeset 4808

Timestamp:

11/16/10 13:51:54 (14 years ago)

Author:

mkommend

Message:

Extracted ColorGradient in a separate class (ticket #1261).

Location:

trunk/sources

Files:

• HeuristicLab.Analysis.Views/3.3/HeatMapView.cs (modified) (3 diffs)
• HeuristicLab.Common/3.3/ColorGradient.cs (added)
• HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Analysis.Views/3.3/HeatMapView.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
+using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -32 +34 @@
   public partial class HeatMapView : ItemView {
     protected static Color[] colors = new Color[256];
-    protected static Color[] grayscaleColors = new Color[256];
-
-    #region Initialize Colors
-    static HeatMapView() {
-      int stepWidth = (256 * 4) / colors.Length;
-      int currentValue;
-      int currentClass;
-      for (int i = 0; i < colors.Length; i++) {
-        currentValue = (i * stepWidth) % 256;
-        currentClass = (i * stepWidth) / 256;
-        switch (currentClass) {
-          case 0: { colors[i] = Color.FromArgb(0, currentValue, 255); break; }        // blue -> cyan
-          case 1: { colors[i] = Color.FromArgb(0, 255, 255 - currentValue); break; }  // cyan -> green
-          case 2: { colors[i] = Color.FromArgb(currentValue, 255, 0); break; }        // green -> yellow
-          case 3: { colors[i] = Color.FromArgb(255, 255 - currentValue, 0); break; }  // yellow -> red
-        }
-      }
-      for (int i = 0; i < 256; i++)
-        grayscaleColors[i] = Color.FromArgb(255 - i, 255 - i, 255 - i);  // white -> black
-    }
-    #endregion
-
     public new HeatMap Content {
       get { return (HeatMap)base.Content; }
@@ -123 +103 @@
 
     protected virtual Color GetDataPointColor(double value, double min, double max, bool grayscale) {
-      int count = grayscale ? grayscaleColors.Length : colors.Length;
-      int index = (int)((count - 1) * (value - min) / (max - min));
-      if (index >= count) index = count - 1;
+      IList<Color> colors = grayscale ? ColorGradient.GrayscaledColors : ColorGradient.Colors;
+      int index = (int)((colors.Count - 1) * (value - min) / (max - min));
+      if (index >= colors.Count) index = colors.Count - 1;
       if (index < 0) index = 0;
-      return grayscale ? grayscaleColors[index] : colors[index];
+      return colors[index];
     }
 

trunk/sources/HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj

@@ -98 +98 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -113 +114 @@
     <Compile Include="CancelEventArgs.cs" />
     <None Include="HeuristicLabCommonPlugin.cs.frame" />
+    <Compile Include="ColorGradient.cs" />
     <Compile Include="Cloner.cs" />
     <Compile Include="Content\ContentManager.cs" />

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

@@ -580 +580 @@
 
     #region automatic coloring
-    private static Color[] colors;
-    protected static Color[] Colors {
-      get {
-        if (colors == null) InitializeColors();
-        return colors;
-      }
-    }
-    private static void InitializeColors() {
-      colors = new Color[256];
-      int stepWidth = (256 * 4) / colors.Length;
-      int currentValue;
-      int currentClass;
-      for (int i = 0; i < colors.Length; i++) {
-        currentValue = (i * stepWidth) % 256;
-        currentClass = (i * stepWidth) / 256;
-        switch (currentClass) {
-          case 0: { colors[i] = Color.FromArgb(0, currentValue, 255); break; }        // blue -> cyan
-          case 1: { colors[i] = Color.FromArgb(0, 255, 255 - currentValue); break; }  // cyan -> green
-          case 2: { colors[i] = Color.FromArgb(currentValue, 255, 0); break; }        // green -> yellow
-          case 3: { colors[i] = Color.FromArgb(255, 255 - currentValue, 0); break; }  // yellow -> red
-        }
-      }
-    }
-
     private void colorXAxisButton_Click(object sender, EventArgs e) {
       double minValue = chart.Series[0].Points.Min(p => p.XValue);
       double maxValue = chart.Series[0].Points.Max(p => p.XValue);
       foreach (DataPoint point in chart.Series[0].Points) {
-        int colorIndex = (int)((Colors.Length - 1) * (point.XValue - minValue) / (maxValue - minValue));
+        int colorIndex = (int)((ColorGradient.Colors.Count - 1) * (point.XValue - minValue) / (maxValue - minValue));
         IRun run = point.Tag as IRun;
-        if (run != null)
-          run.Color = Colors[colorIndex];
+        if (run != null) run.Color = ColorGradient.Colors[colorIndex];
       }
     }
@@ -619 +594 @@
       double maxValue = chart.Series[0].Points.Max(p => p.YValues[0]);
       foreach (DataPoint point in chart.Series[0].Points) {
-        int colorIndex = (int)((Colors.Length - 1) * (point.YValues[0] - minValue) / (maxValue - minValue));
+        int colorIndex = (int)((ColorGradient.Colors.Count - 1) * (point.YValues[0] - minValue) / (maxValue - minValue));
         IRun run = point.Tag as IRun;
-        if (run != null)
-          run.Color = Colors[colorIndex];
+        if (run != null) run.Color = ColorGradient.Colors[colorIndex];
       }
     }