Compare commits

..

No commits in common. "9fd9eac16a975f850656d9ba5a473c305fca39d4" and "3c632d4abcd100398ad6bd566ecdb9021b24e053" have entirely different histories.

4 changed files with 6 additions and 20 deletions

Binary file not shown.

Binary file not shown.

View File

@ -44,9 +44,8 @@ using System.Runtime.InteropServices;
// Revision DHH (day - no leading zero, two digit hour - military time // Revision DHH (day - no leading zero, two digit hour - military time
// //
// ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ******** // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
[assembly: AssemblyVersion("2.1.2403.2209")] [assembly: AssemblyVersion("2.1.2403.413")]
[assembly: AssemblyFileVersion("2.1.2403.2209")] [assembly: AssemblyFileVersion("2.1.2403.413")]

View File

@ -687,8 +687,6 @@ namespace Volian.Controls.Library
cbPageNum.Checked = _ModExistingPageNum = tc != null && tc.Transition_Formatted.ToUpper() == "TRUE"; 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 #endregion
#region Events #region Events
@ -920,8 +918,9 @@ namespace Volian.Controls.Library
{ {
_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]); tvTranFillIn((secitm.Steps == null || secitm.Steps.Count == 0) ? null : secitm.Steps[0]);
// B2024-016 only show the list of steps if used by the select transition tvTran.Enabled = true;
HideStepTreeIfNeeded(); cbIncStepNum.Enabled = true;
cbIncStepNum.Checked = true;
// if doing a 'new' range, no node is selected in tree. Without this, the first node in the // 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 // tree was the selected node which was throwing off the logic for defining the _RangeNode1
// and _RangeNode2 // and _RangeNode2
@ -936,18 +935,6 @@ namespace Volian.Controls.Library
SaveCancelEnabling(); 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 // B2018-002 - Invalid Transitions - Declare Default Section variables
private bool NeedsDefault; private bool NeedsDefault;
private bool HasDefault; private bool HasDefault;