diff options
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteJob/DefaultRemoteJobService.cs')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteJob/DefaultRemoteJobService.cs | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteJob/DefaultRemoteJobService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteJob/DefaultRemoteJobService.cs index 00b4f5ad1..b42a3206c 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteJob/DefaultRemoteJobService.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteJob/DefaultRemoteJobService.cs @@ -180,10 +180,14 @@ namespace Tango.PPC.Common.RemoteJob switch (colorSpace) { case BL.Enumerations.ColorSpaces.Volume: - inputOutput.Input.Add(new Tuple<string, String>("C", i.CurrentBrushStop.Cyan.ToString("0.00"))); - inputOutput.Input.Add(new Tuple<string, String>("M", i.CurrentBrushStop.Magenta.ToString("0.00"))); - inputOutput.Input.Add(new Tuple<string, String>("Y", i.CurrentBrushStop.Yellow.ToString("0.00"))); - inputOutput.Input.Add(new Tuple<string, String>("K", i.CurrentBrushStop.Black.ToString("0.00"))); + if (i.CurrentBrushStop.LiquidVolumes != null) + { + foreach (var input in i.CurrentBrushStop.LiquidVolumesOrderedPigmentedForStandardUser.ToList()) + { + inputOutput.Input.Add(new Tuple<string, string>(input.IdsPack.LiquidType.ShortName, input.Volume.ToString())); + } + } + break; case BL.Enumerations.ColorSpaces.RGB: inputOutput.Input.Add(new Tuple<string, String>("R", i.CurrentBrushStop.Red.ToString())); @@ -205,13 +209,10 @@ namespace Tango.PPC.Common.RemoteJob try { - inputOutput.Output.Add(new Tuple<string, string>("C", i.CyanOutput.ToString())); - inputOutput.Output.Add(new Tuple<string, string>("LC", i.LightCyanOutput.ToString())); - inputOutput.Output.Add(new Tuple<string, string>("M", i.MagentaOutput.ToString())); - inputOutput.Output.Add(new Tuple<string, string>("LM", i.LightMagentaOutput.ToString())); - inputOutput.Output.Add(new Tuple<string, string>("Y", i.YellowOutput.ToString())); - inputOutput.Output.Add(new Tuple<string, string>("LY", i.LightYellowOutput.ToString())); - inputOutput.Output.Add(new Tuple<string, string>("K", i.BlackOutput.ToString())); + foreach (var output in i.LiquidOutputs) + { + inputOutput.Output.Add(new Tuple<string, string>(output.LiquidType.ShortName, output.Volume.ToString())); + } } catch { |