sc
/
SunlightCentralizedControlManagement
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复任务栏绑定错误

master
sc 12 months ago
parent
d580a70503 dedb678c05
commit
6699b64edf
8 changed files with 151 additions and 112 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      Properties/Resources.Designer.cs
  2. 3
      Properties/Resources.en-US.resx
  3. 3
      Properties/Resources.resx
  4. 3
      Properties/Resources.zh-CN.resx
  5. 63
      View/CurveView.xaml
  6. 11
      View/CurveView.xaml.cs
  7. 59
      View/MonitorView.xaml
  8. 4
      ViewModel/CurveDiagramViewModel.cs

9
Properties/Resources.Designer.cs
View File

@ -2013,6 +2013,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
/// <summary>
/// 查找类似 SelectDate 的本地化字符串。
/// </summary>
public static string SelectDate {
get {
return ResourceManager.GetString("SelectDate", resourceCulture);
}
}
/// <summary>
/// 查找类似 Sensor 的本地化字符串。
/// </summary>

3
Properties/Resources.en-US.resx
View File

@ -906,4 +906,7 @@
<data name="Enddate" xml:space="preserve">
<value>End Date</value>
</data>
<data name="SelectDate" xml:space="preserve">
<value>Select Date</value>
</data>
</root>

3
Properties/Resources.resx
View File

@ -906,4 +906,7 @@
<data name="Enddate" xml:space="preserve">
<value>EndDate</value>
</data>
<data name="SelectDate" xml:space="preserve">
<value>SelectDate</value>
</data>
</root>

3
Properties/Resources.zh-CN.resx
View File

@ -906,4 +906,7 @@
<data name="Enddate" xml:space="preserve">
<value>结束日期</value>
</data>
<data name="SelectDate" xml:space="preserve">
<value>选择日期</value>
</data>
</root>

63
View/CurveView.xaml
View File

@ -54,51 +54,46 @@
</DataGrid>
<lvc:CartesianChart x:Name="OscChart" MinWidth="1280" MinHeight="600" EasingFunction="{x:Null}"
Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}" Margin="300,0,0,50"/>
<StackPanel x:Name="s1cr" VerticalAlignment="Bottom" Height="50" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0">
<materialDesign:PackIcon Kind="DateRange" Width="25" Height="40" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<DatePicker Width="200" Foreground="#FF1368BD" FontSize="20" Height="30" FontWeight="Bold" Padding="1,1,0,1"
>
<DatePicker.Resources>
<Style TargetType="{x:Type DatePickerTextBox}">
<Setter Property="IsReadOnly" Value="True"/>
Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}" Margin="300,0,0,60">
<lvc:CartesianChart.Style>
<Style TargetType="{x:Type lvc:CartesianChart}">
<Setter Property="ZoomMode" Value="PanX"/>
<Setter Property="ZoomMode" Value="ZoomX"/>
</Style>
</DatePicker.Resources>
</DatePicker>
<DatePicker Width="200" Foreground="#FF1368BD" FontSize="20"
VerticalAlignment="Center" Height="30" FontWeight="Bold" />
</lvc:CartesianChart.Style>
</lvc:CartesianChart>
<StackPanel x:Name="s1cr" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0">
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Height="60" MouseLeftButtonUp="DatePicker_Today" VerticalAlignment="Center">
<StackPanel Orientation="Horizontal" >
<materialDesign:PackIcon Kind="DateRange" Width="25" Height="40" Margin="10" VerticalAlignment="Center"/>
<TextBlock Text="{x:Static lang:Resources.SelectDate}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
<DatePicker x:Name="Sdatepicker" Width="150" FontSize="20" Height="30" FontWeight="Bold" Padding="1,1,0,1"
Focusable="False" Text="{x:Static lang:Resources.Startdate}"/>
<DatePicker x:Name="Edatepicker" Width="150" FontSize="20" Height="30" FontWeight="Bold" Padding="1,1,0,1"
Focusable="False" Text="{x:Static lang:Resources.Enddate}"/>
</StackPanel>
</ListViewItem>
</ListView>
<ListViewItem Height="50" x:Name="Resume">
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" x:Name="Resume">
<StackPanel Orientation="Horizontal" >
<materialDesign:PackIcon Kind="DateRange" Width="25" Height="40" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<materialDesign:PackIcon Kind="DateRange" Width="25" Height="40" Margin="10" VerticalAlignment="Center"/>
<TextBlock Text="{x:Static lang:Resources.YES}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="Paused_MouseLeftButtonUp" IsEnabled="False" x:Name="Paused">
</ListView>
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" MouseLeftButtonUp="Paused_MouseLeftButtonUp" IsEnabled="False" x:Name="Paused">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Pause" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<materialDesign:PackIcon Kind="Pause" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
<TextBlock Text="{x:Static lang:Resources.Paused}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
</ListView>
</StackPanel>
</Grid>

11
View/CurveView.xaml.cs
View File

@ -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
/// </summary>
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)
{
}
}
}

59
View/MonitorView.xaml
View File

@ -112,64 +112,81 @@
</DataGrid.Columns>
</DataGrid>
<TextBlock x:Name="log" HorizontalAlignment="Left" Margin="0,300,0,50" TextWrapping="Wrap" Width="700" FontSize="25" Background="White" Text="{Binding Sys_log}"/>
<StackPanel x:Name="mt" VerticalAlignment="Bottom" Height="50" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0" Width="700" HorizontalAlignment="Left">
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_DyeingMachine">
<StackPanel x:Name="mt" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0" Width="700" HorizontalAlignment="Left">
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_DyeingMachine">
<StackPanel Orientation="Horizontal" >
<materialDesign:PackIcon Kind="CoffeeMachine" Width="25" Height="40" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<materialDesign:PackIcon Kind="CoffeeMachine" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.DyeingMachine}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Conveyor">
</ListView>
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Conveyor">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Pipe" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<materialDesign:PackIcon Kind="Pipe" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Conveyor}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Receipt">
</ListView>
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Receipt">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="ReceiptText" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<materialDesign:PackIcon Kind="ReceiptText" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Receipt}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
</ListView>
</StackPanel>
<StackPanel x:Name="scr" VerticalAlignment="Bottom" Height="50" Background="#FF00204E" Orientation="Horizontal" Margin="700,0,0,0">
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Resume" IsEnabled="False" x:Name="Resume">
<StackPanel x:Name="scr" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="700,0,0,0">
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Resume" IsEnabled="False" x:Name="Resume">
<StackPanel Orientation="Horizontal" >
<materialDesign:PackIcon Kind="Resume" Width="25" Height="40" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<materialDesign:PackIcon Kind="Resume" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Resume}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Paused" IsEnabled="False" x:Name="Paused">
</ListView>
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Paused" IsEnabled="False" x:Name="Paused">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Pause" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<materialDesign:PackIcon Kind="Pause" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Paused}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Stop" IsEnabled="False" x:Name="Stop">
</ListView>
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Stop" IsEnabled="False" x:Name="Stop">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Stop" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<materialDesign:PackIcon Kind="Stop" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Stop}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_edit" IsEnabled="False" x:Name="edit">
</ListView>
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_edit" IsEnabled="False" x:Name="edit">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Edit" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<materialDesign:PackIcon Kind="Edit" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.edit}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Insert" IsEnabled="False" x:Name="Insert">
</ListView>
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Insert" IsEnabled="False" x:Name="Insert">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="InsertInvitation" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<materialDesign:PackIcon Kind="InsertInvitation" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Insert}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Delete" IsEnabled="False" x:Name="Delete">
</ListView>
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Delete" IsEnabled="False" x:Name="Delete">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Delete" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<materialDesign:PackIcon Kind="Delete" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Delete}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
</ListView>
</StackPanel>
</Grid>
</UserControl>

4
ViewModel/CurveDiagramViewModel.cs
View File

@ -55,7 +55,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
new Axis //y在此轴上缩放
{
MinLimit =0,
MaxLimit =150,
MaxLimit =160,
Name = Properties.Resources.Temperature +" ( °C )",
NameTextSize = 24,
NamePaint = new SolidColorPaint(s_blue),
@ -102,8 +102,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
CrosshairSnapEnabled = true,
Position = LiveChartsCore.Measure.AxisPosition.End
}, //PH轴
//new AnimatableAxisBounds
};
private readonly Random _r = new Random();

Write Preview
Loading…
Cancel
Save