Coerce value and introduce constants.

dilyantraykov · dilyantraykov · commit 6cf85fbbbb97 · 2023-02-01T18:28:57.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,4 +1,5 @@
-﻿using Telerik.UI.Automation.Peers;
+﻿using Telerik.Core;
+using Telerik.UI.Automation.Peers;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -51,7 +52,7 @@ private static void OnSplineTensionChanged(DependencyObject d, DependencyPropert
         {
             SplineAreaSeries series = (SplineAreaSeries)d;
             SplineAreaRenderer renderer = (SplineAreaRenderer)series.renderer;
-            renderer.splineTension = (double)e.NewValue;
+            renderer.splineTension = RadMath.CoerceValue((double)e.NewValue, SplineHelper.MinTension, SplineHelper.MaxTension);
             series.InvalidateCore();
         }
     }
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,4 +1,5 @@
-﻿using Telerik.UI.Automation.Peers;
+﻿using Telerik.Core;
+using Telerik.UI.Automation.Peers;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -51,7 +52,7 @@ private static void OnSplineTensionChanged(DependencyObject d, DependencyPropert
         {
             SplineSeries series = (SplineSeries)d;
             SplineRenderer renderer = (SplineRenderer)series.renderer;
-            renderer.splineTension = (double)e.NewValue;
+            renderer.splineTension = RadMath.CoerceValue((double)e.NewValue, SplineHelper.MinTension, SplineHelper.MaxTension);
             series.InvalidateCore();
         }
     }
diff --git a/Controls/Chart/Chart.UWP/Visualization/CartesianChart/Series/Scatter/ScatterSplineAreaSeries.cs b/Controls/Chart/Chart.UWP/Visualization/CartesianChart/Series/Scatter/ScatterSplineAreaSeries.cs
@@ -1,4 +1,5 @@
 ﻿using Telerik.Charting;
+using Telerik.Core;
 using Telerik.UI.Automation.Peers;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Automation.Peers;
@@ -52,7 +53,7 @@ private static void OnSplineTensionChanged(DependencyObject d, DependencyPropert
         {
             ScatterSplineAreaSeries series = (ScatterSplineAreaSeries)d;
             SplineAreaRenderer renderer = (SplineAreaRenderer)series.renderer;
-            renderer.splineTension = (double)e.NewValue;
+            renderer.splineTension = RadMath.CoerceValue((double)e.NewValue, SplineHelper.MinTension, SplineHelper.MaxTension);
             series.InvalidateCore();
         }
     }
diff --git a/Controls/Chart/Chart.UWP/Visualization/CartesianChart/Series/Scatter/ScatterSplineSeries.cs b/Controls/Chart/Chart.UWP/Visualization/CartesianChart/Series/Scatter/ScatterSplineSeries.cs
@@ -1,4 +1,5 @@
 ﻿using Telerik.Charting;
+using Telerik.Core;
 using Telerik.UI.Automation.Peers;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Automation.Peers;
@@ -52,7 +53,7 @@ private static void OnSplineTensionChanged(DependencyObject d, DependencyPropert
         {
             ScatterSplineSeries series = (ScatterSplineSeries)d;
             SplineRenderer renderer = (SplineRenderer)series.renderer;
-            renderer.splineTension = (double)e.NewValue;
+            renderer.splineTension = RadMath.CoerceValue((double)e.NewValue, SplineHelper.MinTension, SplineHelper.MaxTension);
             series.InvalidateCore();
         }
     }
diff --git a/Controls/Chart/Chart.UWP/Visualization/Common/SplineHelper.cs b/Controls/Chart/Chart.UWP/Visualization/Common/SplineHelper.cs
@@ -9,6 +9,8 @@ internal static class SplineHelper
     {
         // TODO: Should we expose these as public properties for Spline and SplineArea series?
         internal const double DefaultTension = 0.5d;
+        internal const double MinTension = 0d;
+        internal const double MaxTension = 1d;
         private const double DefaultTolerance = 5d;
 
         public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, DataPointSegment dataSegment, double scaleFactor, double tension = DefaultTension, bool isClosedShape = false)
diff --git a/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/PolarSplineAreaSeries.cs b/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/PolarSplineAreaSeries.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Telerik.Core;
 using Windows.UI.Xaml;
 
 namespace Telerik.UI.Xaml.Controls.Chart
@@ -48,7 +49,7 @@ private static void OnSplineTensionChanged(DependencyObject d, DependencyPropert
         {
             PolarSplineAreaSeries series = (PolarSplineAreaSeries)d;
             PolarSplineRenderer renderer = (PolarSplineRenderer)series.renderer;
-            renderer.splineTension = (double)e.NewValue;
+            renderer.splineTension = RadMath.CoerceValue((double)e.NewValue, SplineHelper.MinTension, SplineHelper.MaxTension);
             series.InvalidateCore();
         }
     }
diff --git a/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/PolarSplineSeries.cs b/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/PolarSplineSeries.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Telerik.Core;
 using Windows.UI.Xaml;
 
 namespace Telerik.UI.Xaml.Controls.Chart
@@ -48,7 +49,7 @@ private static void OnSplineTensionChanged(DependencyObject d, DependencyPropert
         {
             PolarSplineSeries series = (PolarSplineSeries)d;
             PolarSplineRenderer renderer = (PolarSplineRenderer)series.renderer;
-            renderer.splineTension = (double)e.NewValue;
+            renderer.splineTension = RadMath.CoerceValue((double)e.NewValue, SplineHelper.MinTension, SplineHelper.MaxTension);
             series.InvalidateCore();
         }
     }
diff --git a/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/RadarSplineAreaSeries.cs b/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/RadarSplineAreaSeries.cs
@@ -1,4 +1,5 @@
-﻿using Telerik.UI.Automation.Peers;
+﻿using Telerik.Core;
+using Telerik.UI.Automation.Peers;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -51,7 +52,7 @@ private static void OnSplineTensionChanged(DependencyObject d, DependencyPropert
         {
             RadarSplineAreaSeries series = (RadarSplineAreaSeries)d;
             RadarSplineRenderer renderer = (RadarSplineRenderer)series.renderer;
-            renderer.splineTension = (double)e.NewValue;
+            renderer.splineTension = RadMath.CoerceValue((double)e.NewValue, SplineHelper.MinTension, SplineHelper.MaxTension);
             series.InvalidateCore();
         }
     }
diff --git a/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/RadarSplineSeries.cs b/Controls/Chart/Chart.UWP/Visualization/PolarChart/Series/RadarSplineSeries.cs
@@ -1,4 +1,5 @@
-﻿using Telerik.UI.Automation.Peers;
+﻿using Telerik.Core;
+using Telerik.UI.Automation.Peers;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -51,7 +52,7 @@ private static void OnSplineTensionChanged(DependencyObject d, DependencyPropert
         {
             RadarSplineSeries series = (RadarSplineSeries)d;
             RadarSplineRenderer renderer = (RadarSplineRenderer)series.renderer;
-            renderer.splineTension = (double)e.NewValue;
+            renderer.splineTension = RadMath.CoerceValue((double)e.NewValue, SplineHelper.MinTension, SplineHelper.MaxTension);
             series.InvalidateCore();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using Telerik.UI.Automation.Peers;`
	`1`	`+using Telerik.Core;`
	`2`	`+using Telerik.UI.Automation.Peers;`
`2`	`3`	`using Windows.UI.Xaml;`
`3`	`4`	`using Windows.UI.Xaml.Automation.Peers;`
`4`	`5`
`@@ -51,7 +52,7 @@ private static void OnSplineTensionChanged(DependencyObject d, DependencyPropert`
`51`	`52`	`{`
`52`	`53`	`SplineAreaSeries series = (SplineAreaSeries)d;`
`53`	`54`	`SplineAreaRenderer renderer = (SplineAreaRenderer)series.renderer;`
`54`		`- renderer.splineTension = (double)e.NewValue;`
	`55`	`+ renderer.splineTension = RadMath.CoerceValue((double)e.NewValue, SplineHelper.MinTension, SplineHelper.MaxTension);`
`55`	`56`	`series.InvalidateCore();`
`56`	`57`	`}`
`57`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Telerik.Charting;`
	`2`	`+using Telerik.Core;`
`2`	`3`	`using Telerik.UI.Automation.Peers;`
`3`	`4`	`using Windows.UI.Xaml;`
`4`	`5`	`using Windows.UI.Xaml.Automation.Peers;`
`@@ -52,7 +53,7 @@ private static void OnSplineTensionChanged(DependencyObject d, DependencyPropert`
`52`	`53`	`{`
`53`	`54`	`ScatterSplineAreaSeries series = (ScatterSplineAreaSeries)d;`
`54`	`55`	`SplineAreaRenderer renderer = (SplineAreaRenderer)series.renderer;`
`55`		`- renderer.splineTension = (double)e.NewValue;`
	`56`	`+ renderer.splineTension = RadMath.CoerceValue((double)e.NewValue, SplineHelper.MinTension, SplineHelper.MaxTension);`
`56`	`57`	`series.InvalidateCore();`
`57`	`58`	`}`
`58`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ internal static class SplineHelper`
`9`	`9`	`{`
`10`	`10`	`// TODO: Should we expose these as public properties for Spline and SplineArea series?`
`11`	`11`	`internal const double DefaultTension = 0.5d;`
	`12`	`+ internal const double MinTension = 0d;`
	`13`	`+ internal const double MaxTension = 1d;`
`12`	`14`	`private const double DefaultTolerance = 5d;`
`13`	`15`
`14`	`16`	`public static IEnumerable<Point> GetSplinePoints(IList<DataPoint> dataPoints, DataPointSegment dataSegment, double scaleFactor, double tension = DefaultTension, bool isClosedShape = false)`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Text;`
`5`	`5`	`using System.Threading.Tasks;`
	`6`	`+using Telerik.Core;`
`6`	`7`	`using Windows.UI.Xaml;`
`7`	`8`
`8`	`9`	`namespace Telerik.UI.Xaml.Controls.Chart`
`@@ -48,7 +49,7 @@ private static void OnSplineTensionChanged(DependencyObject d, DependencyPropert`
`48`	`49`	`{`
`49`	`50`	`PolarSplineAreaSeries series = (PolarSplineAreaSeries)d;`
`50`	`51`	`PolarSplineRenderer renderer = (PolarSplineRenderer)series.renderer;`
`51`		`- renderer.splineTension = (double)e.NewValue;`
	`52`	`+ renderer.splineTension = RadMath.CoerceValue((double)e.NewValue, SplineHelper.MinTension, SplineHelper.MaxTension);`
`52`	`53`	`series.InvalidateCore();`
`53`	`54`	`}`
`54`	`55`	`}`