Changeset 550 for trunk/sources

Timestamp:

09/11/08 15:28:07 (16 years ago)

Author:

gkronber

Message:

fixed #267 (DataRowType.Bars is not implemented in DataChart).
Bars can be specified by adding two data points for the lower left and upper right corner.

File:

• trunk/sources/HeuristicLab.Charting.Data/Datachart.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Charting.Data/Datachart.cs

@@ -34 +34 @@
       get { return myTitle; }
       set {
-        if (myTitle != value) {
+        if(myTitle != value) {
           myTitle = value;
           OnUpdate();
@@ -55 +55 @@
       Group.Add(group);
       dataRowTypes.Add(dataRowType);
-      if (dataRowType == DataRowType.Lines) {
+      if(dataRowType == DataRowType.Lines) {
         Group lines = new Group(this);
         group.Add(lines);
@@ -71 +71 @@
       Group group = (Group)Group.Primitives[dataRowIndex];
 
-      switch (dataRowType) {
+      switch(dataRowType) {
         case DataRowType.Lines:
           Group lines = (Group)group.Primitives[1];
           Group points = (Group)group.Primitives[0];
-          if (points.Primitives.Count > 0) {
+          if(points.Primitives.Count > 0) {
             FixedSizeRectangle lastRect = (FixedSizeRectangle)points.Primitives[0];
             Line line = new Line(this, lastRect.Point, point, group.Pen);
@@ -85 +85 @@
           break;
         case DataRowType.Bars:
+          if(group.Primitives.Count < 2) {
+            group.Add(new FixedSizeRectangle(this, point, new Size(0, 0), group.Pen, group.Brush));
+            if(group.Primitives.Count == 2) {
+              PointD p = ((FixedSizeRectangle)group.Primitives[0]).Point;
+              PointD q = ((FixedSizeRectangle)group.Primitives[1]).Point;
+              double y0 = Math.Min(p.Y, q.Y);
+              double y1 = Math.Max(p.Y, q.Y);
+              double x0 = Math.Min(p.X, q.X);
+              double x1 = Math.Max(p.X, q.X);
+              Rectangle bar = new Rectangle(this, x0, y0, x1, y1, group.Pen, group.Brush);
+              bar.ToolTipText = "Height=" + (y1 - y0);
+              group.Add(bar);
+            }
+          }
           break;
         case DataRowType.Points:
-          FixedSizeRectangle p = new FixedSizeRectangle(this, point, new Size(5, 5), group.Pen, group.Brush);
-          p.ToolTipText = "(" + point.X.ToString() + " ; " + point.Y.ToString() + ")";
-          group.Add(p);
+          FixedSizeRectangle r = new FixedSizeRectangle(this, point, new Size(5, 5), group.Pen, group.Brush);
+          r.ToolTipText = "(" + point.X.ToString() + " ; " + point.Y.ToString() + ")";
+          group.Add(r);
           break;
       }