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

Fixed bottom margin for RNO Continue Message

Browse Source
This commit is contained in:
Rich 2013-12-20 19:07:29 +00:00
parent 48d5197b5e
commit fd8d8fb70d
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -908,6 +908,8 @@ namespace Volian.Print.Library
float xoffB = 0; float xoffB = 0;
if (RNOContinueOnly) if (RNOContinueOnly)
{ {
// The following line was added for McGuire APs/AP/1/5500/12, Step 13
if (msg_yLocation < yBottomMargin + SixLinesPerInch) msg_yLocation = yBottomMargin + SixLinesPerInch;
int colR = int.Parse(MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ColRTable.Split(",".ToCharArray())[MyItemInfo.ColumnMode]); int colR = int.Parse(MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ColRTable.Split(",".ToCharArray())[MyItemInfo.ColumnMode]);
xoffB = colR + docstyle.Layout.LeftMargin + docstyle.Continue.Bottom.Margin ?? 0; xoffB = colR + docstyle.Layout.LeftMargin + docstyle.Continue.Bottom.Margin ?? 0;
} }
@ -2957,22 +2959,8 @@ namespace Volian.Print.Library
float mycolT = (float)formatInfo.MyStepSectionLayoutData.ColT; float mycolT = (float)formatInfo.MyStepSectionLayoutData.ColT;
if (formatInfo.MyStepSectionLayoutData.Dev_Format) if (formatInfo.MyStepSectionLayoutData.Dev_Format)
Width = (float)formatInfo.MyStepSectionLayoutData.WidT + 1; Width = (float)formatInfo.MyStepSectionLayoutData.WidT + 1;
else if (itemInfo.IsInRNO && itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.AdjustRNOCautionNoteWidth) else if (itemInfo.IsInRNO)
{ Width = (float)vlnPrintObject.ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, maxRNO)- tabWidth;
float widadj = tabWidth;
ItemInfo pinfo = itemInfo.MyParent;
// walk up the parent nodes (but only in the RNO) and
// add the width of each tab (at each level)
// so that we can subtract it from the width of Note or Caution
// put in for Catawba and McGuire Notes/Cautions on RNO substeps
while (pinfo != null && pinfo.IsInRNO)
{
widadj += (float)(pinfo.MyTab.Text.Length * pinfo.MyTab.MyFont.CharsToTwips);
pinfo = pinfo.MyParent;
}
Width = (float)vlnPrintObject.ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, maxRNO) - widadj;
//Width = (float)vlnPrintObject.ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, maxRNO) - tabWidth;
}
else else
Width = (float)formatInfo.MyStepSectionLayoutData.WidT - 6 - mycolT; Width = (float)formatInfo.MyStepSectionLayoutData.WidT - 6 - mycolT;
XOffset += mycolT; // adjust caution/note text position XOffset += mycolT; // adjust caution/note text position