Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

B2024-019 - BNPP - Allow the use to select a sub-step that has a bullet instead of a number/letter step tab, when using the {Step Text} transitions. Also don’t show any Tables in the tree view to select the step to link to.

Browse Source
This commit is contained in:
John Jenko
2024-04-01 14:32:26 -04:00
parent 09b5cb4be4
commit e45422755f
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PROMS/Volian.Controls.Library/DisplayTransition.cs
View File

@@ -901,7 +901,8 @@ namespace Volian.Controls.Library
// 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);
bool excludeTableFigEqu = loadAllChildren; // don't show Tables, Figures, or Equations in step list
tn.LoadChildren(loadAllChildren, excludeTableFigEqu);
}
private void cbTranSects_SelectedIndexChanged(object sender, EventArgs e)
{
@@ -1341,7 +1342,13 @@ namespace Volian.Controls.Library
return;
}
// B2015-170 - don't allow a transition to step that is not sequential
if ((toItem != null &&!toItem.IsNumbered) || (rangeItem != null && !rangeItem.IsNumbered))
// B2024-019 - but allow if TranFmt only contains {Step Text}
// - Calvert uses {Step Text} but also includes step number
// - Barakah (BNPP) uses just {Step Text} to link to standard text
bool onlyStepText = false;
if (listBoxTranFmt.Text.Contains("{Step Text}") && !listBoxTranFmt.Text.Contains("{First Step}"))
onlyStepText = true;
if (!onlyStepText && (toItem != null &&!toItem.IsNumbered) || (rangeItem != null && !rangeItem.IsNumbered))
{
FlexibleMessageBox.Show("For transitions containing step references, the transition must be to a numbered or lettered step.",
"Cannot add transition to a non-sequential step", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);