Compare commits

..

No commits in common. "47a14e143ead137ea05021636ad5d6a3fb4e9ba7" and "d67e81d8a66f60e13113a57565786fe8a6a16159" have entirely different histories.

View File

@ -12,12 +12,6 @@ using JR.Utils.GUI.Forms;
namespace VEPROMS.CSLA.Library namespace VEPROMS.CSLA.Library
{ {
public enum E_FieldToEdit { StepText, Text, Number, PSI }; public enum E_FieldToEdit { StepText, Text, Number, PSI };
public enum ReplaceWords
{
Inherit = 0,
Show = 1,
DoNotShow = 2
}
public class DisplayText public class DisplayText
{ {
private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
@ -61,20 +55,21 @@ namespace VEPROMS.CSLA.Library
if (sc == null) return "N"; if (sc == null) return "N";
return sc.Section_ShwRplWords; return sc.Section_ShwRplWords;
} }
// C2019-025 c2025-010 Ability-to-Toggle-Replace-Words
// C2029-025 Show or hide replace words. Can highlight replace words in editor.
private bool ShwRplWdsIndex(ItemInfo _MyItemInfo) private bool ShwRplWdsIndex(ItemInfo _MyItemInfo)
{ {
StepConfig sc = _MyItemInfo.MyConfig as StepConfig; StepConfig sc = _MyItemInfo.MyConfig as StepConfig;
int setting = sc.Step_ShwRplWdsIndex; int setting = sc.Step_ShwRplWdsIndex;
switch (setting) switch (setting)
{ {
case (int)ReplaceWords.DoNotShow: case 2:
return false; return false;
break; break;
case (int)ReplaceWords.Show: case 1:
return true; return true;
break; break;
case (int)ReplaceWords.Inherit: case 0:
//SectionConfig sc2 = _MyItemInfo.ActiveParent.MyConfig as SectionConfig; //SectionConfig sc2 = _MyItemInfo.ActiveParent.MyConfig as SectionConfig;
SectionConfig sc2 = _MyItemInfo.ActiveSection.MyConfig as SectionConfig; SectionConfig sc2 = _MyItemInfo.ActiveSection.MyConfig as SectionConfig;
if (sc2 == null || sc2.Section_ShwRplWords == "Y") if (sc2 == null || sc2.Section_ShwRplWords == "Y")
@ -91,7 +86,6 @@ namespace VEPROMS.CSLA.Library
break; break;
} }
} }
private Item _MyItem; private Item _MyItem;
private string EditText private string EditText
{ {