Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

B2022-030 moved unit watermark setup calls to after processing/setup of the procedure number

Browse Source
This commit is contained in:
John Jenko 2022-02-25 15:26:26 +00:00
parent c79e7942bb
commit b43df02d49
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PROMS/VEPROMS User Interface/DlgPrintProcedure.cs
View File

@ -718,12 +718,10 @@ namespace VEPROMS
{ {
string locpdfname = null; // get pdf file name for later merge code string locpdfname = null; // get pdf file name for later merge code
MyProcedure = myProc; 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 // C2021-019: Override Watermark Text, 'waterMarkText' will have whatever watermark text should be printed
ProcedureConfig procConfig = MyProcedure.MyConfig as ProcedureConfig; ProcedureConfig procConfig = MyProcedure.MyConfig as ProcedureConfig;
string waterMarkTextOverride = ""; string waterMarkTextOverride = "";
if (procConfig != null) waterMarkTextOverride = procConfig.GetValue("PSI", "WATERMARKOVERRIDE"); 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 // 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; Volian.Print.Library.Rtf2Pdf.PaperSize = myProc.ActiveFormat.PlantFormat.FormatData.PDFPageSize.PaperSize;
if (myProc.Sections != null) if (myProc.Sections != null)
@ -737,7 +735,10 @@ namespace VEPROMS
{ {
MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = SelectedSlave; MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = SelectedSlave;
SetupForProcedure(); 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); if (_NewRevForAllProcs != null) SaveRevNumToProcedureConfig(_NewRevForAllProcs);
pbPDFsStatus.TextVisible = true; pbPDFsStatus.TextVisible = true;
pbPDFsStatus.Text = string.Format("Creating PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n); 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; MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = k;
SetupForProcedure(); 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 // C2021-062 save the entered Rev Number to all of the procedures that are being printed
if (_NewRevForAllProcs != null) SaveRevNumToProcedureConfig(_NewRevForAllProcs); if (_NewRevForAllProcs != null) SaveRevNumToProcedureConfig(_NewRevForAllProcs);
pbPDFsStatus.TextVisible = true; pbPDFsStatus.TextVisible = true;
@ -809,6 +814,10 @@ namespace VEPROMS
else else
{ {
SetupForProcedure(); 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.TextVisible = true;
pbPDFsStatus.Text = string.Format("Creating PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n); pbPDFsStatus.Text = string.Format("Creating PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n);
pbPDFsStatus.Value = i; pbPDFsStatus.Value = i;