diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj
index a4431e5..9bea985 100644
--- a/DyeingComputer.csproj
+++ b/DyeingComputer.csproj
@@ -267,6 +267,9 @@
8.0.0
+
+ 5.0.37
+
4.5.1
diff --git a/View/WorkOrderView.xaml b/View/WorkOrderView.xaml
index aedfada..2379b33 100644
--- a/View/WorkOrderView.xaml
+++ b/View/WorkOrderView.xaml
@@ -3,6 +3,7 @@
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:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
xmlns:local="clr-namespace:DyeingComputer.View"
xmlns:lang="clr-namespace:DyeingComputer.Properties"
xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel"
@@ -14,20 +15,19 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -58,7 +58,7 @@
-
+
@@ -83,12 +83,10 @@
-
+
-
-
diff --git a/View/WorkOrderView.xaml.cs b/View/WorkOrderView.xaml.cs
index b808568..1fca933 100644
--- a/View/WorkOrderView.xaml.cs
+++ b/View/WorkOrderView.xaml.cs
@@ -1,5 +1,6 @@
using DyeingComputer.UserClass;
using DyeingComputer.ViewModel;
+using ScottPlot;
using System;
using System.Collections.Generic;
using System.Data;
@@ -33,6 +34,7 @@ namespace DyeingComputer.View
InitializeComponent();
Workorder_sql();
+ WpfPlot();
}
private SQLiteHelper SQLiteHelpers = null; //定义数据库
@@ -61,6 +63,24 @@ namespace DyeingComputer.View
//System.GC.Collect();
}
+ public void WpfPlot()
+ {
+ DateTime[] xs = Generate.ConsecutiveHours(100);
+ double[] ys = Generate.RandomWalk(100);
+
+ //double q = ploigrid.ActualHeight;
+
+ //WpfPlot_Grid.y. SetAxisLimitsY(yMin: 0, yMax: 150);
+ // WpfPlot_Grid.Height = 500;
+
+ // WpfPlot_Grid.Plot.Grid.XAxisStyle.IsVisible = true;
+ // WpfPlot_Grid.Plot.Grid.YAxisStyle.IsVisible = false;
+
+
+ // WpfPlot_Grid.Plot.YLabel("Temperature (C)");
+
+ }
+
private void WorkOrderView_lock_Click(object sender, RoutedEventArgs e)//锁定按钮
{
Dictionary lock_v = new Dictionary();//缓存函数
@@ -83,7 +103,7 @@ namespace DyeingComputer.View
private void WorkOrderView_new_Click(object sender, RoutedEventArgs e)//新建按钮
{
-
+ WpfPlot();
}
private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮