diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 25fc16d..b381d5c 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -2013,6 +2013,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 SelectDate 的本地化字符串。
+ ///
+ public static string SelectDate {
+ get {
+ return ResourceManager.GetString("SelectDate", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Sensor 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index 599ae59..c12a16f 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -906,4 +906,7 @@
End Date
+
+ Select Date
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 6ea7c44..c262ceb 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -906,4 +906,7 @@
EndDate
+
+ SelectDate
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index c866da8..4881d36 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -906,4 +906,7 @@
结束日期
+
+ 选择日期
+
\ No newline at end of file
diff --git a/View/CurveView.xaml b/View/CurveView.xaml
index d30554c..8bd6e15 100644
--- a/View/CurveView.xaml
+++ b/View/CurveView.xaml
@@ -12,13 +12,13 @@
d:DataContext="{d:DesignInstance Type=viewmodel:CurveDiagramViewModel}"
d:DesignHeight="900" d:DesignWidth="1800">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/View/CurveView.xaml.cs b/View/CurveView.xaml.cs
index 35f44fb..94efcdf 100644
--- a/View/CurveView.xaml.cs
+++ b/View/CurveView.xaml.cs
@@ -9,10 +9,12 @@ using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
+using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
+using System.Xaml;
namespace SunlightCentralizedControlManagement_SCCM_.View
{
@@ -21,11 +23,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
///
public partial class CurveView : UserControl
{
+ private readonly UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "SCCM.ini");
+
public CurveView()
{
InitializeComponent();
DataContext = new CurveDiagramViewModel();
+ Sdatepicker.Language = XmlLanguage.GetLanguage(Configini.IniReadvalue("SYS", "Language"));
+ Edatepicker.Language = XmlLanguage.GetLanguage(Configini.IniReadvalue("SYS", "Language"));
Griddata.ItemsSource = MainWindowViewModel.Machines.DefaultView;
}
@@ -43,5 +49,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
{
}
+
+ private void DatePicker_Today(object sender, MouseButtonEventArgs e)
+ {
+
+ }
}
}
diff --git a/View/MonitorView.xaml b/View/MonitorView.xaml
index bb06fc9..8570b2c 100644
--- a/View/MonitorView.xaml
+++ b/View/MonitorView.xaml
@@ -112,64 +112,81 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ViewModel/CurveDiagramViewModel.cs b/ViewModel/CurveDiagramViewModel.cs
index 5cf6f4e..b29e39a 100644
--- a/ViewModel/CurveDiagramViewModel.cs
+++ b/ViewModel/CurveDiagramViewModel.cs
@@ -53,9 +53,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
private static readonly SKColor s_yellow = new SKColor(198, 167, 0);
public ICartesianAxis[] YAxes { get; set; } ={
new Axis //y在此轴上缩放
- {
+ {
MinLimit =0,
- MaxLimit =150,
+ MaxLimit =160,
Name = Properties.Resources.Temperature +" ( °C )",
NameTextSize = 24,
NamePaint = new SolidColorPaint(s_blue),
@@ -101,9 +101,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
DrawTicksPath = true,
CrosshairSnapEnabled = true,
Position = LiveChartsCore.Measure.AxisPosition.End
- }, //PH轴
-
- //new AnimatableAxisBounds
+ }, //PH轴
};
private readonly Random _r = new Random();