From 6dba915200a6eaafc70900511ca6d243bffe6b0e Mon Sep 17 00:00:00 2001
From: SL <123@123.com>
Date: Thu, 29 Jun 2023 10:19:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3ModuleFsmDevice=E7=9A=84Abort?=
 =?UTF-8?q?Routine()=E6=96=B9=E6=B3=95=E4=B8=AD=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?Routine=E5=88=97=E9=98=9F=E4=B8=BA=E7=A9=BA=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8Peek()=E6=96=B9=E6=B3=95=E6=97=B6=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=20=E4=BF=AE=E6=AD=A3Recipe?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=AD=EF=BC=8C=E5=BD=93Recipe?=
 =?UTF-8?q?=E6=80=BB=E6=97=B6=E9=97=B4=E5=A4=AA=E9=95=BF=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E5=AE=8C?=
 =?UTF-8?q?=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Framework/Common/Fsm/ModuleFsmDevice.cs   |   4 +-
 .../Editors/Recipe/RecipeEditorView.xaml      | 137 +++++++++---------
 2 files changed, 70 insertions(+), 71 deletions(-)

diff --git a/MECF.Framework.Common/MECF/Framework/Common/Fsm/ModuleFsmDevice.cs b/MECF.Framework.Common/MECF/Framework/Common/Fsm/ModuleFsmDevice.cs
index 124c6ed..4b7b3c2 100644
--- a/MECF.Framework.Common/MECF/Framework/Common/Fsm/ModuleFsmDevice.cs
+++ b/MECF.Framework.Common/MECF/Framework/Common/Fsm/ModuleFsmDevice.cs
@@ -199,7 +199,9 @@ namespace MECF.Framework.Common.Fsm
 		{
 			if (_qRoutines != null)
 			{
-				_qRoutines.Peek().Abort();
+				if( _qRoutines.Count > 0)
+				    _qRoutines.Peek().Abort();
+
 				_qRoutines.Clear();
 			}
 		}
diff --git a/MECF.Framework.UI.Client/CenterViews/Editors/Recipe/RecipeEditorView.xaml b/MECF.Framework.UI.Client/CenterViews/Editors/Recipe/RecipeEditorView.xaml
index f1f4206..56f2da8 100644
--- a/MECF.Framework.UI.Client/CenterViews/Editors/Recipe/RecipeEditorView.xaml
+++ b/MECF.Framework.UI.Client/CenterViews/Editors/Recipe/RecipeEditorView.xaml
@@ -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"