Merge commit '6dba915200a6eaafc70900511ca6d243bffe6b0e' into rework
This commit is contained in:
commit
072e92104f
|
@ -199,7 +199,9 @@ namespace MECF.Framework.Common.Fsm
|
|||
{
|
||||
if (_qRoutines != null)
|
||||
{
|
||||
_qRoutines.Peek().Abort();
|
||||
if( _qRoutines.Count > 0)
|
||||
_qRoutines.Peek().Abort();
|
||||
|
||||
_qRoutines.Clear();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -836,9 +836,9 @@
|
|||
|
||||
<TabItem Header="Steps" IsSelected="True">
|
||||
<Grid
|
||||
Grid.Row="1"
|
||||
Margin="0,0,0,0"
|
||||
IsEnabled="{Binding IsPermission}">
|
||||
Grid.Row="1"
|
||||
Margin="0,0,0,0"
|
||||
IsEnabled="{Binding IsPermission}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="97*" />
|
||||
<ColumnDefinition Width="1041*" />
|
||||
|
@ -848,82 +848,79 @@
|
|||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
<StackPanel
|
||||
Grid.ColumnSpan="2"
|
||||
IsEnabled="{Binding IsLoading, Converter={StaticResource BoolReverseConverter}}"
|
||||
Orientation="Horizontal">
|
||||
<Label
|
||||
Margin="250,0,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content="TotalTime:"
|
||||
FontFamily="Arial"
|
||||
FontSize="16"
|
||||
Foreground="{DynamicResource FG_Black}" />
|
||||
Grid.ColumnSpan="2"
|
||||
IsEnabled="{Binding IsLoading, Converter={StaticResource BoolReverseConverter}}"
|
||||
Orientation="Horizontal" Margin="200,0,0,0">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Text="TotalTime:"
|
||||
FontFamily="Arial"
|
||||
FontSize="16"
|
||||
Foreground="{DynamicResource FG_Black}" />
|
||||
|
||||
<Label
|
||||
Width="50"
|
||||
Margin="0,0,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalContentAlignment="Right"
|
||||
Content="{Binding CurrentRecipe.RecipeTotalTime, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
|
||||
FontFamily="Arial"
|
||||
FontSize="16"
|
||||
Foreground="{DynamicResource FG_Black}" />
|
||||
<TextBlock
|
||||
Margin="0,0,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
TextAlignment="Right"
|
||||
Text="{Binding CurrentRecipe.RecipeTotalTime}"
|
||||
FontFamily="Arial"
|
||||
FontSize="16"
|
||||
Foreground="{DynamicResource FG_Black}" Width="90" />
|
||||
|
||||
<Label
|
||||
Width="20"
|
||||
Margin="-10,0,10,0"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalContentAlignment="Left"
|
||||
Content="s"
|
||||
FontFamily="Arial"
|
||||
FontSize="16"
|
||||
Foreground="{DynamicResource FG_Black}" />
|
||||
<TextBlock
|
||||
Margin="4,0,10,0"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
TextAlignment="Left"
|
||||
Text="s"
|
||||
FontFamily="Arial"
|
||||
FontSize="16"
|
||||
Foreground="{DynamicResource FG_Black}" />
|
||||
|
||||
<Button
|
||||
Width="90"
|
||||
Height="30"
|
||||
Margin="0,0,0,0"
|
||||
micro:Message.Attach="AddStep()"
|
||||
Content="Add"
|
||||
IsEnabled="{Binding EnableStep}" />
|
||||
Width="90"
|
||||
Height="30"
|
||||
Margin="0,0,0,0"
|
||||
micro:Message.Attach="AddStep()"
|
||||
Content="Add"
|
||||
IsEnabled="{Binding EnableStep}" />
|
||||
<Button
|
||||
Width="90"
|
||||
Height="30"
|
||||
Margin="10,0,0,0"
|
||||
micro:Message.Attach="InsertStepToLeft()"
|
||||
Content="Insert"
|
||||
IsEnabled="{Binding EnableStep}" />
|
||||
Width="90"
|
||||
Height="30"
|
||||
Margin="10,0,0,0"
|
||||
micro:Message.Attach="InsertStepToLeft()"
|
||||
Content="Insert"
|
||||
IsEnabled="{Binding EnableStep}" />
|
||||
<Button
|
||||
Width="90"
|
||||
Height="30"
|
||||
Margin="10,0,0,0"
|
||||
micro:Message.Attach="CopyStep()"
|
||||
Content="Copy"
|
||||
IsEnabled="{Binding EnableStep}" />
|
||||
Width="90"
|
||||
Height="30"
|
||||
Margin="10,0,0,0"
|
||||
micro:Message.Attach="CopyStep()"
|
||||
Content="Copy"
|
||||
IsEnabled="{Binding EnableStep}" />
|
||||
<Button
|
||||
Width="100"
|
||||
Height="30"
|
||||
Margin="10,0,0,0"
|
||||
micro:Message.Attach="PasteStepToLeft()"
|
||||
Content="Paste Front"
|
||||
IsEnabled="{Binding EnableStep}" />
|
||||
Width="100"
|
||||
Height="30"
|
||||
Margin="10,0,0,0"
|
||||
micro:Message.Attach="PasteStepToLeft()"
|
||||
Content="Paste Front"
|
||||
IsEnabled="{Binding EnableStep}" />
|
||||
<Button
|
||||
Width="100"
|
||||
Height="30"
|
||||
Margin="10,0,0,0"
|
||||
micro:Message.Attach="PasteStepToRight()"
|
||||
Content=" Paste Back"
|
||||
IsEnabled="{Binding EnableStep}" />
|
||||
Width="100"
|
||||
Height="30"
|
||||
Margin="10,0,0,0"
|
||||
micro:Message.Attach="PasteStepToRight()"
|
||||
Content=" Paste Back"
|
||||
IsEnabled="{Binding EnableStep}" />
|
||||
<Button
|
||||
Width="90"
|
||||
Height="30"
|
||||
Margin="10,0,0,0"
|
||||
micro:Message.Attach="DeleteStep()"
|
||||
Content="Delete"
|
||||
IsEnabled="{Binding EnableStep}" />
|
||||
Width="90"
|
||||
Height="30"
|
||||
Margin="10,0,0,0"
|
||||
micro:Message.Attach="DeleteStep()"
|
||||
Content="Delete"
|
||||
IsEnabled="{Binding EnableStep}" />
|
||||
|
||||
<materialDesign:Badged
|
||||
x:Name="txtErrorCount"
|
||||
|
|
Loading…
Reference in New Issue