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

Start top continue improvements (don’t put out extra R character); Level0Big support; tab alignment with parent steps and respective step widths

Browse Source
This commit is contained in:
Kathy Ruffing
2014-04-04 13:16:59 +00:00
parent 3be5841027
commit f97dc5780d
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1029,6 +1029,8 @@ namespace Volian.Print.Library
if (myMsg != null && myMsg != "")
{
yPageStart -= 2 * SixLinesPerInch;// Allow two lines for top continue message
if (myMsg.IndexOf(@"%sR") > -1) // KBR NEEDS MUCH MORE WORK, i.e. substep tabs concatenated onto step tabs, AER vs RNO
myMsg = myMsg.Replace(@"%sR", MyItemInfo.MyParent.MyTab.Text);
if (myMsg.IndexOf(@"%3d") > -1)
myMsg = myMsg.Replace(@"%3d", MyItemInfo.MyHLS.Ordinal.ToString());
if (myMsg.IndexOf(@"%d") > -1)
@@ -2583,6 +2585,8 @@ namespace Volian.Print.Library
stText = stText.Replace(@"\ulnone ", "");
stText = stText.Replace(@"\ulnone", "");
}
if (itemInfo.IsSection && itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.SectionNumber.Level0Big && itemInfo.MyParent.IsProcedure)
myFont = new System.Drawing.Font(myFont.FontFamily, 14, myFont.Style | FontStyle.Bold);
_RtfSB.Append(AddFontTable(myFont));
_RtfSB.Append(stText);
if (_MyItemInfo.IsStep && !itemInfo.FormatStepData.UseSmartTemplate && _MyItemInfo.FormatStepData.Suffix != null && _MyItemInfo.FormatStepData.Suffix != "")
@@ -2963,7 +2967,10 @@ namespace Volian.Print.Library
else
{
XOffset += xoff;
if (myTab == null && itemInfo.FormatStepData.AlignNullTabWSectHead)
// For Calvert, adjust from the left margin and current section's tab.
if (myTab == null && itemInfo.FormatStepData.AlignNullTabWSectHead && itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos;
else if (myTab == null && itemInfo.FormatStepData.AlignNullTabWSectHead)
XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos;
if (myTab != null)
{
@@ -3054,7 +3061,9 @@ namespace Volian.Print.Library
}
else if (MyParent != null)
{
if(itemInfo.ActiveFormat.MyStepSectionLayoutData.DevNoteOrCautionTabOffset != null)
if (myTab == null && itemInfo.FormatStepData.AlignNullTabWSectHead && itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos;
else if (itemInfo.ActiveFormat.MyStepSectionLayoutData.DevNoteOrCautionTabOffset != null)
{
if (MyTab != null)
{
@@ -3201,7 +3210,11 @@ namespace Volian.Print.Library
// if AlignHLSTabWithSect is set, we moved the starting x location of the HLS, and following steps
// to be under section header. Adjust the width accordingly, or the text may go out of the margin.
if (itemInfo.MyDocStyle.AlignHLSTabWithSect)
if (myTab == null && itemInfo.FormatStepData.AlignNullTabWSectHead && itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
Width = Width + (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos - (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos;
else if (myTab == null && itemInfo.FormatStepData.AlignNullTabWSectHead)
Width = Width + (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos;
else if (itemInfo.MyDocStyle.AlignHLSTabWithSect)
Width = Width - (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos;
}
else if (bxIndx != null)