From 3642c5ac070dcd5de60125371d80e42c211c56c4 Mon Sep 17 00:00:00 2001 From: Thomas Hilscher Date: Mon, 22 Jan 2024 21:41:01 +0100 Subject: [PATCH] ChartWindow: Upgrade to Scottplot 5 --- Elwig/Elwig.csproj | 2 +- Elwig/Helpers/Billing/Graph.cs | 7 +- Elwig/Windows/ChartWindow.xaml | 9 +- Elwig/Windows/ChartWindow.xaml.cs | 338 ++++++++++++++++++++---------- 4 files changed, 233 insertions(+), 123 deletions(-) diff --git a/Elwig/Elwig.csproj b/Elwig/Elwig.csproj index 33bc1d8..b637be9 100644 --- a/Elwig/Elwig.csproj +++ b/Elwig/Elwig.csproj @@ -32,7 +32,7 @@ - + diff --git a/Elwig/Helpers/Billing/Graph.cs b/Elwig/Helpers/Billing/Graph.cs index fc2647b..808540c 100644 --- a/Elwig/Helpers/Billing/Graph.cs +++ b/Elwig/Helpers/Billing/Graph.cs @@ -1,4 +1,3 @@ -using ScottPlot; using System; using System.Collections.Generic; using System.Linq; @@ -16,15 +15,15 @@ namespace Elwig.Helpers.Billing { Precision = precision; MinX = minX; MaxX = maxX; - DataX = DataGen.Range(minX, maxX + 1); - DataY = DataGen.Zeros(maxX - minX + 1); + DataX = Enumerable.Range(minX, maxX - minX + 1).Select(n => (double)n).ToArray(); + DataY = new double[DataX.Length]; } public Graph(Dictionary data, int precision, int minX, int maxX) { Precision = precision; MinX = minX; MaxX = maxX; - DataX = DataGen.Range(minX, maxX + 1); + DataX = Enumerable.Range(minX, maxX - minX + 1).Select(n => (double)n).ToArray(); DataY = DataX.Select(i => (double)BillingData.GetCurveValueAt(data, i)).ToArray(); } diff --git a/Elwig/Windows/ChartWindow.xaml b/Elwig/Windows/ChartWindow.xaml index 749bb92..0d25ac1 100644 --- a/Elwig/Windows/ChartWindow.xaml +++ b/Elwig/Windows/ChartWindow.xaml @@ -7,10 +7,11 @@ xmlns:local="clr-namespace:Elwig.Windows" xmlns:ctrl="clr-namespace:Elwig.Controls" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" - xmlns:ScottPlot="clr-namespace:ScottPlot;assembly=ScottPlot.WPF" + xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF" mc:Ignorable="d" Title="Auszahlung - Elwig" Height="700" Width="1500" MinWidth="1000" MinHeight="500" - Loaded="Window_Loaded"> + Loaded="Window_Loaded" + Closing="Window_Closing">