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

FNP xoffset of RNO's off unnumbered HLS

Browse Source
This commit is contained in:
Kathy Ruffing 2013-12-04 15:19:25 +00:00
parent f087e6b092
commit 1095b60df3
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1423,23 +1423,20 @@ namespace Volian.Print.Library
XOffset += inc; XOffset += inc;
adjustAgain = false; adjustAgain = false;
} }
else if (mytab != null) if (itemInfo.FormatStepData.AdjHighLevelTab != null)
{
// For Farley (only plant format to use AdjHighLevelTab), determine the xoffset based on // For Farley (only plant format to use AdjHighLevelTab), determine the xoffset based on
// where the right edge of the text is. Their RNO's are numbered with parent numbering // where the right edge of the text is. Their RNO's are numbered with parent numbering
// so the calculations for determining the xoffset backs up from the right edge. // so the calculations for determining the xoffset backs up from the right edge.
if (itemInfo.FormatStepData.AdjHighLevelTab != null)
{ {
float rightTextEdge = this.MyHighLevelParagraph.XOffset + this.MyHighLevelParagraph.Width; float rightTextEdge = this.MyHighLevelParagraph.XOffset + this.MyHighLevelParagraph.Width;
int colRx = int.Parse(formatInfo.MyStepSectionLayoutData.ColRTable.Split(",".ToCharArray())[itemInfo.ColumnMode]); int colRx = int.Parse(formatInfo.MyStepSectionLayoutData.ColRTable.Split(",".ToCharArray())[itemInfo.ColumnMode]);
rightTextEdge += (colRx + MyHighLevelParagraph.MyTab.Width - (itemInfo.FormatStepData.AdjHighLevelTab ?? 0)); rightTextEdge += (colRx + (itemInfo.FormatStepData.AdjHighLevelTab ?? 0));
float diff = rightTextEdge - (XOffset + Width); float diff = rightTextEdge - (XOffset + Width);
mytab.XOffset += diff; if (mytab != null) mytab.XOffset += diff;
XOffset += diff; XOffset += diff;
adjustAgain = false; adjustAgain = false;
} }
} }
}
if(adjustAgain) if(adjustAgain)
AdjustXOffsetForTab(itemInfo, maxRNO, formatInfo, mytab, xMetaAdj); AdjustXOffsetForTab(itemInfo, maxRNO, formatInfo, mytab, xMetaAdj);
if (UseTemplateWidthOrXOff(itemInfo)) XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + GetWidthOrStartFromTemplate(itemInfo, itemInfo.ActiveFormat, false); if (UseTemplateWidthOrXOff(itemInfo)) XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + GetWidthOrStartFromTemplate(itemInfo, itemInfo.ActiveFormat, false);

2
PROMS/fmtxml/AppendPlantSpecific.cs
View File

@ -211,7 +211,7 @@ namespace fmtxml
fmtdata.BoxData[1].End = 500; fmtdata.BoxData[1].End = 500;
fmtdata.BoxData[2].Start = -15; fmtdata.BoxData[2].Start = -15;
fmtdata.BoxData[2].End = 505; fmtdata.BoxData[2].End = 505;
fmtdata.StepData[40].AdjHighLevelTab = "-24"; fmtdata.StepData[40].AdjHighLevelTab = "60";
fmtdata.StepData[41].AlignHLSTabWithSectOvride = "True"; fmtdata.StepData[41].AlignHLSTabWithSectOvride = "True";
fmtdata.StepData[42].ReadOnly = "True"; fmtdata.StepData[42].ReadOnly = "True";
fmtdata.StepData[43].ReadOnly = "True"; fmtdata.StepData[43].ReadOnly = "True";