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

Changed pagination logic for Cautions and Notes on substeps

Browse Source 
Removed code to remove last character when printing in compare mode.  This was originally done because of differences with the way 16 Bit VE-PROMS did word wrapping to aid in comparision printing.
This commit is contained in:
Rich
2014-02-06 18:38:26 +00:00
parent 9de2e84909
commit 7e67e619e8
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,7 +388,7 @@ namespace Volian.Print.Library
ySpaceOnCurPage -= myBottomMsgSpace;
vlnParagraph lastBreak = paraBreak;
paraBreak = FindPageBreak(yStart, ySpaceOnCurPage, yLowerLimit, myList, paraBreak, yPageSize - (myTopMsgSpace + SixLinesPerInch) - myBottomMsgSpace);
Console.WriteLine("Break at {0}", paraBreak.MyItemInfo.ShortPath);
//Console.WriteLine("Break at {0}", paraBreak.MyItemInfo.ShortPath);//Comment Out before release
if (paraBreak == null)
{
_MyLog.ErrorFormat("<<< ERROR >>> Cannot find a place to break\r\n==>'Cannot Find Place to Break',{0},'{1}','{2}'"
@@ -497,7 +497,9 @@ namespace Volian.Print.Library
!myPara.MyParent.MyItemInfo.IsHigh &&
myPara.MyParent.YSize > (yUpperLimit + yLocation))
{
return myList[stepLevel][yLocation];
//McGuire Unit 1 AOPs - AP/1/A/5500/07.SEnclosure 7.S31..S1..C1
if ((-yLocation + yStart) >= yLowerLimit ) // Only if it is more than the lower limit
return myPara;
}
}
}

18
PROMS/Volian.Print.Library/vlnPrintObject.cs
View File

@@ -122,15 +122,15 @@ namespace Volian.Print.Library
if (myParagraph != null)
{
//if (myParagraph.MyItemInfo.FormatStepData != null && myParagraph.MyItemInfo.FormatStepData.Font.Family == "Prestige Elite Tall")
if (!myParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.WrapSameAsEdit)
{
Chunk chk = RemoveLastCharacter(iParagraph);
float heightAllButOne = GetHeight(cb, iParagraph, width, throwException);
if (heightAll != heightAllButOne)
return heightAllButOne;
if (chk != null)
RestoreLastCharacter(iParagraph, chk);
}
//if (!myParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.WrapSameAsEdit)
//{
// Chunk chk = RemoveLastCharacter(iParagraph);
// float heightAllButOne = GetHeight(cb, iParagraph, width, throwException);
// if (heightAll != heightAllButOne)
// return heightAllButOne;
// if (chk != null)
// RestoreLastCharacter(iParagraph, chk);
//}
}
}
return heightAll;