Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion maui/src/Charts/Area/Partial/CartesianChartArea.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ internal void CalculateSbsPosition()
}

SideBySideSeriesPosition = [];
var cartesianSeriesCollection = visibleSeries.OfType<CartesianSeries>();
var cartesianSeriesCollection = visibleSeries.OfType<CartesianSeries>().ToList();

foreach (var cartesianSeries in cartesianSeriesCollection)
{
Expand Down
3 changes: 2 additions & 1 deletion maui/src/Charts/Behaviors/ChartTrackballBehavior.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1707,11 +1707,12 @@ float FindLeastXValue(float pointX, float pointY)

}

var leastXPointsSet = new HashSet<TrackballPointInfo>(leastXPointsInfo);
var copyList = PointInfos.ToList();

foreach (var pointInfo in copyList)
{
if (!leastXPointsInfo.Contains(pointInfo))
if (!leastXPointsSet.Contains(pointInfo))
{
RemoveTrackballInfo(pointInfo);
}
Expand Down
2 changes: 1 addition & 1 deletion maui/src/Charts/Behaviors/DataPointSelectionBehavior.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,4 @@ internal override void SelectionIndexesPropertyChanged(List<int> newValue)

#endregion
}
}
}
2 changes: 1 addition & 1 deletion maui/src/Charts/Behaviors/SeriesSelectionBehavior.cs
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,4 @@ internal override void SelectionIndexesPropertyChanged(List<int> newValue)

#endregion
}
}
}
3 changes: 2 additions & 1 deletion maui/src/Charts/Series/AreaSeries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,9 @@ public override int GetDataPointIndex(float pointX, float pointY)
}

List<PointF> segPoints = [];
foreach (AreaSegment segment in _segments.Cast<AreaSegment>())
foreach (ChartSegment item in _segments)
{
AreaSegment segment = (AreaSegment)item;
var points = segment.FillPoints;
if (points != null)
{
Expand Down
14 changes: 12 additions & 2 deletions maui/src/Charts/Series/BoxAndWhiskerSeries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1109,8 +1109,18 @@ internal override void GenerateSegments(SeriesView seriesView)

if (outliers.Count > 0)
{
actualMinimum = Math.Min(outliers.Min(), actualMinimum);
actualMaximum = Math.Max(outliers.Max(), actualMaximum);
for (int j = 0; j < outliers.Count; j++)
{
if (outliers[j] < actualMinimum)
{
actualMinimum = outliers[j];
}

if (outliers[j] > actualMaximum)
{
actualMaximum = outliers[j];
}
}
}

if (xValues != null)
Expand Down
3 changes: 2 additions & 1 deletion maui/src/Charts/Series/CircularSeries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -534,8 +534,9 @@ protected internal override void DrawDataLabel(ICanvas canvas, Brush? fillColor,

internal void UpdateDataLabelPositions(ICanvas canvas)
{
foreach (PieSegment segment in _segments.Cast<PieSegment>())
foreach (ChartSegment item in _segments)
{
PieSegment segment = (PieSegment)item;
if (IsSegmentWithinBounds(segment) && segment.IsVisible)
{
DrawConnectorLine(canvas, segment);
Expand Down
3 changes: 2 additions & 1 deletion maui/src/Charts/Series/FinancialSeriesBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -700,8 +700,9 @@ internal override void DrawDataLabels(ICanvas canvas)

ChartDataLabelStyle labelStyle = dataLabelSettings.LabelStyle;

foreach (HiLoOpenCloseSegment dataLabel in _segments.Cast<HiLoOpenCloseSegment>())
foreach (ChartSegment item in _segments)
{
HiLoOpenCloseSegment dataLabel = (HiLoOpenCloseSegment)item;
if (!dataLabel.InVisibleRange || dataLabel.IsZero)
{
continue;
Expand Down
3 changes: 2 additions & 1 deletion maui/src/Charts/Series/RangeAreaSeries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -558,8 +558,9 @@ internal override void DrawDataLabels(ICanvas canvas)

ChartDataLabelStyle labelStyle = DataLabelSettings.LabelStyle;

foreach (RangeAreaSegment dataLabel in _segments.Cast<RangeAreaSegment>())
foreach (ChartSegment item in _segments)
{
RangeAreaSegment dataLabel = (RangeAreaSegment)item;
if (dataLabel == null || dataLabel.XValues == null || dataLabel.HighValues == null || dataLabel.LowValues == null)
{
return;
Expand Down
5 changes: 3 additions & 2 deletions maui/src/Charts/Series/ScatterSeries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -492,9 +492,10 @@ void CreateSegment(SeriesView seriesView, double x, double y, int index)

void UpdateScatterType(ShapeType type)
{
foreach (ScatterSegment item in _segments.Cast<ScatterSegment>())
foreach (ChartSegment item in _segments)
{
item.Type = type;
ScatterSegment scatterItem = (ScatterSegment)item;
scatterItem.Type = type;
}
}

Expand Down
3 changes: 2 additions & 1 deletion maui/src/Charts/Series/StepAreaSeries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,9 @@ public override int GetDataPointIndex(float pointX, float pointY)

List<PointF> segPoints = [];

foreach (StepAreaSegment segment in _segments.Cast<StepAreaSegment>())
foreach (ChartSegment item in _segments)
{
StepAreaSegment segment = (StepAreaSegment)item;
var points = segment.FillPoints;
if (points != null)
{
Expand Down