C2025-022-Remove-UCF-2
This commit is contained in:
@@ -272,41 +272,7 @@ namespace VEPROMS.CSLA.Library
|
||||
}
|
||||
#endregion ReplaceStrData
|
||||
#region ReplaceStr
|
||||
//[Flags]
|
||||
//public enum E_ReplaceFlags : uint
|
||||
//{
|
||||
// High = 0x0001, // Do ReplaceWords in HIGH LEVEL STEPS
|
||||
// RNO = 0x0002, // Do ReplaceWords in RNOS
|
||||
// Caution = 0x0004, // Do ReplaceWords in CAUTIONS
|
||||
// Note = 0x0008, // Do ReplaceWords in NOTES
|
||||
// Table = 0x0010, // Do ReplaceWords in TABLES
|
||||
// Substep = 0x0020, // Do ReplaceWords in SUBSTEPS
|
||||
// Attach = 0x0040, // Do ReplaceWords in ATTACHMENTS
|
||||
// Bkgd = 0x0080, // Do ReplaceWords in BACKGROUNDS
|
||||
// DiffUnit = 0x0100, // Do ReplaceWords ONLY for different UNIT #
|
||||
// TOC = 0x0200, // Do in auto table-of-contents
|
||||
// StatTree = 0x0400,
|
||||
// HLSSetpnt = 0x0800, // Do ReplaceWords in HighLevelStep SETPoiNTs
|
||||
// Trans = 0x1000, // Do ReplaceWords in TRANSITIONS
|
||||
// Setpoint = 0x2000, // Do ReplaceWords in SETPOINTS
|
||||
|
||||
// // Case Sensitivity Flags - default is off (Case Sensitive Replace)
|
||||
// CaseInsens = 0x0000C000, // Do ReplaceWords for all words thatmatch, regardless of case,
|
||||
// // and replace with the ReplaceWith string as is
|
||||
// // B2019-022: do not support CaseInsensFirst & CaseInsensAll - there is no supporting replace word code:
|
||||
// //CaseInsensFirst = 0x4000, // Do ReplaceWords for all words thatexactly match the ReplaceWord,
|
||||
// // except the case of the first character may be different
|
||||
// //CaseInsensAll = 0x8000, // Do ReplaceWords for all words that match the ReplaceWord, regardless of case
|
||||
|
||||
// Partials = 0x10000, // Do replace even on partial matches
|
||||
// Plackeep = 0x20000, // Do replace in PlaceKeepers
|
||||
// InSecTitle = 0x40000,
|
||||
// BeforeTrans = 0x80000, // Only do replace if the string occurs immediately before a transition.
|
||||
// BeforeList = 0x100000, // C2021-045 Only if the text ends with a colon ":"
|
||||
// PageList = 0x200000, // F2021-053 Do replace words for PageList items that are ROs
|
||||
// FirstWord = 0x400000, // C2021-056 Do only if is the first word in the text
|
||||
// NotInRO = 0x800000 // B2022-015 BNPPalr: Determine whether RO text should have Replace Words applied
|
||||
//}
|
||||
[Serializable]
|
||||
[TypeConverter(typeof(ExpandableObjectConverter))]
|
||||
public class ReplaceStr
|
||||
@@ -319,7 +285,7 @@ namespace VEPROMS.CSLA.Library
|
||||
get { return _State; }
|
||||
set { _State = value; }
|
||||
}
|
||||
//private E_ReplaceFlags _Flag;
|
||||
|
||||
//[Editor(typeof(FlagEnumUIEditor), typeof(System.Drawing.Design.UITypeEditor))]
|
||||
//[XmlAttribute("Flag")]
|
||||
//[DisplayName("Flags (Use In)")] // Note that [Description] is not used in collection items (that use collection editor)
|
||||
@@ -341,7 +307,6 @@ namespace VEPROMS.CSLA.Library
|
||||
}
|
||||
}
|
||||
private string _ReplaceWith;
|
||||
//[Editor(typeof(RtfEditor), typeof(System.Drawing.Design.UITypeEditor))]
|
||||
|
||||
[XmlAttribute("ReplaceWith")]
|
||||
[DisplayName("With")]
|
||||
|
@@ -2178,7 +2178,6 @@ namespace VEPROMS.CSLA.Library
|
||||
// F2021-053: BNPP Alarm - need ability to have super/sub scripts in the text of Alarm Tables (ROs).
|
||||
// if doing replace words for Page List items, the current item is not a step, use _DoReplWordInPageList flags this
|
||||
if (_MyItemInfo.MyContent.Type < 20000 && !_DoReplWordInPageList) return Text; // for now only replace in steps.
|
||||
//FormatConfig.ReplaceStrData rsl = _MyFormat.PlantFormat.FormatConfig.UCFandReplaceStrData;
|
||||
ReplaceStrList rsl = _MyFormat.PlantFormat.FormatData.SectData.ReplaceStrList;
|
||||
if (rsl.Count == 1 && (rsl[0].ReplaceWord == null || rsl[0].ReplaceWord == "")) return Text;
|
||||
|
||||
|
@@ -6111,23 +6111,7 @@ namespace VEPROMS.CSLA.Library
|
||||
if (!SectionHasCheckOffs()) return null;
|
||||
int stpCoIndx = CheckOffIndex(); // this step has a checkoff defined
|
||||
if (stpCoIndx == -1) return null;
|
||||
//if (stpCoIndx > 1)
|
||||
//{
|
||||
// if (ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffUCF && stpCoIndx >= 100)
|
||||
// {
|
||||
// // get index, if greater than 100, store that - otherwise store index down list.
|
||||
// // if this format does not have ucf signoffs, indx is just the selected index from the combo box.
|
||||
// foreach (CheckOff co in ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList)
|
||||
// {
|
||||
// if (stpCoIndx == co.Index)
|
||||
// {
|
||||
// stpCoIndx = (int)co.Index;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// return ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList[stpCoIndx]; // DO override of CheckOffList[] to get ucf
|
||||
//}
|
||||
|
||||
int sectCoIndx = SectionDefaultCheckOffIndex(); // no checkoff on step, see if there is a section default.
|
||||
if (sectCoIndx == -1) return null;
|
||||
if ((ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffOnHLSOnly && IsHigh)
|
||||
|
Reference in New Issue
Block a user