From ebc76d5f621650ac315da5dc0d2922cf35cf47a4 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 20 Dec 2013 16:51:22 +0000 Subject: [PATCH] Added AdjustRNOCautionNoteWidth flag(Catawba and McGuire) --- .../Format/PlantFormat.cs | 8 ++++++++ PROMS/fmtxml/FmtFileToXml.cs | 6 +++++- PROMS/fmtxml/PlantSpecific_Catawba.cs | 2 ++ PROMS/fmtxml/PlantSpecific_McGuire.cs | 1 + PROMS/fmtxml/TranslateFMT.XSL | Bin 204332 -> 204810 bytes 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 3c5be05b..46cbac3c 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -2137,6 +2137,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseMultiLineSectionTitle, "@UseMultiLineSectionTitle"); } } + private LazyLoad _AdjustRNOCautionNoteWidth; + public bool AdjustRNOCautionNoteWidth + { + get + { + return LazyLoad(ref _AdjustRNOCautionNoteWidth, "@AdjustRNOCautionNoteWidth"); + } + } } #endregion #region TextTypeValue diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index c8ce7459..e82d225b 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -669,6 +669,7 @@ public struct StepSection public string ImperfectStructurePlus4; public string CountAllSubLevels; public string UseMultiLineSectionTitle; // Need for data migration only + public string AdjustRNOCautionNoteWidth; // added to Catawba and McGuire /* end of Format flags */ public StepSectionLayout StpSectLayData; public StepSectionEdit StpSectEditData; @@ -4125,6 +4126,9 @@ namespace fmtxml // by default TurnOffReplaceWords should be False. // this will be overrided as needed (ex. NSP (Prairie Island) Deviations fmtdata.SectData.TurnOffReplaceWords = "False"; + // by default AdjustRNOCautionNoteWidth should be False + // this will be set to True for Catawba and McGuire formats + fmtdata.SectData.StepSectionData.AdjustRNOCautionNoteWidth = "False"; #endregion return true; } @@ -4987,11 +4991,11 @@ namespace fmtxml if (msctstp.ImperfectStructurePlus4 != null && msctstp.ImperfectStructurePlus4 == ssctstp.ImperfectStructurePlus4) subFmt.SectData.StepSectionData.ImperfectStructurePlus4 = "null"; if (msctstp.CountAllSubLevels != null && msctstp.CountAllSubLevels == ssctstp.CountAllSubLevels) subFmt.SectData.StepSectionData.CountAllSubLevels = "null"; if (msctstp.UseMultiLineSectionTitle != null && msctstp.UseMultiLineSectionTitle == ssctstp.UseMultiLineSectionTitle) subFmt.SectData.StepSectionData.UseMultiLineSectionTitle = "null"; + if (msctstp.AdjustRNOCautionNoteWidth != null && msctstp.AdjustRNOCautionNoteWidth == ssctstp.AdjustRNOCautionNoteWidth) subFmt.SectData.StepSectionData.AdjustRNOCautionNoteWidth = "null"; if (msctlay.RNOWidthAlt == ssctlay.RNOWidthAlt) subFmt.SectData.StepSectionData.StpSectLayData.RNOWidthAlt = null; if (msctlay.HLSWidthOVRD == ssctlay.HLSWidthOVRD) subFmt.SectData.StepSectionData.StpSectLayData.HLSWidthOVRD = NullInt; if (msctpr.SecColHdrforActPMode == ssctpr.SecColHdrforActPMode) subFmt.SectData.StepSectionData.StpSectPrtData.SecColHdrforActPMode = NullInt; - SectionNum msctn = mainFmt.SectData.SectionNumber; SectionNum ssctn = subFmt.SectData.SectionNumber; SectionHead mscth = mainFmt.SectData.SectionHeader; diff --git a/PROMS/fmtxml/PlantSpecific_Catawba.cs b/PROMS/fmtxml/PlantSpecific_Catawba.cs index 1037bd19..44df96aa 100644 --- a/PROMS/fmtxml/PlantSpecific_Catawba.cs +++ b/PROMS/fmtxml/PlantSpecific_Catawba.cs @@ -16,6 +16,8 @@ namespace fmtxml //fmtdata.SectData.StepSectionData.StpSectLayData.Separator.SeparatorLocation = 2; fmtdata.SectData.StepSectionData.StpSectLayData.ColT = -3; fmtdata.SectData.StepSectionData.StpSectLayData.WidT = 390; + fmtdata.SectData.StepSectionData.AdjustRNOCautionNoteWidth = "True"; + fmtdata.ProcData.TitleLength = 45; // Base fmtdata.StepData[0].StepLayoutData.STExtraSpace = "0"; diff --git a/PROMS/fmtxml/PlantSpecific_McGuire.cs b/PROMS/fmtxml/PlantSpecific_McGuire.cs index 40ed0662..6cbda39d 100644 --- a/PROMS/fmtxml/PlantSpecific_McGuire.cs +++ b/PROMS/fmtxml/PlantSpecific_McGuire.cs @@ -12,6 +12,7 @@ namespace fmtxml //fmtdata.SectData.StepSectionData.StpSectLayData.Separator.SeparatorLocation = 2; fmtdata.SectData.StepSectionData.StpSectLayData.ColT = -3; fmtdata.SectData.StepSectionData.StpSectLayData.WidT = 390; + fmtdata.SectData.StepSectionData.AdjustRNOCautionNoteWidth = "True"; fmtdata.ProcData.TitleLength = 45; // Base diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 3e57811d6d9fa93ebc24f83b7fca58e72d3e4aee..48ca4d6d542adf13205155901a663cebcf2a7b6a 100644 GIT binary patch delta 200 zcmZ3pho|cR&jy)G#x)F%3@Hp*45bXk3?&Rf41Ns$49*ORKz<2BCPO|$9#AA7$WCPl z2l7*Ztc=NxN|KZH&T(wExs; XcCrAcUh}H|?W_JXZeR7EsYwn1!?HLW delta 47 zcmeA=z_Vr#&jy)G(@n~l#3t*U