增加SV和MV的模型数据
This commit is contained in:
@@ -658,7 +658,7 @@
|
||||
<GridView ColumnHeaderContainerStyle="{StaticResource myHeaderStyle1}">
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -686,23 +686,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -753,7 +753,7 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -781,23 +781,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -912,7 +912,7 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -940,23 +940,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1071,7 +1071,7 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1099,23 +1099,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1230,7 +1230,7 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1258,23 +1258,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1389,7 +1389,7 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1417,23 +1417,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1548,7 +1548,7 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1576,23 +1576,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1707,7 +1707,7 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1735,23 +1735,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
|
||||
@@ -169,7 +169,7 @@
|
||||
AutoHandState="False"
|
||||
HandValueCommand="{Binding Source={StaticResource Proxy}, Path=Data.HandValueCmd}"
|
||||
MeterName="{Binding NameNoUnit}"
|
||||
PVValue="{Binding EngValue}"
|
||||
PVValue="{Binding EngPvValue}"
|
||||
SVValue="{Binding EngSVValue}"
|
||||
Unit="{Binding Unit}" />
|
||||
</DataTemplate>
|
||||
@@ -924,7 +924,7 @@
|
||||
VerticalAlignment="Top"
|
||||
CellTitle="转速"
|
||||
CellUnit="{Binding SpeedTag.Unit}"
|
||||
CellValue="{Binding SpeedTag.EngValueStr}" />
|
||||
CellValue="{Binding SpeedTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="301"
|
||||
Canvas.Top="120"
|
||||
@@ -932,7 +932,7 @@
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="电压"
|
||||
CellUnit="{Binding ComCapBusVolTag.Unit}"
|
||||
CellValue="{Binding ComCapBusVolTag.EngValueStr}" />
|
||||
CellValue="{Binding ComCapBusVolTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="301"
|
||||
Canvas.Top="170"
|
||||
@@ -940,7 +940,7 @@
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="电流"
|
||||
CellUnit="{Binding ComCapBusCurTag.Unit}"
|
||||
CellValue="{Binding ComCapBusCurTag.EngValueStr}" />
|
||||
CellValue="{Binding ComCapBusCurTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="301"
|
||||
Canvas.Top="220"
|
||||
@@ -948,7 +948,7 @@
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="功率"
|
||||
CellUnit="{Binding ComCapPwTag.Unit}"
|
||||
CellValue="{Binding ComCapPwTag.EngValueStr}" />
|
||||
CellValue="{Binding ComCapPwTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="105"
|
||||
Canvas.Top="147"
|
||||
@@ -956,7 +956,7 @@
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="排气口压力"
|
||||
CellUnit="{Binding ExPressTag.Unit}"
|
||||
CellValue="{Binding ExPressTag.EngValueStr}" />
|
||||
CellValue="{Binding ExPressTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="106"
|
||||
Canvas.Top="193"
|
||||
@@ -964,7 +964,7 @@
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="排气口温度"
|
||||
CellUnit="{Binding ExTempTag.Unit}"
|
||||
CellValue="{Binding ExTempTag.EngValueStr}" />
|
||||
CellValue="{Binding ExTempTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="105"
|
||||
Canvas.Top="292"
|
||||
@@ -972,7 +972,7 @@
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="吸气口压力"
|
||||
CellUnit="{Binding InhPressTag.Unit}"
|
||||
CellValue="{Binding InhPressTag.EngValueStr}" />
|
||||
CellValue="{Binding InhPressTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="106"
|
||||
Canvas.Top="338"
|
||||
@@ -980,7 +980,7 @@
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="吸气口温度"
|
||||
CellUnit="{Binding InhTempTag.Unit}"
|
||||
CellValue="{Binding InhTempTag.EngValueStr}" />
|
||||
CellValue="{Binding InhTempTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="551"
|
||||
Canvas.Top="272"
|
||||
@@ -996,7 +996,7 @@
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="阀前温度"
|
||||
CellUnit="{Binding TxvFrTempTag.Unit}"
|
||||
CellValue="{Binding TxvFrTempTag.EngValueStr}" />
|
||||
CellValue="{Binding TxvFrTempTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="1003"
|
||||
Canvas.Top="239"
|
||||
@@ -1004,7 +1004,7 @@
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="阀前压力"
|
||||
CellUnit="{Binding TxvFrPressTag.Unit}"
|
||||
CellValue="{Binding TxvFrPressTag.EngValueStr}" />
|
||||
CellValue="{Binding TxvFrPressTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="635"
|
||||
Canvas.Top="420"
|
||||
@@ -1012,7 +1012,7 @@
|
||||
VerticalAlignment="Top"
|
||||
CellTitle="吸气混合器温度"
|
||||
CellUnit="{Binding OS2TempTag.Unit}"
|
||||
CellValue="{Binding OS2TempTag.EngValueStr}" />
|
||||
CellValue="{Binding OS2TempTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="1190"
|
||||
Canvas.Top="357"
|
||||
@@ -1020,7 +1020,7 @@
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="冷凝器进水温"
|
||||
CellUnit="{Binding Cond1TempTag.Unit}"
|
||||
CellValue="{Binding Cond1TempTag.EngValueStr}" />
|
||||
CellValue="{Binding Cond1TempTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="1074"
|
||||
Canvas.Top="357"
|
||||
@@ -1028,7 +1028,7 @@
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="冷凝器出水温"
|
||||
CellUnit="{Binding CondInTempTag.Unit}"
|
||||
CellValue="{Binding CondInTempTag.EngValueStr}" />
|
||||
CellValue="{Binding CondInTempTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="1217"
|
||||
Canvas.Top="136"
|
||||
@@ -1079,12 +1079,12 @@
|
||||
<ListView.View>
|
||||
<GridView ColumnHeaderContainerStyle="{StaticResource myHeaderStyle1}">
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding EngValueStr}" Header="实时值" />
|
||||
<!-- DisplayMemberBinding="{Binding EngValue, Converter={StaticResource ValuePrecisionConverter}, ConverterParameter={Binding Path=DecimalPoint}}" -->
|
||||
<GridViewColumn DisplayMemberBinding="{Binding EngPvValueStr}" Header="实时值" />
|
||||
<!-- DisplayMemberBinding="{Binding EngPvValue, Converter={StaticResource ValuePrecisionConverter}, ConverterParameter={Binding Path=DecimalPoint}}" -->
|
||||
<!--<GridViewColumn Header="实时值">
|
||||
<GridViewColumn.DisplayMemberBinding>
|
||||
<MultiBinding Converter="{StaticResource ValuePrecisionConverter}">
|
||||
<Binding Path="EngValue" />
|
||||
<Binding Path="EngPvValue" />
|
||||
<Binding Path="DecimalPoint" />
|
||||
</MultiBinding>
|
||||
</GridViewColumn.DisplayMemberBinding>
|
||||
|
||||
@@ -178,7 +178,7 @@
|
||||
BorderBrush="Black"
|
||||
BorderThickness="1">
|
||||
<StackPanel>
|
||||
<StackPanel>
|
||||
<StackPanel Margin="0,3,0,0">
|
||||
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
|
||||
<Button
|
||||
Width="50"
|
||||
@@ -225,7 +225,10 @@
|
||||
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
<Border Margin="2,5" Background="Gray">
|
||||
<Border
|
||||
Margin="2,5"
|
||||
Background="Gray"
|
||||
CornerRadius="3">
|
||||
<TextBlock
|
||||
FontSize="18"
|
||||
Foreground="White"
|
||||
@@ -335,17 +338,23 @@
|
||||
VerticalAlignment="Center"
|
||||
FontSize="20"
|
||||
Text="工况名称:" />
|
||||
<TextBox
|
||||
Width="500"
|
||||
<Border
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Background="MediumSeaGreen"
|
||||
Background="LightSlateGray"
|
||||
BorderThickness="1"
|
||||
FontSize="18"
|
||||
Foreground="White"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding SelectedProgramSeg.Name}"
|
||||
TextAlignment="Center" />
|
||||
CornerRadius="3">
|
||||
<TextBox
|
||||
Width="500"
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
BorderThickness="0"
|
||||
FontSize="18"
|
||||
Foreground="White"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding SelectedProgramSeg.Name}"
|
||||
TextAlignment="Center" />
|
||||
</Border>
|
||||
|
||||
|
||||
<TextBlock
|
||||
Margin="5,0,0,0"
|
||||
@@ -359,18 +368,22 @@
|
||||
VerticalAlignment="Center"
|
||||
FontSize="20"
|
||||
Text="总循环次数:" />
|
||||
<TextBox
|
||||
Width="80"
|
||||
<Border
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Background="MediumSeaGreen"
|
||||
Background="LightSlateGray"
|
||||
BorderThickness="1"
|
||||
FontSize="18"
|
||||
Foreground="White"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding SelectedProgramSeg.ProRepeat}"
|
||||
TextAlignment="Center" />
|
||||
|
||||
CornerRadius="3">
|
||||
<TextBox
|
||||
Width="80"
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
BorderThickness="0"
|
||||
FontSize="18"
|
||||
Foreground="White"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding SelectedProgramSeg.ProRepeat}"
|
||||
TextAlignment="Center" />
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
@@ -408,17 +421,21 @@
|
||||
FontSize="18"
|
||||
Text="选中序号"
|
||||
TextAlignment="Center" />
|
||||
|
||||
<TextBox
|
||||
Width="60"
|
||||
Margin="5,2"
|
||||
VerticalAlignment="Center"
|
||||
Background="MediumSeaGreen"
|
||||
<Border
|
||||
Margin="2"
|
||||
Background="LightSlateGray"
|
||||
BorderThickness="1"
|
||||
FontSize="18"
|
||||
Foreground="White"
|
||||
Text="{Binding ProStepProNo}"
|
||||
TextAlignment="Center" />
|
||||
CornerRadius="3">
|
||||
<TextBox
|
||||
Width="60"
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
BorderThickness="0"
|
||||
FontSize="18"
|
||||
Foreground="White"
|
||||
Text="{Binding ProStepProNo}"
|
||||
TextAlignment="Center" />
|
||||
</Border>
|
||||
<!--<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
@@ -2140,7 +2157,8 @@
|
||||
Margin="-5,-6"
|
||||
Background="LimeGreen"
|
||||
BorderBrush="Blue"
|
||||
BorderThickness="1">
|
||||
BorderThickness="1"
|
||||
CornerRadius="3">
|
||||
<StackPanel>
|
||||
<TextBlock
|
||||
FontSize="16"
|
||||
|
||||
@@ -566,8 +566,8 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
</GridView>
|
||||
@@ -594,23 +594,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -725,8 +725,8 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
</GridView>
|
||||
@@ -753,23 +753,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -884,8 +884,8 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
</GridView>
|
||||
@@ -912,23 +912,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1043,8 +1043,8 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
</GridView>
|
||||
@@ -1071,23 +1071,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1202,8 +1202,8 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
</GridView>
|
||||
@@ -1230,23 +1230,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1361,8 +1361,8 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
</GridView>
|
||||
@@ -1389,23 +1389,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1520,8 +1520,8 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
</GridView>
|
||||
@@ -1548,23 +1548,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
@@ -1679,8 +1679,8 @@
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
</GridView>
|
||||
@@ -1707,23 +1707,23 @@
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
|
||||
Header="左游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
|
||||
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
|
||||
Header="右游标" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MinEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MinEngPvValueStr}"
|
||||
Header="最小值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding MaxEngValueStr}"
|
||||
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
|
||||
Header="最大值" />
|
||||
<GridViewColumn
|
||||
Width="60"
|
||||
DisplayMemberBinding="{Binding AveEngValueStr}"
|
||||
DisplayMemberBinding="{Binding AveEngPvValueStr}"
|
||||
Header="平均值" />
|
||||
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
|
||||
|
||||
|
||||
Reference in New Issue
Block a user