From aba62e86fcc78e71bdcb263abda735e844e86240 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 17 Apr 2019 18:47:20 +0300
Subject: Fixed a few issues with PPC events and memory leak. Changed color
 space PANTON to Coats. Modified JobProgressBarItem in PPC to display the
 proper duration.

---
 .../Modules/Tango.PPC.Jobs/AppBarItems/JobProgressAppBarItemView.xaml | 4 ++--
 .../Tango.PPC.Jobs/Converters/ColorSpaceToVisibilityConverter.cs      | 2 +-
 .../PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/PPC')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppBarItems/JobProgressAppBarItemView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppBarItems/JobProgressAppBarItemView.xaml
index 5e193edbf..cdc28335d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppBarItems/JobProgressAppBarItemView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppBarItems/JobProgressAppBarItemView.xaml
@@ -10,11 +10,11 @@
         <touch:TouchButton Style="{StaticResource TangoFlatButton}" Command="{Binding PressedCommand}" Padding="0">
             <StackPanel VerticalAlignment="Center">
                 <TextBlock Text="{Binding MachineProvider.MachineOperator.RunningJob.Name,FallbackValue='Job Name'}" FontSize="{StaticResource TangoTitleFontSize}"></TextBlock>
-                <ProgressBar Maximum="{Binding MachineProvider.MachineOperator.RunningJobStatus.TotalProgress}" Value="{Binding MachineProvider.MachineOperator.RunningJobStatus.Progress}" Margin="0 10 0 5" Background="{StaticResource TangoGrayBrush}" Height="5" Foreground="{StaticResource TangoPrimaryAccentBrush}" BorderThickness="0" />
+                <ProgressBar Maximum="{Binding MachineProvider.MachineOperator.RunningJobStatus.TotalProgressMinusSettingUp}" Value="{Binding MachineProvider.MachineOperator.RunningJobStatus.ProgressMinusSettingUp}" Margin="0 10 0 5" Background="{StaticResource TangoGrayBrush}" Height="5" Foreground="{StaticResource TangoPrimaryAccentBrush}" BorderThickness="0" />
                 <DockPanel LastChildFill="False">
                     <TextBlock DockPanel.Dock="Left">
                                             <Run>Completed</Run>
-                                            <Run Text="{Binding MachineProvider.MachineOperator.RunningJobStatus.Progress,StringFormat=0}"></Run><Run>/</Run><Run Text="{Binding MachineProvider.MachineOperator.RunningJobStatus.TotalProgress,StringFormat=0}"></Run><Run>m</Run>
+                                            <Run Text="{Binding MachineProvider.MachineOperator.RunningJobStatus.ProgressMinusSettingUp,StringFormat=0}"></Run><Run>/</Run><Run Text="{Binding MachineProvider.MachineOperator.RunningJobStatus.TotalProgressMinusSettingUp,StringFormat=0}"></Run><Run>m</Run>
                     </TextBlock>
 
                     <TextBlock DockPanel.Dock="Right">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Converters/ColorSpaceToVisibilityConverter.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Converters/ColorSpaceToVisibilityConverter.cs
index 4bfc08e62..f7e3bb282 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Converters/ColorSpaceToVisibilityConverter.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Converters/ColorSpaceToVisibilityConverter.cs
@@ -18,7 +18,7 @@ namespace Tango.PPC.Jobs.Converters
 
             if (colorSpace != null)
             {
-                if (colorSpace.Space == BL.Enumerations.ColorSpaces.Twine || colorSpace.Space == BL.Enumerations.ColorSpaces.PANTON)
+                if (colorSpace.Space == BL.Enumerations.ColorSpaces.Twine || colorSpace.Space == BL.Enumerations.ColorSpaces.Coats)
                 {
                     return Visibility.Collapsed;
                 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml
index fe483420a..897810c99 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml
@@ -66,7 +66,7 @@
                                 </touch:TouchStaticListBox.ItemContainerStyle>
                                 <touch:TouchStaticListBox.ItemTemplate>
                                     <DataTemplate>
-                                        <StackPanel Margin="10">
+                                        <StackPanel Margin="10" Width="70">
                                             <Ellipse Width="60" Height="60" Fill="{Binding Brush}" />
                                             <TextBlock Margin="0 5 0 0" HorizontalAlignment="Center" Text="{Binding Name}"></TextBlock>
                                         </StackPanel>
-- 
cgit v1.3.1