diff --git a/PROMS/Formats/fmtall/CPLAall.xml b/PROMS/Formats/fmtall/CPLAall.xml index 60326212..2040ee28 100644 Binary files a/PROMS/Formats/fmtall/CPLAall.xml and b/PROMS/Formats/fmtall/CPLAall.xml differ diff --git a/PROMS/Formats/fmtall/CPLall.xml b/PROMS/Formats/fmtall/CPLall.xml index c0b73adf..9966297b 100644 Binary files a/PROMS/Formats/fmtall/CPLall.xml and b/PROMS/Formats/fmtall/CPLall.xml differ diff --git a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs index 74acc049..66391440 100644 --- a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs +++ b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs @@ -44,8 +44,9 @@ using System.Runtime.InteropServices; // Revision DHH (day - no leading zero, two digit hour - military time // // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ******** -[assembly: AssemblyVersion("2.1.2403.413")] -[assembly: AssemblyFileVersion("2.1.2403.413")] +[assembly: AssemblyVersion("2.1.2403.2209")] +[assembly: AssemblyFileVersion("2.1.2403.2209")] + diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.cs b/PROMS/Volian.Controls.Library/DisplayTransition.cs index 21ac3f2f..2dd78b0e 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.cs @@ -687,6 +687,8 @@ namespace Volian.Controls.Library cbPageNum.Checked = _ModExistingPageNum = tc != null && tc.Transition_Formatted.ToUpper() == "TRUE"; } } + // B2024-016 if transition format does not have {First Step} then don't show step list + HideStepTreeIfNeeded(); } #endregion #region Events @@ -916,11 +918,10 @@ namespace Volian.Controls.Library } else { - _InitializingTrans = true; // just initializing now, don't set any ranges, etc. + _InitializingTrans = true; // just initializing now, don't set any ranges, etc. tvTranFillIn((secitm.Steps == null || secitm.Steps.Count == 0) ? null : secitm.Steps[0]); - tvTran.Enabled = true; - cbIncStepNum.Enabled = true; - cbIncStepNum.Checked = true; + // B2024-016 only show the list of steps if used by the select transition + HideStepTreeIfNeeded(); // if doing a 'new' range, no node is selected in tree. Without this, the first node in the // tree was the selected node which was throwing off the logic for defining the _RangeNode1 // and _RangeNode2 @@ -935,6 +936,18 @@ namespace Volian.Controls.Library SaveCancelEnabling(); } } + // B2024-016 Hide the step tree when the transition definition does not include a step number {First Step} + private void HideStepTreeIfNeeded() + { + string trnFmt = _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransFormat; + bool showStepList = trnFmt.Contains("{First Step}"); + 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? + cbIncStepNum.Enabled = showStepList; // display the Include Step checkbox? + cbIncStepNum.Checked = showStepList; // uncheck the Include Step? + } + // B2018-002 - Invalid Transitions - Declare Default Section variables private bool NeedsDefault; private bool HasDefault;