diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml index 468b33e0..9097498a 100644 Binary files a/PROMS/Formats/fmtall/BNPP1Newall.xml and b/PROMS/Formats/fmtall/BNPP1Newall.xml differ diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml index cb366256..16f08b8f 100644 Binary files a/PROMS/Formats/fmtall/BNPP1all.xml and b/PROMS/Formats/fmtall/BNPP1all.xml differ diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml index 047aca34..e86d43a4 100644 Binary files a/PROMS/Formats/fmtall/BNPP2all.xml and b/PROMS/Formats/fmtall/BNPP2all.xml differ diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml index d785ad41..b6a451e0 100644 Binary files a/PROMS/Formats/fmtall/BNPPalrall.xml and b/PROMS/Formats/fmtall/BNPPalrall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml index 15195ae0..e1ff5287 100644 Binary files a/PROMS/Formats/fmtall/BNPPbckall.xml and b/PROMS/Formats/fmtall/BNPPbckall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPsamall.xml b/PROMS/Formats/fmtall/BNPPsamall.xml index 1e3215b3..955bb9b4 100644 Binary files a/PROMS/Formats/fmtall/BNPPsamall.xml and b/PROMS/Formats/fmtall/BNPPsamall.xml differ diff --git a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs index a89a2e3a..beb4276d 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs @@ -58,7 +58,8 @@ namespace VEPROMS.CSLA.Library SectMenuStep = 0x0020, StepAllowNone = 0x0040, StepFirst = 0x0080, - StepLast = 0x0100 + StepLast = 0x0100, + StepAllChildren = 0x0200 } public enum E_EMode : uint { diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.cs b/PROMS/Volian.Controls.Library/DisplayTransition.cs index 2dd78b0e..f2e46267 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.cs @@ -898,7 +898,10 @@ namespace Volian.Controls.Library // allow this (12/2/09). Note that this was changed to not allow transitions // to RNOs (10/2010), this 'feature' will be added at some later date. tn.ChildrenLoaded = false; - tn.LoadChildren(false); + // F2024-047 BNPP standard Text transition - pass True to LoadChildren to load all children. + E_TransUI etm = (E_TransUI) _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransUI; + bool loadAllChildren = ((etm & E_TransUI.StepAllChildren) == E_TransUI.StepAllChildren); + tn.LoadChildren(loadAllChildren); } private void cbTranSects_SelectedIndexChanged(object sender, EventArgs e) { @@ -940,7 +943,9 @@ namespace Volian.Controls.Library private void HideStepTreeIfNeeded() { string trnFmt = _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransFormat; - bool showStepList = trnFmt.Contains("{First Step}"); + // F2024-047 Added check for {Step Text} so that the step tree is displayed + // Needed for BNPP transition to step text only for standard text + bool showStepList = trnFmt.Contains("{First Step}") || trnFmt.Contains("{Step Text}"); if (!showStepList) tvTran.Nodes.Clear(); // clear the tree view of steps if not needed for selected transition tvTran.Enabled = showStepList; // show the tree view of steps?