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

Browse Source
This commit is contained in:
Kathy Ruffing
2013-06-14 14:22:00 +00:00
parent 5d975e0f8e
commit ad2e39dc4d
5 changed files with 146 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,12 +82,12 @@ namespace Volian.Print.Library
{
if (bxIndx != null)
{
if (box != null)
{
box.Height = yoff - box.YOffset; // new height, with children
if (childItemInfo.MyHeader != null)
yoff += vlnPrintObject.SixLinesPerInch * 2;
}
if (box != null)
{
box.Height = yoff - box.YOffset; // new height, with children
//if (childItemInfo.MyHeader != null)
// yoff += vlnPrintObject.SixLinesPerInch * 2;
}
box = new vlnBox();
box.MyBox = formatInfo.PlantFormat.FormatData.BoxList[(int)bxIndx];
int ln = 1; // a format flag determines whether there is a space before the note/caution.
@@ -698,8 +698,8 @@ namespace Volian.Print.Library
cb.PdfDocument.NewPage();
ResetDocStyleAndValues(ref yTopMargin, ref yBottomMargin);
DebugText.WriteLine("Paginate2");
if (MyItemInfo.FoldoutIndex()>-1)
PromsPrinter.DoFoldoutPage(cb, "Break within Step", MyPageHelper.TextLayer, MyPageHelper, MyItemInfo.FoldoutIndex()); // temporary foldout
if (MyItemInfo.MyHLS.FoldoutIndex()>-1)
PromsPrinter.DoFoldoutPage(cb, "Break within Step", MyPageHelper.TextLayer, MyPageHelper, MyItemInfo.MyHLS.FoldoutIndex()); // temporary foldout
// if there is a 'container vlnbox' around the HLS, flag that the drawn box must also break:
if (MyHighLevelParagraph != null && MyHighLevelParagraph.PartsContainer != null && MyHighLevelParagraph.PartsContainer.Count > 0)
@@ -782,6 +782,18 @@ namespace Volian.Print.Library
// If the flag is 0 or 1, just put the end message out right below this vlnParagraph:
float msg_yLocation = CalculateYLocation(yPageStart - YBottomMost, yTopMargin);
// the following is for IP3 - it was commented out so that an update could be put on
// before this was tested.
// if end message has {par}, remove these but add a line for each.
//int parindx = myMsg.IndexOf("{par}");
//bool foundpar = false;
//while (parindx > -1)
//{
// foundpar = true;
// msg_yLocation += SixLinesPerInch;
// parindx = myMsg.IndexOf("{par}", parindx + 1);
//}
//if (foundpar) myMsg = myMsg.Replace("{par}", "");
// use the 'flag' to position the message.
if (docstyle.End.Flag > 2) // >2 position at an absolute location defined by docstyle.End.Flag.
{
@@ -2197,6 +2209,7 @@ namespace Volian.Print.Library
if (itemInfo.FormatStepData.NumberHighLevel && (itemInfo.MyHLS.RNOs == null || itemInfo.MyHLS.RNOs.Count<=0))
{
// add in the size that an RNO off HLS would take.
tabWidth += itemInfo.MyTab.RNOTabWidthAdjust;
XOffset += tabWidth;
if (myTab != null) myTab.XOffset += tabWidth;
}