Changeset 1458 for trunk

Timestamp:

03/27/09 17:48:20 (16 years ago)

Author:

mstoeger

Message:

Add option for grid visibility and color (#555)

Location:

trunk/sources

Files:

• HeuristicLab.Visualization.Test/LineChartTests.cs (modified) (1 diff)
• HeuristicLab.Visualization/Grid.cs (modified) (5 diffs)
• HeuristicLab.Visualization/LineChart.cs (modified) (1 diff)
• HeuristicLab.Visualization/YAxisDescriptor.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Visualization.Test/LineChartTests.cs

@@ -87 +87 @@
       yaxis1.Position = AxisPosition.Left;
       yaxis2.Position = AxisPosition.Right;
+
+      yaxis1.ShowGrid = true;
+      yaxis2.ShowGrid = false;
+
+      yaxis1.GridColor = Color.Gray;
 
       row1.Color = Color.Red;

trunk/sources/HeuristicLab.Visualization/Grid.cs

@@ -3 +3 @@
 namespace HeuristicLab.Visualization {
   public class Grid : WorldShape {
+    private Color color = Color.LightBlue;
+
     public override void Draw(Graphics graphics) {
       ClearShapes();
@@ -12 +14 @@
         LineShape line = new LineShape(ClippingArea.X1, y,
                                        ClippingArea.X2, y,
-                                       Color.LightBlue, 1,
+                                       color, 1,
                                        DrawingStyle.Dashed);
         AddShape(line);
@@ -23 +25 @@
         LineShape line = new LineShape(x, ClippingArea.Y1,
                                        x, ClippingArea.Y2,
-                                       Color.LightBlue, 1,
+                                       color, 1,
                                        DrawingStyle.Dashed);
         AddShape(line);
@@ -30 +32 @@
       LineShape lineZeroX = new LineShape(0, ClippingArea.Y1,
                                           0, ClippingArea.Y2,
-                                          Color.LightBlue, 3,
+                                          color, 3,
                                           DrawingStyle.Dashed);
 
       LineShape lineZeroY = new LineShape(ClippingArea.X1, 0,
                                           ClippingArea.X2, 0,
-                                          Color.LightBlue, 3,
+                                          color, 3,
                                           DrawingStyle.Dashed);
 
@@ -43 +45 @@
       base.Draw(graphics);
     }
+
+    public Color Color {
+      get { return color; }
+      set { color = value; }
+    }
   }
 }

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -85 +85 @@
       foreach (YAxisDescriptor yAxisDescriptor in model.YAxes) {
         YAxisInfo info = GetYAxisInfo(yAxisDescriptor);
-        canvas.AddShape(info.Grid);
+        if (yAxisDescriptor.ShowGrid) {
+          info.Grid.Color = yAxisDescriptor.GridColor;
+          canvas.AddShape(info.Grid);
+        }
       }
 

trunk/sources/HeuristicLab.Visualization/YAxisDescriptor.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using HeuristicLab.Visualization.LabelProvider;
 using HeuristicLab.Visualization.Test;
@@ -14 +15 @@
     public bool ClipChangeable = true;
     private AxisPosition position = AxisPosition.Left;
+
+    private bool showGrid = true;
+    private Color gridColor = Color.LightBlue;
 
     public event YAxisDescriptorChangedHandler YAxisDescriptorChanged;
@@ -82 +86 @@
     public AxisPosition Position {
       get { return position; }
-      set { position = value; }
+      set {
+        position = value;
+        OnYAxisDescriptorChanged();
+      }
+    }
+
+    public bool ShowGrid {
+      get { return showGrid; }
+      set {
+        showGrid = value;
+        OnYAxisDescriptorChanged();
+      }
+    }
+
+    public Color GridColor {
+      get { return gridColor; }
+      set {
+        gridColor = value;
+        OnYAxisDescriptorChanged();
+      }
     }