wrong color preview with CMYK in CE6

Related Work Items: #8781

1 files changed, 19 insertions, 14 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
index a6e7af170..ffec3cfa1 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
@@ -1,23 +1,18 @@
-using System;
-using ColorMine.ColorSpaces;
+using ColorMine.ColorSpaces;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using Tango.SharedUI;
 using System.Windows.Media;
+using Tango.BL.Dispensing;
+using Tango.BL.Entities;
 using Tango.BL.Enumerations;
-using Tango.Core.Threading;
 using Tango.ColorConversion;
-using System.Reflection;
-using Tango.BL.Dispensing;
-using Tango.BL;
-using Tango.Core.ExtensionMethods;
-using Newtonsoft.Json;
-using Tango.Settings;
-using Tango.PPC.Common;
+using Tango.Core.Threading;
 using Tango.PMR.ColorLab;
+using Tango.PPC.Common;
+using Tango.Settings;
+using Tango.SharedUI;
 
 namespace Tango.PPC.Jobs.Models
 {
@@ -1732,7 +1727,17 @@ namespace Tango.PPC.Jobs.Models
 
                 Configuration configuration = SegmentModel.Job.Machine.Configuration;
                 Rml rml = SegmentModel.Job.Rml;
+                bool bChangedVersion = false;
+                if (stop.BrushColorSpace == BL.Enumerations.ColorSpaces.Volume && rml.ColorConversionVersion == 6)
+                {
+                    rml.ColorConversionVersion = 5;
+                    bChangedVersion = true;
+                }
                 var output = _converter.Convert(stop, configuration, rml, false, false, false);
+                if (bChangedVersion)
+                {
+                    rml.ColorConversionVersion = 6;
+                }
                 //output.SingleCoordinates.OutputLiquids.SingleOrDefault(x => x.LiquidType == PMR.ColorLab.LiquidType.Cyan).Volume;
 
                 if (stop.BrushColorSpace == BL.Enumerations.ColorSpaces.Volume)