Fixed bottom margin for RNO Continue Message
This commit is contained in:
parent
48d5197b5e
commit
fd8d8fb70d
@ -908,6 +908,8 @@ namespace Volian.Print.Library
|
||||
float xoffB = 0;
|
||||
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]);
|
||||
xoffB = colR + docstyle.Layout.LeftMargin + docstyle.Continue.Bottom.Margin ?? 0;
|
||||
}
|
||||
@ -2957,22 +2959,8 @@ namespace Volian.Print.Library
|
||||
float mycolT = (float)formatInfo.MyStepSectionLayoutData.ColT;
|
||||
if (formatInfo.MyStepSectionLayoutData.Dev_Format)
|
||||
Width = (float)formatInfo.MyStepSectionLayoutData.WidT + 1;
|
||||
else if (itemInfo.IsInRNO && itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.AdjustRNOCautionNoteWidth)
|
||||
{
|
||||
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 if (itemInfo.IsInRNO)
|
||||
Width = (float)vlnPrintObject.ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, maxRNO)- tabWidth;
|
||||
else
|
||||
Width = (float)formatInfo.MyStepSectionLayoutData.WidT - 6 - mycolT;
|
||||
XOffset += mycolT; // adjust caution/note text position
|
||||
|
Loading…
x
Reference in New Issue
Block a user