New Extra inks work + changed Transparent Ink to Transparent.

3 files changed, 45 insertions, 46 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs
index f40415159..39d4954fe 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs
@@ -22,28 +22,27 @@ namespace Tango.PMR.ColorLab {
     static LiquidTypeReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChBMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIq4gYKCkxp",
+            "ChBMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIq3wYKCkxp",
             "cXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2VudGEQARIKCgZZZWxsb3cQAhIJ",
-            "CgVCbGFjaxADEhIKDlRyYW5zcGFyZW50SW5rEAQSDQoJTHVicmljYW50EAUS",
-            "CwoHQ2xlYW5lchAGEg0KCUxpZ2h0Q3lhbhAHEhAKDExpZ2h0TWFnZW50YRAI",
-            "Eg8KC0xpZ2h0WWVsbG93EAkSCgoGVmlvbGV0EAoSCAoEQmx1ZRALEg0KCUxp",
-            "Z2h0Qmx1ZRAMEgoKBk9yYW5nZRANEg8KC0xpZ2h0T3JhbmdlEA4SCgoGUnVi",
-            "aW5lEA8SDwoLTGlnaHRSdWJpbmUQEBIICgROYXZ5EBESFAoQVFdUcmFuc3Bh",
-            "cmVudEluaxBkEggKBEMxVEkQaRIKCgZUV0N5YW4QbhIPCgtUV0xpZ2h0Q3lh",
-            "bhBvEg0KCVRXTWFnZW50YRB4EhIKDlRXTGlnaHRNYWdlbnRhEHkSDQoIVFdZ",
-            "ZWxsb3cQggESEgoNVFdMaWdodFllbGxvdxCDARINCghDMVllbGxvdxCHARIS",
-            "Cg1DMUxpZ2h0WWVsbG93EIgBEgwKB1RXQmxhY2sQjAESDQoIVFdWaW9sZXQQ",
-            "lgESEgoNVFdMaWdodFZpb2xldBCXARILCgZDVEJsdWUQ0gESEAoLQ1RMaWdo",
-            "dEJsdWUQ0wESDQoIQ1RSdWJpbmUQ3AESEgoNQ1RMaWdodFJ1YmluZRDdARIN",
-            "CghDVE9yYW5nZRDmARISCg1DVExpZ2h0T3JhbmdlEOcBEgsKBkNUTmF2eRDw",
-            "ARILCgZIREJsdWUQtgISEAoLSERMaWdodEJsdWUQtwISDQoISERSdWJpbmUQ",
-            "wAISEgoNSERMaWdodFJ1YmluZRDBAhINCghIRE9yYW5nZRDKAhISCg1IRExp",
-            "Z2h0T3JhbmdlEMsCEgsKBkhETmF2eRDUAhIQCgtIRExpZ2h0TmF2eRDVAhIL",
-            "CgZBTUJsdWUQmgMSEAoLQU1MaWdodEJsdWUQmwMSCgoFQU1SZWQQpAMSDwoK",
-            "QU1MaWdodFJlZBClAxINCghBTU9yYW5nZRCuAxISCg1BTUxpZ2h0T3Jhbmdl",
-            "EK8DEg0KCEFNWWVsbG93ELgDEhIKDUFNTGlnaHRZZWxsb3cQuQMSDAoHQU1C",
-            "bGFjaxDCA0IeChxjb20udHdpbmUudGFuZ28ucG1yLmNvbG9ybGFiYgZwcm90",
-            "bzM="));
+            "CgVCbGFjaxADEg8KC1RyYW5zcGFyZW50EAQSDQoJTHVicmljYW50EAUSCwoH",
+            "Q2xlYW5lchAGEg0KCUxpZ2h0Q3lhbhAHEhAKDExpZ2h0TWFnZW50YRAIEg8K",
+            "C0xpZ2h0WWVsbG93EAkSCgoGVmlvbGV0EAoSCAoEQmx1ZRALEg0KCUxpZ2h0",
+            "Qmx1ZRAMEgoKBk9yYW5nZRANEg8KC0xpZ2h0T3JhbmdlEA4SCgoGUnViaW5l",
+            "EA8SDwoLTGlnaHRSdWJpbmUQEBIICgROYXZ5EBESFAoQVFdUcmFuc3BhcmVu",
+            "dEluaxBkEggKBEMxVEkQaRIKCgZUV0N5YW4QbhIPCgtUV0xpZ2h0Q3lhbhBv",
+            "Eg0KCVRXTWFnZW50YRB4EhIKDlRXTGlnaHRNYWdlbnRhEHkSDQoIVFdZZWxs",
+            "b3cQggESEgoNVFdMaWdodFllbGxvdxCDARINCghDMVllbGxvdxCHARISCg1D",
+            "MUxpZ2h0WWVsbG93EIgBEgwKB1RXQmxhY2sQjAESDQoIVFdWaW9sZXQQlgES",
+            "EgoNVFdMaWdodFZpb2xldBCXARILCgZDVEJsdWUQ0gESEAoLQ1RMaWdodEJs",
+            "dWUQ0wESDQoIQ1RSdWJpbmUQ3AESEgoNQ1RMaWdodFJ1YmluZRDdARINCghD",
+            "VE9yYW5nZRDmARISCg1DVExpZ2h0T3JhbmdlEOcBEgsKBkNUTmF2eRDwARIL",
+            "CgZIREJsdWUQtgISEAoLSERMaWdodEJsdWUQtwISDQoISERSdWJpbmUQwAIS",
+            "EgoNSERMaWdodFJ1YmluZRDBAhINCghIRE9yYW5nZRDKAhISCg1IRExpZ2h0",
+            "T3JhbmdlEMsCEgsKBkhETmF2eRDUAhIQCgtIRExpZ2h0TmF2eRDVAhILCgZB",
+            "TUJsdWUQmgMSEAoLQU1MaWdodEJsdWUQmwMSCgoFQU1SZWQQpAMSDwoKQU1M",
+            "aWdodFJlZBClAxINCghBTU9yYW5nZRCuAxISCg1BTUxpZ2h0T3JhbmdlEK8D",
+            "Eg0KCEFNWWVsbG93ELgDEhIKDUFNTGlnaHRZZWxsb3cQuQMSDAoHQU1CbGFj",
+            "axDCA0IeChxjb20udHdpbmUudGFuZ28ucG1yLmNvbG9ybGFiYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.ColorLab.LiquidType), }, null));
@@ -57,7 +56,7 @@ namespace Tango.PMR.ColorLab {
     [pbr::OriginalName("Magenta")] Magenta = 1,
     [pbr::OriginalName("Yellow")] Yellow = 2,
     [pbr::OriginalName("Black")] Black = 3,
-    [pbr::OriginalName("TransparentInk")] TransparentInk = 4,
+    [pbr::OriginalName("Transparent")] Transparent = 4,
     [pbr::OriginalName("Lubricant")] Lubricant = 5,
     [pbr::OriginalName("Cleaner")] Cleaner = 6,
     [pbr::OriginalName("LightCyan")] LightCyan = 7,
diff --git a/Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs b/Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs
index 5e6507bd0..03b1ffe87 100644
--- a/Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs
+++ b/Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs
@@ -138,9 +138,9 @@ public static class ExtensionMethods
     /// <param name="nlPerStep">The nl per step.</param>
     public static void NormalizeStop(this JobBrushStop stop, double nlPerCM, double minInkUptake, double dyeingSpeed)
     {
-        double nlPcmSum = stop.Dispensers.Where(x => x.DispenserLiquidType != DispenserLiquidType.Cleaner && x.DispenserLiquidType != DispenserLiquidType.Lubricant && x.DispenserLiquidType != DispenserLiquidType.TransparentInk).Sum(x => x.NanoliterPerCentimeter);
+        double nlPcmSum = stop.Dispensers.Where(x => x.DispenserLiquidType != DispenserLiquidType.Cleaner && x.DispenserLiquidType != DispenserLiquidType.Lubricant && x.DispenserLiquidType != DispenserLiquidType.Transparent).Sum(x => x.NanoliterPerCentimeter);
 
-        var ti = stop.Dispensers.FirstOrDefault(x => x.DispenserLiquidType == DispenserLiquidType.TransparentInk);
+        var ti = stop.Dispensers.FirstOrDefault(x => x.DispenserLiquidType == DispenserLiquidType.Transparent);
 
         if (ti == null) return;
         //if (Math.Max(0, minInkUptake - nlPcmSum) < minInkUptake * 0.02d) return;
diff --git a/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs b/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs
index 8066298cf..acaec115b 100644
--- a/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs
@@ -23,27 +23,27 @@ namespace Tango.PMR.Printing {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChlEaXNwZW5zZXJMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuUHJpbnRp",
-            "bmcq6wYKE0Rpc3BlbnNlckxpcXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2Vu",
-            "dGEQARIKCgZZZWxsb3cQAhIJCgVCbGFjaxADEhIKDlRyYW5zcGFyZW50SW5r",
-            "EAQSDQoJTHVicmljYW50EAUSCwoHQ2xlYW5lchAGEg0KCUxpZ2h0Q3lhbhAH",
-            "EhAKDExpZ2h0TWFnZW50YRAIEg8KC0xpZ2h0WWVsbG93EAkSCgoGVmlvbGV0",
-            "EAoSCAoEQmx1ZRALEg0KCUxpZ2h0Qmx1ZRAMEgoKBk9yYW5nZRANEg8KC0xp",
-            "Z2h0T3JhbmdlEA4SCgoGUnViaW5lEA8SDwoLTGlnaHRSdWJpbmUQEBIICgRO",
-            "YXZ5EBESFAoQVFdUcmFuc3BhcmVudEluaxBkEggKBEMxVEkQaRIKCgZUV0N5",
-            "YW4QbhIPCgtUV0xpZ2h0Q3lhbhBvEg0KCVRXTWFnZW50YRB4EhIKDlRXTGln",
-            "aHRNYWdlbnRhEHkSDQoIVFdZZWxsb3cQggESEgoNVFdMaWdodFllbGxvdxCD",
-            "ARINCghDMVllbGxvdxCHARISCg1DMUxpZ2h0WWVsbG93EIgBEgwKB1RXQmxh",
-            "Y2sQjAESDQoIVFdWaW9sZXQQlgESEgoNVFdMaWdodFZpb2xldBCXARILCgZD",
-            "VEJsdWUQ0gESEAoLQ1RMaWdodEJsdWUQ0wESDQoIQ1RSdWJpbmUQ3AESEgoN",
-            "Q1RMaWdodFJ1YmluZRDdARINCghDVE9yYW5nZRDmARISCg1DVExpZ2h0T3Jh",
-            "bmdlEOcBEgsKBkNUTmF2eRDwARILCgZIREJsdWUQtgISEAoLSERMaWdodEJs",
-            "dWUQtwISDQoISERSdWJpbmUQwAISEgoNSERMaWdodFJ1YmluZRDBAhINCghI",
-            "RE9yYW5nZRDKAhISCg1IRExpZ2h0T3JhbmdlEMsCEgsKBkhETmF2eRDUAhIQ",
-            "CgtIRExpZ2h0TmF2eRDVAhILCgZBTUJsdWUQmgMSEAoLQU1MaWdodEJsdWUQ",
-            "mwMSCgoFQU1SZWQQpAMSDwoKQU1MaWdodFJlZBClAxINCghBTU9yYW5nZRCu",
-            "AxISCg1BTUxpZ2h0T3JhbmdlEK8DEg0KCEFNWWVsbG93ELgDEhIKDUFNTGln",
-            "aHRZZWxsb3cQuQMSDAoHQU1CbGFjaxDCA0IeChxjb20udHdpbmUudGFuZ28u",
-            "cG1yLnByaW50aW5nYgZwcm90bzM="));
+            "bmcq6AYKE0Rpc3BlbnNlckxpcXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2Vu",
+            "dGEQARIKCgZZZWxsb3cQAhIJCgVCbGFjaxADEg8KC1RyYW5zcGFyZW50EAQS",
+            "DQoJTHVicmljYW50EAUSCwoHQ2xlYW5lchAGEg0KCUxpZ2h0Q3lhbhAHEhAK",
+            "DExpZ2h0TWFnZW50YRAIEg8KC0xpZ2h0WWVsbG93EAkSCgoGVmlvbGV0EAoS",
+            "CAoEQmx1ZRALEg0KCUxpZ2h0Qmx1ZRAMEgoKBk9yYW5nZRANEg8KC0xpZ2h0",
+            "T3JhbmdlEA4SCgoGUnViaW5lEA8SDwoLTGlnaHRSdWJpbmUQEBIICgROYXZ5",
+            "EBESFAoQVFdUcmFuc3BhcmVudEluaxBkEggKBEMxVEkQaRIKCgZUV0N5YW4Q",
+            "bhIPCgtUV0xpZ2h0Q3lhbhBvEg0KCVRXTWFnZW50YRB4EhIKDlRXTGlnaHRN",
+            "YWdlbnRhEHkSDQoIVFdZZWxsb3cQggESEgoNVFdMaWdodFllbGxvdxCDARIN",
+            "CghDMVllbGxvdxCHARISCg1DMUxpZ2h0WWVsbG93EIgBEgwKB1RXQmxhY2sQ",
+            "jAESDQoIVFdWaW9sZXQQlgESEgoNVFdMaWdodFZpb2xldBCXARILCgZDVEJs",
+            "dWUQ0gESEAoLQ1RMaWdodEJsdWUQ0wESDQoIQ1RSdWJpbmUQ3AESEgoNQ1RM",
+            "aWdodFJ1YmluZRDdARINCghDVE9yYW5nZRDmARISCg1DVExpZ2h0T3Jhbmdl",
+            "EOcBEgsKBkNUTmF2eRDwARILCgZIREJsdWUQtgISEAoLSERMaWdodEJsdWUQ",
+            "twISDQoISERSdWJpbmUQwAISEgoNSERMaWdodFJ1YmluZRDBAhINCghIRE9y",
+            "YW5nZRDKAhISCg1IRExpZ2h0T3JhbmdlEMsCEgsKBkhETmF2eRDUAhIQCgtI",
+            "RExpZ2h0TmF2eRDVAhILCgZBTUJsdWUQmgMSEAoLQU1MaWdodEJsdWUQmwMS",
+            "CgoFQU1SZWQQpAMSDwoKQU1MaWdodFJlZBClAxINCghBTU9yYW5nZRCuAxIS",
+            "Cg1BTUxpZ2h0T3JhbmdlEK8DEg0KCEFNWWVsbG93ELgDEhIKDUFNTGlnaHRZ",
+            "ZWxsb3cQuQMSDAoHQU1CbGFjaxDCA0IeChxjb20udHdpbmUudGFuZ28ucG1y",
+            "LnByaW50aW5nYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Printing.DispenserLiquidType), }, null));
@@ -57,7 +57,7 @@ namespace Tango.PMR.Printing {
     [pbr::OriginalName("Magenta")] Magenta = 1,
     [pbr::OriginalName("Yellow")] Yellow = 2,
     [pbr::OriginalName("Black")] Black = 3,
-    [pbr::OriginalName("TransparentInk")] TransparentInk = 4,
+    [pbr::OriginalName("Transparent")] Transparent = 4,
     [pbr::OriginalName("Lubricant")] Lubricant = 5,
     [pbr::OriginalName("Cleaner")] Cleaner = 6,
     [pbr::OriginalName("LightCyan")] LightCyan = 7,