diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 76409c30..1f8c24d5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -3343,8 +3343,27 @@ namespace VEPROMS.CSLA.Library parentTab = parentTab.Replace(".0", ""); // this was added in, remove for substeps. tbformat = parentTab + (parentTab.EndsWith(".") ? "" : ".") + tbformat.TrimStart(); } - } + else if (IsSequential && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.SkipNonSeqTabWithPar) + { + // this was added for Wolf Creek WCN1: if this has a 'wpar' flag, then walk up until finding + // a sequential or high and use that tab (ignore non-sequential steps when walking up parents). + // Note that the format flag 'SkipNonSeqTabWithPar' was added to prevent this code being run for Westinghouse and Farley. + // the following prevents the concatenation of parent tabs onto this once the indenting is + // past the number of seqtabs. + if (localPrintLevel < seqtabs.Count || (PrintLevel < seqtabs.Count && seqtabs[PrintLevel].TabToken.ToUpper().Contains("WPAR"))) + { + ItemInfo mpar = myparent; + while (mpar != null && !mpar.IsSection && !mpar.IsHigh && !mpar.IsSequential) mpar = (mpar.MyParent as ItemInfo); + if (mpar != null && !mpar.IsSection) + { + parentTab = mpar.MyTab.CleanText.Trim(); + tbformat = parentTab + (parentTab.EndsWith(".") ? "" : ".") + tbformat.TrimStart(); + //if (_MyLog.IsInfoEnabled) _MyLog.InfoFormat("==>PARTAB: [{0}]", ShortPath + ", " + ItemID.ToString()); + } + } + } + } if (tbformat.IndexOf("#2#") > -1 || tbformat.IndexOf("#1#") > -1) {