From b43df02d498d3ad51bdf111da8cc26d75891a955 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 25 Feb 2022 15:26:26 +0000 Subject: [PATCH] B2022-030 moved unit watermark setup calls to after processing/setup of the procedure number --- PROMS/VEPROMS User Interface/DlgPrintProcedure.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index 3426ba79..a5c0ad9f 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -718,12 +718,10 @@ namespace VEPROMS { string locpdfname = null; // get pdf file name for later merge code MyProcedure = myProc; - frmPDFStatusForm.SetUnitWatermark(MyProcedure, ref waterMarkText, ref watermarkColor); //C2022-004 Unit Designator watermark // C2021-019: Override Watermark Text, 'waterMarkText' will have whatever watermark text should be printed ProcedureConfig procConfig = MyProcedure.MyConfig as ProcedureConfig; string waterMarkTextOverride = ""; if (procConfig != null) waterMarkTextOverride = procConfig.GetValue("PSI", "WATERMARKOVERRIDE"); - if (swtbtnWaterMark.Value && waterMarkTextOverride != null && waterMarkTextOverride != "") waterMarkText = waterMarkTextOverride; // C2020-002 paper size is now set in the format files - default is Letter Volian.Print.Library.Rtf2Pdf.PaperSize = myProc.ActiveFormat.PlantFormat.FormatData.PDFPageSize.PaperSize; if (myProc.Sections != null) @@ -737,7 +735,10 @@ namespace VEPROMS { MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = SelectedSlave; SetupForProcedure(); - // C2021-062 save the entered Rev Number to all of the procedures that are being printed + //B2022-030 moved the watermark stuff after SetupForProcedure so that DisplayNumber is properly resolved and the proper unit watermark is found + // also moved the setting of override watermark to after SetUnitWatermark so that it truely overrrides + frmPDFStatusForm.SetUnitWatermark(MyProcedure, ref waterMarkText, ref watermarkColor); //C2022-004 Unit Designator watermark // C2021-062 save the entered Rev Number to all of the procedures that are being printed + if (swtbtnWaterMark.Value && waterMarkTextOverride != null && waterMarkTextOverride != "") waterMarkText = waterMarkTextOverride; if (_NewRevForAllProcs != null) SaveRevNumToProcedureConfig(_NewRevForAllProcs); pbPDFsStatus.TextVisible = true; pbPDFsStatus.Text = string.Format("Creating PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n); @@ -775,6 +776,10 @@ namespace VEPROMS { MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = k; SetupForProcedure(); + //B2022-030 moved the watermark stuff after SetupForProcedure so that DisplayNumber is properly resolved and the proper unit watermark is found + // also moved the setting of override watermark to after SetUnitWatermark so that it truely overrrides + frmPDFStatusForm.SetUnitWatermark(MyProcedure, ref waterMarkText, ref watermarkColor); //C2022-004 Unit Designator watermark // C2021-062 save the entered Rev Number to all of the procedures that are being printed + if (swtbtnWaterMark.Value && waterMarkTextOverride != null && waterMarkTextOverride != "") waterMarkText = waterMarkTextOverride; // C2021-062 save the entered Rev Number to all of the procedures that are being printed if (_NewRevForAllProcs != null) SaveRevNumToProcedureConfig(_NewRevForAllProcs); pbPDFsStatus.TextVisible = true; @@ -809,6 +814,10 @@ namespace VEPROMS else { SetupForProcedure(); + //B2022-030 moved the watermark stuff after SetupForProcedure so that DisplayNumber is properly resolved and the proper unit watermark is found + // also moved the setting of override watermark to after SetUnitWatermark so that it truely overrrides + frmPDFStatusForm.SetUnitWatermark(MyProcedure, ref waterMarkText, ref watermarkColor); //C2022-004 Unit Designator watermark // C2021-062 save the entered Rev Number to all of the procedures that are being printed + if (swtbtnWaterMark.Value && waterMarkTextOverride != null && waterMarkTextOverride != "") waterMarkText = waterMarkTextOverride; pbPDFsStatus.TextVisible = true; pbPDFsStatus.Text = string.Format("Creating PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n); pbPDFsStatus.Value = i;