Changeset 1559

Timestamp:

04/14/09 21:59:13 (16 years ago)

Author:

dwagner

Message:

Added functionality: Markers on every datapoint. (#581)

Location:

trunk/sources/HeuristicLab.Visualization/3.2

Files:

• CompositeShape.cs (modified) (2 diffs)
• HeuristicLab.Visualization-3.2.csproj (modified) (1 diff)
• LineChart.cs (modified) (12 diffs)
• MarkerShape.cs (added)

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

@@ -6 +6 @@
   public class CompositeShape : IShape {
     private IShape parent;
+    private bool showChildShapes = true;
 
     protected readonly List<IShape> shapes = new List<IShape>();
     protected RectangleD boundingBox = RectangleD.Empty;
 
+
+
     public virtual void Draw(Graphics graphics) {
+      if(!showChildShapes)
+        return;
       foreach (IShape shape in shapes) {
         shape.Draw(graphics);
@@ -39 +44 @@
     }
 
+    public bool ShowChildShapes {
+      get { return showChildShapes; }
+      set { showChildShapes = value; }
+    }
+
     public void ClearShapes() {
       shapes.Clear();
       boundingBox = RectangleD.Empty;
+    }
+
+    public IShape GetShape(int index) {
+      return shapes[index];
     }
 

trunk/sources/HeuristicLab.Visualization/3.2/HeuristicLab.Visualization-3.2.csproj

@@ -110 +110 @@
     <Compile Include="IMouseEventListener.cs" />
     <Compile Include="Legend\LegendItem.cs" />
+    <Compile Include="MarkerShape.cs" />
     <Compile Include="MaxAggregator.cs" />
     <Compile Include="MinAggregator.cs" />

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

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Drawing2D;
 using System.Windows.Forms;
 using HeuristicLab.Core;
@@ -391 +392 @@
           LineShape lineShape = new LineShape(i - 1, row[i - 1], i, row[i], row.Color, row.Thickness, row.Style);
           rowEntry.LinesShape.AddShape(lineShape);
-        }
+          rowEntry.LinesShape.AddMarkerShape(new MarkerShape(i-1,row[i-1],8,row.Color));
+        }
+        if(row.Count>0)
+          rowEntry.LinesShape.AddMarkerShape(new MarkerShape((row.Count - 1), row[(row.Count - 1)], 8, row.Color));
       }
 
@@ -405 +409 @@
                                                         row.Style);
           rowEntry.LinesShape.AddShape(lineShape);
+          
         } else {
           LineShape lineShape = rowEntry.LinesShape.GetShape(0);
@@ -411 +416 @@
         }
       } else {
-        if (index > rowEntry.LinesShape.Count + 1) {
+        if (index > rowEntry.LinesShape.Count + 1) {    //MarkersShape is on position zero
           throw new NotImplementedException();
         }
@@ -419 +424 @@
           LineShape lineShape = new LineShape(index - 1, row[index - 1], index, row[index], row.Color, row.Thickness, row.Style);
           rowEntry.LinesShape.AddShape(lineShape);
+          rowEntry.LinesShape.AddMarkerShape(new MarkerShape(index, row[index ], 8, row.Color));
         }
 
@@ -424 +430 @@
         if (index > 0) {
           rowEntry.LinesShape.GetShape(index - 1).Y2 = value;
+          ((MarkerShape)rowEntry.LinesShape.markersShape.GetShape(index - 1)).Y = value;
         }
 
@@ -429 +436 @@
         if (index > 0 && index < row.Count - 1) {
           rowEntry.LinesShape.GetShape(index).Y1 = value;
+          ((MarkerShape)rowEntry.LinesShape.markersShape.GetShape(index)).Y = value;
         }
       }
@@ -583 +591 @@
 
     private class LinesShape : WorldShape {
+      public readonly CompositeShape markersShape = new CompositeShape();
+
       public void UpdateStyle(IDataRow row) {
         foreach (IShape shape in shapes) {
@@ -594 +604 @@
       }
 
+      public override void Draw(Graphics graphics) {
+        GraphicsState gstate = graphics.Save();
+
+        graphics.SetClip(Viewport);
+        foreach (IShape shape in shapes) {
+          // draw child shapes using our own clipping area
+          shape.Draw(graphics);
+        }
+        markersShape.Draw(graphics);
+        graphics.Restore(gstate);
+      }
+
+      public void AddMarkerShape(IShape shape) {
+        shape.Parent = this;
+        markersShape.AddShape(shape);
+      }
+
       public int Count {
         get { return shapes.Count; }
@@ -599 +626 @@
 
       public LineShape GetShape(int index) {
-        return (LineShape)shapes[index];
+        return (LineShape)shapes[index];     //shapes[0] is markersShape!!
       }
     }
@@ -610 +637 @@
       public RowEntry(IDataRow dataRow) {
         this.dataRow = dataRow;
+        linesShape.markersShape.Parent = linesShape;
       }
 
@@ -619 +647 @@
         get { return linesShape; }
       }
-    }
-
-    private class YAxisInfo {
+
+      public void hideMarkers() {
+        linesShape.markersShape.ShowChildShapes = false;
+      }
+
+      public void showMarkers() {
+        linesShape.markersShape.ShowChildShapes = true;
+      }
+    }
+
+    private class YAxisInfo { 
       private readonly Grid grid = new Grid();
       private readonly YAxis yAxis = new YAxis();