aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2020-11-14 01:49:42 +0200
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2020-11-14 01:49:42 +0200
commit679c6ceb5ad91431df0180ce46c2b407cfe49def (patch)
tree86506dcfd13078ebd74a58600cec7713fa6e36f0 /Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs
parent64aca5fe579bf2b12d33f2a8a9010c257c358aec (diff)
downloadTango-679c6ceb5ad91431df0180ce46c2b407cfe49def.tar.gz
Tango-679c6ceb5ad91431df0180ce46c2b407cfe49def.zip
Thread Break/Loading improvements.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs')
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadBreakView.xaml10
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadBreakViewVM.cs2
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml8
3 files changed, 11 insertions, 9 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 6c64520a4..f17860d42 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadBreakView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadBreakView.xaml
@@ -51,7 +51,7 @@
<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>
</StackPanel>
- <commonControls:ImageGalleryControl Duration="00:00:02">
+ <commonControls:ImageGalleryControl Duration="00:00:03">
<Image Stretch="Uniform" Source="/Images/ThreadLoading/GuidingUnits/1.jpg"></Image>
</commonControls:ImageGalleryControl>
</DockPanel>
@@ -77,7 +77,7 @@
<Grid>
<Grid Visibility="{Binding IsArcHead,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
- <commonControls:ImageGalleryControl Duration="00:00:02">
+ <commonControls:ImageGalleryControl Duration="00:00:03">
<Image Stretch="Uniform" Source="/Images/ThreadLoading/FeedingUnits/1.jpg"></Image>
<Image Stretch="Uniform" Source="/Images/ThreadLoading/FeedingUnits/2.jpg"></Image>
<Image Stretch="Uniform" Source="/Images/ThreadLoading/FeedingUnits/3.jpg"></Image>
@@ -86,7 +86,7 @@
</Grid>
<Grid Visibility="{Binding IsArcHead,Converter={StaticResource BooleanToVisibilityConverter}}">
- <commonControls:ImageGalleryControl Duration="00:00:02">
+ <commonControls:ImageGalleryControl Duration="00:00:03">
<Image Stretch="Uniform" Source="/Images/ThreadLoading/FeedingUnits/arc/1.jpg"></Image>
<Image Stretch="Uniform" Source="/Images/ThreadLoading/FeedingUnits/arc/2.jpg"></Image>
<Image Stretch="Uniform" Source="/Images/ThreadLoading/FeedingUnits/arc/3.jpg"></Image>
@@ -122,7 +122,7 @@
</TextBlock>
</StackPanel>
- <commonControls:ImageGalleryControl Duration="00:00:02">
+ <commonControls:ImageGalleryControl Duration="00:00:03">
<Image Stretch="Uniform" Source="/Images/ThreadLoading/TheDryer/1.jpg"></Image>
<Image Stretch="Uniform" Source="/Images/ThreadLoading/TheDryer/2.jpg"></Image>
<Image Stretch="Uniform" Source="/Images/ThreadLoading/TheDryer/3.jpg"></Image>
@@ -149,7 +149,7 @@
</TextBlock>
</StackPanel>
- <commonControls:ImageGalleryControl Duration="00:00:02">
+ <commonControls:ImageGalleryControl Duration="00:00:03">
<Image Stretch="Uniform" Source="/Images/ThreadLoading/DryerClose/1.jpg"></Image>
<Image Stretch="Uniform" Source="/Images/ThreadLoading/DryerClose/2.jpg"></Image>
<Image Stretch="Uniform" Source="/Images/ThreadLoading/DryerClose/3.jpg"></Image>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadBreakViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadBreakViewVM.cs
index 131f976c1..e737f3b12 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadBreakViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadBreakViewVM.cs
@@ -157,6 +157,7 @@ namespace Tango.PPC.UI.Dialogs
catch (Exception ex)
{
LogManager.Log(ex, LogCategory.Warning, "Error occurred while attempting to perform thread jogging.");
+ await NotificationProvider.ShowError($"Thread movement verification failed.\n{ex.FlattenMessage()}");
Stage = WizardStage.FeedingUnits;
}
}
@@ -192,6 +193,7 @@ namespace Tango.PPC.UI.Dialogs
catch (Exception ex)
{
LogManager.Log(ex, LogCategory.Warning, "Error occurred while attempting to perform thread jogging.");
+ await NotificationProvider.ShowError($"Thread movement verification failed.\n{ex.FlattenMessage()}");
Stage = WizardStage.TheDryer;
}
}
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 3d37c81bd..2bb63d909 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml
@@ -17,7 +17,7 @@
</StackPanel>
<Grid Margin="0 20 0 0">
- <controls:NavigationControl Margin="0 5 0 0" SelectedObject="{Binding Stage}" TransitionType="Slide" TransitionAlwaysFades="False" TransitionDuration="00:00:0.1" SelectedIndex="0">
+ <controls:NavigationControl Margin="0 5 0 0" SelectedObject="{Binding Stage}" TransitionType="Slide" TransitionAlwaysFades="False" TransitionDuration="00:00:0.1" SelectedIndex="5">
<!--Welcome-->
<Grid controls:NavigationControl.NavigationName="Welcome" Background="{StaticResource TangoPrimaryBackgroundBrush}">
<DockPanel>
@@ -78,7 +78,7 @@
</Grid>
<Grid>
- <commonControls:ImageGalleryControl Duration="00:00:02">
+ <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>
<Image Stretch="Uniform" Source="/Images/ThreadLoading/NewThread/ReadyForLoading/arc/3.jpg"></Image>
@@ -136,7 +136,7 @@
</UniformGrid>
<DockPanel Margin="0 50 0 0" >
<StackPanel DockPanel.Dock="Top">
- <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Something went wrong</TextBlock>
+ <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Something went wrong, press 'retry' to try again</TextBlock>
<touch:TouchIcon Icon="AlertCircleOutline" Margin="0 40 0 0" HorizontalAlignment="Center" Foreground="{StaticResource TangoErrorBrush}" Width="100" Height="100" />
<TextBlock Margin="0 10 0 0" FontSize="{StaticResource TangoSmallFontSize}" TextAlignment="Center" TextWrapping="Wrap" HorizontalAlignment="Center" Foreground="{StaticResource TangoGrayTextBrush}" Text="{Binding Error}"></TextBlock>
</StackPanel>
@@ -153,7 +153,7 @@
</UniformGrid>
<DockPanel Margin="0 50 0 0" >
<StackPanel DockPanel.Dock="Top">
- <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Something went wrong</TextBlock>
+ <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Something went wrong, press 'retry' to try again</TextBlock>
<touch:TouchIcon Icon="AlertCircleOutline" Margin="0 40 0 0" HorizontalAlignment="Center" Foreground="{StaticResource TangoErrorBrush}" Width="100" Height="100" />
<TextBlock Margin="0 10 0 0" FontSize="{StaticResource TangoSmallFontSize}" TextAlignment="Center" TextWrapping="Wrap" HorizontalAlignment="Center" Foreground="{StaticResource TangoGrayTextBrush}" Text="{Binding Error}"></TextBlock>
</StackPanel>
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-19 17:38:13 +0000