|
@@ -92,7 +92,7 @@
|
|
|
VerticalAlignment="Center"
|
|
|
FontSize="12"
|
|
|
Text="Sequence Change:"/>
|
|
|
-
|
|
|
+
|
|
|
<Button Height="30" Width="120" Content="Select">
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="Click">
|
|
@@ -1499,9 +1499,9 @@
|
|
|
IsN2PurgeView="True"
|
|
|
Command="{Binding CmdSetValve}"
|
|
|
ValveOpenOrientation="Vertical"/>
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
<deviceControl:AITGasIIIValve
|
|
|
Canvas.Left="508"
|
|
|
Canvas.Top="214"
|
|
@@ -1644,7 +1644,7 @@
|
|
|
Grid.Row="3"
|
|
|
Grid.Column="0"
|
|
|
Grid.ColumnSpan="3"/>
|
|
|
- <TextBlock
|
|
|
+ <!--<TextBlock
|
|
|
Grid.Row="5"
|
|
|
Grid.Column="0"
|
|
|
Grid.ColumnSpan="3"
|
|
@@ -1654,7 +1654,7 @@
|
|
|
<TextBox
|
|
|
Grid.Row="6"
|
|
|
Grid.Column="0"
|
|
|
- Grid.ColumnSpan="3"/>
|
|
|
+ Grid.ColumnSpan="3"/>-->
|
|
|
</Grid>
|
|
|
|
|
|
<Grid
|
|
@@ -1684,11 +1684,11 @@
|
|
|
Grid.Row="1"
|
|
|
Grid.Column="0"
|
|
|
Grid.ColumnSpan="3"
|
|
|
- Text="{Binding ConcentrationO2Value, StringFormat={}{0:f2}}"/>
|
|
|
+ Text="{Binding CheckO2Location,UpdateSourceTrigger=PropertyChanged}"/>
|
|
|
<TextBox
|
|
|
Grid.Row="2"
|
|
|
Grid.Column="0"
|
|
|
- Grid.ColumnSpan="1"/>
|
|
|
+ Grid.ColumnSpan="1" Text="{Binding ConcentrationO2Value, StringFormat={}{0:f2}}" />
|
|
|
<TextBlock
|
|
|
Grid.Row="2"
|
|
|
Grid.Column="1"
|
|
@@ -1698,8 +1698,8 @@
|
|
|
<TextBox
|
|
|
Grid.Row="2"
|
|
|
Grid.Column="2"
|
|
|
- Grid.ColumnSpan="1"/>
|
|
|
- <UniformGrid
|
|
|
+ Grid.ColumnSpan="1" Text="{Binding O2SetCheckSetPoint,UpdateSourceTrigger=PropertyChanged}"/>
|
|
|
+ <!--<UniformGrid
|
|
|
Grid.Row="3"
|
|
|
Grid.ColumnSpan="3"
|
|
|
Rows="1">
|
|
@@ -1707,8 +1707,8 @@
|
|
|
<TextBox Width="46" Margin="2,0,4,0"/>
|
|
|
<TextBox Width="46" Margin="2,0,4,0"/>
|
|
|
<TextBox Width="46" Margin="2,0,0,0"/>
|
|
|
- </UniformGrid>
|
|
|
- <TextBlock
|
|
|
+ </UniformGrid>-->
|
|
|
+ <!--<TextBlock
|
|
|
Grid.Row="5"
|
|
|
Grid.Column="0"
|
|
|
Grid.ColumnSpan="3"
|
|
@@ -1717,8 +1717,8 @@
|
|
|
<TextBox
|
|
|
Grid.Row="6"
|
|
|
Grid.Column="0"
|
|
|
- Grid.ColumnSpan="1"/>
|
|
|
- <TextBlock
|
|
|
+ Grid.ColumnSpan="1"/>-->
|
|
|
+ <!--<TextBlock
|
|
|
Grid.Row="6"
|
|
|
Grid.Column="1"
|
|
|
HorizontalAlignment="Center"
|
|
@@ -1727,7 +1727,7 @@
|
|
|
<TextBox
|
|
|
Grid.Row="6"
|
|
|
Grid.Column="2"
|
|
|
- Grid.ColumnSpan="1"/>
|
|
|
+ Grid.ColumnSpan="1"/>-->
|
|
|
</Grid>
|
|
|
</Grid>
|
|
|
</Border>
|