diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 01a1f14d..99e700e9 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -771,6 +771,8 @@ public struct StepSectionLayout public string UseRNOParentIdent; public string DevNoteOrCautionTabOffset; //end for Braidwood by jcb + //for Calvert Cliffs (bge) to force the order of Warnings, Cautions, Notes, and Messages + public string CautionNoteOrder; /* Format flags moved to here.... */ public string Dev_Format; @@ -4988,6 +4990,7 @@ namespace fmtxml if (msctlay.WidSTablePrint == ssctlay.WidSTablePrint) subFmt.SectData.StepSectionData.StpSectLayData.WidSTablePrint = null; if (mscted.ColRScreen == sscted.ColRScreen) subFmt.SectData.StepSectionData.StpSectEditData.ColRScreen = null; if (msctlay.AdjRNOCol == ssctlay.AdjRNOCol) subFmt.SectData.StepSectionData.StpSectLayData.AdjRNOCol = NullInt; + if (msctlay.CautionNoteOrder == ssctlay.CautionNoteOrder) subFmt.SectData.StepSectionData.StpSectLayData.CautionNoteOrder = null; // change bar ChangeBar mcb = mainFmt.ProcData.ChangeBarData; diff --git a/PROMS/fmtxml/PlantSpecific_Calvert.cs b/PROMS/fmtxml/PlantSpecific_Calvert.cs index 16a7aa54..332e34cd 100644 --- a/PROMS/fmtxml/PlantSpecific_Calvert.cs +++ b/PROMS/fmtxml/PlantSpecific_Calvert.cs @@ -9,6 +9,7 @@ namespace fmtxml { private void AddBGEALNfmt(ref FormatData fmtdata) { + fmtdata.SectData.StepSectionData.StpSectLayData.CautionNoteOrder = "7,6,22"; // Note,Caution,Warning fmtdata.SectData.StepSectionData.CompressHPSub = "False"; fmtdata.SectData.StepSectionData.CompressPropSubSup = "True"; fmtdata.PrintData.SpecialCaseCalvert = "True"; @@ -29,6 +30,7 @@ namespace fmtxml fmtdata.SectData.StepSectionData.StpSectLayData.ColT = -16; fmtdata.SectData.StepSectionData.StpSectLayData.WidT = 442; fmtdata.SectData.StepSectionData.StpSectLayData.TabPtsPerChar = 6.2f; + fmtdata.SectData.StepSectionData.StpSectLayData.CautionNoteOrder = "29,7,6,22"; // Message,Note,Caution,Warning fmtdata.SectData.StepSectionData.SequentialTabFormat[4].TabFormat = "{seq})"; fmtdata.SectData.StepSectionData.SequentialTabFormat[4].PrintTabFormat = "{seq})"; fmtdata.TransData.UseSpecificTransitionModifier = "True"; diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index ca0542b0..e771d3b0 100644 Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ