diff options
| author | Roy Ben Shabat <roy.mail.net@gmail.com> | 2025-09-08 17:28:51 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <roy.mail.net@gmail.com> | 2025-09-08 17:28:51 +0300 |
| commit | 987e4992d01a0bc84170498c40dad0621542f46c (patch) | |
| tree | 4b593db7f1e22ea34cc8dd8a7285903c43846188 /Software/Visual_Studio/Tango.Integration | |
| parent | f272d741e2c3ec820b1a39e7797ac46986ab62c9 (diff) | |
| download | Tango-987e4992d01a0bc84170498c40dad0621542f46c.tar.gz Tango-987e4992d01a0bc84170498c40dad0621542f46c.zip | |
New Extra inks work + changed Transparent Ink to Transparent.
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration')
| -rw-r--r-- | Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs | 5 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs | 4 |
2 files changed, 5 insertions, 4 deletions
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) { |