sc 1 year ago
parent
commit
bec6644e80
  1. 3
      DyeingComputer.csproj
  2. 20
      View/WorkOrderView.xaml
  3. 22
      View/WorkOrderView.xaml.cs

3
DyeingComputer.csproj

@ -267,6 +267,9 @@
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces"> <PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
<Version>8.0.0</Version> <Version>8.0.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="ScottPlot.WPF">
<Version>5.0.37</Version>
</PackageReference>
<PackageReference Include="System.Buffers"> <PackageReference Include="System.Buffers">
<Version>4.5.1</Version> <Version>4.5.1</Version>
</PackageReference> </PackageReference>

20
View/WorkOrderView.xaml

@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
xmlns:local="clr-namespace:DyeingComputer.View" xmlns:local="clr-namespace:DyeingComputer.View"
xmlns:lang="clr-namespace:DyeingComputer.Properties" xmlns:lang="clr-namespace:DyeingComputer.Properties"
xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel" xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel"
@ -15,19 +16,18 @@
<ConvertMoels:GramsSQLConvert x:Key="GramsSQLConvert"/> <ConvertMoels:GramsSQLConvert x:Key="GramsSQLConvert"/>
</UserControl.Resources> </UserControl.Resources>
<Grid VerticalAlignment="Top"> <Grid>
<Grid VerticalAlignment="Top"> <Rectangle Margin="0,0,0,0" Fill="#FFCCCCCC" VerticalAlignment="Top" Height="40"/>
<Rectangle Margin="0,0,0,0" Fill="#FFCCCCCC" VerticalAlignment="Top" Height="40"/> <Button Content="{x:Static lang:Resources._lock}" x:Name="WorkOrderView_lock" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="0,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_lock_Click"/>
<Button Content="{x:Static lang:Resources._lock}" x:Name="WorkOrderView_lock" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="0,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_lock_Click"/> <Button Content="{x:Static lang:Resources.New}" x:Name="WorkOrderView_new" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="200,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_new_Click"/>
<Button Content="{x:Static lang:Resources.New}" x:Name="WorkOrderView_new" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="200,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_new_Click"/> <Button Content="{x:Static lang:Resources.Delete}" x:Name="WorkOrderView_del" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="400,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_del_Click"/>
<Button Content="{x:Static lang:Resources.Delete}" x:Name="WorkOrderView_del" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="400,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_del_Click"/> <Button Content="{x:Static lang:Resources.Redye}" x:Name="WorkOrderView_redy" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="600,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_redy_Click"/>
<Button Content="{x:Static lang:Resources.Redye}" x:Name="WorkOrderView_redy" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="600,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_redy_Click"/>
<DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True" ItemsSource="{Binding sql}" SelectionChanged="Grid_SelectionChanged" <DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True" ItemsSource="{Binding sql}" SelectionChanged="Grid_SelectionChanged"
Margin="0,40,0,0" Height="400" d:ItemsSource="{d:SampleData ItemCount=20}" AutoGenerateColumns="False" MinColumnWidth="30" Margin="0,40,0,0" Height="400" d:ItemsSource="{d:SampleData ItemCount=20}" AutoGenerateColumns="False" MinColumnWidth="30"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"
CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
CanUserAddRows="False" CanUserDeleteRows="False" HeadersVisibility ="Column" CanUserAddRows="False" CanUserDeleteRows="False" HeadersVisibility ="Column"
Background="White" SelectionMode="Single" FontSize="15" VerticalAlignment="Top" > Background="White" SelectionMode="Single" FontSize="15" VerticalAlignment="Top" >
<DataGrid.RowStyle > <DataGrid.RowStyle >
@ -83,11 +83,9 @@
<DataGridTextColumn Header="{x:Static lang:Resources.StartTime}" Width="250" Binding="{Binding StartTime}" IsReadOnly="True"/> <DataGridTextColumn Header="{x:Static lang:Resources.StartTime}" Width="250" Binding="{Binding StartTime}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Time}" Width="100" Binding="{Binding Time}" IsReadOnly="True"/> <DataGridTextColumn Header="{x:Static lang:Resources.Time}" Width="100" Binding="{Binding Time}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.EndTime}" Width="250" Binding="{Binding EndTime}" IsReadOnly="True"/> <DataGridTextColumn Header="{x:Static lang:Resources.EndTime}" Width="250" Binding="{Binding EndTime}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Width="SizeToCells" Binding="{Binding Remark}" IsReadOnly="True"/> <DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Width="*" Binding="{Binding Remark}" IsReadOnly="True"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</Grid>
</Grid> </Grid>

22
View/WorkOrderView.xaml.cs

@ -1,5 +1,6 @@
using DyeingComputer.UserClass; using DyeingComputer.UserClass;
using DyeingComputer.ViewModel; using DyeingComputer.ViewModel;
using ScottPlot;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
@ -33,6 +34,7 @@ namespace DyeingComputer.View
InitializeComponent(); InitializeComponent();
Workorder_sql(); Workorder_sql();
WpfPlot();
} }
private SQLiteHelper SQLiteHelpers = null; //定义数据库 private SQLiteHelper SQLiteHelpers = null; //定义数据库
@ -61,6 +63,24 @@ namespace DyeingComputer.View
//System.GC.Collect(); //System.GC.Collect();
} }
public void WpfPlot()
{
DateTime[] xs = Generate.ConsecutiveHours(100);
double[] ys = Generate.RandomWalk(100);
//double q = ploigrid.ActualHeight;
//WpfPlot_Grid.y. SetAxisLimitsY(yMin: 0, yMax: 150);
// WpfPlot_Grid.Height = 500;
// WpfPlot_Grid.Plot.Grid.XAxisStyle.IsVisible = true;
// WpfPlot_Grid.Plot.Grid.YAxisStyle.IsVisible = false;
// WpfPlot_Grid.Plot.YLabel("Temperature (C)");
}
private void WorkOrderView_lock_Click(object sender, RoutedEventArgs e)//锁定按钮 private void WorkOrderView_lock_Click(object sender, RoutedEventArgs e)//锁定按钮
{ {
Dictionary<string, object> lock_v = new Dictionary<string, object>();//缓存函数 Dictionary<string, object> lock_v = new Dictionary<string, object>();//缓存函数
@ -83,7 +103,7 @@ namespace DyeingComputer.View
private void WorkOrderView_new_Click(object sender, RoutedEventArgs e)//新建按钮 private void WorkOrderView_new_Click(object sender, RoutedEventArgs e)//新建按钮
{ {
WpfPlot();
} }
private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮 private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮

Loading…
Cancel
Save