Merge branch 'eureka' of https://twinetfs.visualstudio.com/Tango/_git/Tango into eureka

3 files changed, 61 insertions, 72 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoadingView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoadingView.xaml
index 146d4b50d..3ed91e5db 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoadingView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoadingView.xaml
@@ -9,47 +9,16 @@
 			 xmlns:global="clr-namespace:Tango.PPC.UI"
              xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
              xmlns:local="clr-namespace:Tango.PPC.UI.Views"
+             xmlns:mediaKit="clr-namespace:WPFMediaKit.DirectShow.Controls;assembly=WPFMediaKit"
              mc:Ignorable="d" 
              d:DesignHeight="1280" d:DesignWidth="800" Background="{StaticResource TangoPrimaryBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:LoadingViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.LoadingView}">
     <Grid>
-        <StackPanel HorizontalAlignment="Center">
-            <!--<Image gif:ImageBehavior.EnableAnimation="{Binding IsLoading}" gif:ImageBehavior.AnimatedSource="/Images/Twine_Loading_GIF.gif" Margin="100 100 100 0" RenderTransformOrigin="0.5,0.5" RenderOptions.BitmapScalingMode="Fant" Height="382">
-                <Image.Style>
-                    <Style TargetType="Image">
-                        <Setter Property="RenderTransform">
-                            <Setter.Value>
-                                <ScaleTransform ScaleX="1" ScaleY="1" />
-                            </Setter.Value>
-                        </Setter>
-                        <Setter Property="Effect">
-                            <Setter.Value>
-                                <fx:DisplaySettingEffect SaturationLevel="0"  />
-                            </Setter.Value>
-                        </Setter>
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding IsLoading}" Value="True">
-                                <DataTrigger.EnterActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" Duration="00:00:1" To="1.010" AutoReverse="True" RepeatBehavior="10x" />
-                                            <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleX" Duration="00:00:1" To="1.010" AutoReverse="True" RepeatBehavior="10x" />
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Effect.SaturationLevel" Duration="00:00:3" AutoReverse="True" RepeatBehavior="3x">
-                                                <LinearDoubleKeyFrame KeyTime="00:00:00" Value="0" />
-                                                <LinearDoubleKeyFrame KeyTime="00:00:2" Value="1" />
-                                                <LinearDoubleKeyFrame KeyTime="00:00:3" Value="6" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </DataTrigger.EnterActions>
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </Image.Style>
-            </Image>-->
-
+        <Grid x:Name="videoPlayerGrid" Visibility="{Binding BuildProvider.BuildType,Converter={StaticResource BuildTypeToVisibilityConverter},ConverterParameter='Eureka'}">
+            <mediaKit:MediaUriElement x:Name="videoPlayer" Stretch="Uniform" LoadedBehavior="Manual" />
+        </Grid>
+        <StackPanel HorizontalAlignment="Center" Visibility="{Binding BuildProvider.BuildType,Converter={StaticResource BuildTypeToVisibilityConverter},ConverterParameter='TS1800'}">
+        
             <Grid Margin="0 0 0 0">
-                <!--<Image Source="/Images/machine.png" Stretch="Uniform" Width="250" RenderOptions.BitmapScalingMode="Fant"></Image>
-                <touch:TouchBusyIndicator Width="350" Height="350" IsIndeterminate="{Binding IsLoading}" />-->
                 <touch:TouchGifAnimation Source="/Images/loading_anim2.gif" EnableAnimation="{Binding IsLoading}" Margin="0 200 0 0" />
             </Grid>
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoadingView.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoadingView.xaml.cs
index a1214a0df..4616ea438 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoadingView.xaml.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoadingView.xaml.cs
@@ -12,6 +12,9 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Tango.Core.DI;
+using Tango.PPC.Common.Application;
+using Tango.PPC.Common.Build;
 
 namespace Tango.PPC.UI.Views
 {
@@ -20,9 +23,22 @@ namespace Tango.PPC.UI.Views
     /// </summary>
     public partial class LoadingView : UserControl
     {
+        public static DateTime VideoStartTime { get; set; }
+
         public LoadingView()
         {
             InitializeComponent();
+
+            var buildProvider = TangoIOC.Default.GetInstance<IBuildProvider>();
+            var appManager = TangoIOC.Default.GetInstance<IPPCApplicationManager>();
+
+            if (buildProvider.IsEureka)
+            {
+                VideoStartTime = DateTime.Now;
+                videoPlayer.Source = new Uri(appManager.StartPath + "\\Intro.wmv", UriKind.Absolute);
+                videoPlayer.MediaOpened += (_, __) => VideoStartTime = DateTime.Now;
+                videoPlayer.Play();
+            }
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
index 1e528765e..66bc6f580 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -593,19 +593,18 @@
                         <TextBlock Text="Total Job Progress" FontWeight="DemiBold" Margin="15 10 0 0" FontSize="{StaticResource TangoComboBoxItemFontSize}" VerticalAlignment="Top"></TextBlock>
                         <Rectangle Height="2" Fill="{StaticResource TangoLightBorderBrush}" Width="1010" VerticalAlignment="Top" Margin="15 20 0 0"></Rectangle>
                     </StackPanel>
-                    <Grid Margin="0 10 0 0">
-                            <locaControls:RunningJobViewerEureka Height="14"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}"  />
-                           
-                           
+                        <Grid Margin="0 22 0 0">
+                            <locaControls:RunningJobViewerEureka ThumbHeight="16" HeightSlider="14"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" 
+                                                                 RunningJobStatus="{Binding RunningJobStatus}"  
+                                                                 MaximumValue="{Binding RunningJobStatus.TotalProgressMinusSettingUp, FallbackValue=100,TargetNullValue=100}" 
+                                                                 MinimumValue="0"
+                                                                 SliderValue="{Binding RunningJobStatus.ProgressMinusSettingUp, TargetNullValue=0, FallbackValue=0}"/>
+
+
                             <!--<TextBlock Margin="0 0 -50 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" HorizontalAlignment="Right">
                             <Run Text="x"></Run><Run Text="{Binding RunningJobStatus.RemainingUnits}"></Run>
                         </TextBlock>-->
-                    </Grid>
-                        <touch:MultiRangeSlider x:Name="PART_LowerSlider" Height="30"  Margin="0 0 0 0"   Foreground="{StaticResource TangoDarkForegroundBrush}"
-                                           IsSnapToTickEnabled="True"  TickFrequency="1" VerticalAlignment="Center"  Maximum="{Binding RunningJobStatus.TotalProgressMinusSettingUp}" Minimum="0" IsEnabled="False"
-                                           MaximumValue ="{Binding RunningJobStatus.TotalProgressMinusSettingUp}"
-                            Value ="{Binding RunningJobStatus.ProgressMinusSettingUp}"/>
-
+                        </Grid>
                         <UniformGrid DockPanel.Dock="Bottom" Columns="4" Rows="1" HorizontalAlignment="Left" Margin="0 10 0 0" Height="Auto" VerticalAlignment="Top" Width="840">
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                 <Image Source="../Images/Job Issues/job_length.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
@@ -810,10 +809,34 @@
                         <RowDefinition Height="Auto"></RowDefinition>
                         <RowDefinition Height="100"></RowDefinition>
                     </Grid.RowDefinitions>
-                    <Grid>
-                        <DockPanel Margin="0 10 0 0">
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" DockPanel.Dock="Right" Margin="0 0 0 0">
-                                <Image Source="../Images/Job Issues/ttime_left.png" Stretch="Fill" VerticalAlignment="Top" Height="32" Width="32"/>
+                    <Grid Margin="0 10 0 0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="400"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" >
+                                <Image Margin="0 2 0 0" Source="../Images/Job Issues/job_length.png" Stretch="Uniform" VerticalAlignment="Top" HorizontalAlignment="Left" Width="Auto" Height="32" />
+                                <TextBlock Margin="20 10 0 0" Width="50"  FontWeight="SemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}" >
+                                    <TextBlock.Text>
+                                        <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
+                                            <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
+                                            <Binding Path="Job.Spools" Mode="OneWay"/>
+                                        </MultiBinding>
+                                    </TextBlock.Text>
+                                </TextBlock>
+                        </StackPanel>
+                        <!--<Grid Grid.Column="1"  Margin="20 8 20 0" VerticalAlignment="Top" Height="20">-->
+                        <locaControls:RunningJobViewerEureka Grid.Column="1" Margin="20 12 20 0"  VerticalAlignment="Top" ThumbHeight="16" Height="14"  HeightSlider="14"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" 
+                                                                 RunningJobStatus="{Binding RunningJobStatus}"  
+                                                                 MaximumValue="{Binding RunningJobStatus.TotalProgressMinusSettingUp, FallbackValue=100,TargetNullValue=100}" 
+                                                                 MinimumValue="0"
+                                                                 SliderValue="{Binding RunningJobStatus.ProgressMinusSettingUp, TargetNullValue=0, FallbackValue=0, Delay=100}"/>
+
+                        <!--</Grid>-->
+                        
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Grid.Column="2" Margin="0 0 0 0">
+                            <Image Margin="0 2 0 0" Source="../Images/Job Issues/ttime_left.png" Stretch="Uniform" VerticalAlignment="Top" Height="32"/>
                                 <TextBlock Margin="15 10 0 0" FontWeight="Light" FontSize="{StaticResource TangoComboBoxItemFontSize}"  HorizontalAlignment="Center">
                                             <Run Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=5}"></Run>
                                              <Run FontSize="16" Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run>
@@ -835,27 +858,8 @@
                                 </touch:TouchButton>
 
                             </StackPanel>
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" DockPanel.Dock="Left">
-                                <Image Source="../Images/Job Issues/job_length.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/>
-                                <TextBlock Margin="20 10 0 0" Width="50"  FontWeight="SemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}" >
-                                    <TextBlock.Text>
-                                        <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
-                                            <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
-                                            <Binding Path="Job.Spools" Mode="OneWay"/>
-                                        </MultiBinding>
-                                    </TextBlock.Text>
-                                </TextBlock>
-                            </StackPanel>
-                            <StackPanel Orientation="Vertical" Margin="30 8 30 0" >
-                                <locaControls:RunningJobViewerEureka Height="16"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}"  />
-                                
-                                <touch:MultiRangeSlider x:Name="PART_LowerSlider1" Height="26"  Margin="0 0 0 0"   Foreground="{StaticResource TangoDarkForegroundBrush}"
-                                           IsSnapToTickEnabled="True"  TickFrequency="1" VerticalAlignment="Center" Maximum="{Binding RunningJobStatus.TotalProgressMinusSettingUp}" Minimum="0" IsEnabled="False" 
-                                           MaximumValue ="{Binding RunningJobStatus.TotalProgressMinusSettingUp}" Value ="{Binding RunningJobStatus.ProgressMinusSettingUp}"/>
-
-                            </StackPanel>
-                        </DockPanel>
-                        <Border Height="2" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
+                        
+                        <Border Height="2" Grid.ColumnSpan="012" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
                     </Grid>
                     <Grid Grid.Row="1" Margin="0 28 0 0">
                         <StackPanel Orientation="Vertical">