|
@@ -7,9 +7,13 @@
|
|
|
xmlns:hc="https://handyorg.github.io/handycontrol"
|
|
|
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
|
|
|
xmlns:prism="http://prismlibrary.com/"
|
|
|
+ xmlns:cvt="clr-namespace:PLCTool.Controls.Convert"
|
|
|
BorderBrush="#CBCBCB" BorderThickness="1"
|
|
|
Height="600" Width="1200" >
|
|
|
<UserControl.Resources>
|
|
|
+ <cvt:ValueToLedAndValueConverter x:Key="ValueToColorConverter"/>
|
|
|
+ <cvt:ValueToVisibilityConverter x:Key="ValueToElispConverter"/>
|
|
|
+ <cvt:ValueToTxtVisibilityConverter x:Key="ValueToTxtConverter"/>
|
|
|
<Style TargetType="TextBlock" x:Key="textBlockStyle">
|
|
|
<Setter Property="Width" Value="80"/>
|
|
|
<Setter Property="FontSize" Value="12"/>
|
|
@@ -130,10 +134,29 @@
|
|
|
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
|
|
|
<DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
|
|
|
<DataGridTextColumn Header="PLC变量名" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
- <DataGridTextColumn Header="判定值" Binding="{Binding PlcValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
+ <DataGridTemplateColumn Header="判定值" CellStyle="{StaticResource MyDataGridCellStyle}">
|
|
|
+ <DataGridTemplateColumn.CellTemplate>
|
|
|
+ <DataTemplate>
|
|
|
+ <Grid >
|
|
|
+ <Ellipse Fill="{Binding PlcValue,Converter={StaticResource ValueToColorConverter}}" Visibility="{Binding PlcValue,Converter={StaticResource ValueToElispConverter}}" Width="20" Height="20" />
|
|
|
+ <TextBlock Text="{Binding PlcValue}" Visibility="{Binding PlcValue,Converter={StaticResource ValueToTxtConverter}}" HorizontalAlignment="Center"/>
|
|
|
+ </Grid>
|
|
|
+ </DataTemplate>
|
|
|
+ </DataGridTemplateColumn.CellTemplate>
|
|
|
+ </DataGridTemplateColumn>
|
|
|
<DataGridTextColumn Header="描述" Binding="{Binding Remark}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
<DataGridTextColumn Header="测试时间" Width="160" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
- <DataGridTextColumn Header="实际值" Binding="{Binding RealValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
+ <DataGridTemplateColumn Header="实际值" CellStyle="{StaticResource MyDataGridCellStyle}">
|
|
|
+ <DataGridTemplateColumn.CellTemplate>
|
|
|
+ <DataTemplate>
|
|
|
+ <Grid >
|
|
|
+ <Ellipse Fill="{Binding RealValue,Converter={StaticResource ValueToColorConverter}}" Visibility="{Binding RealValue,Converter={StaticResource ValueToElispConverter}}"
|
|
|
+ Width="20" Height="20" />
|
|
|
+ <TextBlock Text="{Binding RealValue}" Visibility="{Binding RealValue,Converter={StaticResource ValueToTxtConverter}}" HorizontalAlignment="Center"/>
|
|
|
+ </Grid>
|
|
|
+ </DataTemplate>
|
|
|
+ </DataGridTemplateColumn.CellTemplate>
|
|
|
+ </DataGridTemplateColumn>
|
|
|
<DataGridTextColumn Header="结果" Binding="{Binding TestResult}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
</DataGrid.Columns>
|
|
|
|
|
@@ -198,10 +221,29 @@ ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticRe
|
|
|
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
|
|
|
<DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
|
|
|
<DataGridTextColumn Header="PLC变量名" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
- <DataGridTextColumn Header="判定值" Binding="{Binding PlcValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
+ <DataGridTemplateColumn Header="判定值" CellStyle="{StaticResource MyDataGridCellStyle}">
|
|
|
+ <DataGridTemplateColumn.CellTemplate>
|
|
|
+ <DataTemplate>
|
|
|
+ <Grid >
|
|
|
+ <Ellipse Fill="{Binding PlcValue,Converter={StaticResource ValueToColorConverter}}" Visibility="{Binding PlcValue,Converter={StaticResource ValueToElispConverter}}" Width="20" Height="20" />
|
|
|
+ <TextBlock Text="{Binding PlcValue}" Visibility="{Binding PlcValue,Converter={StaticResource ValueToTxtConverter}}" HorizontalAlignment="Center"/>
|
|
|
+ </Grid>
|
|
|
+ </DataTemplate>
|
|
|
+ </DataGridTemplateColumn.CellTemplate>
|
|
|
+ </DataGridTemplateColumn>
|
|
|
<DataGridTextColumn Header="描述" Binding="{Binding Remark}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
<DataGridTextColumn Header="测试时间" Width="160" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
- <DataGridTextColumn Header="实际值" Binding="{Binding RealValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
+ <DataGridTemplateColumn Header="实际值" CellStyle="{StaticResource MyDataGridCellStyle}">
|
|
|
+ <DataGridTemplateColumn.CellTemplate>
|
|
|
+ <DataTemplate>
|
|
|
+ <Grid >
|
|
|
+ <Ellipse Fill="{Binding RealValue,Converter={StaticResource ValueToColorConverter}}" Visibility="{Binding RealValue,Converter={StaticResource ValueToElispConverter}}"
|
|
|
+ Width="20" Height="20" />
|
|
|
+ <TextBlock Text="{Binding RealValue}" Visibility="{Binding RealValue,Converter={StaticResource ValueToTxtConverter}}" HorizontalAlignment="Center"/>
|
|
|
+ </Grid>
|
|
|
+ </DataTemplate>
|
|
|
+ </DataGridTemplateColumn.CellTemplate>
|
|
|
+ </DataGridTemplateColumn>
|
|
|
<DataGridTextColumn Header="结果" Binding="{Binding TestResult}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
</DataGrid.Columns>
|
|
|
|
|
@@ -266,10 +308,29 @@ ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticRe
|
|
|
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
|
|
|
<DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
|
|
|
<DataGridTextColumn Header="PLC变量名" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
- <DataGridTextColumn Header="判定值" Binding="{Binding PlcValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
+ <DataGridTemplateColumn Header="判定值" CellStyle="{StaticResource MyDataGridCellStyle}">
|
|
|
+ <DataGridTemplateColumn.CellTemplate>
|
|
|
+ <DataTemplate>
|
|
|
+ <Grid >
|
|
|
+ <Ellipse Fill="{Binding PlcValue,Converter={StaticResource ValueToColorConverter}}" Visibility="{Binding PlcValue,Converter={StaticResource ValueToElispConverter}}" Width="20" Height="20" />
|
|
|
+ <TextBlock Text="{Binding PlcValue}" Visibility="{Binding PlcValue,Converter={StaticResource ValueToTxtConverter}}" HorizontalAlignment="Center"/>
|
|
|
+ </Grid>
|
|
|
+ </DataTemplate>
|
|
|
+ </DataGridTemplateColumn.CellTemplate>
|
|
|
+ </DataGridTemplateColumn>
|
|
|
<DataGridTextColumn Header="描述" Binding="{Binding Remark}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
<DataGridTextColumn Header="测试时间" Width="160" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
- <DataGridTextColumn Header="实际值" Binding="{Binding RealValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
+ <DataGridTemplateColumn Header="实际值" CellStyle="{StaticResource MyDataGridCellStyle}">
|
|
|
+ <DataGridTemplateColumn.CellTemplate>
|
|
|
+ <DataTemplate>
|
|
|
+ <Grid >
|
|
|
+ <Ellipse Fill="{Binding RealValue,Converter={StaticResource ValueToColorConverter}}" Visibility="{Binding RealValue,Converter={StaticResource ValueToElispConverter}}"
|
|
|
+ Width="20" Height="20" />
|
|
|
+ <TextBlock Text="{Binding RealValue}" Visibility="{Binding RealValue,Converter={StaticResource ValueToTxtConverter}}" HorizontalAlignment="Center"/>
|
|
|
+ </Grid>
|
|
|
+ </DataTemplate>
|
|
|
+ </DataGridTemplateColumn.CellTemplate>
|
|
|
+ </DataGridTemplateColumn>
|
|
|
<DataGridTextColumn Header="结果" Binding="{Binding TestResult}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
|
|
|
</DataGrid.Columns>
|
|
|
|