Thread loading changes.

3 files changed, 65 insertions, 26 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadBreakView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadBreakView.xaml
index 6e6c75333..b12967cd0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadBreakView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadBreakView.xaml
@@ -41,14 +41,17 @@
                     <!--Guiding Units-->
                     <Grid controls:NavigationControl.NavigationName="GuidingUnits" Background="{StaticResource TangoPrimaryBackgroundBrush}">
                         <DockPanel>
-                            <UniformGrid Margin="20" Columns="3" DockPanel.Dock="Bottom" Height="55">
-                                <touch:TouchButton Style="{StaticResource TangoHollowButton}" Padding="30 0" HorizontalAlignment="Left" Command="{Binding GuidingUnitsFoundCantFixCommand}">Found But Can't Fix</touch:TouchButton>
-                                <touch:TouchButton Style="{StaticResource TangoHollowButton}" Padding="40 0" HorizontalAlignment="Right" Command="{Binding GuidingUnitsFoundAndFixedCommand}">Found and Fixed</touch:TouchButton>
-                                <touch:TouchButton Style="{StaticResource TangoHollowButton}" Padding="50 0" HorizontalAlignment="Right" Command="{Binding GuidingUnitsCantFindItCommand}">Can't Find It</touch:TouchButton>
+                            <UniformGrid Margin="20" Columns="2" DockPanel.Dock="Bottom" Height="55">
+                                <!--<touch:TouchButton Style="{StaticResource TangoHollowButton}" Padding="30 0" HorizontalAlignment="Left" Command="{Binding GuidingUnitsFoundCantFixCommand}">Found But Can't Fix</touch:TouchButton>-->
+                                <touch:TouchButton Style="{StaticResource TangoHollowButton}" Width="250" HorizontalAlignment="Left" Command="{Binding GuidingUnitsFoundAndFixedCommand}">Fixed</touch:TouchButton>
+                                <touch:TouchButton Style="{StaticResource TangoHollowButton}" Width="250" HorizontalAlignment="Right" Command="{Binding GuidingUnitsCantFindItCommand}">Not Fixed</touch:TouchButton>
                             </UniformGrid>
                             <DockPanel>
                                 <StackPanel DockPanel.Dock="Top">
-                                    <TextBlock TextWrapping="Wrap" TextAlignment="Center" Margin="40 0" HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Please check guiding units on both sides of the system and fix/tie the thread if possible.</TextBlock>
+                                    <TextBlock TextWrapping="Wrap" TextAlignment="Center" Margin="40 0" HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">
+                                        <Run FontWeight="Bold">Check the guide units</Run>
+                                        <Run>on each side of the system and, if possible, fix or tie the thread</Run>
+                                    </TextBlock>
                                 </StackPanel>
 
                                 <commonControls:ImageGalleryControl Duration="00:00:03">
@@ -62,16 +65,14 @@
                     <Grid controls:NavigationControl.NavigationName="FeedingUnits" Background="{StaticResource TangoPrimaryBackgroundBrush}">
                         <DockPanel>
                             <UniformGrid Margin="20" Columns="2" DockPanel.Dock="Bottom" Height="55">
-                                <touch:TouchButton Style="{StaticResource TangoHollowButton}" Width="250" HorizontalAlignment="Left" Command="{Binding FeedingUnitsFoundAndFixedCommand}">Found and Fixed</touch:TouchButton>
-                                <touch:TouchButton Style="{StaticResource TangoHollowButton}" Width="250" HorizontalAlignment="Right" Command="{Binding FeedingUnitsCantFixCommand}">Can't Fix</touch:TouchButton>
+                                <touch:TouchButton Style="{StaticResource TangoHollowButton}" Width="250" HorizontalAlignment="Left" Command="{Binding FeedingUnitsFoundAndFixedCommand}">Fixed</touch:TouchButton>
+                                <touch:TouchButton Style="{StaticResource TangoHollowButton}" Width="250" HorizontalAlignment="Right" Command="{Binding FeedingUnitsCantFixCommand}">Not Fix</touch:TouchButton>
                             </UniformGrid>
-                            <TextBlock Foreground="{StaticResource TangoErrorBrush}" DockPanel.Dock="Bottom" TextWrapping="Wrap" TextAlignment="Center" Margin="50 20">
-                                if the thread is out of is route or tangle on one of the components you can go to the maintenance screen and open the component to solve the problem
-                            </TextBlock>
                             <DockPanel>
                                 <StackPanel DockPanel.Dock="Top">
                                     <TextBlock TextWrapping="Wrap" TextAlignment="Center" Margin="40 0" HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">
-                                        Open the covers and check the  feeder and puller and fix/tie if possible.
+                                        <Run FontWeight="Bold">Open the covers, check the thread route</Run>
+                                        <Run>and, if possible, fix or tie the thread</Run>
                                     </TextBlock>
                                 </StackPanel>
 
@@ -109,16 +110,16 @@
                             <StackPanel DockPanel.Dock="Bottom" TextElement.Foreground="{StaticResource TangoErrorBrush}" Margin="50 20">
                                 <DockPanel HorizontalAlignment="Center">
                                     <touch:TouchIcon Icon="Alert" Foreground="{StaticResource TangoErrorBrush}" />
-                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">HOT SURFACE!</TextBlock>
+                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoButtonFontSize}">CAUTION: HOT SURFACE!</TextBlock>
                                 </DockPanel>
                                 <TextBlock Margin="0 5 0 0" Foreground="{StaticResource TangoErrorBrush}" TextWrapping="Wrap" TextAlignment="Center">
-                                Recommended to cool down and/or to wear safety gloves
+                                    ALLOW THE SURFACE TO COOL AND/OR WEAR SAFETY GLOVES
                                 </TextBlock>
                             </StackPanel>
                             <DockPanel>
                                 <StackPanel DockPanel.Dock="Top">
                                     <TextBlock TextWrapping="Wrap" TextAlignment="Center" Margin="40 0" HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">
-                                        Open the dryer, cut the thread and remove any residue.
+                                        <Run FontWeight="Bold">Open the dryer, cut the thread and remove any residual thread</Run>
                                     </TextBlock>
                                 </StackPanel>
 
@@ -144,7 +145,7 @@
                             </TextBlock>
                             <DockPanel>
                                 <StackPanel DockPanel.Dock="Top">
-                                    <TextBlock TextWrapping="Wrap" TextAlignment="Center" Margin="40 0" HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">
+                                    <TextBlock FontWeight="Bold" TextWrapping="Wrap" TextAlignment="Center" Margin="40 0" HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">
                                         Close the dryer door
                                     </TextBlock>
                                 </StackPanel>
@@ -167,7 +168,7 @@
                             </UniformGrid>
                             <DockPanel>
                                 <StackPanel DockPanel.Dock="Top">
-                                    <TextBlock TextWrapping="Wrap" TextAlignment="Center" Margin="40 0" HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">
+                                    <TextBlock FontWeight="Bold" TextWrapping="Wrap" TextAlignment="Center" Margin="40 0" HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">
                                         Please Contact Twine Customer Care
                                     </TextBlock>
                                 </StackPanel>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml
index 3762ca1c7..55493e286 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml
@@ -28,14 +28,20 @@
                                 <StackPanel DockPanel.Dock="Top">
                                     <!--<TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Welcome to the automatic thread loading wizard.</TextBlock>-->
                                     <StackPanel HorizontalAlignment="Center" Margin="0 20 0 0">
-                                        <touch:TouchIcon Icon="Alert" VerticalAlignment="Center" Foreground="{StaticResource TangoErrorBrush}" />
+                                        <TextBlock TextAlignment="Center">Welcome to the thread loading wizard</TextBlock>
+                                        <touch:TouchIcon Margin="0 20 0 0" Icon="Alert" VerticalAlignment="Center" Foreground="{StaticResource TangoErrorBrush}" />
                                         <TextBlock TextWrapping="Wrap" TextAlignment="Center" VerticalAlignment="Center" Margin="0 10 0 0" Width="400">
-                                            <Run>Please ensure there are no thread residue in the system and press</Run>
-                                            <Run FontWeight="SemiBold">continue</Run>
+                                            <Run>Check for residual threads in the system and remove them</Run>
+                                        </TextBlock>
+
+                                        <TextBlock Margin="0 50 0 0" Foreground="{StaticResource TangoErrorBrush}" TextWrapping="Wrap" TextAlignment="Center">
+                                            <Run>CAUTION!</Run>
+                                            <LineBreak/>
+                                            <Run>When pressing continue the system will start preparing</Run>
                                         </TextBlock>
                                     </StackPanel>
                                 </StackPanel>
-                                <Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/TS1800_CloseUp_Feeder_P.jpg" VerticalAlignment="Center" Margin="50"></Image>
+                                <!--<Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/TS1800_CloseUp_Feeder_P.jpg" VerticalAlignment="Center" Margin="50"></Image>-->
                             </DockPanel>
                         </DockPanel>
                     </Grid>
@@ -57,6 +63,33 @@
                         </DockPanel>
                     </Grid>
 
+                    <!--Insert Thread-->
+                    <Grid controls:NavigationControl.NavigationName="InsertThread" Background="{StaticResource TangoPrimaryBackgroundBrush}">
+                        <DockPanel>
+                            <UniformGrid Margin="50" Columns="1" DockPanel.Dock="Bottom" Height="55">
+                                <touch:TouchButton Style="{StaticResource TangoHollowButton}" Width="250" HorizontalAlignment="Center" Command="{Binding ContinueCommand}">Continue</touch:TouchButton>
+                            </UniformGrid>
+                            <DockPanel Margin="0 50 0 0" >
+                                <StackPanel DockPanel.Dock="Top">
+                                    <!--<TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Welcome to the automatic thread loading wizard.</TextBlock>-->
+                                    <StackPanel HorizontalAlignment="Center" Margin="0 20 0 0">
+                                        <TextBlock TextAlignment="Center" FontWeight="Bold">
+                                            <Run>Insert thread</Run>
+                                            <LineBreak/>
+                                            <Run>(see the User Guide for full details)</Run>
+                                        </TextBlock>
+                                        <TextBlock TextWrapping="Wrap" TextAlignment="Center" VerticalAlignment="Center" Margin="0 40 0 0" Width="400">
+                                            <Run>Press</Run>
+                                            <Run FontWeight="Bold">continue</Run>
+                                            <Run>after the thread is loaded</Run>
+                                        </TextBlock>
+                                    </StackPanel>
+                                </StackPanel>
+                                <!--<Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/TS1800_CloseUp_Feeder_P.jpg" VerticalAlignment="Center" Margin="50"></Image>-->
+                            </DockPanel>
+                        </DockPanel>
+                    </Grid>
+
                     <!--Ready For Loading-->
                     <Grid controls:NavigationControl.NavigationName="ReadyForLoading" Background="{StaticResource TangoPrimaryBackgroundBrush}">
                         <DockPanel>
@@ -85,11 +118,11 @@
                                 </StackPanel>
 
                                 <Grid>
-                                    <Grid Visibility="{Binding IsArcHead,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                    <!--<Grid Visibility="{Binding IsArcHead,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                         <touch:TouchGifAnimation Margin="50" Source="/Images/thread_loading.gif" VerticalAlignment="Center" Stretch="Uniform" EnableAnimation="{Binding IsVisible}" />
-                                    </Grid>
+                                    </Grid>-->
 
-                                    <Grid Visibility="{Binding IsArcHead,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                    <!--<Grid Visibility="{Binding IsArcHead,Converter={StaticResource BooleanToVisibilityConverter}}">
                                         <commonControls:ImageGalleryControl Duration="00:00:03">
                                             <Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/ReadyForLoading/arc/1.jpg"></Image>
                                             <Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/ReadyForLoading/arc/2.jpg"></Image>
@@ -99,7 +132,7 @@
                                             <Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/ReadyForLoading/arc/6.jpg"></Image>
                                             <Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/ReadyForLoading/arc/7.jpg"></Image>
                                         </commonControls:ImageGalleryControl>
-                                    </Grid>
+                                    </Grid>-->
                                 </Grid>
                             </DockPanel>
                         </DockPanel>
@@ -119,7 +152,7 @@
                                     <touch:TouchProgressBar Margin="50 40 50 0" Height="10" IsIndeterminate="{Binding IsVisible}" />
                                 </StackPanel>
 
-                                <Image VerticalAlignment="Center" Margin="50" Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/machine_full.jpg"></Image>
+                                <!--<Image VerticalAlignment="Center" Margin="50" Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/machine_full.jpg"></Image>-->
                             </DockPanel>
                         </DockPanel>
                     </Grid>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingViewVM.cs
index c250c561b..3813a4c58 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingViewVM.cs
@@ -25,6 +25,7 @@ namespace Tango.PPC.UI.Dialogs
         {
             Welcome,
             Preparing,
+            InsertThread,
             ReadyForLoading,
             Finalizing,
             Completed,
@@ -138,7 +139,7 @@ namespace Tango.PPC.UI.Dialogs
                 }
                 else if (status.State == ThreadLoadingState.ReadyForLoading)
                 {
-                    Stage = ThreadLoadingStage.ReadyForLoading;
+                    Stage = ThreadLoadingStage.InsertThread;
                 }
                 else if (status.State == ThreadLoadingState.Finalizing)
                 {
@@ -179,6 +180,10 @@ namespace Tango.PPC.UI.Dialogs
                 Stage = ThreadLoadingStage.Preparing;
                 StartPreparing();
             }
+            else if (Stage == ThreadLoadingStage.InsertThread)
+            {
+                Stage = ThreadLoadingStage.ReadyForLoading;
+            }
             else if (Stage == ThreadLoadingStage.ReadyForLoading)
             {
                 ContinueThreadLoading();