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

Reverted the first transition type back to not allowing the user to select a section

Browse Source 
Fixed the transition logic so that the first transition type can be when the procedure you are transiting to does not have a default section named “Procedure Steps”.
This commit is contained in:
John Jenko 2014-11-06 20:59:22 +00:00
parent fd6e80ef71
commit b52c7098f9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/SUMall.xml
View File

Binary file not shown.

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

@ -1017,7 +1017,11 @@ namespace Volian.Controls.Library
toItem = (ItemInfo)vtn.VEObject; toItem = (ItemInfo)vtn.VEObject;
} }
else else
{
toItem = (ItemInfo)cbTranSects.SelectedItem; // didn't select a step. toItem = (ItemInfo)cbTranSects.SelectedItem; // didn't select a step.
if (toItem == null)
toItem = (ItemInfo)cbTranProcs.SelectedItem;
}
if (toItem != null) // this will be null if transition is to a an empty procedure set (sections but no steps) if (toItem != null) // this will be null if transition is to a an empty procedure set (sections but no steps)
linktxt = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, toItem.ItemID); linktxt = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, toItem.ItemID);
} }
@ -1029,7 +1033,7 @@ namespace Volian.Controls.Library
else else
{ {
VETreeNode vtn = (VETreeNode)tvTran.SelectedNode; VETreeNode vtn = (VETreeNode)tvTran.SelectedNode;
if (vtn.Tag == null) toItem = (ItemInfo)cbTranSects.SelectedItem; if (vtn == null || vtn.Tag == null) toItem = (ItemInfo)cbTranSects.SelectedItem;
else toItem = (ItemInfo)vtn.VEObject; else toItem = (ItemInfo)vtn.VEObject;
} }
if (toItem==null) if (toItem==null)