diff --git a/View/CurveDiagramView.xaml b/View/CurveDiagramView.xaml index 58a3ab9..1982546 100644 --- a/View/CurveDiagramView.xaml +++ b/View/CurveDiagramView.xaml @@ -9,7 +9,7 @@ d:DataContext="{d:DesignInstance Type=viewmodel:CurveDiagramViewModel}" d:DesignHeight="630" d:DesignWidth="1280"> - diff --git a/ViewModel/CurveDiagramViewModel.cs b/ViewModel/CurveDiagramViewModel.cs index ebfa388..737fcc1 100644 --- a/ViewModel/CurveDiagramViewModel.cs +++ b/ViewModel/CurveDiagramViewModel.cs @@ -146,7 +146,7 @@ namespace DyeingComputer.ViewModel public CurveDiagramViewModel() { - // if (MainWindowViewModel.WorkNumder.ToString() != "----------") + if (MainWindowViewModel.WorkNumder.ToString() != "----------") { SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径 SQLiteHelpers.Open(); //打开数据库 @@ -154,34 +154,34 @@ namespace DyeingComputer.ViewModel CDB = SQLiteHelpers.ExecuteDataSet("select * from Chart order by Time", null).Tables[0]; SQLiteHelpers.Close(); CDB_Count = CDB.Rows.Count; - } - var items = new List(); - for (var i = 0; i < CDB_Count; i++) - { - // _current += _r.Next(-9, 10); - // CDB.Rows[i].Field("varchar") - items.Add(new DateTimePoint(Convert.ToDateTime(CDB.Rows[i].Field("Time")), CDB.Rows[i].Field("MTT"))); - } - _values = new ObservableCollection(items); - Series = new ISeries[] - { + var items = new List(); + for (var i = 0; i < CDB_Count; i++) + { + // _current += _r.Next(-9, 10); + // CDB.Rows[i].Field("varchar") + items.Add(new DateTimePoint(Convert.ToDateTime(CDB.Rows[i].Field("Time")), CDB.Rows[i].Field("MTT"))); + } + _values = new ObservableCollection(items); + + Series = new ISeries[] + { new LineSeries { Name = Properties.Resources.Temperature +"1", Values = _values, Stroke = new SolidColorPaint(s_blue, 2), - GeometrySize = 2, + GeometrySize = 0, GeometryStroke = new SolidColorPaint(s_blue, 2), Fill = null, LineSmoothness = 0, ScalesYAt = 0, }, - }; - + }; + } }