Inks Extension Support.

3 files changed, 40 insertions, 19 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
                     {
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteJob/IRemoteJobInputOutputProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteJob/IRemoteJobInputOutputProvider.cs
index cc98bd419..85dd66f7c 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteJob/IRemoteJobInputOutputProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteJob/IRemoteJobInputOutputProvider.cs
@@ -10,13 +10,6 @@ namespace Tango.PPC.Common.RemoteJob
     public interface IRemoteJobInputOutputProvider
     {
         BrushStop CurrentBrushStop { get; }
-
-        double CyanOutput { get; }
-        double MagentaOutput { get; }
-        double YellowOutput { get; }
-        double BlackOutput { get; }
-        double LightCyanOutput { get; }
-        double LightMagentaOutput { get; }
-        double LightYellowOutput { get; }
+        List<LiquidOutputModel> LiquidOutputs { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteJob/LiquidOutputModel.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteJob/LiquidOutputModel.cs
new file mode 100644
index 000000000..113d11ddc
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteJob/LiquidOutputModel.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using Tango.Core;
+
+namespace Tango.PPC.Common.RemoteJob
+{
+    public class LiquidOutputModel : ExtendedObject
+    {
+        private LiquidType _liquidType;
+        public LiquidType LiquidType
+        {
+            get { return _liquidType; }
+            set { _liquidType = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _volume;
+        public double Volume
+        {
+            get { return _volume; }
+            set { _volume = value; RaisePropertyChangedAuto(); }
+        }
+    }
+}