diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 54df38f3..a70c6184 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1423,21 +1423,18 @@ namespace Volian.Print.Library XOffset += inc; adjustAgain = false; } - else if (mytab != null) + if (itemInfo.FormatStepData.AdjHighLevelTab != null) + // 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 + // so the calculations for determining the xoffset backs up from the right edge. { - // 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 - // 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; - int colRx = int.Parse(formatInfo.MyStepSectionLayoutData.ColRTable.Split(",".ToCharArray())[itemInfo.ColumnMode]); - rightTextEdge += (colRx + MyHighLevelParagraph.MyTab.Width - (itemInfo.FormatStepData.AdjHighLevelTab ?? 0)); - float diff = rightTextEdge - (XOffset + Width); - mytab.XOffset += diff; - XOffset += diff; - adjustAgain = false; - } + float rightTextEdge = this.MyHighLevelParagraph.XOffset + this.MyHighLevelParagraph.Width; + int colRx = int.Parse(formatInfo.MyStepSectionLayoutData.ColRTable.Split(",".ToCharArray())[itemInfo.ColumnMode]); + rightTextEdge += (colRx + (itemInfo.FormatStepData.AdjHighLevelTab ?? 0)); + float diff = rightTextEdge - (XOffset + Width); + if (mytab != null) mytab.XOffset += diff; + XOffset += diff; + adjustAgain = false; } } if(adjustAgain) diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index d46a510d..1b92a552 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -211,7 +211,7 @@ namespace fmtxml fmtdata.BoxData[1].End = 500; fmtdata.BoxData[2].Start = -15; fmtdata.BoxData[2].End = 505; - fmtdata.StepData[40].AdjHighLevelTab = "-24"; + fmtdata.StepData[40].AdjHighLevelTab = "60"; fmtdata.StepData[41].AlignHLSTabWithSectOvride = "True"; fmtdata.StepData[42].ReadOnly = "True"; fmtdata.StepData[43].ReadOnly = "True";