for tabs that include the parent tab prefixed to them (‘wpar’ in tab format), do this even if there are non-sequential steps in between this & step whose tab is to be used (use SkipNonSeqTabWithPar format flag to only do for WCN1).
This commit is contained in:
parent
a956574892
commit
4a9a3f815a
@ -3343,8 +3343,27 @@ namespace VEPROMS.CSLA.Library
|
|||||||
parentTab = parentTab.Replace(".0", ""); // this was added in, remove for substeps.
|
parentTab = parentTab.Replace(".0", ""); // this was added in, remove for substeps.
|
||||||
tbformat = parentTab + (parentTab.EndsWith(".") ? "" : ".") + tbformat.TrimStart();
|
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)
|
if (tbformat.IndexOf("#2#") > -1 || tbformat.IndexOf("#1#") > -1)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user