Skip to content

Commit f696f6c

Browse files
Fixed the issue of Axis range not updated when publish with AOT Trim support enabled.
1 parent da41cba commit f696f6c

File tree

10 files changed

+19
-19
lines changed

10 files changed

+19
-19
lines changed

maui/src/Charts/Area/Partial/CartesianChartArea.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ internal void UpdateSBS()
203203

204204
if (cartesianSeries.ActualXAxis == null)
205205
{
206-
cartesianSeries.SbsInfo = DoubleRange.Empty;
206+
cartesianSeries.SbsInfo = new DoubleRange(double.NaN, double.NaN);
207207
}
208208

209209
double sideBySideMinWidth = SideBySideMinWidth == double.MaxValue ? 1 : SideBySideMinWidth;

maui/src/Charts/Axis/ChartAxis.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public abstract partial class ChartAxis : Element, IThemeElement
1515
double _previousLabelCoefficientValue = -1;
1616
CartesianChartArea? _cartesianArea;
1717
internal bool _isOverriddenOnCreateLabelsMethod;
18-
DoubleRange _actualRange = DoubleRange.Empty;
18+
DoubleRange _actualRange = new DoubleRange(double.NaN, double.NaN);
1919
internal static readonly int[] IntervalDivs = [10, 5, 2, 1];
2020

2121
#region labelFormats
@@ -357,7 +357,7 @@ protected virtual DoubleRange CalculateVisibleRange(DoubleRange actualRange, Siz
357357
/// </summary>
358358
protected virtual DoubleRange CalculateActualRange()
359359
{
360-
var range = DoubleRange.Empty;
360+
var range = new DoubleRange(double.NaN, double.NaN);
361361
var visibleSeries = GetVisibleSeries();
362362

363363
if (visibleSeries == null)

maui/src/Charts/Axis/Layouts/CartesianAxisLayout.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,8 @@ void UpdateSeriesRange(ReadOnlyObservableCollection<ChartSeries> visibleSeries)
463463
isStackingSegmentCreated = true;
464464
}
465465

466-
series.XRange = DoubleRange.Empty;
467-
series.YRange = DoubleRange.Empty;
466+
series.XRange = new DoubleRange(double.NaN, double.NaN);
467+
series.YRange = new DoubleRange(double.NaN, double.NaN);
468468

469469
if (series.SbsInfo.IsEmpty)
470470
{

maui/src/Charts/Axis/Layouts/PolarAxisLayout.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ void UpdateSeriesRange(ReadOnlyObservableCollection<ChartSeries> visibleSeries)
131131
{
132132
if (!series.SegmentsCreated)
133133
{
134-
series.XRange = DoubleRange.Empty;
135-
series.YRange = DoubleRange.Empty;
134+
series.XRange = new DoubleRange(double.NaN, double.NaN);
135+
series.YRange = new DoubleRange(double.NaN, double.NaN);
136136
}
137137

138138
_chartArea.InternalCreateSegments(series);

maui/src/Charts/Events/ActualRangeChangedEventArgs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ internal DoubleRange GetVisibleRange()
5656
{
5757
if (VisibleMinimum == null && VisibleMaximum == null)
5858
{
59-
return DoubleRange.Empty;
59+
return new DoubleRange(double.NaN, double.NaN);
6060
}
6161

6262
double start, end;

maui/src/Charts/Segment/BubbleSegment.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ internal override void SetData(double[] values)
124124

125125
if (Series != null)
126126
{
127-
Series.XRange += !double.IsNaN(_x) ? DoubleRange.Union(_x) : DoubleRange.Empty;
128-
Series.YRange += !double.IsNaN(_y) ? DoubleRange.Union(_y) : DoubleRange.Empty;
127+
Series.XRange += !double.IsNaN(_x) ? DoubleRange.Union(_x) : new DoubleRange(double.NaN, double.NaN);
128+
Series.YRange += !double.IsNaN(_y) ? DoubleRange.Union(_y) : new DoubleRange(double.NaN, double.NaN);
129129
}
130130
}
131131

maui/src/Charts/Segment/ScatterSegment.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ internal override void SetData(double[] values)
121121

122122
if (Series != null)
123123
{
124-
Series.XRange += !double.IsNaN(_x) ? DoubleRange.Union(_x) : DoubleRange.Empty;
125-
Series.YRange += !double.IsNaN(_y) ? DoubleRange.Union(_y) : DoubleRange.Empty;
124+
Series.XRange += !double.IsNaN(_x) ? DoubleRange.Union(_x) : new DoubleRange(double.NaN, double.NaN);
125+
Series.YRange += !double.IsNaN(_y) ? DoubleRange.Union(_y) : new DoubleRange(double.NaN, double.NaN);
126126
}
127127
}
128128

maui/src/Charts/Series/CartesianSeries.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ internal bool IsGrouped
4444
}
4545
}
4646

47-
internal DoubleRange SbsInfo { get; set; } = DoubleRange.Empty;
47+
internal DoubleRange SbsInfo { get; set; } = new DoubleRange(double.NaN, double.NaN);
4848

4949
internal int SideBySideIndex { get; set; }
5050

@@ -968,8 +968,8 @@ internal override void UpdateRange()
968968

969969
if (PointsCount <= 0)
970970
{
971-
XRange = DoubleRange.Empty;
972-
YRange = DoubleRange.Empty;
971+
XRange = new DoubleRange(double.NaN, double.NaN);
972+
YRange = new DoubleRange(double.NaN, double.NaN);
973973
VisibleXRange = XRange;
974974
VisibleYRange = YRange;
975975
}

maui/src/Charts/Series/ChartSeries.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,12 +1188,12 @@ public bool ListenPropertyChange
11881188
/// <summary>
11891189
/// Gets the XRange values.
11901190
/// </summary>
1191-
public DoubleRange XRange { get; internal set; } = DoubleRange.Empty;
1191+
public DoubleRange XRange { get; internal set; } = new DoubleRange(double.NaN, double.NaN);
11921192

11931193
/// <summary>
11941194
/// Gets the YRange values.
11951195
/// </summary>
1196-
public DoubleRange YRange { get; internal set; } = DoubleRange.Empty;
1196+
public DoubleRange YRange { get; internal set; } = new DoubleRange(double.NaN, double.NaN);
11971197

11981198
#endregion
11991199

maui/src/Charts/Utils/DoubleRange.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ public static DoubleRange Offset(DoubleRange range, double value)
334334
/// <returns>A boolean indicating whether the exclusion was successful.</returns>
335335
public static bool Exclude(DoubleRange range, DoubleRange excluder, out DoubleRange leftRange, out DoubleRange rightRange)
336336
{
337-
leftRange = DoubleRange.Empty;
338-
rightRange = DoubleRange.Empty;
337+
leftRange = new DoubleRange(double.NaN, double.NaN);
338+
rightRange = new DoubleRange(double.NaN, double.NaN);
339339

340340
if (!(range.IsEmpty || excluder.IsEmpty))
341341
{

0 commit comments

Comments
 (0)