Changeset 13783 for branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4

Timestamp:

04/21/16 17:24:10 (9 years ago)

Author:

bburlacu

Message:

#2597: Fix text annotations.

File:

• branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChart.cs (modified) (2 diffs)

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChart.cs

@@ -200 +200 @@
         var p = series.Points.Last();
         vla.X = p.XValue;
-        var ta = new TextAnnotation { Text = string.Format("X: {0:0.000}, Y: {1:0.000}", p.XValue, p.YValues[0]), Visible = true, X = p.XValue, Y = p.YValues[0] };
+        var ta = new TextAnnotation {
+          Text = string.Format("X: {0:0.000}, Y: {1:0.000}", p.XValue, p.YValues[0]),
+          Visible = true,
+          X = p.XValue,
+          Y = p.YValues[0],
+          AxisX = ChartAreas[0].AxisX,
+          AxisY = ChartAreas[0].AxisY
+        };
         ta.ClipToChartArea = "ChartArea1";
+        ta.Name = series.Name;
         Annotations.Add(ta);
       }
@@ -334 +342 @@
       var x = e.NewLocationX;
 
-      var va = VerticalLineAnnotation;
-      Annotations.Clear();
-      Annotations.Add(va);
+      //      var va = VerticalLineAnnotation;
+      //      Annotations.Clear();
+      //      Annotations.Add(va);
       for (int i = 0; i < solutionList.Count; ++i) {
         var y = GetEstimatedValue(solutionList[i], x);
         var s = Series[i];
         var n = s.Points.Count;
-        var ta = new TextAnnotation { X = x, Y = y };
-        Annotations.Add(ta);
         s.Points[n - 1] = new DataPoint(x, y) { MarkerColor = Color.Red, MarkerSize = 5 };
+      }
+      foreach (var annotation in Annotations.OfType<TextAnnotation>()) {
+        var p = Series[annotation.Name].Points.Last();
+        annotation.Text = string.Format("X: {0:0.000}, Y: {1:0.000}", p.XValue, p.YValues[0]);
+        annotation.X = p.XValue;
+        annotation.Y = p.YValues[0];
       }
       Update();