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

Fixed issue where the first step of the second section was printing on top of the section title, when the second section prints with the continuous setting. Needed to use a different variable which better represented the y position of the text.

Browse Source
This commit is contained in:
John Jenko 2016-05-17 20:07:30 +00:00
parent f4b05839fa
commit 3b4d15b7dd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PROMS/Volian.Print.Library/Pagination.cs
View File

@ -441,11 +441,14 @@ namespace Volian.Print.Library
// ySize7LPI includes a blank line after the step which we don't want to include in the page break test. // ySize7LPI includes a blank line after the step which we don't want to include in the page break test.
else if (!KeepStepsOnPage && MyItemInfo.ActiveFormat.MyStepSectionLayoutData.CompressSteps else if (!KeepStepsOnPage && MyItemInfo.ActiveFormat.MyStepSectionLayoutData.CompressSteps
&& (mySize7LPI - SixLinesPerInch + yEndMsg - tableSpaceAvailable) < (yPageSizeNextPage * SixLinesPerInch / _SevenLinesPerInch))// RHM20150525 - Table Scrunch //&& (mySize7LPI - SixLinesPerInch + yEndMsg - tableSpaceAvailable) < (yPageSizeNextPage * SixLinesPerInch / _SevenLinesPerInch))// RHM20150525 - Table Scrunch
// if this is the first step, then the step has to fit in the space that remains on the page // if this is the first step, then the step has to fit in the space that remains on the page
// otherwise it needs to fit on a blank page // otherwise it needs to fit on a blank page
// This was originally (10/12/2015) added for Farley Shared AOP 79 but was found to be unnecessary // This was originally (10/12/2015) added for Farley Shared AOP 79 but was found to be unnecessary
//&& (mySize7LPI - SixLinesPerInch + yEndMsg - tableSpaceAvailable) < ((MyItemInfo.MyPrevious == null ? yWithinMargins : yPageSizeNextPage) * SixLinesPerInch / _SevenLinesPerInch))// RHM20150525 - Table Scrunch // jsj 5-17-2016 B2015-090 - Turns out that Wolf Creek needs this logic to properly print
// the Purpose, Symptoms or Entry Conditions, and References and Commitments sections which are set to print continuous.
// Without this logic, the first step of section 2.0 print on top of the section text in OFN BB-007
&& (mySize7LPI - SixLinesPerInch + yEndMsg - tableSpaceAvailable) < ((MyItemInfo.MyPrevious == null ? yWithinMargins : yPageSizeNextPage) * SixLinesPerInch / _SevenLinesPerInch))// RHM20150525 - Table Scrunch
{ {
// ooooooooo ooooo ooooooooo. ooooo // ooooooooo ooooo ooooooooo. ooooo
// d"""""""8' `888' `888 `Y88. `888' // d"""""""8' `888' `888 `Y88. `888'
@ -701,7 +704,6 @@ namespace Volian.Print.Library
private void BuildPageBreakList(float ySpaceOnCurPage, float yPageSize, bool KeepStepsOnPage, float yEndMsg, bool doSectionTitleContinued, bool onNewPage) private void BuildPageBreakList(float ySpaceOnCurPage, float yPageSize, bool KeepStepsOnPage, float yEndMsg, bool doSectionTitleContinued, bool onNewPage)
{ {
float topContinueHeight=2 * SixLinesPerInch; float topContinueHeight=2 * SixLinesPerInch;
//if(MyItemInfo.InList(41955)) Console.WriteLine("Here");
int profileDepth = ProfileTimer.Push(">>>> BuildPageBreakList"); int profileDepth = ProfileTimer.Push(">>>> BuildPageBreakList");
// if this paragraph is flagged to pagebreakonstep (i.e. these are used by background documents // if this paragraph is flagged to pagebreakonstep (i.e. these are used by background documents
// to get each hls/caution/note to be on its own page), then any of the children above should // to get each hls/caution/note to be on its own page), then any of the children above should