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

View/CurveDiagramView.xaml

@@ -5,12 +5,13 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"        
              xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF"      
              xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel" 
+             mc:Ignorable="d" Loaded="UserControl_Loaded"           
              d:DataContext="{d:DesignInstance Type=viewmodel:CurveDiagramViewModel}"
-             mc:Ignorable="d" Loaded="UserControl_Loaded"
-             d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
+             d:DesignHeight="630" d:DesignWidth="1280">
     <Grid>
-        <lvc:PieChart x:Name="OscChart" Series="{Binding Series}">
-            
-        </lvc:PieChart>
+        <lvc:CartesianChart x:Name="OscChart" MinWidth="1280" MinHeight="600"  
+                            Series="{Binding Series}"
+                            YAxes="{Binding YAxes}"
+                            XAxes="{Binding XAxes}"/>
     </Grid>
 </UserControl>

View/CurveDiagramView.xaml.cs

@@ -46,23 +46,14 @@ namespace DyeingComputer.View
             {
                 SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径
                 SQLiteHelpers.Open();  //打开数据库
-                CDB = SQLiteHelpers.ExecuteDataSet("select * from Chart where DYELOT = '" + MainWindowViewModel.WorkNumder + "'", null).Tables[0];
+                CDB = SQLiteHelpers.ExecuteDataSet("select * from Chart where DYELOT = '" + MainWindowViewModel.WorkNumder + "'order by Time", null).Tables[0];
                 SQLiteHelpers.Close();
 
 
-
-
-
-
-
             }
 
+           
 
-            OscChart.Series = new ISeries[] {  new LineSeries<double>
-            {
-                Values = new double[] { 2, 1, 3, 5, 3, 4, 6 },
-                Fill = null
-            } };
 
         }