Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

View/HistoryRecordsView.xaml

@@ -3,11 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:DyeingComputer.View"
+             xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel"          
+             xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF"      
              mc:Ignorable="d" 
-             d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
+             d:DataContext="{d:DesignInstance Type=viewmodel:HistoryRecordsViewModel}"
+             d:DesignHeight="630" d:DesignWidth="1280">
     <Grid>
-        <DataGrid HorizontalAlignment="Left" Height="264" Margin="783,195,0,0" VerticalAlignment="Top" Width="394" d:ItemsSource="{d:SampleData ItemCount=5}"/>
-
+        <lvc:CartesianChart x:Name="OscChart" MinWidth="1280" MinHeight="600" EasingFunction="{x:Null}"
+                     Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}"/>
     </Grid>
 </UserControl>

View/HistoryRecordsView.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using DyeingComputer.ViewModel;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -23,6 +24,7 @@ namespace DyeingComputer.View
         public HistoryRecordsView()
         {
             InitializeComponent();
+            DataContext = new HistoryRecordsViewModel();
         }
     }
 }