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

15 files changed, 557 insertions, 32 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Images/backup-restoreX4.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Images/backup-restoreX4.png
new file mode 100644
index 000000000..65ebb2b1d
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Images/backup-restoreX4.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Tango.PPC.BackupRestore.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Tango.PPC.BackupRestore.csproj
index 99ac13ae4..b3fbdd624 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Tango.PPC.BackupRestore.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Tango.PPC.BackupRestore.csproj
@@ -237,6 +237,9 @@
   <ItemGroup>
     <Resource Include="Images\restore.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\backup-restorex4.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Views/MainView.xaml
index 0caabd0e1..9aac37f7b 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BackupRestore/Views/MainView.xaml
@@ -15,7 +15,18 @@
         <DockPanel>
             <Grid DockPanel.Dock="Top">
                 <StackPanel DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0 20 0 0">
-                    <Image Source="/Images/backup-restore.png" Stretch="Fill" Width="700" />
+                    <Image Stretch="Fill" Width="700" >
+                        <Image.Style>
+                            <Style TargetType="{x:Type Image}">
+                                <Setter Property="Source" Value="../Images/backup-restorex4.png"/>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding BuildProvider.IsEureka}" Value="false">
+                                        <Setter Property="Source" Value="/Images/backup-restore.png"/>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Image.Style>
+                    </Image>
                 </StackPanel>
             </Grid>
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml
index f018acf97..0224ab766 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml
@@ -128,11 +128,11 @@
                                 </Border>
                             </DockPanel>-->
                                 <DockPanel  Margin="0 50 0 0" HorizontalAlignment="Stretch">
-                                    <TextBlock HorizontalAlignment="Left" Margin="0 10 0 0" FontSize="{StaticResource TangoDialogFontSize}" Width="155" >
+                                    <TextBlock HorizontalAlignment="Left" Margin="0 10 0 0" FontSize="{StaticResource TangoDialogFontSize}" Width="166" >
                                         <Run Text="White Gap"></Run>
-                                        <Run Text="[m]" FontWeight="SemiBold"></Run>
+                                        <Run Text="[m]" FontWeight="SemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></Run>
                                     </TextBlock>
-                                    <Border Margin="49 0 0 0" BorderThickness="1"  Height="44" CornerRadius="22" BorderBrush="{StaticResource TangoMidAccentBrush}">
+                                    <Border Margin="38 0 0 0" BorderThickness="1"  Height="44" CornerRadius="22" BorderBrush="{StaticResource TangoMidAccentBrush}">
                                         <touch:TouchNumericTextBox  Margin="20 0 0 10" FontSize="{StaticResource TangoComboBoxItemFontSize}" Value="{Binding WhiteGap, Mode=TwoWay}" IsEnabled="True" HorizontalAlignment="Left" MinWidth="250" VerticalAlignment="Center" FocusSelectionMode="SelectAll" KeyboardNavigation.TabIndex="2"></touch:TouchNumericTextBox>
                                     </Border>
                                 </DockPanel  >
@@ -142,7 +142,7 @@
                                         <Run Text="Use Flat Spool"></Run>
                                     </TextBlock>
 
-                                    <touch:TouchToggleSlider IsChecked="{Binding UseFlatSpool,Mode=TwoWay}" Style="{StaticResource TangoToggleButtonGrayAccent}" Margin="49 0 0 0" HorizontalAlignment="Left" Width="90" />
+                                    <touch:TouchToggleSlider IsChecked="{Binding UseFlatSpool,Mode=TwoWay}" Style="{StaticResource TangoToggleButtonGrayAccent}" Margin="49 0 0 0" HorizontalAlignment="Left" Width="90" Height="42"/>
                                 </DockPanel>
                             </StackPanel>
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Images/JobProgressView/input.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Images/JobProgressView/input.png
new file mode 100644
index 000000000..77dbab1c9
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Images/JobProgressView/input.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Images/JobProgressView/output.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Images/JobProgressView/output.png
new file mode 100644
index 000000000..53b317042
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Images/JobProgressView/output.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Tango.PPC.JobsV2.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Tango.PPC.JobsV2.csproj
index 33ccc5b53..405f87b28 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Tango.PPC.JobsV2.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Tango.PPC.JobsV2.csproj
@@ -755,10 +755,14 @@
   <ItemGroup>
     <Resource Include="Images\JobView\select_all.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\JobProgressView\input.png" />
+    <Resource Include="Images\JobProgressView\output.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobProgressViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobProgressViewVM.cs
index 8756a6a57..b879831b9 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobProgressViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobProgressViewVM.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.BL.Entities;
+using Tango.BL.Enumerations;
 using Tango.Core.Commands;
 using Tango.Integration.Operation;
 using Tango.Logging;
@@ -37,7 +38,12 @@ namespace Tango.PPC.Jobs.ViewModels
         public Job Job
         {
             get { return _job; }
-            set { _job = value; RaisePropertyChangedAuto(); }
+            set { _job = value;
+                if(_job == null)
+                {
+                    IsDyeingProcess = false;
+                }
+                RaisePropertyChangedAuto(); }
         }
 
         private RunningJobStatus _runningJobStatus;
@@ -47,7 +53,14 @@ namespace Tango.PPC.Jobs.ViewModels
         public RunningJobStatus RunningJobStatus
         {
             get { return _runningJobStatus; }
-            set { _runningJobStatus = value; RaisePropertyChangedAuto(); }
+            set {
+                _runningJobStatus = value;
+                if(_runningJobStatus == null)
+                {
+                    IsDyeingProcess = false;
+                }
+                RaisePropertyChangedAuto();
+            }
         }
 
         private bool _isDisplayJobOutline;
@@ -70,6 +83,73 @@ namespace Tango.PPC.Jobs.ViewModels
             set { _jobOutlineTicket = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _isDyeingProcess;
+
+        public bool IsDyeingProcess
+        {
+            get { return _isDyeingProcess; }
+            set
+            {
+                if (_isDyeingProcess != value)
+                {
+                    _isDyeingProcess = value;
+                    RaisePropertyChangedAuto();
+                }
+            }
+        }
+
+        private BrushStop _currentBrushStop;
+        public BrushStop CurrentBrushStop
+        {
+            get { return _currentBrushStop; }
+            set
+            {
+                // if (_currentBrushStop != value)
+                {
+                    _currentBrushStop = value;
+                    OnUpdateCurrentBrush();
+                    RaisePropertyChangedAuto();
+                }
+            }
+        }
+
+        public JobBrushStop JobBrushStop { get; set; }
+
+        public double CyanOutput
+        {
+            get { return GetVolumeLiquidType(LiquidTypes.Cyan); }
+        }
+
+        public double MagentaOutput
+        {
+            get { return GetVolumeLiquidType(LiquidTypes.Magenta); }
+        }
+
+        public double YellowOutput
+        {
+            get { return GetVolumeLiquidType(LiquidTypes.Yellow); }
+        }
+
+        public double BlackOutput
+        {
+            get { return GetVolumeLiquidType(LiquidTypes.Black); }
+        }
+
+        public double LightCyanOutput
+        {
+            get { return GetVolumeLiquidType(LiquidTypes.LightCyan); }
+        }
+
+        public double LightMagentaOutput
+        {
+            get { return GetVolumeLiquidType(LiquidTypes.LightMagenta); }
+        }
+
+        public double LightYellowOutput
+        {
+            get { return GetVolumeLiquidType(LiquidTypes.LightYellow); }
+        }
+
         #endregion
 
         #region Commands
@@ -123,6 +203,31 @@ namespace Tango.PPC.Jobs.ViewModels
             NavigationManager.ClearHistoryExcept<JobsView>();
         }
 
+        protected void OnUpdateCurrentBrush()
+        {
+            RaisePropertyChanged(nameof(CyanOutput));
+            RaisePropertyChanged(nameof(LightCyanOutput));
+            RaisePropertyChanged(nameof(MagentaOutput));
+            RaisePropertyChanged(nameof(LightMagentaOutput));
+            RaisePropertyChanged(nameof(YellowOutput));
+            RaisePropertyChanged(nameof(LightYellowOutput));
+            RaisePropertyChanged(nameof(BlackOutput));
+        }
+
+        private double GetVolumeLiquidType(LiquidTypes liquidType)
+        {
+            if (JobBrushStop != null && JobBrushStop.Dispensers != null && JobBrushStop.Dispensers.Count > 0)
+            {
+                var lt = JobBrushStop.Dispensers.FirstOrDefault(x => x.DispenserLiquidType == (DispenserLiquidType)liquidType);
+
+                if (lt != null)
+                {
+                    return Math.Round(lt.Volume, 2);
+                }
+            }
+            return 0;
+        }
+
         #endregion
 
         #region Override Methods
@@ -160,6 +265,7 @@ namespace Tango.PPC.Jobs.ViewModels
             if (_handler != null)
             {
                 _handler.Cancel();
+                IsDyeingProcess = false;
             }
         }
 
@@ -228,6 +334,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 _handler.SpoolChangeRequired -= JobHandler_SpoolChangeRequired;
                 _handler.Stopped -= JobHandler_Stopped;
                 _handler.CanCancelChanged -= JobHandler_CanCancelChanged;
+                IsDyeingProcess = false;
             }
         }
 
@@ -241,6 +348,42 @@ namespace Tango.PPC.Jobs.ViewModels
             InvokeUI(() =>
             {
                 RunningJobStatus = e;
+                IsDyeingProcess = (RunningJobStatus != null && RunningJobStatus.CurrentSegment != null);
+            if (RunningJobStatus != null && RunningJobStatus.CurrentSegment != null)
+            {
+                if (_runningJobStatus.CurrentSegment.IsInterSegment)
+                {
+                    CurrentBrushStop = _runningJobStatus.CurrentSegment.BrushStops.FirstOrDefault();
+                    JobBrushStop = null;
+                }
+                else
+                {
+                    var realsegmIndex = 1;
+                    if (Job.EnableInterSegment && Job.InterSegmentLength > 0)
+                    {
+                        int segmentIndex = _runningJobStatus.CurrentSegment.SegmentIndex - (Job.EffectiveSegments.Count * RunningJobStatus.CurrentUnit);
+                        if (RunningJobStatus.CurrentUnit > 0)
+                        {
+                            segmentIndex -= RunningJobStatus.CurrentUnit;// inter segment between units
+                        }
+                        realsegmIndex = (int)(segmentIndex / 2) + 1;
+                    }
+                    else
+                    {
+                        realsegmIndex = Math.Max(_runningJobStatus.CurrentSegment.SegmentIndex - (Job.Segments.Count * RunningJobStatus.CurrentUnit), 0);
+                    }
+
+                    var segment = Job.Segments.FirstOrDefault(x => x.SegmentIndex == realsegmIndex);
+                    if (segment != null)
+                    {
+                        if (_handler.JobTicket.Segments.Count > 0)
+                        {
+                            JobBrushStop = _handler.JobTicket.Segments[Job.OrderedSegments.IndexOf(segment)].BrushStops.First();
+                        }
+                    }
+                    CurrentBrushStop = RunningJobStatus.CurrentSegment.FirstBrushStop;
+                }
+                }
             });
         }
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobProgressView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobProgressView.xaml
index a91d5676b..89b69a316 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobProgressView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobProgressView.xaml
@@ -7,6 +7,7 @@
              xmlns:controls="clr-namespace:Tango.PPC.Jobs.Controls"
              xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
              xmlns:converters="clr-namespace:Tango.PPC.Jobs.Converters"
+             xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:global="clr-namespace:Tango.PPC.Jobs"
              xmlns:local="clr-namespace:Tango.PPC.Jobs.Views"
              mc:Ignorable="d" 
@@ -14,6 +15,105 @@
 
     <UserControl.Resources>
         <converters:JobProgressToPositionConverter x:Key="JobProgressToPositionConverter" />
+
+        <Style x:Key="SliderGreyTextStyle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="{StaticResource TangoDefaultFontSize}"></Setter>
+            <Setter Property="VerticalAlignment" Value="Center"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Center"></Setter>
+        </Style>
+
+        <DataTemplate x:Key="CMYK_Template" DataType="{x:Type entities:BrushStop}">
+            <UniformGrid Rows="1" Columns="4" Height="Auto" MinWidth="180" HorizontalAlignment="Left">
+                <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                    <Border Width="50" Height="50" Background="Cyan" CornerRadius="16" HorizontalAlignment="Left" >
+                          <TextBlock Margin="0 0 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding Cyan, StringFormat=0.##}" VerticalAlignment="Center"></TextBlock>
+                    </Border>
+                    <TextBlock Margin="0 10 0 0" Text="C" FontSize="{StaticResource TangoDefaultFontSize}" HorizontalAlignment="Center"/>
+                </StackPanel>
+                <StackPanel Orientation="Vertical" Margin="0 0 0 0" Width="50">
+                    <Border Width="50" Height="50" Background="Magenta" CornerRadius="16" HorizontalAlignment="Left">
+                        <TextBlock Margin="0 0 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding Magenta, StringFormat=0.##}" VerticalAlignment="Center" ></TextBlock>
+                    </Border>
+                    <TextBlock Margin="0 10 0 0"  Text="M" FontSize="{StaticResource TangoDefaultFontSize}"  HorizontalAlignment="Center"/>
+                </StackPanel>
+                <StackPanel Orientation="Vertical" Margin="10 0 0 0" Width="50">
+                    <Border Width="50" Height="50" Background="Yellow" CornerRadius="16" HorizontalAlignment="Left">
+                         <TextBlock Margin="0 0 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding Yellow, StringFormat=0.##}" VerticalAlignment="Center" ></TextBlock>
+                    </Border>
+                    <TextBlock Margin="0 10 0 0"  Text="Y" FontSize="{StaticResource TangoDefaultFontSize}"  HorizontalAlignment="Center"/>
+                </StackPanel>
+                <StackPanel Orientation="Vertical" Margin="10 0 0 0" Width="50">
+                    <Border Width="50" Height="50" Background="Black" CornerRadius="16" HorizontalAlignment="Left">
+                        <TextBlock Margin="0 0 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding Black, StringFormat=0.##}" VerticalAlignment="Center" Foreground="{StaticResource TangoLightForegroundBrush}"></TextBlock>
+                    </Border>
+                    <TextBlock  Margin="0 10 0 0" Text="K" FontSize="{StaticResource TangoDefaultFontSize}"  HorizontalAlignment="Center"/>
+                </StackPanel>
+            </UniformGrid>
+        </DataTemplate>
+
+        <DataTemplate x:Key="RGB_Template" DataType="{x:Type entities:BrushStop}">
+            <UniformGrid Rows="1" Columns="3" Height="Auto" >
+                <StackPanel Orientation="Vertical" Width="50">
+                    <Border Width="50" Height="50" Background="Red" CornerRadius="16" HorizontalAlignment="Left">
+                        <TextBlock Margin="0 0 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding Red}" VerticalAlignment="Center"></TextBlock>
+                    </Border>
+                    <TextBlock Margin="0 10 0 0" Text="R" FontSize="{StaticResource TangoDefaultFontSize}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    
+                </StackPanel>
+                <StackPanel Orientation="Vertical" Margin="4 0 0 0"  Width="50">
+                    <Border Width="50" Height="50" Background="Green" CornerRadius="16" HorizontalAlignment="Left">
+                        <TextBlock Margin="0 0 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding Green}"  VerticalAlignment="Center"></TextBlock>
+                    </Border>
+                    <TextBlock Margin="0 10 0 0" Text="G" FontSize="{StaticResource TangoDefaultFontSize}"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    
+                </StackPanel>
+                <StackPanel Orientation="Vertical" Margin="4 0 0 0" Width="50">
+                    <Border Width="50" Height="50" Background="Blue" CornerRadius="16" HorizontalAlignment="Left">
+                        <TextBlock Margin="0 0 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding Blue}"  VerticalAlignment="Center" Foreground="{StaticResource TangoLightForegroundBrush}"></TextBlock>
+                    </Border>
+                    <TextBlock Margin="0 10 0 0" Text="B" FontSize="{StaticResource TangoDefaultFontSize}"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    
+                </StackPanel>
+            </UniformGrid>
+        </DataTemplate>
+
+        <DataTemplate x:Key="LAB_Template" DataType="{x:Type entities:BrushStop}">
+            <UniformGrid Rows="1" Columns="3" Height="Auto" MinWidth="180" HorizontalAlignment="Left">
+                <StackPanel Orientation="Vertical" Width="50">
+                    <Border Width="50" Height="50" Background="Gray" CornerRadius="16" HorizontalAlignment="Left">
+                        <TextBlock Margin="0 0 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding L, StringFormat=0.##}" VerticalAlignment="Center"></TextBlock>
+                    </Border>
+                    <TextBlock Margin="0 10 0 0 " Text="L" FontSize="{StaticResource TangoDefaultFontSize}" HorizontalAlignment="Center"/>
+                    
+                </StackPanel>
+                <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left" Margin="5 0 0 0">
+                    <Border Width="50" Height="50" Background="red" CornerRadius="16" HorizontalAlignment="Left">
+                        <TextBlock Margin="0 0 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding A, StringFormat=0.##}"  VerticalAlignment="Center"></TextBlock>
+                    </Border>
+                    <TextBlock  Margin="0 10 0 0 " Text="a" FontSize="{StaticResource TangoDefaultFontSize}"  HorizontalAlignment="Center"/>
+                </StackPanel>
+                <StackPanel Orientation="Vertical" Margin="10 0 0 0" Width="50">
+                    <Border Width="50" Height="50" Background="Blue" CornerRadius="16" HorizontalAlignment="Left">
+                        <TextBlock Margin="0 0 0 0" HorizontalAlignment="Center" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding B, StringFormat=0.##}" Foreground="{StaticResource TangoLightForegroundBrush}"  VerticalAlignment="Center"></TextBlock>
+                    </Border>
+                    <TextBlock  Margin="0 10 0 0 " Text="b" FontSize="{StaticResource TangoDefaultFontSize}"  HorizontalAlignment="Center"/>
+                </StackPanel>
+            </UniformGrid>
+        </DataTemplate>
+
+        <DataTemplate x:Key="CATALOG_Template" DataType="{x:Type entities:BrushStop}">
+            <UniformGrid Rows="1" Columns="2" Height="Auto" MinWidth="180">
+                <StackPanel Orientation="Vertical" Margin="0 0 0 0">
+                    <TextBlock  Text="Catalog:" FontSize="{StaticResource TangoDefaultFontSize}"  VerticalAlignment="Center"/>
+                    <TextBlock Margin="0 10 0 0"  Style="{StaticResource SliderGreyTextStyle}" Text="{Binding ColorCatalog.Name}" FontSize="{StaticResource TangoDefaultFontSize}" HorizontalAlignment="Left"></TextBlock>
+                </StackPanel>
+                <StackPanel Orientation="Vertical" Margin="10 0 0 0">
+                    <TextBlock  Text="Color:" FontSize="{StaticResource TangoDefaultFontSize}"  VerticalAlignment="Center"/>
+                    <TextBlock Margin="0 10 0 0"   Style="{StaticResource SliderGreyTextStyle}" Text="{Binding ColorCatalogsItem.Name}" FontSize="{StaticResource TangoDefaultFontSize}" HorizontalAlignment="Left" ></TextBlock>
+                </StackPanel>
+            </UniformGrid>
+        </DataTemplate>
+        
     </UserControl.Resources>
 
     <Grid>
@@ -119,7 +219,7 @@
                 </StackPanel>
             </Grid>
 
-            <Grid Margin="0 150 0 0">
+            <Grid Margin="0 70 0 0">
                 <StackPanel MaxWidth="600">
                     <Canvas Height="80" Margin="0">
                         <StackPanel>
@@ -206,8 +306,175 @@
                     </Grid>
                 </StackPanel>
             </Grid>
+            <Grid Margin="0 30 0 0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="2*"/>
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Vertical">
+                    <StackPanel Orientation="Horizontal">
+                        <Image Source="../Images/JobProgressView/input.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                        <TextBlock VerticalAlignment="Center" Margin="15 0 0 0" FontSize="{StaticResource TangoDefaultFontSize}">
+                            <TextBlock.Style>
+                                <Style TargetType="TextBlock">
+                                    <Setter Property="Text" Value="Input"/>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding CurrentBrushStop.ColorSpace.Name, Converter={StaticResource EnumToDescriptionConverter}}" Value="Volume">
+                                            <Setter Property="Text" Value="Input ( % )"/>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                    </StackPanel>
+                    <UniformGrid Margin="0 20 0 0" Rows="1" Columns="3" Height="Auto" MinWidth="190" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                        <StackPanel Orientation="Vertical" Width="50">
+                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                <TextBlock Margin="0 0 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " Text="L" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                        <StackPanel Orientation="Vertical" Width="50" >
+                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                <TextBlock Margin="0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                            </Border>
+                            <TextBlock  Margin="0 10 0 0 " Text="a" FontSize="{StaticResource TangoSmallFontSize}"  HorizontalAlignment="Center"/>
+                        </StackPanel>
+                        <StackPanel Orientation="Vertical"  Width="50">
+                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                <TextBlock Margin="0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                            </Border>
+                            <TextBlock  Margin="0 10 0 0 " Text="b" FontSize="{StaticResource TangoSmallFontSize}"  HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </UniformGrid>
+                    <Grid Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <ContentControl x:Name="leftBrushValues" HorizontalAlignment="Left" Content="{Binding CurrentBrushStop}" Width="Auto"  Height="Auto"  Margin="0 20 0 0">
+                            <ContentControl.Style>
+                                <Style TargetType="ContentControl">
+                                    <Setter Property="ContentTemplate">
+                                        <Setter.Value>
+                                            <DataTemplate/>
+                                        </Setter.Value>
+                                    </Setter>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding CurrentBrushStop.ColorSpace.Name, Converter={StaticResource EnumToDescriptionConverter}}" Value="RGB">
+                                            <Setter Property="ContentTemplate" Value="{StaticResource RGB_Template}" />
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding CurrentBrushStop.ColorSpace.Name, Converter={StaticResource EnumToDescriptionConverter}}" Value="Volume">
+                                            <Setter Property="ContentTemplate" Value="{StaticResource CMYK_Template}" />
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding CurrentBrushStop.ColorSpace.Name}" Value="LAB">
+                                            <Setter Property="ContentTemplate" Value="{StaticResource LAB_Template}" />
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding CurrentBrushStop.ColorSpace.Name, Converter={StaticResource EnumToDescriptionConverter}}" Value="Catalog">
+                                            <Setter Property="ContentTemplate" Value="{StaticResource CATALOG_Template}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </ContentControl.Style>
+                        </ContentControl>
+                    </Grid>
+                </StackPanel>
+                <StackPanel Orientation="Vertical"  Grid.Column="1" Margin="60 0 0 0">
+                    <StackPanel Orientation="Horizontal">
+                        <Image Source="../Images/JobProgressView/output.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"  Height="Auto" ClipToBounds="True"/>
+                        <TextBlock VerticalAlignment="Center" Margin="15 0 0 0" FontSize="{StaticResource TangoDefaultFontSize}" >Output ( % ) </TextBlock>
+                    </StackPanel>
+                    <UniformGrid Margin="0 20 0 0" Rows="1" Columns="7" Height="Auto" Width="435" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                        <StackPanel Orientation="Vertical" Width="50">
+                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="C" ></TextBlock>
+                        </StackPanel>
+                        <StackPanel Orientation="Vertical" Width="50">
+                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="M" ></TextBlock>
+                        </StackPanel>
+                        <StackPanel Orientation="Vertical" Width="50">
+                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="Y" HorizontalAlignment="Center" ></TextBlock>
+                        </StackPanel> 
+                        <StackPanel Orientation="Vertical" Width="50">
+                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="K" ></TextBlock>
+                        </StackPanel>
+                        <StackPanel Orientation="Vertical" Width="50">
+                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                        </StackPanel>
+                        <StackPanel Orientation="Vertical" Width="50">
+                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                        </StackPanel>
+                        <StackPanel Orientation="Vertical" Width="50">
+                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                        </StackPanel>
+                       
+                    </UniformGrid>
+                    <UniformGrid Columns="7" Rows="1" Margin="0 20 0 0" Width="440" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left" >
+                            <Border Width="50" Height="50" Background="Cyan" CornerRadius="16" HorizontalAlignment="Left" VerticalAlignment="Center">
+                                <TextBlock Margin="0 0 0 0 " HorizontalAlignment="Center" Text="{Binding CyanOutput}" VerticalAlignment="Center"></TextBlock>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">C</TextBlock>
+                        </StackPanel>
+                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                            <Border Width="50" Height="50" Background="LightCyan" CornerRadius="16" HorizontalAlignment="Left">
+                                <TextBlock Margin="0 0 0 0 " HorizontalAlignment="Center" Text="{Binding LightCyanOutput}" VerticalAlignment="Center"></TextBlock>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LC</TextBlock>
+                        </StackPanel>
+                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                            <Border Width="50" Height="50" Background="Magenta" CornerRadius="16" HorizontalAlignment="Left">
+                                 <TextBlock Margin="0 0 0 0 " HorizontalAlignment="Center" Text="{Binding MagentaOutput}" VerticalAlignment="Center"></TextBlock>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">M</TextBlock>
+                        </StackPanel> 
+                       
+                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                            <Border Width="50" Height="50" Background="LightPink" CornerRadius="16" HorizontalAlignment="Left">
+                                 <TextBlock Margin="0 0 0 0 " HorizontalAlignment="Center" Text="{Binding LightMagentaOutput}" VerticalAlignment="Center"></TextBlock>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LM</TextBlock>
+                        </StackPanel>
+                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                            <Border Width="50" Height="50" Background="Yellow" CornerRadius="16" HorizontalAlignment="Left">
+                                <TextBlock Margin="0 0 0 0 " HorizontalAlignment="Center" Text="{Binding YellowOutput}" VerticalAlignment="Center"></TextBlock>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">Y</TextBlock>
+                        </StackPanel>
+                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                            <Border Width="50" Height="50" Background="LightYellow" CornerRadius="16" HorizontalAlignment="Left">
+                                <TextBlock Margin="0 0 0 0 " HorizontalAlignment="Center" Text="{Binding LightYellowOutput}" VerticalAlignment="Center"></TextBlock>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LY</TextBlock>
+                        </StackPanel>
+                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                            <Border Width="50" Height="50" Background="Black" CornerRadius="16" HorizontalAlignment="Left">
+                                <TextBlock Margin="0 0 0 0 " HorizontalAlignment="Center" Text="{Binding BlackOutput}" VerticalAlignment="Center" Foreground="{StaticResource TangoLightForegroundBrush}"></TextBlock>
+                            </Border>
+                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">K</TextBlock>
+                        </StackPanel>
+                    </UniformGrid>
+                </StackPanel>
+
+            </Grid>
 
-            <touch:TouchButton Margin="0 100 0 0" Command="{Binding GoToJobCommand}" Style="{StaticResource TangoLinkButton}" Height="60" FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding RunningJobStatus.IsCompleted,Converter={StaticResource BooleanToVisibilityConverter}}">
+            <touch:TouchButton Margin="0 5 0 20" Command="{Binding GoToJobCommand}" Style="{StaticResource TangoLinkButton}" Height="60" FontSize="{StaticResource TangoTitleFontSize}" Visibility="{Binding RunningJobStatus.IsCompleted,Converter={StaticResource BooleanToVisibilityConverter}}">
                 Go to job
             </touch:TouchButton>
         </StackPanel>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobSummeryView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobSummeryView.xaml
index a013cd7f9..6eb51d16f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobSummeryView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobSummeryView.xaml
@@ -11,6 +11,14 @@
              xmlns:local="clr-namespace:Tango.PPC.Jobs.Views"
              mc:Ignorable="d" 
              d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:JobSummeryViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.JobSummeryViewVM}">
+    
+    <UserControl.Resources>
+        <Style x:Key="SliderGreyTextStyle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="{StaticResource TangoDefaultFontSize}"></Setter>
+            <Setter Property="VerticalAlignment" Value="Center"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Center"></Setter>
+        </Style>
+    </UserControl.Resources>
 
     <Grid Background="White">
         <Grid.RowDefinitions>
@@ -51,7 +59,8 @@
                         <Grid.RowDefinitions>
                             <RowDefinition Height="60*"/>
                             <RowDefinition Height="400*"/>
-                            <RowDefinition Height="300*"/>
+                            <RowDefinition Height="180*"/>
+                            <RowDefinition Height="170"/>
                         </Grid.RowDefinitions>
 
                         <TextBlock FontSize="{StaticResource TangoHeaderFontSize}" Text="{Binding Job.Name}" HorizontalAlignment="Center" VerticalAlignment="Center" TextWrapping="Wrap"></TextBlock>
@@ -103,7 +112,92 @@
                         </StackPanel>
 
                         <controls:JobSummeryViewer Height="60" Job="{Binding Job}" VerticalAlignment="Center" Margin="20 0" Grid.Row="2" />
+                       <Grid Margin="0 0 0 20" Grid.Row="3">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="2.5*"/>
+                            </Grid.ColumnDefinitions>
+                            <StackPanel Orientation="Vertical">
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Source="../Images/JobProgressView/input.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                                    <TextBlock VerticalAlignment="Center" Margin="15 0 0 0" FontSize="{StaticResource TangoDefaultFontSize}">Input</TextBlock>
+                                </StackPanel>
+                                <UniformGrid Margin="0 20 0 0" Rows="1" Columns="3" Height="Auto" MinWidth="190" HorizontalAlignment="Left" >
+                                    <StackPanel Orientation="Vertical" Width="50">
+                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                            <TextBlock Margin="0 0 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                        </Border>
+                                        <TextBlock Margin="0 10 0 0 " Text="L" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Vertical" Width="50" >
+                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                            <TextBlock Margin="0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                        </Border>
+                                        <TextBlock  Margin="0 10 0 0 " Text="a" FontSize="{StaticResource TangoSmallFontSize}"  HorizontalAlignment="Center"/>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Vertical"  Width="50">
+                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                             <TextBlock Margin="0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                        </Border>
+                                        <TextBlock  Margin="0 10 0 0 " Text="b" FontSize="{StaticResource TangoSmallFontSize}"  HorizontalAlignment="Center"/>
+                                    </StackPanel>
+                                </UniformGrid>
+                            </StackPanel>
+                            <StackPanel Orientation="Vertical"  Grid.Column="1" Margin="60 0 0 0">
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Source="../Images/JobProgressView/output.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"  Height="Auto"/>
+                                    <TextBlock VerticalAlignment="Center" Margin="15 0 0 0" FontSize="{StaticResource TangoDefaultFontSize}" >Output ( % )</TextBlock>
+                                </StackPanel>
+                                <UniformGrid Margin="0 20 0 0" Rows="1" Columns="7" Height="Auto" Width="435" HorizontalAlignment="Left" >
+                                    <StackPanel Orientation="Vertical" Width="50">
+                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                            <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                        </Border>
+                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="C" ></TextBlock>
+                                       </StackPanel>
+                                    <StackPanel Orientation="Vertical" Width="50">
+                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                            <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                        </Border>
+                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="M" ></TextBlock>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Vertical" Width="50">
+                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                           <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                        </Border>
+                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="Y" HorizontalAlignment="Center" ></TextBlock>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Vertical" Width="50">
+                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                             <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                        </Border>
+                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="K" ></TextBlock>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Vertical" Width="50">
+                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                            <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                        </Border>
+                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Vertical" Width="50">
+                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                            <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                        </Border>
+                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Vertical" Width="50">
+                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1">
+                                            <TextBlock Margin="0 0 0 0 " Text="0" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                        </Border>
+                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                        
+                                    </StackPanel>
+                                </UniformGrid>
+                                </StackPanel>
+                        </Grid>
+                        
                     </Grid>
+                   
                 </DockPanel>
             </Border>
         </Grid>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/Guides/machine-image-X4.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/Guides/machine-image-X4.png
new file mode 100644
index 000000000..5a6095e4c
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/Guides/machine-image-X4.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj
index bebdd63c7..6ede5f25b 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj
@@ -323,10 +323,13 @@
   <ItemGroup>
     <Resource Include="Images\thread_loading.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Guides\machine-image-X4.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs
index a8af047fc..2279b8bb5 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs
@@ -34,36 +34,36 @@ namespace Tango.PPC.Maintenance.ViewModels
     {
         public enum Boards
         {
-            [Description("Main")]
-            Main = 1,
+            //[Description("Main")]
+            //Main = 1,
             [Description("Heads")]
-            Heads = 2,
+            Heads = 1,
             [Description("Dryer")]
-            Dryer = 3,
+            Dryer = 2,
             [Description("Mid tanks")]
-            Midtanks = 4,
+            Midtanks = 3,
             [Description("Lubricant")]
-            Lubricant = 5,
+            Lubricant = 4,
             [Description("Dispenser 1")]
-            Dispenser_1 = 6,
+            Dispenser_1 = 5,
             [Description("Dispenser 2")]
-            Dispenser_2 = 7,
+            Dispenser_2 = 6,
             [Description("Dispenser 3")]
-            Dispenser_3 = 8,
+            Dispenser_3 = 7,
             [Description("Dispenser 4")]
-            Dispenser_4 = 9,
-            [Description("Dispenser 5")]
-            Dispenser_5 = 10,
-            [Description("Dispenser 6")]
-            Dispenser_6 = 11,
+            Dispenser_4 = 8,
+            //[Description("Dispenser 5")]
+            //Dispenser_5 = 9,
+            //[Description("Dispenser 6")]
+            //Dispenser_6 = 10,
             [Description("Winder 1")]
-            Winder_1 = 12,
+            Winder_1 = 11,
             [Description("Winder 2")]
-            Winder_2 = 13,
+            Winder_2 = 12,
             [Description("Winder 3")]
-            Winder_3 = 14,
+            Winder_3 = 13,
             [Description("Winder 4")]
-            Winder_4 = 15,
+            Winder_4 = 14,
             
         }
         public class WasteStateModel : ExtendedObject
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/EurekaMaintenanceView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/EurekaMaintenanceView.xaml
index faef8be1a..0b30d697e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/EurekaMaintenanceView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/EurekaMaintenanceView.xaml
@@ -132,7 +132,7 @@
                             <touch:TouchDropShadowBorder Margin="0 0 0 0" Padding="0" MinHeight="216">
                                 <StackPanel Orientation="Vertical">
                                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="30 0 30 0" Height="116">
-                                        <TextBlock VerticalAlignment="Center" Text="Reset Specific Board:" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Width="210"></TextBlock>
+                                        <TextBlock VerticalAlignment="Center" Text="Reset Specific Board:" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Width="240"></TextBlock>
                                         <Border Margin="55 0 0 0" x:Name="emborder" BorderThickness="1 1 1 1"  Height="50" CornerRadius="25" BorderBrush="{StaticResource TangoMidAccentBrush}">
                                             <touch:TouchComboBox Margin="20 0 10 0" ItemsSource="{Binding ListBoards}" SelectedItem="{Binding SelecteadBoard,Mode=TwoWay}" Focusable="False" KeyboardNavigation.TabNavigation ="None" Width="260" DisplayMemberPath="">
                                                 <touch:TouchComboBox.ItemTemplate>
@@ -152,7 +152,7 @@
 
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="30 0 30 0" Height="100">
-                                        <TextBlock VerticalAlignment="Center" Text="Machine Heaters:" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Width="210"></TextBlock>
+                                        <TextBlock VerticalAlignment="Center" Text="Machine Heaters:" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Width="240"></TextBlock>
                                         <touch:TouchToggleSlider IsChecked="{Binding EnableHeaters}" Margin="55 0 0 0"   HorizontalAlignment="Right" Width="90">
                                             <touch:TouchToggleSlider.Style>
                                                 <Style TargetType="touch:TouchToggleSlider" BasedOn="{StaticResource TangoToggleButtonGrayAccent}">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine-X4.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine-X4.png
new file mode 100644
index 000000000..25e4697fd
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Images/machine-X4.png