Changeset 1883 for trunk/sources

Timestamp:

05/23/09 10:35:51 (16 years ago)

Author:

dwagner

Message:

Bug fix: No marker on first added value (#581)
New feature: Tooltip, which shows the world-values on mouseover event of a datapoint. (#638)
New feature: New Linetype Points, which is a line consisting only of the markers (#637)

Location:

trunk/sources/HeuristicLab.Visualization/3.2

Files:

• CompositeShape.cs (modified) (2 diffs)
• HeuristicLab.Visualization-3.2.csproj (modified) (1 diff)
• IDataRow.cs (modified) (1 diff)
• LineChart.cs (modified) (24 diffs)
• TooltipListener.cs (added)

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

@@ -58 +58 @@
     }
 
+
+    /// <summary>
+    /// Adds a shape to the container
+    /// </summary>
+    /// <param name="shape"> the Shape to add</param>
     public void AddShape(IShape shape) {
       shape.Parent = this;
@@ -71 +76 @@
       shapes.Add(shape);
     }
+
+    /// <summary>
+    /// Recalculate the bounding box
+    /// </summary>
+    private void InitBoundingBox() {
+      if (shapes.Count > 0) 
+        boundingBox = shapes[0].BoundingBox;
+      foreach (var shape in shapes) {
+        boundingBox = new RectangleD(Math.Min(boundingBox.X1, shape.BoundingBox.X1),
+                                    Math.Min(boundingBox.Y1, shape.BoundingBox.Y1),
+                                    Math.Max(boundingBox.X2, shape.BoundingBox.X2),
+                                    Math.Max(boundingBox.Y2, shape.BoundingBox.Y2));
+      }
+    }
+
+    /// <summary>
+    /// Removes a Shape from the container and reinitializes the bounding box
+    /// </summary>
+    /// <param name="shape">the Shape to remove</param>
+    public void RemoveShape(IShape shape) {
+      shapes.Remove(shape);
+      InitBoundingBox();
+    }
   }
 }

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

@@ -161 +161 @@
     <Compile Include="RectangleShape.cs" />
     <Compile Include="SizeD.cs" />
+    <Compile Include="TooltipListener.cs" />
     <Compile Include="Transform.cs" />
     <Compile Include="Translate.cs" />

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

@@ -3 +3 @@
 namespace HeuristicLab.Visualization {
   public enum DataRowType {
-    Normal, SingleValue
+    Normal, SingleValue,
+    Points
   }
 

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

@@ -31 +31 @@
     private const int YAxisWidth = 100;
     private const int XAxisHeight = 40;
+    private readonly TooltipListener toolTipListener;
+    private readonly ToolTip valueToolTip;
+    private Point currentMousePos;
 
     /// <summary>
@@ -55 +58 @@
 
       Item = model;
+
+      valueToolTip = new ToolTip();
+      toolTipListener = new TooltipListener();
+      toolTipListener.ShowToolTip += ShowToolTip;
+      mouseEventListener = toolTipListener;
+      currentMousePos = new Point(0, 0);
 
       this.ResizeRedraw = true;
@@ -137 +146 @@
       canvas.AddShape(titleShape);
       canvas.AddShape(legendShape);
-
       canvas.AddShape(userInteractionShape);
 
@@ -160 +168 @@
 
       int yAxisLeft = 0;
-      int yAxisRight = (int)linesAreaBoundingBox.X2;
+      int yAxisRight = (int) linesAreaBoundingBox.X2;
 
       foreach (YAxisDescriptor yAxisDescriptor in model.YAxes) {
@@ -187 +195 @@
 
       userInteractionShape.BoundingBox = linesAreaBoundingBox;
-      userInteractionShape.ClippingArea = new RectangleD(0, 0, userInteractionShape.BoundingBox.Width, userInteractionShape.BoundingBox.Height);
+      userInteractionShape.ClippingArea = new RectangleD(0, 0, userInteractionShape.BoundingBox.Width,
+                                                         userInteractionShape.BoundingBox.Height);
 
       xAxis.BoundingBox = new RectangleD(linesAreaBoundingBox.X1,
@@ -199 +208 @@
     private readonly Dictionary<YAxisDescriptor, YAxisInfo> yAxisInfos = new Dictionary<YAxisDescriptor, YAxisInfo>();
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="yAxisDescriptor"></param>
+    /// <returns></returns>
     private YAxisInfo GetYAxisInfo(YAxisDescriptor yAxisDescriptor) {
       YAxisInfo info;
@@ -209 +223 @@
       return info;
     }
+
+
+    #region Legend-specific
 
     /// <summary>
@@ -235 +252 @@
     public void setLegendRight() {
       // legend right
-      legendShape.BoundingBox = new RectangleD(canvasUI.Width - legendShape.GetMaxLabelLength(), 10, canvasUI.Width, canvasUI.Height - 50);
+      legendShape.BoundingBox = new RectangleD(canvasUI.Width - legendShape.GetMaxLabelLength(), 10, canvasUI.Width,
+                                               canvasUI.Height - 50);
       legendShape.ClippingArea = new RectangleD(0, 0, legendShape.BoundingBox.Width, legendShape.BoundingBox.Height);
       legendShape.Row = false;
@@ -253 +271 @@
     public void setLegendTop() {
       // legend top
-      legendShape.BoundingBox = new RectangleD(100, canvasUI.Height - canvasUI.Height, canvasUI.Width, canvasUI.Height - 10);
+      legendShape.BoundingBox = new RectangleD(100, canvasUI.Height - canvasUI.Height, canvasUI.Width,
+                                               canvasUI.Height - 10);
       legendShape.ClippingArea = new RectangleD(0, 0, legendShape.BoundingBox.Width, legendShape.BoundingBox.Height);
       legendShape.Row = true;
@@ -269 +288 @@
     }
 
+    #endregion
+
+    /// <summary>
+    /// Shows the Tooltip with the real values of a datapoint, if the mousepoint is near to one
+    /// </summary>
+    /// <param name="location"></param>
+    private void ShowToolTip(Point location) {
+      valueToolTip.Hide(this);
+      if (rowEntries.Count > 0) {
+        double dx = Transform.ToWorldX(location.X, this.rowEntries[0].LinesShape.Viewport,
+                                       this.rowEntries[0].LinesShape.ClippingArea);
+        int ix = (int) Math.Round(dx);
+        foreach (var rowEntry in rowEntries) {
+          if ((rowEntry.DataRow.Count > ix) && (ix > 0) && ((rowEntry.DataRow.LineType == DataRowType.Normal)||(rowEntry.DataRow.LineType==DataRowType.Points))) {
+            Point screenDataP = Transform.ToScreen(new PointD(ix, rowEntry.DataRow[ix]), rowEntry.LinesShape.Viewport,
+                                                   rowEntry.LinesShape.ClippingArea);
+            if ((Math.Abs(screenDataP.X - location.X) <= 6) && (Math.Abs(screenDataP.Y - location.Y) <= 6)) {
+              valueToolTip.Show(("\t x:" + ix + " y:" + rowEntry.DataRow[ix]), this, screenDataP.X, screenDataP.Y);
+            }
+          }
+        }
+      }
+    }
+
+
+
     private void optionsToolStripMenuItem_Click(object sender, EventArgs e) {
       OptionsDialog optionsdlg = new OptionsDialog(model);
       optionsdlg.Show();
+      mouseEventListener = toolTipListener;
     }
 
@@ -408 +454 @@
     }
 
+    /// <summary>
+    /// Creates the shapes for the data of the given row and stores them.
+    /// </summary>
+    /// <param name="row">Datarow, whose data items should be converted to shapes</param>
     private void InitLineShapes(IDataRow row) {
       RowEntry rowEntry = new RowEntry(row);
@@ -419 +469 @@
           rowEntry.LinesShape.AddShape(lineShape);
         }
-      } else {
+      } else if (row.LineType == DataRowType.Points) {
+        rowEntry.showMarkers(true);      //no lines, only markers are shown!!
+        for (int i = 0; i < row.Count; i++)
+          rowEntry.LinesShape.AddMarkerShape(new MarkerShape(i , row[i], 8, row.Color));
+      } else if (row.LineType == DataRowType.Normal) {
         rowEntry.showMarkers(row.ShowMarkers);
         for (int i = 1; i < row.Count; i++) {
@@ -434 +488 @@
     }
 
+    /// <summary>
+    /// Handles the event, when a value of a datarow was changed
+    /// </summary>
+    /// <param name="row">row in which the data was changed</param>
+    /// <param name="value">new value of the data point</param>
+    /// <param name="index">index in the datarow of the changed datapoint</param>
+    /// <param name="action">the performed action (added, modified, deleted)</param>
     private void OnRowValueChanged(IDataRow row, double value, int index, Action action) {
       RowEntry rowEntry = rowToRowEntry[row];
@@ -442 +503 @@
                                                         row.Style);
           rowEntry.LinesShape.AddShape(lineShape);
-        } else {
+        } else if(action==Action.Deleted) {
+          throw new ArgumentException("It is unwise to delete the only value of the SinglevalueRow!!");
+        }else if(action ==Action.Modified){
           LineShape lineShape = rowEntry.LinesShape.GetShape(0);
           lineShape.Y1 = value;
           lineShape.Y2 = value;
         }
-      } else {
-        if (index > rowEntry.LinesShape.Count + 1) {
-          //MarkersShape is on position zero
-          throw new NotImplementedException();
-        }
-
+      } else if (row.LineType == DataRowType.Points) {
         if (action == Action.Added) {
-          // new value was added
+          if(rowEntry.LinesShape.Count==0)
+            rowEntry.LinesShape.AddMarkerShape(new MarkerShape(0, row[0], 8, row.Color));
           if (index > 0 && index == rowEntry.LinesShape.Count + 1) {
             LineShape lineShape = new LineShape(index - 1, row[index - 1], index, row[index], row.Color, row.Thickness,
@@ -460 +519 @@
             rowEntry.LinesShape.AddShape(lineShape);
             rowEntry.LinesShape.AddMarkerShape(new MarkerShape(index, row[index], 8, row.Color));
+          } else {
+            throw new ArgumentException("Adding a value is only possible at the end of a row!");
           }
         } else if (action == Action.Modified) {
@@ -465 +526 @@
           if (index > 0) {
             rowEntry.LinesShape.GetShape(index - 1).Y2 = value;
-            ((MarkerShape)rowEntry.LinesShape.markersShape.GetShape(index - 1)).Y = value;
+            ((MarkerShape) rowEntry.LinesShape.markersShape.GetShape(index - 1)).Y = value;
           }
 
           // not the last value
-          if (index > 0 && index < row.Count - 1) {
+          if (index < row.Count - 1) {
             rowEntry.LinesShape.GetShape(index).Y1 = value;
-            ((MarkerShape)rowEntry.LinesShape.markersShape.GetShape(index)).Y = value;
-          }
+            ((MarkerShape) rowEntry.LinesShape.markersShape.GetShape(index)).Y = value;
+          }
+        } else if(action == Action.Deleted) {
+          if (index == row.Count - 1)
+            rowEntry.LinesShape.RemoveMarkerShape(rowEntry.LinesShape.markersShape.GetShape(index));
+          else
+            throw new NotSupportedException("Deleting of values other than the last one is not supported!");
+        }
+        
+      } else if (row.LineType == DataRowType.Normal) {
+        if (index > rowEntry.LinesShape.Count + 1) {
+          throw new NotImplementedException();
+        }
+
+        if (action == Action.Added) {
+          if (rowEntry.LinesShape.Count == 0)
+            rowEntry.LinesShape.AddMarkerShape(new MarkerShape(0, row[0], 8, row.Color));
+          if (index > 0 && index == rowEntry.LinesShape.Count + 1) {
+            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));
+          }
+        } else if (action == Action.Modified) {
+          // not the first value
+          if (index > 0) {
+            rowEntry.LinesShape.GetShape(index - 1).Y2 = value;
+            ((MarkerShape) rowEntry.LinesShape.markersShape.GetShape(index - 1)).Y = value;
+          }
+
+          // not the last value
+          if (index < row.Count - 1) {
+            rowEntry.LinesShape.GetShape(index).Y1 = value;
+            ((MarkerShape) rowEntry.LinesShape.markersShape.GetShape(index)).Y = value;
+          }
+        } else if (action == Action.Deleted) {
+          if (index == row.Count - 1) {
+            rowEntry.LinesShape.RemoveMarkerShape(rowEntry.LinesShape.markersShape.GetShape(index));
+            rowEntry.LinesShape.RemoveShape(rowEntry.LinesShape.GetShape(index));
+          } else
+            throw new NotSupportedException("Deleting of values other than the last one is not supported!");
         }
       }
@@ -520 +620 @@
       foreach (RowEntry rowEntry in rowEntries) {
         if (rowEntry.DataRow.YAxis.ClipChangeable) {
-          clippingArea = Translate.ClippingArea(startPoint, endPoint, rowEntry.LinesShape.ClippingArea, rowEntry.LinesShape.Viewport);
+          clippingArea = Translate.ClippingArea(startPoint, endPoint, rowEntry.LinesShape.ClippingArea,
+                                                rowEntry.LinesShape.Viewport);
           SetClipY(rowEntry, clippingArea.Y1, clippingArea.Y2);
         }
@@ -550 +651 @@
 
     private void DrawRectangle(Rectangle rectangle) {
-      rectangleShape.Rectangle = Transform.ToWorld(rectangle, userInteractionShape.Viewport, userInteractionShape.ClippingArea);
+      rectangleShape.Rectangle = Transform.ToWorld(rectangle, userInteractionShape.Viewport,
+                                                   userInteractionShape.ClippingArea);
       canvasUI.Invalidate();
     }
@@ -560 +662 @@
 
       if (e.Button == MouseButtons.Right) {
-        contextMenu.Show(PointToScreen(e.Location));
+        valueToolTip.Hide(this);
+        mouseEventListener = null;
+        this.contextMenu.Show(PointToScreen(e.Location));
       } else if (e.Button == MouseButtons.Left) {
         if (ModifierKeys == Keys.None) {
@@ -582 +686 @@
 
     private void canvasUI_MouseMove(object sender, MouseEventArgs e) {
+      if (currentMousePos == e.Location)
+        return;
       if (mouseEventListener != null) {
         mouseEventListener.MouseMove(sender, e);
       }
+
+      currentMousePos = e.Location;
     }
 
@@ -592 +700 @@
       }
 
-      mouseEventListener = null;
+      mouseEventListener = toolTipListener;
     }
 
@@ -640 +748 @@
           }
         }
-        this.markersShape.ShowChildShapes = row.ShowMarkers;
-      }
-
+        markersShape.ShowChildShapes = row.ShowMarkers;
+      }
+
+      /// <summary>
+      /// Draws all Shapes in the chart
+      /// </summary>
+      /// <param name="graphics"></param>
       public override void Draw(Graphics graphics) {
         GraphicsState gstate = graphics.Save();
@@ -660 +772 @@
       }
 
+      public void RemoveMarkerShape(IShape shape) {
+        shape.Parent = this;
+        markersShape.RemoveShape(shape);
+      }
+
       public int Count {
         get { return shapes.Count; }
@@ -665 +782 @@
 
       public LineShape GetShape(int index) {
-        return (LineShape)shapes[index]; //shapes[0] is markersShape!!
+        return (LineShape) shapes[index]; //shapes[0] is markersShape!!
       }
     }