Upgrade to LiveCharts 2.0.0-rc4.5.

carina-studio · Oct 26, 2024 · df21121 · df21121
1 parent d7cfe91
commit df21121
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/ULogViewer/Controls/SessionView.axaml.LogChart.cs b/ULogViewer/Controls/SessionView.axaml.LogChart.cs
@@ -39,7 +39,6 @@
 using System.Linq;
 using System.Text;
 using CarinaStudio.AppSuite.Media;
-using System.Collections;
 using System.Globalization;
 
 namespace CarinaStudio.ULogViewer.Controls;
@@ -119,7 +118,7 @@ public LvcSize Measure(Chart<SkiaSharpDrawingContext> chart)
                 new Padding(it.Left, it.Top, it.Right, it.Bottom));
             foreach (var series in chart.Series.Where(it => it.IsVisible && it.IsVisibleAtLegend))
             {
-                var sketch = series.GetMiniaturesSketch().AsDrawnControl(LogChartLegendZIndex + 1);
+                var sketch = series.GetMiniature(null, LogChartLegendZIndex + 1);
                 containerChildViews.Add(new StackPanel<RoundedRectangleGeometry, SkiaSharpDrawingContext>().Also(it =>
                 {
                     it.Children.Add(sketch);
@@ -201,7 +200,7 @@ public void Show(IEnumerable<ChartPoint> foundPoints, Chart<SkiaSharpDrawingCont
             foreach (var point in foundPoints)
             {
                 var series = (ICartesianSeries<SkiaSharpDrawingContext>)point.Context.Series;
-                var sketch = series.GetMiniaturesSketch().AsDrawnControl(LogChartToolTipZIndex + 1);
+                var sketch = series.GetMiniature(null, LogChartToolTipZIndex + 1);
                 if (isFirstPoint)
                 {
                     isFirstPoint = false;
@@ -455,7 +454,7 @@ ISeries CreateLogChartSeries(LogChartViewModel viewModel, DisplayableLogChartSer
                     Rx = 0,
                     Ry = 0,
                     Tag = series,
-                    Values = series.Values as ICollection,
+                    Values = series.Values,
                     XToolTipLabelFormatter = chartType == LogChartType.ValueStatisticBars ? null : this.GetLogChartXToolTipLabel,
                     YToolTipLabelFormatter = p => this.GetLogChartYToolTipLabel(series, p, false),
                 };
@@ -488,7 +487,7 @@ ISeries CreateLogChartSeries(LogChartViewModel viewModel, DisplayableLogChartSer
                         IsAntialias = true,
                     },
                     Tag = series,
-                    Values = series.Values as ICollection,
+                    Values = series.Values,
                     XToolTipLabelFormatter = this.GetLogChartXToolTipLabel,
                     YToolTipLabelFormatter = p => this.GetLogChartYToolTipLabel(series, p, false),
                 };
@@ -504,7 +503,7 @@ ISeries CreateLogChartSeries(LogChartViewModel viewModel, DisplayableLogChartSer
                     Rx = 0,
                     Ry = 0,
                     Tag = series,
-                    Values = series.Values as ICollection,
+                    Values = series.Values,
                     XToolTipLabelFormatter = this.GetLogChartXToolTipLabel,
                     YToolTipLabelFormatter = p => this.GetLogChartYToolTipLabel(series, p, false),
                 };
@@ -561,7 +560,7 @@ or LogChartType.ValueCurvesWithDataPoints
                         },
                     },
                     Tag = series,
-                    Values = series.Values as ICollection,
+                    Values = series.Values,
                     XToolTipLabelFormatter = this.GetLogChartXToolTipLabel,
                     YToolTipLabelFormatter = p => this.GetLogChartYToolTipLabel(series, p, false),
                 };

diff --git a/ULogViewer/ULogViewer.csproj b/ULogViewer/ULogViewer.csproj
@@ -98,7 +98,7 @@
 		<PackageReference Include="CarinaStudio.AppSuite.SyntaxHighlighting" Version="$(AppSuiteVersion)" />
 		<PackageReference Include="Dotnet.Bundle" Version="0.9.13" />
 		<PackageReference Include="evtx" Version="1.2.0" />
-		<PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc3.3" />
+		<PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc4.5" />
 		<PackageReference Include="MySqlConnector" Version="2.3.7" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="SkiaSharp" Version="2.88.8" />