From c23e72b8b4eec5fe4b6ee77bc997980fcb356846 Mon Sep 17 00:00:00 2001 From: Roy Date: Sun, 13 Nov 2022 10:36:11 +0200 Subject: PPC "Use Flat Spool" + SpoolType logic improvements. Added RML->SpoolType calibration new parameters. --- .../PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Printing') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs index c5fc6c6b2..83f4d4f29 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs @@ -55,7 +55,7 @@ namespace Tango.PPC.UI.Printing /// The job. /// The context. /// - public async Task Print(Job job, ObservablesContext context) + public async Task Print(Job job, ObservablesContext context, PrintingConfiguration printConfig = null) { ThrowIfJobInvalid(job); @@ -99,7 +99,12 @@ namespace Tango.PPC.UI.Printing var spoolType = await context.SpoolTypes.FirstOrDefaultAsync(x => x.Guid == spoolTypeGuid); if (spoolType == null) { - spoolType = await context.SpoolTypes.FirstOrDefaultAsync(x => x.Code == (int)BL.Enumerations.SpoolTypes.StandardSpool); + spoolType = await context.SpoolTypes.FirstOrDefaultAsync(x => x.Code == (int)SpoolTypes.StandardSpool); + } + + if (job.SpoolType.Type == SpoolTypes.FlatSpool) + { + spoolType = await context.SpoolTypes.FirstOrDefaultAsync(x => x.Code == (int)SpoolTypes.FlatSpool); } job.SpoolType = spoolType; -- cgit v1.3.1