Skip to content

Commit a47db97

Browse files
Harsha-SF4223Harsha-SF4223
committed
cleared massage warnings
1 parent 9406379 commit a47db97

File tree

5 files changed

+93
-92
lines changed

5 files changed

+93
-92
lines changed

‎maui/src/Charts/Series/CartesianSeries.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,7 +1355,7 @@ internal bool IsDataInVisibleRange(double xValue, double yValue)
13551355
FontSize = tooltipBehavior.FontSize,
13561356
FontAttributes = tooltipBehavior.FontAttributes,
13571357
Background = tooltipBehavior.Background,
1358-
Text = yValue.ToString("#.##"),
1358+
Text = yValue == 0 ? yValue.ToString("0.##") : yValue.ToString("#.##"),
13591359
Item = dataPoint
13601360
};
13611361
return tooltipInfo;
@@ -1499,9 +1499,9 @@ internal List<object> FindNearestChartPoints(float pointX, float pointY)
14991499

15001500
if (xValue <= xEnd && xValue >= xStart && xValue < dataCount && xValue >= 0)
15011501
{
1502-
var dataPoint = new object();
1502+
object? dataPoint;
15031503

1504-
if (isGrouped)
1504+
if (isGrouped)
15051505
{
15061506
dataPoint = GroupedActualData?[(int)xValue];
15071507
}

‎maui/src/Charts/Series/ChartSeries.cs

Lines changed: 44 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Collections.ObjectModel;
1+
using System.Collections.ObjectModel;
42
using System.Collections.Specialized;
5-
using Microsoft.Maui.Controls;
6-
using Microsoft.Maui.Graphics;
73
using Syncfusion.Maui.Toolkit.Graphics.Internals;
84

95
namespace Syncfusion.Maui.Toolkit.Charts
@@ -31,7 +27,7 @@ internal virtual ChartDataLabelSettings? ChartDataLabelSettings
3127
}
3228
}
3329

34-
internal readonly float DefaultSelectionStrokeWidth = 5;//Todo: check necessary this default value
30+
internal readonly float _defaultSelectionStrokeWidth = 5;//Todo: check necessary this default value
3531

3632
internal IChart? Chart
3733
{
@@ -1622,7 +1618,7 @@ internal virtual void SetDashArray(ChartSegment segment)
16221618

16231619
internal virtual Brush? GetFillColor(object item, int index)
16241620
{
1625-
Brush? fillColor = null;
1621+
Brush? fillColor;
16261622

16271623
// Chart selection check.
16281624
fillColor = Chart?.GetSelectionBrush(this);
@@ -1742,37 +1738,33 @@ internal bool CanAnimate()
17421738

17431739
internal virtual void InvalidateSeries()
17441740
{
1745-
var plotArea = Chart?.Area.PlotArea as ChartPlotArea;
1746-
1747-
if (plotArea != null)
1748-
{
1749-
foreach (SeriesView seriesView in plotArea._seriesViews.Children)
1750-
{
1751-
if (seriesView != null && this == seriesView._series)
1752-
{
1753-
seriesView.InvalidateDrawable();
1754-
break;
1755-
}
1756-
}
1757-
}
1758-
}
1741+
if (Chart?.Area.PlotArea is ChartPlotArea plotArea)
1742+
{
1743+
foreach (var view in plotArea._seriesViews.Children)
1744+
{
1745+
if (view is SeriesView seriesView && this == seriesView._series)
1746+
{
1747+
seriesView.InvalidateDrawable();
1748+
break;
1749+
}
1750+
}
1751+
}
1752+
}
17591753

17601754
internal void Invalidate()
17611755
{
1762-
var plotArea = Chart?.Area.PlotArea as ChartPlotArea;
1763-
1764-
if (plotArea != null)
1765-
{
1766-
foreach (SeriesView seriesView in plotArea._seriesViews.Children)
1767-
{
1768-
if (seriesView != null && this == seriesView._series)
1769-
{
1770-
seriesView.Invalidate();
1771-
break;
1772-
}
1773-
}
1774-
}
1775-
}
1756+
if (Chart?.Area.PlotArea is ChartPlotArea plotArea)
1757+
{
1758+
foreach (var view in plotArea._seriesViews.Children)
1759+
{
1760+
if (view is SeriesView seriesView && this == seriesView._series)
1761+
{
1762+
seriesView.Invalidate();
1763+
break;
1764+
}
1765+
}
1766+
}
1767+
}
17761768

17771769
internal void ScheduleUpdateChart()
17781770
{
@@ -1865,12 +1857,12 @@ static void OnXBindingPathChanged(BindableObject bindable, object oldValue, obje
18651857
{
18661858
if (bindable is ChartSeries chartSeries)
18671859
{
1868-
if (newValue != null && newValue is string)
1869-
{
1870-
chartSeries.XComplexPaths = ((string)newValue).Split(['.']);
1871-
}
1860+
if (newValue is string path)
1861+
{
1862+
chartSeries.XComplexPaths = path.Split(['.']);
1863+
}
18721864

1873-
chartSeries.OnBindingPathChanged();
1865+
chartSeries.OnBindingPathChanged();
18741866
}
18751867
}
18761868

@@ -2091,17 +2083,15 @@ void Segments_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs
20912083

20922084
void AddSegment(object chartSegment)
20932085
{
2094-
var segment = chartSegment as ChartSegment;
2095-
2096-
if (segment != null)
2097-
{
2098-
SetFillColor(segment);
2099-
SetStrokeColor(segment);
2100-
SetStrokeWidth(segment);
2101-
SetDashArray(segment);
2102-
segment.Opacity = (float)Opacity;
2103-
}
2104-
}
2086+
if (chartSegment is ChartSegment segment)
2087+
{
2088+
SetFillColor(segment);
2089+
SetStrokeColor(segment);
2090+
SetStrokeWidth(segment);
2091+
SetDashArray(segment);
2092+
segment.Opacity = (float)Opacity;
2093+
}
2094+
}
21052095

21062096
void RemoveSegment(object chartSegment)
21072097
{
@@ -2129,11 +2119,9 @@ void OnAnimationPropertyChanged()
21292119

21302120
void LabelStyle_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
21312121
{
2132-
var labelStyle = sender as ChartDataLabelStyle;
2133-
2134-
if (e.PropertyName != null && labelStyle != null && labelStyle.NeedDataLabelMeasure(e.PropertyName))
2135-
{
2136-
InvalidateMeasureDataLabel();
2122+
if (e.PropertyName != null && sender is ChartDataLabelStyle labelStyle && labelStyle.NeedDataLabelMeasure(e.PropertyName))
2123+
{
2124+
InvalidateMeasureDataLabel();
21372125
}
21382126

21392127
InvalidateDataLabel();

‎maui/src/Charts/Styles/ChartMarkerSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
/// </chart:SfCartesianChart.YAxes>
3232
///
3333
/// <chart:SfCartesianChart.Series>
34-
/// <chart:LineSeries ItemsSource = "{Binding Data}" XBindingPath="XValue" YBindingPath="YValue1" ShowMarker="True"/>
34+
/// <chart:LineSeries ItemsSource = "{Binding Data}" XBindingPath="XValue" YBindingPath="YValue" ShowMarker="True"/>
3535
/// <chart:LineSeries.MarkerSettings>
3636
/// <chart:ChartMarkerSettings Type="Diamond" Fill="white" Stroke="Red" StrokeWidth="1" Width="8" Height="8"/>
3737
/// </chart:LineSeries.MarkerSettings>

‎maui/src/Charts/Utils/ChartUtils.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ internal static bool SegmentContains(LineSegment segment, PointF touchPoint, Cha
265265
{
266266
var pointX = touchPoint.X;
267267
var pointY = touchPoint.Y;
268-
var defaultSelectionStrokeWidth = series.DefaultSelectionStrokeWidth;
268+
var defaultSelectionStrokeWidth = series._defaultSelectionStrokeWidth;
269269
var leftPoint = new PointF(pointX - defaultSelectionStrokeWidth, pointY - defaultSelectionStrokeWidth);
270270
var rightPoint = new PointF(pointX + defaultSelectionStrokeWidth, pointY + defaultSelectionStrokeWidth);
271271
var topPoint = new PointF(pointX + defaultSelectionStrokeWidth, pointY - defaultSelectionStrokeWidth);
@@ -286,7 +286,7 @@ internal static bool SegmentContains(StepLineSegment segment, PointF touchPoint,
286286
{
287287
var pointX = touchPoint.X;
288288
var pointY = touchPoint.Y;
289-
var defaultSelectionStrokeWidth = series.DefaultSelectionStrokeWidth;
289+
var defaultSelectionStrokeWidth = series._defaultSelectionStrokeWidth;
290290
var leftPoint = new PointF(pointX - defaultSelectionStrokeWidth, pointY - defaultSelectionStrokeWidth);
291291
var rightPoint = new PointF(pointX + defaultSelectionStrokeWidth, pointY + defaultSelectionStrokeWidth);
292292
var topPoint = new PointF(pointX + defaultSelectionStrokeWidth, pointY - defaultSelectionStrokeWidth);
@@ -310,7 +310,7 @@ internal static bool SegmentContains(SplineSegment segment, PointF touchPoint, C
310310
{
311311
var pointX = touchPoint.X;
312312
var pointY = touchPoint.Y;
313-
var defaultSelectionStrokeWidth = series.DefaultSelectionStrokeWidth;
313+
var defaultSelectionStrokeWidth = series._defaultSelectionStrokeWidth;
314314
var leftPoint = new PointF(pointX - defaultSelectionStrokeWidth, pointY - defaultSelectionStrokeWidth);
315315
var rightPoint = new PointF(pointX + defaultSelectionStrokeWidth, pointY + defaultSelectionStrokeWidth);
316316
var topPoint = new PointF(pointX + defaultSelectionStrokeWidth, pointY - defaultSelectionStrokeWidth);

‎maui/tests/Syncfusion.Maui.Toolkit.UnitTest/Chart/Features/EmptyPointSettingUnitTest.cs

Lines changed: 42 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,18 @@ public void IsEmpty_SetValue_ReturnsExpectedValue(bool expectedIsEmpty)
1919
[Fact]
2020
public void ReValidateYValues_SetsValuesToNaN_Correctly()
2121
{
22-
var columnSeries = new ColumnSeries();
23-
columnSeries.YValues = new List<double> { 1, 2, 3, 4, 5 };
24-
IList<int>[] emptyPointIndex = new IList<int>[]
25-
{
26-
new List<int> { 1, 3 },
27-
new List<int>()
28-
};
22+
var columnSeries = new ColumnSeries
23+
{
24+
YValues = [1, 2, 3, 4, 5]
25+
};
26+
IList<int>[] emptyPointIndex =
27+
[
28+
[1, 3],
29+
[]
30+
];
2931
columnSeries.EmptyPointIndexes = emptyPointIndex;
3032
columnSeries.ResetEmptyPointIndexes();
31-
Assert.Equal(new List<double> { 1.0, double.NaN, 3.0, double.NaN, 5.0 }, columnSeries.YValues);
33+
Assert.Equal([1.0, double.NaN, 3.0, double.NaN, 5.0], columnSeries.YValues);
3234
}
3335

3436
[Fact]
@@ -45,17 +47,17 @@ public void EmptyPointIndexes_CanBeSetAndRetrieved()
4547
var series = new ColumnSeries();
4648
var indexes = new List<int>[]
4749
{
48-
new List<int> { 2, 4 },
49-
new List<int> {3 },
50-
new List<int>()
50+
[2, 4],
51+
[3],
52+
[]
5153
};
5254

5355
series.EmptyPointIndexes = indexes;
5456
var retrievedIndexes = series.EmptyPointIndexes;
5557
Assert.NotNull(retrievedIndexes);
5658
Assert.Equal(3, retrievedIndexes.Length);
57-
Assert.Equal(new List<int> { 2, 4 }, retrievedIndexes[0]);
58-
Assert.Equal(new List<int> { 3 }, retrievedIndexes[1]);
59+
Assert.Equal([2, 4], retrievedIndexes[0]);
60+
Assert.Equal([3], retrievedIndexes[1]);
5961
Assert.Empty(retrievedIndexes[2]);
6062
}
6163

@@ -83,8 +85,10 @@ public void EmptyPointMode_DefaultValue_ShouldBeNone()
8385
[InlineData(EmptyPointMode.None)]
8486
public void EmptyPointMode_SetAndRetrieveValue(EmptyPointMode emptyPointMode)
8587
{
86-
var series = new ColumnSeries();
87-
series.EmptyPointMode = emptyPointMode;
88+
var series = new ColumnSeries
89+
{
90+
EmptyPointMode = emptyPointMode
91+
};
8892
var mode = series.EmptyPointMode;
8993
Assert.Equal(emptyPointMode, mode);
9094
}
@@ -112,52 +116,61 @@ public void EmptyPointSettings_CanBeSetAndRetrieved()
112116
[Fact]
113117
public void ValidateYPoints_With10Points_EmptyPointMode_Average_ShouldReplaceNaNWithAverage()
114118
{
115-
var series = new ColumnSeries() { YValues = new List<double> { 1.0, double.NaN, 2.0, 3.0, double.NaN, 5.5, 6.0, 7.0, double.NaN, 10.0 } };
116-
series.EmptyPointMode = EmptyPointMode.Average;
119+
var series = new ColumnSeries
120+
{
121+
YValues = [1.0, double.NaN, 2.0, 3.0, double.NaN, 5.5, 6.0, 7.0, double.NaN, 10.0],
122+
EmptyPointMode = EmptyPointMode.Average
123+
};
117124
series.ValidateYValues();
118-
Assert.Equal(new List<double> { 1.0, 1.5, 2.0, 3.0, 4.25, 5.5, 6.0, 7.0, 8.5, 10.0 }, series.YValues);
125+
Assert.Equal([1.0, 1.5, 2.0, 3.0, 4.25, 5.5, 6.0, 7.0, 8.5, 10.0], series.YValues);
119126
}
120127

121128
[Fact]
122129
public void ValidateYPoints_With10Points_EmptyPointMode_Zero_ShouldReplaceNaNWithZero()
123130
{
124131
var series = new ColumnSeries
125132
{
126-
YValues = new List<double> { 1.0, double.NaN, 2.0, 3.0, double.NaN, 5.5, 6.0, 7.0, double.NaN, 10.0 },
133+
YValues = [1.0, double.NaN, 2.0, 3.0, double.NaN, 5.5, 6.0, 7.0, double.NaN, 10.0],
127134
EmptyPointMode = EmptyPointMode.Zero
128135
};
129136
series.ValidateYValues();
130-
Assert.Equal(new List<double> { 1.0, 0, 2.0, 3.0, 0, 5.5, 6.0, 7.0, 0, 10.0 }, series.YValues);
137+
Assert.Equal([1.0, 0, 2.0, 3.0, 0, 5.5, 6.0, 7.0, 0, 10.0], series.YValues);
131138
}
132139

133140
[Fact]
134141
public void ValidateDataPoints_With10Points_EmptyPointMode_None_ShouldRemainUnchanged()
135142
{
136-
var series = new ColumnSeries();
137-
series.EmptyPointMode = EmptyPointMode.None;
143+
var series = new ColumnSeries
144+
{
145+
EmptyPointMode = EmptyPointMode.None
146+
};
138147
var yValues = new List<double> { 1.0, double.NaN, 2.0, 3.0, double.NaN, 5.5, 6.0, 7.0, double.NaN, 10.0 };
139148
series.ValidateDataPoints(yValues);
140-
Assert.Equal(new List<double> { 1.0, double.NaN, 2.0, 3.0, double.NaN, 5.5, 6.0, 7.0, double.NaN, 10.0 }, yValues);
149+
Assert.Equal([1.0, double.NaN, 2.0, 3.0, double.NaN, 5.5, 6.0, 7.0, double.NaN, 10.0], yValues);
141150
}
142151

143152
[Fact]
144153
public void ValidateDataPoints_With10Points_EmptyPointMode_Zero_ShouldReplaceNaNWithZero()
145154
{
146-
var series = new ColumnSeries();
147-
series.EmptyPointMode = EmptyPointMode.Zero;
155+
var series = new ColumnSeries
156+
{
157+
EmptyPointMode = EmptyPointMode.Zero
158+
};
148159
var yValues = new List<double> { 1.0, double.NaN, 2.0, 3.0, double.NaN, 5.5, 6.0, 7.0, double.NaN, 10.0 };
149160
series.ValidateDataPoints(yValues);
150-
Assert.Equal(new List<double> { 1.0, 0.0, 2.0, 3.0, 0.0, 5.5, 6.0, 7.0, 0.0, 10.0 }, yValues);
161+
Assert.Equal([1.0, 0.0, 2.0, 3.0, 0.0, 5.5, 6.0, 7.0, 0.0, 10.0], yValues);
151162
}
152163

153164
[Fact]
154165
public void ValidateDataPoints_With10Points_EmptyPointMode_Average_ShouldReplaceNaNWithAverage()
155166
{
156-
var series = new ColumnSeries();
157-
series.EmptyPointMode = EmptyPointMode.Average;
167+
var series = new ColumnSeries
168+
{
169+
EmptyPointMode = EmptyPointMode.Average
170+
};
158171
var yValues = new List<double> { 1.0, double.NaN, 2.0, 3.0, double.NaN, 5.5, 6.0, 7.0, double.NaN, 10.0 };
159172
series.ValidateDataPoints(yValues);
160-
Assert.Equal(new List<double> { 1.0, 1.5, 2.0, 3.0, 4.25, 5.5, 6.0, 7.0, 8.5, 10.0 }, yValues);
173+
Assert.Equal([1.0, 1.5, 2.0, 3.0, 4.25, 5.5, 6.0, 7.0, 8.5, 10.0], yValues);
161174
}
162175

163176
[Fact]

0 commit comments

Comments
 (0)