diff --git a/PROMS/Formats/fmtall/GENall.xml b/PROMS/Formats/fmtall/GENall.xml index 92e8e74e..2821d291 100644 Binary files a/PROMS/Formats/fmtall/GENall.xml and b/PROMS/Formats/fmtall/GENall.xml differ diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index da5cca77..dd2ccec3 100644 Binary files a/PROMS/Formats/fmtall/VEGP2all.xml and b/PROMS/Formats/fmtall/VEGP2all.xml differ diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 2c145421..e1634696 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4452,9 +4452,10 @@ namespace VEPROMS.CSLA.Library } } // F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step - else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0) + // F2024-049 changed to specify the level via the format file (Generic EOP and Vogtle 3&4) + else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS != null && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0) { - localPrintLevel--; // since parent is a high level step we only need to go back one level + localPrintLevel = (int)sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS; itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex; } if (!tbformat.Contains(@"{!C")) diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 653c3df8..faf65a31 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -4508,8 +4508,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd"); } } - private LazyLoad _ResetSeqNumberingAfterUnnumberedHLS; - public bool ResetSeqNumberingAfterUnnumberedHLS + // F2024-049 changed to specify the sub-step level via the format file (Generic EOP and Vogtle 3&4) + private LazyLoad _ResetSeqNumberingAfterUnnumberedHLS; + public int? ResetSeqNumberingAfterUnnumberedHLS { get {