diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index 633ca3dd..d28299d4 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -223,14 +223,15 @@ namespace fmtxml case "WEP2.FMT": AddWEP2fmt(ref fmtdata); break; + case "WPB.X20": + AddWPB20fmt(ref fmtdata); + break; case "WEPENB.FMT": AddWEPENBFmt(ref fmtdata); break; } } - - private void AddCALBCKfmt(ref FormatData fmtdata) { fmtdata.StepData[42].ReadOnly = "True"; @@ -1543,6 +1544,9 @@ namespace fmtxml case "WEP2": AddWEP2(myDoc); break; + case "WEPENB": + AddWEPENB(myDoc); + break; } } diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 46086a6b..af619df0 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -1093,6 +1093,7 @@ public struct Trans public string SpecifiedSubstepsOnly; public string CapsTransitions; public string CapTranStep; + public string Underline; public string TStepNoFlag; public string LowerCaseTranNumber; public string UpcaseTranAnd; @@ -5120,6 +5121,7 @@ namespace fmtxml if (mainFmt.TransData.SpecifiedSubstepsOnly != null && mainFmt.TransData.SpecifiedSubstepsOnly == subFmt.TransData.SpecifiedSubstepsOnly) subFmt.TransData.SpecifiedSubstepsOnly = "null"; if (mainFmt.TransData.CapsTransitions != null && mainFmt.TransData.CapsTransitions == subFmt.TransData.CapsTransitions) subFmt.TransData.CapsTransitions = "null"; if (mainFmt.TransData.CapTranStep != null && mainFmt.TransData.CapTranStep == subFmt.TransData.CapTranStep) subFmt.TransData.CapTranStep = "null"; + if (mainFmt.TransData.Underline != null && mainFmt.TransData.Underline == subFmt.TransData.Underline) subFmt.TransData.Underline = "null"; if (mainFmt.TransData.TStepNoFlag != null && mainFmt.TransData.TStepNoFlag == subFmt.TransData.TStepNoFlag) subFmt.TransData.TStepNoFlag = "null"; if (mainFmt.TransData.LowerCaseTranNumber != null && mainFmt.TransData.LowerCaseTranNumber == subFmt.TransData.LowerCaseTranNumber) subFmt.TransData.LowerCaseTranNumber = "null"; if (mainFmt.TransData.UpcaseTranAnd != null && mainFmt.TransData.UpcaseTranAnd == subFmt.TransData.UpcaseTranAnd) subFmt.TransData.UpcaseTranAnd = "null"; diff --git a/PROMS/fmtxml/PlantSpecific_PointBeach.cs b/PROMS/fmtxml/PlantSpecific_PointBeach.cs index f438a848..0d9cdf79 100644 --- a/PROMS/fmtxml/PlantSpecific_PointBeach.cs +++ b/PROMS/fmtxml/PlantSpecific_PointBeach.cs @@ -10,6 +10,7 @@ namespace fmtxml private void AddWEP2fmt(ref FormatData fmtdata) { fmtdata.SectData.StepSectionData.StpSectPrtData.DiffContActBox = "True"; + fmtdata.TransData.Underline = "True"; fmtdata.StepData[2].TabData.Ident = "{Section Prefix}{numeric} "; fmtdata.StepData[3].TabData.Ident = "{!C0}{numeric} "; } @@ -37,12 +38,17 @@ namespace fmtxml fmtdata.StepData[26].TabData.RNOIdent = @"\ul ERG NOTE:\ulnone "; fmtdata.StepData[27].TabData.RNOIdent = @"\ul ERG CAUTION:\ulnone "; } + private void AddWPB20fmt(ref FormatData fmtdata) + { + fmtdata.TransData.DoSectionTransitions = "True"; + } } public partial class FmtToXml { private void AddWEP2DOC(ref DocStyles dcstyles) { dcstyles.DcStyles[1].PageLength = 654; + dcstyles.DcStyles[6].PageWidth = 564; } private void AddWEPENBPage(ref PageStyles pgstyles) { @@ -80,6 +86,13 @@ namespace fmtxml "" + ""); myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[6]); + myDoc.DocumentElement.RemoveChild(myDoc.DocumentElement.ChildNodes[4]); // remove references to BMP files. + myDoc.DocumentElement.RemoveChild(myDoc.DocumentElement.ChildNodes[4]); + } + private void AddWEPENB(XmlDocument myDoc) + { + myDoc.DocumentElement.RemoveChild(myDoc.DocumentElement.ChildNodes[4]); // remove references to BMP files. + myDoc.DocumentElement.RemoveChild(myDoc.DocumentElement.ChildNodes[4]); } } } diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 63624a48..dd4c8cbf 100644 Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ