Changeset 2132

Timestamp:

07/03/09 18:38:47 (15 years ago)

Author:

gkronber

Message:

Show actual X and Y values in the tooltip. This is important for sub-entry bubble charts where the actual values are hidden in enumerations. #286 (Variable-usage diagrams for the CEDMA frontend)

Location:

trunk/sources/HeuristicLab.CEDMA.Charting/3.3

Files:

• BubbleChart.cs (modified) (9 diffs)
• BubbleChartControl.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.Charting/3.3/BubbleChart.cs

@@ -67 +67 @@
       records = new List<ResultsEntry>();
       primitiveToEntryDictionary = new Dictionary<IPrimitive, ResultsEntry>();
-      // entryToPrimitivesDictionary = new Dictionary<ResultsEntry, IList<IPrimitive>>();
+      //entryToPrimitivesDictionary = new Dictionary<ResultsEntry, IList<IPrimitive>>();
       this.results = results;
 
@@ -133 +133 @@
       Group.Clear();
       primitiveToEntryDictionary.Clear();
-      // entryToPrimitivesDictionary.Clear();
+      //entryToPrimitivesDictionary.Clear();
       points = new Group(this);
       Group.Add(new Axis(this, 0, 0, AxisType.Both));
@@ -140 +140 @@
         List<double> xs = new List<double>();
         List<double> ys = new List<double>();
+        List<object> actualXValues = new List<object>();
+        List<object> actualYValues = new List<object>();
         int size;
         if (results.OrdinalVariables.Contains(xDimension)) {
           xs.Add(Convert.ToDouble(r.Get(xDimension)) + (double)r.Get(X_JITTER) * xJitterFactor);
+          actualXValues.Add(r.Get(xDimension));
         } else if (results.CategoricalVariables.Contains(xDimension)) {
           xs.Add(results.IndexOfCategoricalValue(xDimension, r.Get(xDimension)) + (double)r.Get(X_JITTER) * xJitterFactor);
+          actualXValues.Add(r.Get(xDimension));
         } else if (results.MultiDimensionalCategoricalVariables.Contains(xDimension)) {
           var path = xDimension.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
@@ -150 +154 @@
           foreach (ResultsEntry subEntry in subEntries) {
             xs.Add(results.IndexOfCategoricalValue(xDimension, subEntry.Get(path.ElementAt(1))) + (double)r.Get(X_JITTER) * xJitterFactor);
+            actualXValues.Add(subEntry.Get(path.ElementAt(1)));
           }
         } else if (results.MultiDimensionalOrdinalVariables.Contains(xDimension)) {
@@ -156 +161 @@
           foreach (ResultsEntry subEntry in subEntries) {
             xs.Add(Convert.ToDouble(subEntry.Get(path.ElementAt(1))) + (double)r.Get(X_JITTER) * xJitterFactor);
+            actualXValues.Add(subEntry.Get(path.ElementAt(1)));
           }
         } else {
           xs.Add(double.NaN);
+          actualXValues.Add("NaN");
         }
         if (results.OrdinalVariables.Contains(yDimension)) {
           ys.Add(Convert.ToDouble(r.Get(yDimension)) + (double)r.Get(Y_JITTER) * yJitterFactor);
+          actualYValues.Add(r.Get(yDimension));
         } else if (results.CategoricalVariables.Contains(yDimension)) {
           ys.Add(results.IndexOfCategoricalValue(yDimension, r.Get(yDimension)) + (double)r.Get(Y_JITTER) * yJitterFactor);
+          actualYValues.Add(r.Get(yDimension));
         } else if (results.MultiDimensionalCategoricalVariables.Contains(yDimension)) {
           var path = yDimension.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
@@ -169 +178 @@
           foreach (ResultsEntry subEntry in subEntries) {
             ys.Add(results.IndexOfCategoricalValue(yDimension, subEntry.Get(path.ElementAt(1))) + (double)r.Get(Y_JITTER) * yJitterFactor);
+            actualYValues.Add(subEntry.Get(path.ElementAt(1)));
           }
         } else if (results.MultiDimensionalOrdinalVariables.Contains(yDimension)) {
@@ -175 +185 @@
           foreach (ResultsEntry subEntry in subEntries) {
             ys.Add(Convert.ToDouble(subEntry.Get(path.ElementAt(1))) + (double)r.Get(Y_JITTER) * yJitterFactor);
+            actualYValues.Add(subEntry.Get(path.ElementAt(1)));
           }
         } else {
           ys.Add(double.NaN);
+          actualYValues.Add("NaN");
         }
         size = CalculateSize(Convert.ToDouble(r.Get(sizeDimension)), minSize, maxSize);
@@ -183 +195 @@
         int n = Math.Max(xs.Count(), ys.Count());
         for (int i = 0; i < n; i++) {
-          double x = xs[Math.Min(i, xs.Count()-1)];
-          double y = ys[Math.Min(i, ys.Count()-1)];
+          double x = xs[Math.Min(i, xs.Count() - 1)];
+          double y = ys[Math.Min(i, ys.Count() - 1)];
+          string actualXValue = actualXValues[Math.Min(i, actualXValues.Count() - 1)].ToString();
+          string actualYValue = actualYValues[Math.Min(i, actualYValues.Count() - 1)].ToString();
           if (double.IsInfinity(x) || x == double.MaxValue || x == double.MinValue) x = double.NaN;
           if (double.IsInfinity(y) || y == double.MaxValue || y == double.MinValue) y = double.NaN;
@@ -193 +207 @@
             Brush brush = pen.Brush;
             FixedSizeCircle c = new FixedSizeCircle(this, x, y, size, pen, brush);
-            c.ToolTipText = r.GetToolTipText();
+            c.ToolTipText = xDimension + " = " + actualXValue + Environment.NewLine +
+              yDimension + " = " + actualYValue + Environment.NewLine +
+              r.GetToolTipText();
             points.Add(c);
             if (!r.Selected) c.IntoBackground();

trunk/sources/HeuristicLab.CEDMA.Charting/3.3/BubbleChartControl.cs

@@ -36 +36 @@
     private Point mousePosition;
     private Point buttonDownPoint;
+    private IPrimitive primitiveUnderCursor;
 
     private BubbleChart myChart;
@@ -107 +108 @@
     }
     private void pictureBox_MouseMove(object sender, MouseEventArgs e) {
-      toolTip.SetToolTip(pictureBox, Chart.GetToolTipText(e.Location));
+      if (Chart.GetPrimitive(e.Location) != primitiveUnderCursor) {
+        primitiveUnderCursor = Chart.GetPrimitive(e.Location);
+        toolTip.SetToolTip(pictureBox, Chart.GetToolTipText(e.Location));
+      }
       if(e.Button != MouseButtons.None) {
         if((Chart.Mode == ChartMode.Zoom || Chart.Mode == ChartMode.Select) && (e.Button == MouseButtons.Left)) {