diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index eec99ffa..927b0a15 100644 Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 7fcb8746..e654d1af 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 8cd4a26b..a0340ed4 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4745,6 +4745,19 @@ namespace VEPROMS.CSLA.Library { _MyTab.Text = _MyTab.Text.Substring(1); } + // C2026-003 Vogtle Continuous Action high level RNO (AER is not continuous action) + if (ActiveFormat.MyStepSectionLayoutData.AddContActTagToHighLevelRNOWhenIncludedOnCAS && + IsInRNO && !MyParent.IsInRNO && FormatStepData.TabData.CASPrintMacro != null) + { + StepConfig sc = MyConfig as StepConfig; + if (sc != null && sc.Step_CAS == "True") + { + if (FormatStepData.TabData.CASPrintMacro != null) + _MyTab.Text = FormatStepData.TabData.CASPrintMacro + _MyTab.Text; + if (FormatStepData.TabData.CASEditTag != null) + _MyTab.CleanText = FormatStepData.TabData.CASEditTag + _MyTab.CleanText; + } + } _MyTab.RNOTabWidthAdjust = ((ItemInfo)ActiveParent).FormatStepData.TabData.RNOAdjustTabSize ?? 0; if (((ItemInfo)ActiveParent).MyTab.Offset != 0) _MyTab.Offset = ((ItemInfo)ActiveParent).MyTab.Offset; if (((ItemInfo)ActiveParent).FormatStepData.TabData.RNOExcludeMacros) diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 282cc8f1..36631cf5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -3814,6 +3814,18 @@ namespace VEPROMS.CSLA.Library } } + // C2026-003 (for Vogtle Units 3&4) Adds the continuous action tag to a high level RNO + // only when it as a tab and the parent is an AER step that is not tagged as a continuous action + // Use this with the setting of CASPrintMacro and CASEditTag on the RNO step type TabData definition + private LazyLoad _AddContActTagToHighLevelRNOWhenIncludedOnCAS; + public bool AddContActTagToHighLevelRNOWhenIncludedOnCAS + { + get + { + return LazyLoad(ref _AddContActTagToHighLevelRNOWhenIncludedOnCAS, "@AddContActTagToHighLevelRNOWhenIncludedOnCAS"); + } + } + // treat sub-sections and High Level Steps as if they are at the same procedure structure level. This is used with the TieTabToLevel flag private LazyLoad _SubSectAndHighSameLevel; public bool SubSectAndHighSameLevel @@ -5708,6 +5720,30 @@ public StepData Equation // equation has a parent of embedded object. return LazyLoad(ref _RNOIdentPrint, "TabData/@RNOIdent"); } } + // Adds a print macro for the high level RNO when the user want it to be a Continuous Action + // while the corresponding AER is not a continuous action + // C2026-003 used in RNO step definition for Vogtle 3&4 two column format + // use with AddContActTagToHighLevelRNOWhenIncludedOnCAS set to True in the format file's StpSectLayData + private LazyLoad _CASPrintMacro; + public string CASPrintMacro + { + get + { + return LazyLoad(ref _CASPrintMacro, "TabData/@CASPrintMacro"); + } + } + // Adds a character indicator in the step editor for the high level RNO when the user want it to be a Continuous Action + // while the corresponding AER is not a continuous action + // C2026-003 used in RNO step definition for Vogtle 3&4 two colmn format + // use with AddContActTagToHighLevelRNOWhenIncludedOnCAS set to True in the format file's StpSectLayData + private LazyLoad _CASEditTag; + public string CASEditTag + { + get + { + return LazyLoad(ref _CASEditTag, "TabData/@CASEditTag"); + } + } // don't use the defined macro when creating a step tab for the step type's RNO private LazyLoad _RNOExcludeMacros; diff --git a/PROMS/Volian.Controls.Library/DisplayTags.cs b/PROMS/Volian.Controls.Library/DisplayTags.cs index 7621c55c..4d5c12b1 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.cs @@ -647,6 +647,10 @@ namespace Volian.Controls.Library MyEditItem.ChangeBarForConfigItemChange = false; sc.Step_CAS = (cbCAS.Checked) ? "True" : "False"; MyEditItem.ChangeBarForConfigItemChange = true; + // C2026-003 (put in for Vogtle 3&4) refresh the RNO step tab if including it on the Continuous Action Summary + if (MyEditItem.MyItemInfo.ActiveFormat.MyStepSectionLayoutData.AddContActTagToHighLevelRNOWhenIncludedOnCAS && + MyEditItem.MyItemInfo.IsInRNO && !MyEditItem.MyItemInfo.MyParent.IsInRNO) + MyEditItem.RefreshTab(); } private void cbTCAS_CheckedChanged(object sender, EventArgs e) {