aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio
diff options
context:
space:
mode:
Diffstat (limited to 'Software/Visual_Studio')
-rw-r--r--Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/CsvModel.cs2
-rw-r--r--Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs2
-rw-r--r--Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs2
-rw-r--r--Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/LiquidTypeToColorConverter.cs2
-rw-r--r--Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/LiquidTypeToShortNameConverter.cs2
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs2
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs2
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/ExcelModel.cs2
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs2
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Converters/LiquidTypeToShortNameConverter.cs2
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs2
-rw-r--r--Software/Visual_Studio/Tango.BL/Entities/JobRun.cs2
-rw-r--r--Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs6
-rw-r--r--Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs5
-rw-r--r--Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs4
-rw-r--r--Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs43
-rw-r--r--Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs4
-rw-r--r--Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs44
-rw-r--r--Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs2
19 files changed, 66 insertions, 66 deletions
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/CsvModel.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/CsvModel.cs
index 5b9371748..06cca05ab 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/CsvModel.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/CsvModel.cs
@@ -63,7 +63,7 @@ namespace Tango.FSE.Statistics.Models
public String OutputLightRubine { get; set; }
public String OutputNavy { get; set; }
public String OutputViolet { get; set; }
- public String OutputTransparentInk { get; set; }
+ public String OutputTransparent { get; set; }
public String OutputLubricant { get; set; }
public String FailureReason { get; set; }
}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs
index fe240f18d..a4f2f8caf 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs
@@ -87,7 +87,7 @@ namespace Tango.FSE.Statistics.Models
{
var output = new List<PresentationLiquidVolume>();
output.AddRange(LiquidVolumes.Where(x => x.LiquidType.HasPigment && x.Volume > 0).OrderBy(x => x.LiquidType.PreferredIndex));
- output.Add(LiquidVolumes.FirstOrDefault(x => x.LiquidType.Type == LiquidTypes.TransparentInk));
+ output.Add(LiquidVolumes.FirstOrDefault(x => x.LiquidType.Type == LiquidTypes.Transparent));
return output;
}
}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
index e93370621..e3546cb92 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
@@ -859,7 +859,7 @@ namespace Tango.FSE.Statistics.ViewModels
model.OutputNavy = stop.GetLiquidVolumeOutputOrZero(LiquidTypes.Navy).ToString();
model.OutputViolet = stop.GetLiquidVolumeOutputOrZero(LiquidTypes.Violet).ToString();
- model.OutputTransparentInk = stop.GetLiquidVolumeOutputOrZero(LiquidTypes.TransparentInk).ToString();
+ model.OutputTransparent = stop.GetLiquidVolumeOutputOrZero(LiquidTypes.Transparent).ToString();
model.OutputLubricant = stop.GetLiquidVolumeOutputOrZero(LiquidTypes.Lubricant).ToString();
model.FailureReason = stop.JobRun.FailedMessage;
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/LiquidTypeToColorConverter.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/LiquidTypeToColorConverter.cs
index 5ae27f0ec..bbd22cf39 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/LiquidTypeToColorConverter.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/LiquidTypeToColorConverter.cs
@@ -38,7 +38,7 @@ namespace Tango.FSE.Common.Converters
return LightMagenta;
case LiquidTypes.LightYellow:
return LightYellow;
- case LiquidTypes.TransparentInk:
+ case LiquidTypes.Transparent:
return Brushes.Transparent;
}
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/LiquidTypeToShortNameConverter.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/LiquidTypeToShortNameConverter.cs
index 8d783ae69..9d3f435ce 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/LiquidTypeToShortNameConverter.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/LiquidTypeToShortNameConverter.cs
@@ -20,7 +20,7 @@ namespace Tango.FSE.Common.Converters
{
case LiquidTypes.Cleaner:
return "CL";
- case LiquidTypes.TransparentInk:
+ case LiquidTypes.Transparent:
return "TI";
case LiquidTypes.Black:
return "K";
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 75dcdbfe4..c928af0c7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -1130,7 +1130,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
if (!ValidateIdsPack(orderedPacks[1], LiquidTypes.Cyan, MidTankTypes.StandardMidTank, DispenserTypes.StandardDispenser, IdsPackFormulas.StandardColor)) throw noneGen1Exception;
if (!ValidateIdsPack(orderedPacks[2], LiquidTypes.Magenta, MidTankTypes.StandardMidTank, DispenserTypes.StandardDispenser, IdsPackFormulas.StandardColor)) throw noneGen1Exception;
if (!ValidateIdsPack(orderedPacks[3], LiquidTypes.Yellow, MidTankTypes.StandardMidTank, DispenserTypes.StandardDispenser, IdsPackFormulas.StandardColor)) throw noneGen1Exception;
- if (!ValidateIdsPack(orderedPacks[4], LiquidTypes.TransparentInk, MidTankTypes.StandardMidTank, DispenserTypes.StandardDispenser, IdsPackFormulas.TransparentLiquid)) throw noneGen1Exception;
+ if (!ValidateIdsPack(orderedPacks[4], LiquidTypes.Transparent, MidTankTypes.StandardMidTank, DispenserTypes.StandardDispenser, IdsPackFormulas.TransparentLiquid)) throw noneGen1Exception;
if (!orderedPacks[5].IsEmpty) throw noneGen1Exception;
if (!ValidateIdsPack(orderedPacks[6], LiquidTypes.Cleaner, MidTankTypes.StandardMidTank, DispenserTypes.StandardDispenser, IdsPackFormulas.CleanerLiquid)) throw noneGen1Exception;
if (!ValidateIdsPack(orderedPacks[7], LiquidTypes.Lubricant, MidTankTypes.StandardMidTank, DispenserTypes.StandardDispenser, IdsPackFormulas.Lubricant)) throw noneGen1Exception;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index 0962cd4d1..2e39f9e12 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -1357,7 +1357,7 @@ namespace Tango.MachineStudio.RML.ViewModels
case PMR.ColorLab.LiquidType.Black:
item.Volume = result.Black;
break;
- case PMR.ColorLab.LiquidType.TransparentInk:
+ case PMR.ColorLab.LiquidType.Transparent:
break;
case PMR.ColorLab.LiquidType.Lubricant:
break;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/ExcelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/ExcelModel.cs
index 8b916237a..aff113fc6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/ExcelModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/ExcelModel.cs
@@ -46,7 +46,7 @@ namespace Tango.MachineStudio.Statistics.Models
public String OutputLightRubine { get; set; }
public String OutputNavy { get; set; }
public String OutputViolet { get; set; }
- public String OutputTransparentInk { get; set; }
+ public String OutputTransparent { get; set; }
public String OutputLubricant { get; set; }
public String FailureReason { get; set; }
}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
index 5f667bf01..9327ecfdf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
@@ -724,7 +724,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
excel_model.OutputNavy = jobRunModel.JobRun.NavyQuantity < 0 ? "" : jobRunModel.JobRun.NavyQuantity.ToString();
excel_model.OutputViolet = jobRunModel.JobRun.VioletQuantity < 0 ? "" : jobRunModel.JobRun.VioletQuantity.ToString();
- excel_model.OutputTransparentInk = jobRunModel.JobRun.TransparentQuantity < 0 ? "" : jobRunModel.JobRun.TransparentQuantity.ToString();
+ excel_model.OutputTransparent = jobRunModel.JobRun.TransparentQuantity < 0 ? "" : jobRunModel.JobRun.TransparentQuantity.ToString();
excel_model.OutputLubricant = jobRunModel.JobRun.LubricantQuantity < 0 ? "" : jobRunModel.JobRun.LubricantQuantity.ToString();
//excel_model.Cleaner = jobRunModel.JobRun.CleanerQuantity < 0 ? "" : jobRunModel.JobRun.CleanerQuantity.ToString();
excel_model.FailureReason = jobRunModel.JobRun.FailedMessage;
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Converters/LiquidTypeToShortNameConverter.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Converters/LiquidTypeToShortNameConverter.cs
index 15041bf17..c9b49d221 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Converters/LiquidTypeToShortNameConverter.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Converters/LiquidTypeToShortNameConverter.cs
@@ -20,7 +20,7 @@ namespace Tango.PPC.Maintenance.Converters
{
case BL.Enumerations.LiquidTypes.Cleaner:
return "CL";
- case BL.Enumerations.LiquidTypes.TransparentInk:
+ case BL.Enumerations.LiquidTypes.Transparent:
return "TI";
case BL.Enumerations.LiquidTypes.Black:
return "K";
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
index 56314414a..2f8f4e24a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
@@ -125,7 +125,7 @@ namespace Tango.PPC.UI.ViewModels
return Application.Current.Resources["TangoLubricantBrush"] as Brush;
case BL.Enumerations.LiquidTypes.Cleaner:
return Application.Current.Resources["TangoCleanerBrush"] as Brush;
- case BL.Enumerations.LiquidTypes.TransparentInk:
+ case BL.Enumerations.LiquidTypes.Transparent:
return Application.Current.Resources["TangoTransparentInkBrush"] as Brush;
case BL.Enumerations.LiquidTypes.LightCyan:
return Application.Current.Resources["TangoLightCyanInkBrush"] as Brush;
diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
index 73be1c9d8..f2a182e84 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs
@@ -99,7 +99,7 @@ namespace Tango.BL.Entities
_liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Magenta, Quantity = MagentaQuantity });
_liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Yellow, Quantity = YellowQuantity });
_liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Black, Quantity = BlackQuantity });
- _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.TransparentInk, Quantity = TransparentQuantity });
+ _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Transparent, Quantity = TransparentQuantity });
_liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Lubricant, Quantity = LubricantQuantity });
_liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Cleaner, Quantity = CleanerQuantity });
_liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.LightCyan, Quantity = LightCyanQuantity });
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs
index d44726994..36dbbc823 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs
@@ -56,10 +56,10 @@ namespace Tango.BL.Enumerations
HDOrange = 330,
/// <summary>
- /// (Transparent Ink)
+ /// (Transparent)
/// </summary>
- [Description("Transparent Ink")]
- TransparentInk = 4,
+ [Description("Transparent")]
+ Transparent = 4,
/// <summary>
/// (TW Transparent Ink)
diff --git a/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs b/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs
index c29ec8319..e128a5949 100644
--- a/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs
+++ b/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs
@@ -411,7 +411,7 @@ namespace Tango.Integration.JobRuns
{ LiquidTypes.Magenta, q => run.MagentaQuantity = update ? run.MagentaQuantity + q : q },
{ LiquidTypes.Yellow, q => run.YellowQuantity = update ? run.YellowQuantity + q : q },
{ LiquidTypes.Black, q => run.BlackQuantity = update ? run.BlackQuantity + q : q },
- { LiquidTypes.TransparentInk, q => run.TransparentQuantity = update ? run.TransparentQuantity + q : q },
+ { LiquidTypes.Transparent, q => run.TransparentQuantity = update ? run.TransparentQuantity + q : q },
{ LiquidTypes.Lubricant, q => run.LubricantQuantity = update ? run.LubricantQuantity + q : q },
{ LiquidTypes.Cleaner, q => run.CleanerQuantity = update ? run.CleanerQuantity + q : q },
{ LiquidTypes.LightCyan, q => run.LightCyanQuantity = update ? run.LightCyanQuantity + q : q },
@@ -424,7 +424,8 @@ namespace Tango.Integration.JobRuns
{ LiquidTypes.Rubine, q => run.RubineQuantity = update ? run.RubineQuantity + q : q },
{ LiquidTypes.LightRubine, q => run.LightRubineQuantity = update ? run.LightRubineQuantity + q : q },
{ LiquidTypes.Navy, q => run.NavyQuantity = update ? run.NavyQuantity + q : q },
- { LiquidTypes.Violet, q => run.VioletQuantity = update ? run.VioletQuantity + q : q }
+ { LiquidTypes.Violet, q => run.VioletQuantity = update ? run.VioletQuantity + q : q },
+ { LiquidTypes.TWCyan, q => run.TwCyanQuantity = update ? run.VioletQuantity + q : q }
};
foreach (var liquidType in setters.Keys)
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 1da752d23..86f93c872 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -4815,12 +4815,12 @@ namespace Tango.Integration.Operation
LogManager.Log("Modifying all 'white' brush stops...");
foreach (var stop in job.OrderedSegmentsWithGroups.SelectMany(x => x.BrushStops).Where(x => x.IsTransparent || x.IsWhite).ToList())
{
- foreach (var liquidVolume in stop.LiquidVolumes.Where(x => x.LiquidType != LiquidTypes.TransparentInk && x.LiquidType != LiquidTypes.Lubricant).ToList())
+ foreach (var liquidVolume in stop.LiquidVolumes.Where(x => x.LiquidType != LiquidTypes.Transparent && x.LiquidType != LiquidTypes.Lubricant).ToList())
{
liquidVolume.Volume = 0;
}
- var tiLiquid = stop.LiquidVolumes.SingleOrDefault(x => x.IdsPack != null && x.IdsPack.LiquidType != null && x.LiquidType == LiquidTypes.TransparentInk);
+ var tiLiquid = stop.LiquidVolumes.SingleOrDefault(x => x.IdsPack != null && x.IdsPack.LiquidType != null && x.LiquidType == LiquidTypes.Transparent);
if (tiLiquid != null)
{
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,
diff --git a/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs
index 1509bdd6e..ce47ec063 100644
--- a/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs
@@ -104,7 +104,7 @@ namespace Tango.JobRunsGenerator
run.BlackQuantity = black != null ? black.Quantity : 0;
//TI
- var ti = run.LiquidQuantities.FirstOrDefault(x => x.LiquidType == BL.Enumerations.LiquidTypes.TransparentInk);
+ var ti = run.LiquidQuantities.FirstOrDefault(x => x.LiquidType == BL.Enumerations.LiquidTypes.Transparent);
run.TransparentQuantity = ti != null ? ti.Quantity : 0;
//Lubricant
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-19 18:28:56 +0000