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

C2017-026: Add a visual indicator (*) in the PROMS editor to indicate a Continuous Action Step

Browse Source
This commit is contained in:
Kathy Ruffing 2017-07-07 11:53:58 +00:00
parent 590d43ed6f
commit f4f52e2a84
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -3986,10 +3986,18 @@ namespace VEPROMS.CSLA.Library
} }
int macroindx = tbformat.IndexOf("{!C"); int macroindx = tbformat.IndexOf("{!C");
if (macroindx > -1) if (macroindx > -1)
{
// C2017-026: have visual indicator for CAS Step
if (FormatStepData.TabData.IdentEdit.Contains("*. "))
{
cltext = cltext == null ? tbformat.Substring(0, macroindx) + "*. " + tbformat.Substring(macroindx + 8) : cltext.Remove(macroindx, 5);
}
else
{ {
cltext = cltext == null ? tbformat.Remove(macroindx, 5) : cltext.Remove(macroindx, 5); cltext = cltext == null ? tbformat.Remove(macroindx, 5) : cltext.Remove(macroindx, 5);
cltext = cltext + " "; cltext = cltext + " ";
} }
}
macroindx = tbformat.IndexOf("{!diamond1}"); macroindx = tbformat.IndexOf("{!diamond1}");
if (macroindx > -1) //i found it if (macroindx > -1) //i found it
{ {

2
PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
View File

@ -1071,6 +1071,8 @@ namespace VEPROMS.CSLA.Library
{ {
Tab myTab = pitem.MyDocVersion.DocVersionConfig.SelectedSlave == 0 ? StepInfo.Get(pitem.ItemID).MyTab : pitem.MyTab; Tab myTab = pitem.MyDocVersion.DocVersionConfig.SelectedSlave == 0 ? StepInfo.Get(pitem.ItemID).MyTab : pitem.MyTab;
string hlsTab = myTab.BasicTab ?? myTab.CleanTextNoSymbols; string hlsTab = myTab.BasicTab ?? myTab.CleanTextNoSymbols;
// C2017-026: have visual indicator for CAS Step (but remove for transitions):
if (pitem.FormatStepData.TabData.IdentEdit.Contains("*. ")) hlsTab = hlsTab.Replace("*", "");
if (!sret.StartsWith(hlsTab.Trim(" ".ToCharArray()))) if (!sret.StartsWith(hlsTab.Trim(" ".ToCharArray())))
{ {
if (!hasDelim) if (!hasDelim)