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

View/CurveDiagramView.xaml

@@ -9,7 +9,7 @@
              d:DataContext="{d:DesignInstance Type=viewmodel:CurveDiagramViewModel}"
              d:DesignHeight="630" d:DesignWidth="1280">
     <Grid>
-        <lvc:CartesianChart x:Name="OscChart" MinWidth="1280" MinHeight="600"  
+        <lvc:CartesianChart x:Name="OscChart" MinWidth="1280" MinHeight="600" EasingFunction="{x:Null}"
                             Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}"/>
     </Grid>
 </UserControl>

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,7 +154,7 @@ 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<DateTimePoint>();
@@ -173,7 +173,7 @@ namespace DyeingComputer.ViewModel
                 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,
@@ -181,7 +181,7 @@ namespace DyeingComputer.ViewModel
             },
             };
 
-
+            }
 
 
         }