From f4f52e2a8406fdac14390886d2bdecb41a5504dd Mon Sep 17 00:00:00 2001 From: Kathy Date: Fri, 7 Jul 2017 11:53:58 +0000 Subject: [PATCH] C2017-026: Add a visual indicator (*) in the PROMS editor to indicate a Continuous Action Step --- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 12 ++++++++++-- .../VEPROMS.CSLA.Library/Extension/TransitionExt.cs | 4 +++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 20f45bf2..b6af2c24 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -3987,8 +3987,16 @@ namespace VEPROMS.CSLA.Library int macroindx = tbformat.IndexOf("{!C"); if (macroindx > -1) { - cltext = cltext == null ? tbformat.Remove(macroindx, 5) : cltext.Remove(macroindx, 5); - cltext = cltext + " "; + // 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 + " "; + } } macroindx = tbformat.IndexOf("{!diamond1}"); if (macroindx > -1) //i found it diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index f09b68b2..9d0812cf 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -1070,7 +1070,9 @@ namespace VEPROMS.CSLA.Library if (doStep && pitem.IsHigh) { 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 (!hasDelim)