From a0b6b8a8ce5d1252ba96064b228e604674f18ceb Mon Sep 17 00:00:00 2001 From: John Date: Fri, 9 Oct 2020 19:44:40 +0000 Subject: [PATCH] B2020-140 Added a format variable to Wolf Creek to override the placement of text table cells to correct placement of checkboxes in table cells --- PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs | 8 ++++++++ PROMS/Volian.Print.Library/Grid2Pdf.cs | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 31686e9b..27732d78 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -3600,6 +3600,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SingleColumnRNOIndent, "@SingleColumnRNOIndent"); } } + private LazyLoad _OverrideTableTopIndent; + public int? OverrideTableTopIndent + { + get + { + return LazyLoad(ref _OverrideTableTopIndent, "@OverrideTableTopIndent"); + } + } private LazyLoad _ColRTable; public string ColRTable { diff --git a/PROMS/Volian.Print.Library/Grid2Pdf.cs b/PROMS/Volian.Print.Library/Grid2Pdf.cs index b80b2434..e5917868 100644 --- a/PROMS/Volian.Print.Library/Grid2Pdf.cs +++ b/PROMS/Volian.Print.Library/Grid2Pdf.cs @@ -1027,8 +1027,11 @@ public string Path // / Current (Post FLEX) - U1 NOP NOT [EOPs] - ES-3.3.SProcedure Body.S9..S1..S1..T1. // Table did not print properly. Cell text was truncated. int topPlacementAdjust = (myCell.MyPara.Font.Size == 12 && - myCell.MyPara.Font.Familyname != "Courier New" && + myCell.MyPara.Font.Familyname != "Courier New" && myCell.MyPara.Font.Familyname != "VESymbFix") ? 1 : 3; // for font size of 12 set to one, else set to 3 + // B2020-140 for Wolf Creek check boxes in tables were printing too hight in the table cells - added format variable to overide topPlacementAdjust + if (myCell.MyPara !=null && ItemInfo.Get(myCell.MyTable.ItemID).ActiveFormat.MyStepSectionLayoutData.OverrideTableTopIndent != null) + topPlacementAdjust = (int)ItemInfo.Get(myCell.MyTable.ItemID).ActiveFormat.MyStepSectionLayoutData.OverrideTableTopIndent; myCell.ToPdf(myColumnText, left, top, topPlacementAdjust); } }