Changeset 1977

Timestamp:

05/30/09 13:12:34 (16 years ago)

Author:

shofstad

Message:

Legend implementation updated (#407)

Location:

trunk/sources

Files:

• HeuristicLab.Visualization.Test/3.2/LegendForm.cs (modified) (1 diff)
• HeuristicLab.Visualization/3.2/Legend/LegendItem.cs (modified) (1 diff)
• HeuristicLab.Visualization/3.2/LineChart.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Visualization.Test/3.2/LegendForm.cs

@@ -13 +13 @@
     private void CreateLegendShape() {
       LegendShape ls = new LegendShape();
-      ls.AddLegendItem(new LegendItem("test", Color.Black, 5));
-      ls.AddLegendItem(new LegendItem("test2", Color.Red, 5));
+//      ls.AddLegendItem(new LegendItem("test", Color.Black, 5));
+//      ls.AddLegendItem(new LegendItem("test2", Color.Red, 5));
 
       canvasUI.Canvas.AddShape(ls);

trunk/sources/HeuristicLab.Visualization/3.2/Legend/LegendItem.cs

@@ -3 +3 @@
 namespace HeuristicLab.Visualization.Legend {
   public class LegendItem {
-
     // default width
     // every legend under 100 gets the default width
     public static readonly int WIDTH = 100;
 
+    private readonly IDataRow row;
+
     /// <summary>
     /// a legend item object with its properties
     /// </summary>
-    /// <param name="label">the label of the legend</param>
-    /// <param name="color">the color of the legend line</param>
-    /// <param name="thickness">the thickness of the legend line</param>
-    public LegendItem(string label, Color color, int thickness) {
-      Label = label;
-      Color = color;
-      Thickness = thickness;
+    public LegendItem(IDataRow row) {
+      this.row = row;
     }
 
-    public string Label { get; set; }
-    public Color Color { get; set; }
-    public int Thickness { get; set; }
+    public string Label {
+      get { return row.RowSettings.Label; }
+    }
+
+    public Color Color {
+      get { return row.RowSettings.Color; }
+    }
+
+    public int Thickness {
+      get { return row.RowSettings.Thickness; }
+    }
   }
 }

trunk/sources/HeuristicLab.Visualization/3.2/LineChart.cs

@@ -367 +367 @@
       row.DataRowChanged += OnDataRowChanged;
 
-      legendShape.AddLegendItem(new LegendItem(row.RowSettings.Label, row.RowSettings.Color, row.RowSettings.Thickness));
+      legendShape.AddLegendItem(new LegendItem(row));
       legendShape.CreateLegend();