From 7bb4f9c680b07cac8d27e05f753bd576d9452efd Mon Sep 17 00:00:00 2001 From: John Date: Wed, 16 May 2018 20:13:51 +0000 Subject: [PATCH] B2018-077 Fixed the printing of a table that is inside of a Note. The table was printing outside the note box and overwriting the high level step text below it. --- PROMS/Volian.Print.Library/vlnParagraph.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 5ea6fe05..92f508db 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -383,7 +383,8 @@ namespace Volian.Print.Library box.Height = yoff - box.YOffset; // new height, with children // C2017-024 Wolf Creek wanted a hold point with out text and no extra blank lines in the caution/note box // so if they put only a hard space in for the text, then we will print the note/caution box with only the tab text - if (box.MyParent.MyItemInfo.MyContent.Text.StartsWith(@"\u160?") && box.MyParent.MyItemInfo.DisplayText.Length == 1) + // B2018-077 added check for parts under the note (ex. a table off of the note text) fix for Calvert OI-27B 6.11.B and 6.12.B + if (box.MyParent.MyItemInfo.MyContent.Text.StartsWith(@"\u160?") && box.MyParent.MyItemInfo.DisplayText.Length == 1 && box.MyParent.MyItemInfo.MyContent.ContentPartCount == 0) { box.Height -= 3 * vlnPrintObject.SixLinesPerInch; yoff -= vlnPrintObject.SixLinesPerInch; @@ -4160,7 +4161,8 @@ namespace Volian.Print.Library if (itemInfo.Tables[0].IsTable) { MyFlexGrid.LoadGrid(itemInfo.Tables[0]); - if (MyFlexGrid.BorderStyle == C1.Win.C1FlexGrid.Util.BaseControls.BorderStyleEnum.None && !MyFlexGrid.TopRowHasBorder()) + // B2018-077 added check for caution and note parts in which case we want the blank line - fix for Calvert OI-27B 6.11.B and 6.12.B + if (MyFlexGrid.BorderStyle == C1.Win.C1FlexGrid.Util.BaseControls.BorderStyleEnum.None && !MyFlexGrid.TopRowHasBorder() && !MyItemInfo.IsCautionOrNotePart) yoffadj = -SixLinesPerInch; }