diff --git a/BPASmartClient.Academy/View/DeviceChartView.xaml.cs b/BPASmartClient.Academy/View/DeviceChartView.xaml.cs index 552f5356..f72f254f 100644 --- a/BPASmartClient.Academy/View/DeviceChartView.xaml.cs +++ b/BPASmartClient.Academy/View/DeviceChartView.xaml.cs @@ -46,9 +46,9 @@ namespace BPASmartClient.Academy.View plotModel.Series.Clear(); plotModel = new PlotModel() { Title = "温度曲线" }; chartGrid.Visibility = Visibility.Visible; - OxyPlot.Series.LineSeries line = new OxyPlot.Series.LineSeries() { LineStyle = LineStyle.Solid, Title = "反应釜温度", MarkerFill = OxyColor.FromRgb(110, 79, 79), MarkerSize = 2 }; - OxyPlot.Series.LineSeries line_1 = new OxyPlot.Series.LineSeries() { LineStyle = LineStyle.Solid, Title = "反应釜排气温度", MarkerFill = OxyColor.FromRgb(110, 79, 79), MarkerSize = 2 }; - OxyPlot.Series.LineSeries line_2 = new OxyPlot.Series.LineSeries() { LineStyle = LineStyle.Solid, Title = "配料罐温度", MarkerFill = OxyColor.FromRgb(110, 79, 79), MarkerSize = 2 }; + OxyPlot.Series.LineSeries line = new OxyPlot.Series.LineSeries() { LineStyle = LineStyle.Solid, Title = "反应釜温度", MarkerFill = OxyColor.FromRgb(110, 79, 79), MarkerSize = 2, LineLegendPosition = OxyPlot.Series.LineLegendPosition.End }; + OxyPlot.Series.LineSeries line_1 = new OxyPlot.Series.LineSeries() { LineStyle = LineStyle.Solid, Title = "反应釜排气温度", MarkerFill = OxyColor.FromRgb(110, 79, 79), MarkerSize = 2, LineLegendPosition = OxyPlot.Series.LineLegendPosition.End }; + OxyPlot.Series.LineSeries line_2 = new OxyPlot.Series.LineSeries() { LineStyle = LineStyle.Solid, Title = "配料罐温度", MarkerFill = OxyColor.FromRgb(110, 79, 79), MarkerSize = 2, LineLegendPosition = OxyPlot.Series.LineLegendPosition.End }; List twValues = new List(); List tvValues = new List(); List tmValues = new List(); @@ -77,8 +77,8 @@ namespace BPASmartClient.Academy.View plotModel.Series.Clear(); plotModel = new PlotModel() { Title = "转速曲线" }; chartGrid.Visibility = Visibility.Visible; - OxyPlot.Series.LineSeries line_3 = new OxyPlot.Series.LineSeries() { LineStyle = LineStyle.Solid, Title = "反应釜转速", MarkerFill = OxyColor.FromRgb(110, 79, 79), MarkerSize = 2 }; - OxyPlot.Series.LineSeries line_4 = new OxyPlot.Series.LineSeries() { LineStyle = LineStyle.Solid, Title = "配料罐转速", MarkerFill = OxyColor.FromRgb(110, 79, 79), MarkerSize = 2 }; + OxyPlot.Series.LineSeries line_3 = new OxyPlot.Series.LineSeries() { LineStyle = LineStyle.Solid, Title = "反应釜转速", MarkerFill = OxyColor.FromRgb(110, 79, 79), MarkerSize = 2, LineLegendPosition = OxyPlot.Series.LineLegendPosition.End }; + OxyPlot.Series.LineSeries line_4 = new OxyPlot.Series.LineSeries() { LineStyle = LineStyle.Solid, Title = "配料罐转速", MarkerFill = OxyColor.FromRgb(110, 79, 79), MarkerSize = 2, LineLegendPosition = OxyPlot.Series.LineLegendPosition.End }; List m101 = new List(); List m102 = new List(); Sqlite.GetInstance.SelectId(Simens_PLC.GetInstance.id).ForEach(t => @@ -141,10 +141,10 @@ namespace BPASmartClient.Academy.View // break; case "重量曲线": plotModel.Series.Clear(); - plotModel = new PlotModel() { Title = "反应釜重量曲线" }; + plotModel = new PlotModel() { Title = "反应釜重量曲线"}; chartGrid.Visibility = Visibility.Visible; List ww = new List(); - OxyPlot.Series.LineSeries line_5 = new OxyPlot.Series.LineSeries() { LineStyle = LineStyle.Solid, Title = "配料罐转速", MarkerFill = OxyColor.FromRgb(110, 79, 79), MarkerSize = 2 }; + OxyPlot.Series.LineSeries line_5 = new OxyPlot.Series.LineSeries() { Title = "反应釜重量",Color = OxyColor.FromRgb(0, 0, 0),LineStyle = LineStyle.Solid, LineLegendPosition = OxyPlot.Series.LineLegendPosition.End }; Sqlite.GetInstance.SelectId(Simens_PLC.GetInstance.id).ForEach(t => { ww.Add(new DataPoint(DateTimeAxis.ToDouble(t.Date), t.WeightWok));