Expose SplineTension property for spline series.

dilyantraykov · dilyantraykov · commit fd9bfde79027 · 2023-02-01T15:02:13.000+02:00
diff --git a/Controls/Chart/Chart.UWP/Visualization/CartesianChart/Series/Categorical/SplineAreaSeries.cs b/Controls/Chart/Chart.UWP/Visualization/CartesianChart/Series/Categorical/SplineAreaSeries.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using Telerik.UI.Automation.Peers;
 using Windows.UI.Xaml.Automation.Peers;
+using Windows.UI.Xaml;
 
 namespace Telerik.UI.Xaml.Controls.Chart
 {
@@ -9,6 +10,12 @@ namespace Telerik.UI.Xaml.Controls.Chart
     /// </summary>
     public class SplineAreaSeries : AreaSeries
     {
+        /// <summary>
+        /// Identifies the <see cref="SplineTension"/> property.
+        /// </summary>   
+        public static readonly DependencyProperty SplineTensionProperty =
+            DependencyProperty.Register("SplineTension", typeof(double), typeof(SplineAreaSeries), new PropertyMetadata(SplineHelper.DefaultTension, OnSplineTensionChanged));
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SplineAreaSeries"/> class.
         /// </summary>
@@ -17,9 +24,30 @@ public SplineAreaSeries()
             this.DefaultStyleKey = typeof(SplineAreaSeries);
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="SplineTension"/> that is used to determine the tension of the additional spline points.
+        /// The default value is 0.5d.
+        /// </summary>
+        public double SplineTension
+        {
+            get { return (double)GetValue(SplineTensionProperty); }
+            set { SetValue(SplineTensionProperty, value); }
+        }
+
+        private static void OnSplineTensionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            SplineAreaSeries series = (SplineAreaSeries)d;
+            SplineAreaRenderer renderer = (SplineAreaRenderer)series.renderer;
+            renderer.splineTension = (double)e.NewValue;
+            series.InvalidateCore();
+        }
+
         internal override LineRenderer CreateRenderer()
         {
-            return new SplineAreaRenderer();
+            return new SplineAreaRenderer()
+            {
+                splineTension = this.SplineTension
+            };
         }
 
         /// <inheritdoc/>
diff --git a/Controls/Chart/Chart.UWP/Visualization/CartesianChart/Series/Categorical/SplineSeries.cs b/Controls/Chart/Chart.UWP/Visualization/CartesianChart/Series/Categorical/SplineSeries.cs
@@ -1,14 +1,21 @@
 ﻿using System;
 using Telerik.UI.Automation.Peers;
 using Windows.UI.Xaml.Automation.Peers;
+using Windows.UI.Xaml;
 
 namespace Telerik.UI.Xaml.Controls.Chart
 {
     /// <summary>
-    /// Visualizes a collection of data points using a smooth <see cref="Windows.UI.Xaml.Shapes.Line"/> shape.
+    /// Visualizes a collection of data points using a smooth <see cref="Microsoft.UI.Xaml.Shapes.Line"/> shape.
     /// </summary>
     public class SplineSeries : LineSeries
     {
+        /// <summary>
+        /// Identifies the <see cref="SplineTension"/> property.
+        /// </summary>   
+        public static readonly DependencyProperty SplineTensionProperty =
+            DependencyProperty.Register("SplineTension", typeof(double), typeof(SplineSeries), new PropertyMetadata(SplineHelper.DefaultTension, OnSplineTensionChanged));
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SplineSeries"/> class.
         /// </summary>
@@ -17,9 +24,30 @@ public SplineSeries()
             this.DefaultStyleKey = typeof(SplineSeries);
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="SplineTension"/> that is used to determine the tension of the additional spline points.
+        /// The default value is 0.5d.
+        /// </summary>
+        public double SplineTension
+        {
+            get { return (double)GetValue(SplineTensionProperty); }
+            set { SetValue(SplineTensionProperty, value); }
+        }
+
+        private static void OnSplineTensionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            SplineSeries series = (SplineSeries)d;
+            SplineRenderer renderer = (SplineRenderer)series.renderer;
+            renderer.splineTension = (double)e.NewValue;
+            series.InvalidateCore();
+        }
+
         internal override LineRenderer CreateRenderer()
         {
-            return new SplineRenderer();
+            return new SplineRenderer()
+            {
+                splineTension = this.SplineTension
+            };
         }
 
         /// <inheritdoc/>
diff --git a/Controls/Chart/Chart.UWP/Visualization/CartesianChart/Series/Scatter/ScatterSplineAreaSeries.cs b/Controls/Chart/Chart.UWP/Visualization/CartesianChart/Series/Scatter/ScatterSplineAreaSeries.cs
@@ -2,6 +2,7 @@
 using Telerik.Charting;
 using Telerik.UI.Automation.Peers;
 using Windows.UI.Xaml.Automation.Peers;
+using Windows.UI.Xaml;
 
 namespace Telerik.UI.Xaml.Controls.Chart
 {
@@ -10,6 +11,12 @@ namespace Telerik.UI.Xaml.Controls.Chart
     /// </summary>
     public class ScatterSplineAreaSeries : ScatterAreaSeries
     {
+        /// <summary>
+        /// Identifies the <see cref="SplineTension"/> property.
+        /// </summary>   
+        public static readonly DependencyProperty SplineTensionProperty =
+            DependencyProperty.Register("SplineTension", typeof(double), typeof(ScatterSplineAreaSeries), new PropertyMetadata(SplineHelper.DefaultTension, OnSplineTensionChanged));
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ScatterSplineAreaSeries"/> class.
         /// </summary>
@@ -18,9 +25,30 @@ public ScatterSplineAreaSeries()
             this.DefaultStyleKey = typeof(ScatterSplineAreaSeries);
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="SplineTension"/> that is used to determine the tension of the additional spline points.
+        /// The default value is 0.5d.
+        /// </summary>
+        public double SplineTension
+        {
+            get { return (double)GetValue(SplineTensionProperty); }
+            set { SetValue(SplineTensionProperty, value); }
+        }
+
+        private static void OnSplineTensionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ScatterSplineAreaSeries series = (ScatterSplineAreaSeries)d;
+            SplineAreaRenderer renderer = (SplineAreaRenderer)series.renderer;
+            renderer.splineTension = (double)e.NewValue;
+            series.InvalidateCore();
+        }
+
         internal override LineRenderer CreateRenderer()
         {
-            return new SplineAreaRenderer();
+            return new SplineAreaRenderer()
+            {
+                splineTension = this.SplineTension
+            };
         }
 
         /// <inheritdoc/>
diff --git a/Controls/Chart/Chart.UWP/Visualization/CartesianChart/Series/Scatter/ScatterSplineSeries.cs b/Controls/Chart/Chart.UWP/Visualization/CartesianChart/Series/Scatter/ScatterSplineSeries.cs
@@ -2,6 +2,7 @@
 using Telerik.Charting;
 using Telerik.UI.Automation.Peers;
 using Windows.UI.Xaml.Automation.Peers;
+using Windows.UI.Xaml;
 
 namespace Telerik.UI.Xaml.Controls.Chart
 {
@@ -10,6 +11,12 @@ namespace Telerik.UI.Xaml.Controls.Chart
     /// </summary>
     public class ScatterSplineSeries : ScatterLineSeries
     {
+        /// <summary>
+        /// Identifies the <see cref="SplineTension"/> property.
+        /// </summary>   
+        public static readonly DependencyProperty SplineTensionProperty =
+            DependencyProperty.Register("SplineTension", typeof(double), typeof(ScatterSplineSeries), new PropertyMetadata(SplineHelper.DefaultTension, OnSplineTensionChanged));
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ScatterSplineSeries"/> class.
         /// </summary>
@@ -18,9 +25,30 @@ public ScatterSplineSeries()
             this.DefaultStyleKey = typeof(ScatterSplineSeries);
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="SplineTension"/> that is used to determine the tension of the additional spline points.
+        /// The default value is 0.5d.
+        /// </summary>
+        public double SplineTension
+        {
+            get { return (double)GetValue(SplineTensionProperty); }
+            set { SetValue(SplineTensionProperty, value); }
+        }
+
+        private static void OnSplineTensionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ScatterSplineSeries series = (ScatterSplineSeries)d;
+            SplineRenderer renderer = (SplineRenderer)series.renderer;
+            renderer.splineTension = (double)e.NewValue;
+            series.InvalidateCore();
+        }
+
         internal override LineRenderer CreateRenderer()
         {
-            return new SplineRenderer();
+            return new SplineRenderer()
+            {
+                splineTension = this.SplineTension
+            };
         }
 
         /// <inheritdoc/>
diff --git a/Controls/Chart/Chart.UWP/Visualization/Common/Renderers/Cartesian/Spline/SplineAreaRenderer.cs b/Controls/Chart/Chart.UWP/Visualization/Common/Renderers/Cartesian/Spline/SplineAreaRenderer.cs
@@ -7,6 +7,8 @@ namespace Telerik.UI.Xaml.Controls.Chart
 {
     internal class SplineAreaRenderer : AreaRenderer
     {
+        internal double splineTension;
+
         protected override IEnumerable<Point> GetTopPoints(DataPointSegment segment)
         {
             // return the first point since spline segmentation skips it
@@ -15,7 +17,7 @@ protected override IEnumerable<Point> GetTopPoints(DataPointSegment segment)
             IChartView view = this.model.GetChartArea().view;
             double scaleFactor = Math.Abs(view.ZoomWidth - view.ZoomHeight) / 2;
 
-            foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor))
+            foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor, this.splineTension))
             {
                 yield return point;
             }
diff --git a/Controls/Chart/Chart.UWP/Visualization/Common/Renderers/Cartesian/Spline/SplineRenderer.cs b/Controls/Chart/Chart.UWP/Visualization/Common/Renderers/Cartesian/Spline/SplineRenderer.cs
@@ -7,6 +7,8 @@ namespace Telerik.UI.Xaml.Controls.Chart
 {
     internal class SplineRenderer : LineRenderer
     {
+        internal double splineTension;
+
         protected internal override IEnumerable<Point> GetPoints(DataPointSegment segment)
         {
             // return the first point since spline segmentation skips it
@@ -15,7 +17,7 @@ protected internal override IEnumerable<Point> GetPoints(DataPointSegment segmen
             IChartView view = this.model.GetChartArea().view;
             double scaleFactor = Math.Abs(view.ZoomWidth - view.ZoomHeight) / 2;
 
-            foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor))
+            foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor, this.splineTension))
             {
                 yield return point;
             }
diff --git a/Controls/Chart/Chart.UWP/Visualization/Common/Renderers/Polar/Polar/PolarSplineRenderer.cs b/Controls/Chart/Chart.UWP/Visualization/Common/Renderers/Polar/Polar/PolarSplineRenderer.cs
@@ -8,6 +8,8 @@ namespace Telerik.UI.Xaml.Controls.Chart
 {
     internal class PolarSplineRenderer : PolarLineRenderer
     {
+        internal double splineTension;
+
         protected internal override IEnumerable<Point> GetPoints(DataPointSegment segment)
         {
             // return the first point since spline segmentation skips it
@@ -16,7 +18,7 @@ protected internal override IEnumerable<Point> GetPoints(DataPointSegment segmen
             IChartView view = this.model.GetChartArea().view;
             double scaleFactor = Math.Abs(view.ZoomWidth - view.ZoomHeight) / 2;
 
-            foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor, this.isClosed))
+            foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor, this.splineTension, this.isClosed))
             {
                 yield return point;
             }
diff --git a/Controls/Chart/Chart.UWP/Visualization/Common/Renderers/Polar/Radar/RadarSplineRenderer.cs b/Controls/Chart/Chart.UWP/Visualization/Common/Renderers/Polar/Radar/RadarSplineRenderer.cs
@@ -8,6 +8,8 @@ namespace Telerik.UI.Xaml.Controls.Chart
 {
     internal class RadarSplineRenderer : RadarLineRenderer
     {
+        internal double splineTension;
+
         protected internal override IEnumerable<Point> GetPoints(DataPointSegment segment)
         {
             // return the first point since spline segmentation skips it
@@ -16,7 +18,7 @@ protected internal override IEnumerable<Point> GetPoints(DataPointSegment segmen
             IChartView view = this.model.GetChartArea().view;
             double scaleFactor = Math.Abs(view.ZoomWidth - view.ZoomHeight) / 2;
 
-            foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor, this.isClosed))
+            foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor, this.splineTension, this.isClosed))
             {
                 yield return point;
             }
diff --git a/Controls/Chart/Chart.UWP/Visualization/Common/SplineHelper.cs b/Controls/Chart/Chart.UWP/Visualization/Common/SplineHelper.cs
@@ -8,10 +8,10 @@ namespace Telerik.UI.Xaml.Controls.Chart
     internal static class SplineHelper
     {
         // TODO: Should we expose these as public properties for Spline and SplineArea series?
-        private const double DefaultTension = 0.5d;
+        internal const double DefaultTension = 0.5d;
         private const double DefaultTolerance = 5d;
 
-        public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, DataPointSegment dataSegment, double scaleFactor, bool isClosedShape = false)
+        public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, DataPointSegment dataSegment, double scaleFactor, double tension = DefaultTension, bool isClosedShape = false)
         {
             double tolerance = DefaultTolerance;
             if (scaleFactor > 2)
@@ -29,7 +29,7 @@ public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, Da
                 Point firstPoint = dataPoints[dataSegment.StartIndex].Center();
                 Point secondPoint = dataPoints[dataSegment.EndIndex].Center();
 
-                foreach (Point segmentedPoint in Segment(startPoint, firstPoint, secondPoint, endPoint, tolerance))
+                foreach (Point segmentedPoint in Segment(startPoint, firstPoint, secondPoint, endPoint, tolerance, tension))
                 {
                     yield return segmentedPoint;
                 }
@@ -48,7 +48,8 @@ public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, Da
                         dataPoints[i].Center(),
                         dataPoints[i + 1].Center(),
                         dataPoints[i + 2].Center(),
-                        tolerance);
+                        tolerance,
+                        tension);
                 }
                 else if (i == dataSegment.EndIndex - 1)
                 {
@@ -57,7 +58,8 @@ public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, Da
                         dataPoints[i].Center(),
                         dataPoints[i + 1].Center(),
                         endPoint,
-                        tolerance);
+                        tolerance,
+                        tension);
                 }
                 else
                 {
@@ -66,7 +68,8 @@ public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, Da
                         dataPoints[i].Center(),
                         dataPoints[i + 1].Center(),
                         dataPoints[i + 2].Center(),
-                        tolerance);
+                        tolerance,
+                        tension);
                 }
 
                 foreach (Point point in segmentedPoints)
@@ -76,7 +79,7 @@ public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, Da
             }
         }
 
-        public static IEnumerable<Point> GetSplinePointsConnectingAbsoluteFirstLastDataPoints(IList<DataPoint> dataPoints, double scaleFactor)
+        public static IEnumerable<Point> GetSplinePointsConnectingAbsoluteFirstLastDataPoints(IList<DataPoint> dataPoints, double scaleFactor, double tension = DefaultTension)
         {
             DataPoint firstPoint = dataPoints[0];
             DataPoint lastPoint = dataPoints[dataPoints.Count - 1];
@@ -99,18 +102,18 @@ public static IEnumerable<Point> GetSplinePointsConnectingAbsoluteFirstLastDataP
             // return the first point since spline segmentation skips it
             yield return lastPoint.Center();
 
-            foreach (Point point in Segment(previousSignificantPointBeforeAbsoluteLast.Center(), lastPoint.Center(), firstPoint.Center(), nextSignificantPointAfterAbsoluteFirst.Center(), tolerance))
+            foreach (Point point in Segment(previousSignificantPointBeforeAbsoluteLast.Center(), lastPoint.Center(), firstPoint.Center(), nextSignificantPointAfterAbsoluteFirst.Center(), tolerance, tension))
             {
                 yield return point;
             }
         }
 
-        private static IEnumerable<Point> Segment(Point pt0, Point pt1, Point pt2, Point pt3, double tolerance)
+        private static IEnumerable<Point> Segment(Point pt0, Point pt1, Point pt2, Point pt3, double tolerance, double tension)
         {
-            double sX1 = DefaultTension * (pt2.X - pt0.X);
-            double sY1 = DefaultTension * (pt2.Y - pt0.Y);
-            double sX2 = DefaultTension * (pt3.X - pt1.X);
-            double sY2 = DefaultTension * (pt3.Y - pt1.Y);
+            double sX1 = tension * (pt2.X - pt0.X);
+            double sY1 = tension * (pt2.Y - pt0.Y);
+            double sX2 = tension * (pt3.X - pt1.X);
+            double sY2 = tension * (pt3.Y - pt1.Y);
 
             double ax = sX1 + sX2 + (2 * pt1.X) - (2 * pt2.X);
             double ay = sY1 + sY2 + (2 * pt1.Y) - (2 * pt2.Y);
diff --git a/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/PolarSplineAreaSeries.cs b/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/PolarSplineAreaSeries.cs
diff --git a/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/PolarSplineSeries.cs b/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/PolarSplineSeries.cs
diff --git a/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/RadarSplineAreaSeries.cs b/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/RadarSplineAreaSeries.cs
diff --git a/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/RadarSplineSeries.cs b/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/RadarSplineSeries.cs

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ namespace Telerik.UI.Xaml.Controls.Chart`
`7`	`7`	`{`
`8`	`8`	`internal class SplineAreaRenderer : AreaRenderer`
`9`	`9`	`{`
	`10`	`+ internal double splineTension;`
	`11`	`+`
`10`	`12`	`protected override IEnumerable<Point> GetTopPoints(DataPointSegment segment)`
`11`	`13`	`{`
`12`	`14`	`// return the first point since spline segmentation skips it`
`@@ -15,7 +17,7 @@ protected override IEnumerable<Point> GetTopPoints(DataPointSegment segment)`
`15`	`17`	`IChartView view = this.model.GetChartArea().view;`
`16`	`18`	`double scaleFactor = Math.Abs(view.ZoomWidth - view.ZoomHeight) / 2;`
`17`	`19`
`18`		`- foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor))`
	`20`	`+ foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor, this.splineTension))`
`19`	`21`	`{`
`20`	`22`	`yield return point;`
`21`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ namespace Telerik.UI.Xaml.Controls.Chart`
`7`	`7`	`{`
`8`	`8`	`internal class SplineRenderer : LineRenderer`
`9`	`9`	`{`
	`10`	`+ internal double splineTension;`
	`11`	`+`
`10`	`12`	`protected internal override IEnumerable<Point> GetPoints(DataPointSegment segment)`
`11`	`13`	`{`
`12`	`14`	`// return the first point since spline segmentation skips it`
`@@ -15,7 +17,7 @@ protected internal override IEnumerable<Point> GetPoints(DataPointSegment segmen`
`15`	`17`	`IChartView view = this.model.GetChartArea().view;`
`16`	`18`	`double scaleFactor = Math.Abs(view.ZoomWidth - view.ZoomHeight) / 2;`
`17`	`19`
`18`		`- foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor))`
	`20`	`+ foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor, this.splineTension))`
`19`	`21`	`{`
`20`	`22`	`yield return point;`
`21`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ namespace Telerik.UI.Xaml.Controls.Chart`
`8`	`8`	`{`
`9`	`9`	`internal class PolarSplineRenderer : PolarLineRenderer`
`10`	`10`	`{`
	`11`	`+ internal double splineTension;`
	`12`	`+`
`11`	`13`	`protected internal override IEnumerable<Point> GetPoints(DataPointSegment segment)`
`12`	`14`	`{`
`13`	`15`	`// return the first point since spline segmentation skips it`
`@@ -16,7 +18,7 @@ protected internal override IEnumerable<Point> GetPoints(DataPointSegment segmen`
`16`	`18`	`IChartView view = this.model.GetChartArea().view;`
`17`	`19`	`double scaleFactor = Math.Abs(view.ZoomWidth - view.ZoomHeight) / 2;`
`18`	`20`
`19`		`- foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor, this.isClosed))`
	`21`	`+ foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor, this.splineTension, this.isClosed))`
`20`	`22`	`{`
`21`	`23`	`yield return point;`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ namespace Telerik.UI.Xaml.Controls.Chart`
`8`	`8`	`{`
`9`	`9`	`internal class RadarSplineRenderer : RadarLineRenderer`
`10`	`10`	`{`
	`11`	`+ internal double splineTension;`
	`12`	`+`
`11`	`13`	`protected internal override IEnumerable<Point> GetPoints(DataPointSegment segment)`
`12`	`14`	`{`
`13`	`15`	`// return the first point since spline segmentation skips it`
`@@ -16,7 +18,7 @@ protected internal override IEnumerable<Point> GetPoints(DataPointSegment segmen`
`16`	`18`	`IChartView view = this.model.GetChartArea().view;`
`17`	`19`	`double scaleFactor = Math.Abs(view.ZoomWidth - view.ZoomHeight) / 2;`
`18`	`20`
`19`		`- foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor, this.isClosed))`
	`21`	`+ foreach (Point point in SplineHelper.GetSplinePoints(this.renderPoints, segment, scaleFactor, this.splineTension, this.isClosed))`
`20`	`22`	`{`
`21`	`23`	`yield return point;`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@ namespace Telerik.UI.Xaml.Controls.Chart`
`8`	`8`	`internal static class SplineHelper`
`9`	`9`	`{`
`10`	`10`	`// TODO: Should we expose these as public properties for Spline and SplineArea series?`
`11`		`- private const double DefaultTension = 0.5d;`
	`11`	`+ internal const double DefaultTension = 0.5d;`
`12`	`12`	`private const double DefaultTolerance = 5d;`
`13`	`13`
`14`		`- public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, DataPointSegment dataSegment, double scaleFactor, bool isClosedShape = false)`
	`14`	`+ public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, DataPointSegment dataSegment, double scaleFactor, double tension = DefaultTension, bool isClosedShape = false)`
`15`	`15`	`{`
`16`	`16`	`double tolerance = DefaultTolerance;`
`17`	`17`	`if (scaleFactor > 2)`
`@@ -29,7 +29,7 @@ public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, Da`
`29`	`29`	`Point firstPoint = dataPoints[dataSegment.StartIndex].Center();`
`30`	`30`	`Point secondPoint = dataPoints[dataSegment.EndIndex].Center();`
`31`	`31`
`32`		`- foreach (Point segmentedPoint in Segment(startPoint, firstPoint, secondPoint, endPoint, tolerance))`
	`32`	`+ foreach (Point segmentedPoint in Segment(startPoint, firstPoint, secondPoint, endPoint, tolerance, tension))`
`33`	`33`	`{`
`34`	`34`	`yield return segmentedPoint;`
`35`	`35`	`}`
`@@ -48,7 +48,8 @@ public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, Da`
`48`	`48`	`dataPoints[i].Center(),`
`49`	`49`	`dataPoints[i + 1].Center(),`
`50`	`50`	`dataPoints[i + 2].Center(),`
`51`		`- tolerance);`
	`51`	`+ tolerance,`
	`52`	`+ tension);`
`52`	`53`	`}`
`53`	`54`	`else if (i == dataSegment.EndIndex - 1)`
`54`	`55`	`{`
`@@ -57,7 +58,8 @@ public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, Da`
`57`	`58`	`dataPoints[i].Center(),`
`58`	`59`	`dataPoints[i + 1].Center(),`
`59`	`60`	`endPoint,`
`60`		`- tolerance);`
	`61`	`+ tolerance,`
	`62`	`+ tension);`
`61`	`63`	`}`
`62`	`64`	`else`
`63`	`65`	`{`
`@@ -66,7 +68,8 @@ public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, Da`
`66`	`68`	`dataPoints[i].Center(),`
`67`	`69`	`dataPoints[i + 1].Center(),`
`68`	`70`	`dataPoints[i + 2].Center(),`
`69`		`- tolerance);`
	`71`	`+ tolerance,`
	`72`	`+ tension);`
`70`	`73`	`}`
`71`	`74`
`72`	`75`	`foreach (Point point in segmentedPoints)`
`@@ -76,7 +79,7 @@ public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, Da`
`76`	`79`	`}`
`77`	`80`	`}`
`78`	`81`
`79`		`- public static IEnumerable<Point> GetSplinePointsConnectingAbsoluteFirstLastDataPoints(IList<DataPoint> dataPoints, double scaleFactor)`
	`82`	`+ public static IEnumerable<Point> GetSplinePointsConnectingAbsoluteFirstLastDataPoints(IList<DataPoint> dataPoints, double scaleFactor, double tension = DefaultTension)`
`80`	`83`	`{`
`81`	`84`	`DataPoint firstPoint = dataPoints[0];`
`82`	`85`	`DataPoint lastPoint = dataPoints[dataPoints.Count - 1];`
`@@ -99,18 +102,18 @@ public static IEnumerable<Point> GetSplinePointsConnectingAbsoluteFirstLastDataP`
`99`	`102`	`// return the first point since spline segmentation skips it`
`100`	`103`	`yield return lastPoint.Center();`
`101`	`104`
`102`		`- foreach (Point point in Segment(previousSignificantPointBeforeAbsoluteLast.Center(), lastPoint.Center(), firstPoint.Center(), nextSignificantPointAfterAbsoluteFirst.Center(), tolerance))`
	`105`	`+ foreach (Point point in Segment(previousSignificantPointBeforeAbsoluteLast.Center(), lastPoint.Center(), firstPoint.Center(), nextSignificantPointAfterAbsoluteFirst.Center(), tolerance, tension))`
`103`	`106`	`{`
`104`	`107`	`yield return point;`
`105`	`108`	`}`
`106`	`109`	`}`
`107`	`110`
`108`		`- private static IEnumerable<Point> Segment(Point pt0, Point pt1, Point pt2, Point pt3, double tolerance)`
	`111`	`+ private static IEnumerable<Point> Segment(Point pt0, Point pt1, Point pt2, Point pt3, double tolerance, double tension)`
`109`	`112`	`{`
`110`		`- double sX1 = DefaultTension * (pt2.X - pt0.X);`
`111`		`- double sY1 = DefaultTension * (pt2.Y - pt0.Y);`
`112`		`- double sX2 = DefaultTension * (pt3.X - pt1.X);`
`113`		`- double sY2 = DefaultTension * (pt3.Y - pt1.Y);`
	`113`	`+ double sX1 = tension * (pt2.X - pt0.X);`
	`114`	`+ double sY1 = tension * (pt2.Y - pt0.Y);`
	`115`	`+ double sX2 = tension * (pt3.X - pt1.X);`
	`116`	`+ double sY2 = tension * (pt3.Y - pt1.Y);`
`114`	`117`
`115`	`118`	`double ax = sX1 + sX2 + (2 * pt1.X) - (2 * pt2.X);`
`116`	`119`	`double ay = sY1 + sY2 + (2 * pt1.Y) - (2 * pt2.Y);`