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

B2016-222 fixed calculation of box height for notes and cautions at a section level

Browse Source 
Added a check to prevent an index out of range error
This commit is contained in:
John Jenko 2016-10-04 19:13:11 +00:00
parent aa3be25330
commit 454697efdf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -301,7 +301,7 @@ namespace Volian.Print.Library
box = null; box = null;
yoff += 1 * vlnPrintObject.SixLinesPerInch; yoff += 1 * vlnPrintObject.SixLinesPerInch;
} }
vlnParagraph para = new vlnParagraph(Parent, cb, childItemInfo, xoff, yoff, rnoLevel, maxRNO, formatInfo, null, null, yoffRight,true, pp); vlnParagraph para = new vlnParagraph(Parent, cb, childItemInfo, xoff, yoff, rnoLevel, maxRNO, formatInfo, null, null, yoffRight, true, pp);
// if doing the component list (FNP), keep track of the bottom most columns' data // if doing the component list (FNP), keep track of the bottom most columns' data
// so this can be returned after the row is done. // so this can be returned after the row is done.
@ -3490,7 +3490,8 @@ namespace Volian.Print.Library
// In Checklist: I don't have children or if I have children the first child doesn't alignwithparent. // In Checklist: I don't have children or if I have children the first child doesn't alignwithparent.
|| (!itemInfo.IsStepSection && itemInfo.MyHLS != null && itemInfo.MyHLS.FormatStepData.UseSmartTemplate || (!itemInfo.IsStepSection && itemInfo.MyHLS != null && itemInfo.MyHLS.FormatStepData.UseSmartTemplate
&& ((itemInfo.Steps == null || itemInfo.Steps.Count == 0) && ((itemInfo.Steps == null || itemInfo.Steps.Count == 0)
|| !itemInfo.Steps[0].FormatStepData.StepLayoutData.AlignWithParentTab))) || !itemInfo.Steps[0].FormatStepData.StepLayoutData.AlignWithParentTab))
||((MyItemInfo.IsNote || MyItemInfo.IsCaution) && MyItemInfo.MyParent.IsSection)) // B2016-222 check if is a caution or note and parent is a section
{ {
bool doprint = !(MyPageHelper.DidHLSText && MyItemInfo.ItemID == MyPageHelper.HasHLSTextId); bool doprint = !(MyPageHelper.DidHLSText && MyItemInfo.ItemID == MyPageHelper.HasHLSTextId);
if (MyItemInfo.IsSection) if (MyItemInfo.IsSection)

2
PROMS/Volian.Print.Library/vlnTab.cs
View File

@ -29,7 +29,7 @@ namespace Volian.Print.Library
{ {
if ("0123456789".Contains(Text[(int)_TabAlign].ToString())) if ("0123456789".Contains(Text[(int)_TabAlign].ToString()))
{ {
while ("0123456789".Contains(Text[(int)_TabAlign].ToString())) while (_TabAlign < Text.Length && "0123456789".Contains(Text[(int)_TabAlign].ToString()))
_TabAlign++; _TabAlign++;
_TabAlign--; _TabAlign--;
} }