Development #287

Merged
djankowski merged 9 commits from Development into master 2024-04-04 11:36:56 -04:00
8 changed files with 9 additions and 3 deletions
Showing only changes of commit e309c4a814 - Show all commits

No files matched your search

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+2 -1
View File
@@ -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
{
@@ -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?