Changeset 861 for trunk/sources/HeuristicLab.Visualization

Timestamp:

11/29/08 12:19:58 (16 years ago)

Author:

mstoeger

Message:

Adjustments on LineChart for new interface. #345

Location:

trunk/sources/HeuristicLab.Visualization

Files:

• LineChart.cs (modified) (3 diffs)
• LineShape.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -1 +1 @@
 using System;
-using System.Drawing;
+using System.Collections.Generic;
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Visualization
-{
-  public partial class LineChart : ViewBase
-  {
+namespace HeuristicLab.Visualization {
+  public partial class LineChart : ViewBase {
     private readonly IChartDataRowsModel model;
-    private Color[] lineColors;
 
     /// <summary>
     /// This constructor shouldn't be called. Only required for the designer.
     /// </summary>
-    public LineChart()
-    {
+    public LineChart() {
       InitializeComponent();
     }
@@ -22 +18 @@
     /// </summary>
     /// <param name="model">Referenz to the model, for data</param>
-    public LineChart(IChartDataRowsModel model) : this()
-    {
+    public LineChart(IChartDataRowsModel model) : this() {
       if (model == null)
-      {
         throw new NullReferenceException("Model cannot be null.");
-      }
 
       this.model = model;
+      this.Item = (IItem)model;
 
-      //TODO: read line colors instead of static ones
-      lineColors = new Color[3];
-      lineColors[0] = Color.Red;
-      lineColors[1] = Color.Green;
-      lineColors[2] = Color.Blue;
-      
       //TODO: correct Rectangle to fit
-      RectangleD clientRectangle = new RectangleD(ClientRectangle.Left, ClientRectangle.Top, ClientRectangle.Right,
-                                                  ClientRectangle.Bottom);
+      RectangleD clientRectangle = new RectangleD(-1, -1, 11, 11);
       canvasUI1.MainCanvas.WorldShape = new WorldShape(clientRectangle, clientRectangle);
-      Reset();
-    }
-
-    /// <summary>
-    /// Resets the line chart by deleting all shapes and reloading all data from the model.
-    /// </summary>
-    private void Reset()
-    {
-      // TODO an neues model interface anpassen   
-      throw new NotImplementedException();
-      
-//      BeginUpdate();
-//
-//      // TODO clear existing shapes
-//
-//      WorldShape mainWorld = canvasUI1.MainCanvas.WorldShape;
-//
-//      double spacing = mainWorld.BoundingBox.Width/model.Columns.Count;
-//      double oldX = 0;
-//      double currentX = spacing;
-//      ChartDataRowsModelColumn oldColumn = null;
-//      // reload data from the model and create shapes
-//      foreach (ChartDataRowsModelColumn column in model.Columns)
-//      {
-//        if (oldColumn != null)
-//        {
-//          if (column.Values != null)
-//          {
-//            for (int i = 0; i < column.Values.Length; i++)
-//            {
-//              LineShape line = new LineShape(oldX, oldColumn.Values[i], currentX, column.Values[i], 0, lineColors[i]);
-//              mainWorld.AddShape(line);
-//            }
-//            oldX = currentX;
-//            currentX += spacing;
-//          }
-//          oldColumn = column;
-//        }
-//        else
-//        {
-//          oldColumn = column;
-//        }
-//
-//        canvasUI1.Invalidate();
-//
-//        //   AddColumn(column.ColumnId, column.Values);
-//      }
-//
-//      EndUpdate();
-    }
-
-    /// <summary>
-    /// Event handler which gets called when data in the model changes.
-    /// </summary>
-    /// <param name="type">Type of change</param>
-    /// <param name="columnId">Id of the changed column</param>
-    /// <param name="values">Values contained within the changed column</param>
-    private void OnDataChanged(ChangeType type, long columnId, double[] values)
-    {
-      switch (type)
-      {
-        case ChangeType.Add:
-          AddColumn(columnId, values);
-          break;
-        case ChangeType.Modify:
-          ModifyColumn(columnId, values);
-          break;
-        case ChangeType.Remove:
-          RemoveColumn(columnId);
-          break;
-        default:
-          throw new ArgumentOutOfRangeException("type");
-      }
-    }
-
-    /// <summary>
-    /// Adds a new column to the chart.
-    /// </summary>
-    /// <param name="columnId">Id of the column</param>
-    /// <param name="values">Values of the column</param>
-    private void AddColumn(long columnId, double[] values)
-    {
-      throw new NotImplementedException();
-    }
-
-    /// <summary>
-    /// Modifies an existing column of the chart.
-    /// </summary>
-    /// <param name="columnId">Id of the column</param>
-    /// <param name="values">Values of the column</param>
-    private void ModifyColumn(long columnId, double[] values)
-    {
-      throw new NotImplementedException();
-    }
-
-    /// <summary>
-    /// Removes a column from the chart.
-    /// </summary>
-    /// <param name="columnId">Id of the column</param>
-    private void RemoveColumn(long columnId)
-    {
-      throw new NotImplementedException();
     }
 
     #region Add-/RemoveItemEvents
 
-    protected override void AddItemEvents()
-    {
-      // TODO an neues model interface anpassen   
-      throw new NotImplementedException();
-//      base.AddItemEvents();
-//      model.ColumnChanged += OnDataChanged;
+    protected override void AddItemEvents() {
+      base.AddItemEvents();
+
+      model.DataRowAdded += OnDataRowAdded;
+      model.DataRowRemoved += OnDataRowRemoved;
+      model.ModelChanged += OnModelChanged;
     }
 
-    protected override void RemoveItemEvents()
-    {
-      // TODO an neues model interface anpassen   
-      throw new NotImplementedException();
+    protected override void RemoveItemEvents() {
+      base.RemoveItemEvents();
 
-//      base.RemoveItemEvents();
-//      model.ColumnChanged -= OnDataChanged;
+      model.DataRowAdded -= OnDataRowAdded;
+      model.DataRowRemoved -= OnDataRowRemoved;
+      model.ModelChanged -= OnModelChanged;
+    }
+
+    private void OnDataRowAdded(IDataRow row) {
+      row.ValueChanged += OnRowValueChanged;
+      row.ValuesChanged += OnRowValuesChanged;
+
+      InitShapes(row);
+    }
+
+    private void InitShapes(IDataRow row) {
+      List<LineShape> lineShapes = new List<LineShape>();
+
+      for (int i = 1; i < row.Count; i++) {
+        LineShape lineShape = new LineShape(i - 1, row[i - 1], i, row[i], 0, row.Color);
+        lineShapes.Add(lineShape);
+        canvasUI1.MainCanvas.WorldShape.AddShape(lineShape);
+      }
+
+      rowToLineShapes[row] = lineShapes;
+
+      canvasUI1.Invalidate();
+    }
+
+    private void OnDataRowRemoved(IDataRow row) {
+      row.ValueChanged -= OnRowValueChanged;
+      row.ValuesChanged -= OnRowValuesChanged;
+    }
+
+    private readonly IDictionary<IDataRow, List<LineShape>> rowToLineShapes = new Dictionary<IDataRow, List<LineShape>>();
+
+    private void OnRowValueChanged(IDataRow row, double value, int index) {
+      List<LineShape> lineShapes = rowToLineShapes[row];
+
+      if (index > lineShapes.Count+1)
+        throw new NotImplementedException();
+
+      // new value was added
+      if (index > 0 && index == lineShapes.Count+1) {
+        LineShape lineShape = new LineShape(index - 1, row[index - 1], index, row[index], 0, row.Color);
+        lineShapes.Add(lineShape);
+        canvasUI1.MainCanvas.WorldShape.AddShape(lineShape);
+      }
+
+      // not the first value
+      if (index > 0)
+        lineShapes[index-1].Y2 = value;
+
+      // not the last value
+      if (index > 0 && index < row.Count)
+        lineShapes[index].Y1 = value;
+
+      canvasUI1.Invalidate();
+    }
+
+    private void OnRowValuesChanged(IDataRow row, double[] values, int index) {
+      foreach (double value in values) {
+        OnRowValueChanged(row, value, index++);
+      }
+    }
+
+    private void OnModelChanged() {
     }
 
@@ -170 +115 @@
     private int beginUpdateCount = 0;
 
-    public void BeginUpdate()
-    {
+    public void BeginUpdate() {
       beginUpdateCount++;
     }
 
-    public void EndUpdate()
-    {
+    public void EndUpdate() {
       if (beginUpdateCount == 0)
-      {
         throw new InvalidOperationException("Too many EndUpdates.");
-      }
 
       beginUpdateCount--;
 
       if (beginUpdateCount == 0)
-      {
         Invalidate();
-      }
     }
 

trunk/sources/HeuristicLab.Visualization/LineShape.cs

@@ -3 +3 @@
 namespace HeuristicLab.Visualization {
   public class LineShape : IShape {
-    private RectangleD boundingRect;
+    private RectangleD boundingBox;
     private double z;
     private Color color;
@@ -16 +16 @@
     /// <param name="color">color for the LineShape</param>
     public LineShape(double x1, double y1, double x2, double y2, double z, Color color) {
-      this.boundingRect = new RectangleD(x1, y1, x2, y2);
+      this.boundingBox = new RectangleD(x1, y1, x2, y2);
       this.z = z;
       this.color = color;
@@ -22 +22 @@
 
     public RectangleD BoundingBox {
-      get { return boundingRect; }
+      get { return boundingBox; }
+    }
+
+    public double Y1 {
+      get { return boundingBox.Y1; }
+      set { boundingBox.Y1 = value; }
+    }
+
+    public double Y2 {
+      get { return boundingBox.Y2; }
+      set { boundingBox.Y2 = value; }
+    }
+
+    public double X1 {
+      get { return boundingBox.X1; }
+      set { boundingBox.X1 = value; }
+    }
+
+    public double X2 {
+      get { return boundingBox.X2; }
+      set { boundingBox.X2 = value; }
     }
 
@@ -33 +53 @@
     public void Draw(Graphics graphics, Rectangle viewport, RectangleD clippingArea) {
       using (Pen pen = new Pen(color, 3)){
-        Rectangle screenRect = Transform.ToScreen(boundingRect, viewport, clippingArea);
+        Rectangle screenRect = Transform.ToScreen(boundingBox, viewport, clippingArea);
         graphics.DrawLine(pen,screenRect.Left, screenRect.Bottom, screenRect.Right, screenRect.Top);
       }