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

B2020-047 forced pagination causing single step part to print on a page all by itself. Westinghouse house data BDS-101 Attachment 1

Browse Source
This commit is contained in:
John Jenko 2020-04-01 20:27:09 +00:00
parent dc304f984f
commit 9bea938777
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@ -1782,7 +1782,8 @@ i = 0;
if (myMsg != null && myMsg != "")stitle = stitle + myMsg; if (myMsg != null && myMsg != "")stitle = stitle + myMsg;
} }
plstr = SplitTitle(svgGroup, pageItem, stitle, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionTitleLength, token, plstr, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionNumberAndTitleLength); plstr = SplitTitle(svgGroup, pageItem, stitle, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionTitleLength, token, plstr, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionNumberAndTitleLength);
PrintedSectionPage = (int)pageItem.Row - _sectLevelNumTtlDiff; if ((pageItem.Justify & VEPROMS.CSLA.Library.E_Justify.PSOnlyFirst) == VEPROMS.CSLA.Library.E_Justify.PSOnlyFirst) // B2020-047 only set PrintedSectionPage if PSOnly is used
PrintedSectionPage = (int)pageItem.Row - _sectLevelNumTtlDiff;
} }
else else
plstr = plstr.Replace(token, ""); plstr = plstr.Replace(token, "");

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

@ -1415,10 +1415,10 @@ namespace Volian.Print.Library
yTopMargin = _PointsPerPage - (float)MyItemInfo.ActiveSection.MyDocStyle.Layout.TopMargin; yTopMargin = _PointsPerPage - (float)MyItemInfo.ActiveSection.MyDocStyle.Layout.TopMargin;
yBottomMargin = Math.Max(0, yTopMargin - (float)MyItemInfo.ActiveSection.MyDocStyle.Layout.PageLength); yBottomMargin = Math.Max(0, yTopMargin - (float)MyItemInfo.ActiveSection.MyDocStyle.Layout.PageLength);
} }
else if (MyPageHelper.PrintedSectionPage > 0) else // B2020-047 move check of PrintSectionPage to after the ResetSvg
{ {
MyPageHelper.ResetSvg(); MyPageHelper.ResetSvg();
if (MyItemInfo.ActiveSection != null && (MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PrintSectOnFirst) == E_DocStructStyle.DSS_PrintSectOnFirst) if (MyPageHelper.PrintedSectionPage > 0 && MyItemInfo.ActiveSection != null && (MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PrintSectOnFirst) == E_DocStructStyle.DSS_PrintSectOnFirst)
{ {
yTopMargin = _PointsPerPage - (float)MyItemInfo.ActiveSection.MyDocStyle.Layout.TopMargin + MyPageHelper.PrintedSectionPage; yTopMargin = _PointsPerPage - (float)MyItemInfo.ActiveSection.MyDocStyle.Layout.TopMargin + MyPageHelper.PrintedSectionPage;
MyPageHelper.YTopMargin = yTopMargin; MyPageHelper.YTopMargin = yTopMargin;