Changeset 980 for trunk

Timestamp:

12/12/08 07:15:24 (16 years ago)

Author:

dwagner

Message:

Added feature: Drawingstyle for lines; #345

Location:

trunk/sources

Files:

• HeuristicLab.Visualization.Test/LineChartTests.cs (modified) (1 diff)
• HeuristicLab.Visualization/LineChart.cs (modified) (2 diffs)
• HeuristicLab.Visualization/LineShape.cs (modified) (4 diffs)

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

@@ -20 +20 @@
       row2.Thickness = 4;
       row3.Thickness = 5;
+
+      row1.Style = DrawingStyle.Solid;
+      row2.Style = DrawingStyle.Solid;
+      row3.Style = DrawingStyle.Dashed;
+      
 
       f.Model.AddDataRow(row1);

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -69 +69 @@
 
       for (int i = 1; i < row.Count; i++) {
-        LineShape lineShape = new LineShape(i - 1, row[i - 1], i, row[i], 0, row.Color, row.Thickness);
+        LineShape lineShape = new LineShape(i - 1, row[i - 1], i, row[i], 0, row.Color, row.Thickness, row.Style);
         lineShapes.Add(lineShape);
         // TODO each DataRow needs its own WorldShape so Y Axes can be zoomed independently.
@@ -97 +97 @@
       // 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, row.Thickness);
+        LineShape lineShape = new LineShape(index - 1, row[index - 1], index, row[index], 0, row.Color, row.Thickness, row.Style);
         lineShapes.Add(lineShape);
         // TODO each DataRow needs its own WorldShape so Y Axes can be zoomed independently.

trunk/sources/HeuristicLab.Visualization/LineShape.cs

@@ -1 +1 @@
 using System.Drawing;
+using System.Drawing.Drawing2D;
 
 namespace HeuristicLab.Visualization {
@@ -7 +8 @@
     private Color color;
     private int thickness;
+    private DashStyle dashStyle;
 
     /// <summary>
@@ -16 +18 @@
     /// <param name="y2">y coordinate of right lineEndPoind</param>
     /// <param name="color">color for the LineShape</param>
-    public LineShape(double x1, double y1, double x2, double y2, double z, Color color, int thickness) {
+    public LineShape(double x1, double y1, double x2, double y2, double z, Color color, int thickness, DrawingStyle style) {
       this.boundingBox = new RectangleD(x1, y1, x2, y2);
       this.z = z;
       this.color = color;
       this.thickness = thickness;
+      if (style==DrawingStyle.Dashed) {
+        this.dashStyle = DashStyle.Dash;
+      }
+      else {
+        this.dashStyle = DashStyle.Solid;        //default
+      }
     }
 
@@ -55 +63 @@
     public void Draw(Graphics graphics, Rectangle viewport, RectangleD clippingArea) {
       using (Pen pen = new Pen(color, thickness)){
-        // TODO there seems to be a bug with drawing straight lines.
+        pen.DashStyle = this.dashStyle;
         Rectangle screenRect = Transform.ToScreen(boundingBox, viewport, clippingArea);
         graphics.DrawLine(pen,screenRect.Left, screenRect.Bottom, screenRect.Right, screenRect.Top);