|
@@ -771,14 +771,14 @@
|
|
|
<TextBlock Text="Valve Heater"/>
|
|
|
<Button Height="18" Width="50" Content="{Binding ValveHeaterData.FeedBack}" ToolTip="{Binding ValveHeaterData,Converter={StaticResource HeaterToStringConverter}}" Foreground="White" ContentStringFormat="F1" Background="{Binding ValveHeaterData.IsPowerOnSetPoint,Converter={StaticResource boolToColor5}}" Style="{x:Null}" Command="{Binding HeaterCommand}" CommandParameter="{Binding ValveHeaterData}" Cursor="Hand"/>
|
|
|
</StackPanel>-->
|
|
|
- <StackPanel Canvas.Top="645" Canvas.Left="1160" Orientation="Vertical">
|
|
|
+ <!--<StackPanel Canvas.Top="645" Canvas.Left="1160" Orientation="Vertical">
|
|
|
<TextBlock Text="Foreline Heater"/>
|
|
|
<Button Height="18" Width="50" Content="{Binding ForelineHeaterData.FeedBack}" ToolTip="{Binding ForelineHeaterData,Converter={StaticResource HeaterToStringConverter}}" Foreground="White" ContentStringFormat="F1" Background="{Binding ForelineHeaterData.IsPowerOnSetPoint,Converter={StaticResource boolToColor5}}" Style="{x:Null}" Command="{Binding HeaterCommand}" CommandParameter="{Binding ForelineHeaterData}" Cursor="Hand" />
|
|
|
- </StackPanel>
|
|
|
- <StackPanel Canvas.Top="320" Canvas.Left="1250" Orientation="Vertical">
|
|
|
- <TextBlock Text="Wall Heater"/>
|
|
|
- <Button Height="18" Width="50" Content="{Binding WallHeaterData.FeedBack}" ToolTip="{Binding WallHeaterData,Converter={StaticResource HeaterToStringConverter}}" Foreground="White" ContentStringFormat="F1" Background="{Binding WallHeaterData.IsPowerOnSetPoint,Converter={StaticResource boolToColor5}}" Style="{x:Null}" Command="{Binding HeaterCommand}" CommandParameter="{Binding WallHeaterData}" Cursor="Hand"/>
|
|
|
- </StackPanel>
|
|
|
+ </StackPanel>-->
|
|
|
+ <!--<StackPanel Canvas.Top="320" Canvas.Left="1250" Orientation="Vertical">
|
|
|
+ <TextBlock Text="Pendulum Heater"/>
|
|
|
+ <Button Height="18" Width="50" Content="{Binding PendulumHeaterData.FeedBack}" ToolTip="{Binding PendulumHeaterData,Converter={StaticResource HeaterToStringConverter}}" Foreground="White" ContentStringFormat="F1" Background="{Binding PendulumHeaterData.IsPowerOnSetPoint,Converter={StaticResource boolToColor5}}" Style="{x:Null}" Command="{Binding HeaterCommand}" CommandParameter="{Binding PendulumHeaterData}" Cursor="Hand"/>
|
|
|
+ </StackPanel>-->
|
|
|
|
|
|
<!--Chamber-->
|
|
|
<ctrls:Chamber Canvas.Left="1000" Canvas.Top="224"
|
|
@@ -1014,7 +1014,7 @@
|
|
|
<TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepDescription}" FontSize="15" Padding="10,2,0,0"/>
|
|
|
<TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepDuringTime, StringFormat=hh\\:mm\\:ss}" FontSize="15" Padding="10,2,0,0"/>
|
|
|
<TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepSetTime}" FontSize="15" Padding="10,2,0,0"/>
|
|
|
- <customControls:PathButton BorderThickness="0" PathData="{StaticResource Icon_Next}" Background="Transparent" DefaultFillBrush="Black" Foreground="White" Cursor="Hand" Grid.Row="5" Grid.Column="1" Visibility="{Binding IsProcessing,Converter={StaticResource BoolToVisibility2}}" Command="{Binding EndStepCommand}" Margin="15,0,0,0" HorizontalAlignment="Left"/>
|
|
|
+ <customControls:PathButton Grid.Row="6" Grid.Column="1" BorderThickness="0" PathData="{StaticResource Icon_Next}" Background="Transparent" DefaultFillBrush="Black" Foreground="White" Cursor="Hand" Visibility="{Binding IsProcessing,Converter={StaticResource BoolToVisibility2}}" Command="{Binding EndStepCommand}" Margin="15,0,0,0" HorizontalAlignment="Left"/>
|
|
|
<TextBlock Grid.Row="7" Grid.Column="1" FontSize="15" Padding="10,2,0,0" Background="#E9EDF4">
|
|
|
<TextBlock.Text>
|
|
|
<MultiBinding StringFormat="{}{0}/{1}">
|
|
@@ -1100,7 +1100,7 @@
|
|
|
<RowDefinition/>
|
|
|
</Grid.RowDefinitions>
|
|
|
<Grid.ColumnDefinitions>
|
|
|
- <ColumnDefinition Width="170"/>
|
|
|
+ <ColumnDefinition Width="166"/>
|
|
|
<ColumnDefinition Width="3*"/>
|
|
|
<ColumnDefinition Width="2*"/>
|
|
|
<ColumnDefinition Width="2*"/>
|