1添加真值表XML配置
2添加实时气体流量显示界面,封装单独用户控件 3添加后台数据绑定,添加后台数据 4修改S02数据不显示问题
This commit is contained in:
@@ -0,0 +1,64 @@
|
||||
<UserControl
|
||||
x:Class="Aitex.Core.UI.Control.GasFlow"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:control="clr-namespace:Aitex.Core.UI.Control;assembly=MECF.Framework.UI.Core"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:Aitex.Core.UI.Control"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
d:Background="#91b0cd"
|
||||
d:DesignHeight="26"
|
||||
d:DesignWidth="287"
|
||||
mc:Ignorable="d">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Grid Visibility="{Binding FlowData.RunVisibility, RelativeSource={RelativeSource AncestorType=UserControl}}">
|
||||
<local:FlowPipeV2
|
||||
Width="62"
|
||||
Height="9"
|
||||
FlowOrientation="Horizontal"
|
||||
GasType="Slow"
|
||||
IsFlowing="True"
|
||||
RenderTransformOrigin="0.5,0.5">
|
||||
<local:FlowPipeV2.RenderTransform>
|
||||
<TransformGroup>
|
||||
<RotateTransform Angle="180" />
|
||||
</TransformGroup>
|
||||
</local:FlowPipeV2.RenderTransform>
|
||||
</local:FlowPipeV2>
|
||||
<Border
|
||||
Width="62"
|
||||
Height="9"
|
||||
Background="Gold"
|
||||
Opacity="0.8" />
|
||||
|
||||
</Grid>
|
||||
<Border
|
||||
Width="75"
|
||||
Height="26"
|
||||
Background="LightGray"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Text="{Binding FlowData.RunFlow, StringFormat={}{0:f1}, RelativeSource={RelativeSource AncestorType=UserControl}}" />
|
||||
</Border>
|
||||
<Border
|
||||
Width="75"
|
||||
Height="26"
|
||||
Background="Gold"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1"
|
||||
Opacity="0.8">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Text="{Binding FlowData.GasName, RelativeSource={RelativeSource AncestorType=UserControl}}" />
|
||||
</Border>
|
||||
<Border
|
||||
Width="75"
|
||||
Height="26"
|
||||
Background="LightGray"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Text="{Binding FlowData.VentFlow, StringFormat={}{0:f1}, RelativeSource={RelativeSource AncestorType=UserControl}}" />
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</UserControl>
|
||||
@@ -0,0 +1,28 @@
|
||||
using MECF.Framework.Common.Aitex.Core.Common.DeviceData;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
|
||||
namespace Aitex.Core.UI.Control
|
||||
{
|
||||
/// <summary>
|
||||
/// GasFlow.xaml 的交互逻辑
|
||||
/// </summary>
|
||||
public partial class GasFlow : UserControl
|
||||
{
|
||||
public GasFlow()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
public GasFlowData FlowData
|
||||
{
|
||||
get => (GasFlowData)GetValue(FlowDataProperty);
|
||||
set => SetValue(FlowDataProperty, value);
|
||||
}
|
||||
public static readonly DependencyProperty FlowDataProperty =
|
||||
DependencyProperty.Register(nameof(FlowData), typeof(GasFlowData), typeof(GasFlow), new PropertyMetadata(null));
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
<UserControl
|
||||
x:Class="Aitex.Core.UI.Control.GasFlow2"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:Aitex.Core.UI.Control"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
d:Background="#91b0cd"
|
||||
d:DesignHeight="26"
|
||||
d:DesignWidth="287"
|
||||
mc:Ignorable="d">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Border
|
||||
Width="75"
|
||||
Height="26"
|
||||
Background="LightGray"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Text="{Binding FlowData.VentFlow, StringFormat={}{0:f1}, RelativeSource={RelativeSource AncestorType=UserControl}}" />
|
||||
</Border>
|
||||
<Border
|
||||
Width="75"
|
||||
Height="26"
|
||||
Background="Cyan"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1"
|
||||
Opacity="0.8">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Text="{Binding FlowData.GasName, RelativeSource={RelativeSource AncestorType=UserControl}}" />
|
||||
</Border>
|
||||
<Border
|
||||
Width="75"
|
||||
Height="26"
|
||||
Background="LightGray"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Text="{Binding FlowData.RunFlow, StringFormat={}{0:f1}, RelativeSource={RelativeSource AncestorType=UserControl}}" />
|
||||
</Border>
|
||||
|
||||
<Grid Visibility="{Binding FlowData.RunVisibility, RelativeSource={RelativeSource AncestorType=UserControl}}">
|
||||
<local:FlowPipeV2
|
||||
Width="62"
|
||||
Height="9"
|
||||
FlowOrientation="Horizontal"
|
||||
GasType="Slow"
|
||||
IsFlowing="True"
|
||||
RenderTransformOrigin="0.5,0.5" />
|
||||
<Border
|
||||
Width="62"
|
||||
Height="9"
|
||||
Background="Cyan"
|
||||
Opacity="0.8" />
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
</UserControl>
|
||||
@@ -0,0 +1,28 @@
|
||||
using MECF.Framework.Common.Aitex.Core.Common.DeviceData;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
|
||||
namespace Aitex.Core.UI.Control
|
||||
{
|
||||
/// <summary>
|
||||
/// GasFlow2.xaml 的交互逻辑
|
||||
/// </summary>
|
||||
public partial class GasFlow2 : UserControl
|
||||
{
|
||||
public GasFlow2()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
public GasFlowData FlowData
|
||||
{
|
||||
get => (GasFlowData)GetValue(FlowDataProperty);
|
||||
set => SetValue(FlowDataProperty, value);
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty FlowDataProperty =
|
||||
DependencyProperty.Register(nameof(FlowData), typeof(GasFlowData), typeof(GasFlow2), new PropertyMetadata(null));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user