From c50e8793fc48afdb53a44ef670860e18f366a70d Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 6 Jan 2021 15:16:42 +0200
Subject: Restored latest changes !!!

---
 .../PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs   | 14 +++++++++++++-
 .../Modules/Tango.PPC.Technician/Views/SystemView.xaml    | 15 +++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/PPC/Modules')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
index fe831587c..afbce995d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
@@ -537,7 +537,19 @@ namespace Tango.PPC.Jobs.ViewModels
 
                 if (colorProfile == null)
                 {
-                    job.AddSolidSegment(Settings.DefaultSegmentLength > 0 ? Settings.DefaultSegmentLength : 100);
+                    var segment = job.AddSolidSegment(Settings.DefaultSegmentLength > 0 ? Settings.DefaultSegmentLength : 100);
+
+                    try
+                    {
+                        if (vm.SelectedColorSpace == ColorSpaces.Catalog)
+                        {
+                            segment.BrushStops[0].ColorCatalogGuid = catalogVM.SelectedCatalog.Guid;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, $"Error setting first segment brush stop color catalog guide.");
+                    }
                 }
                 else
                 {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
index 52abfc239..292a87bb9 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
@@ -131,6 +131,21 @@
                                 </Table.Columns>
 
                                 <TableRowGroup>
+
+                                    <TableRow>
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>Environment:</TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock Text="{Binding Settings.DeploymentSlot,Converter={StaticResource EnumToDescriptionConverter},Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+
                                     <TableRow>
                                         <TableCell>
                                             <Paragraph>
-- 
cgit v1.3.1