diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index 8bbe529b..f1fde6aa 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -66,6 +66,9 @@ namespace fmtxml case "WCNBCK.FMT": AddWCNBCKFmt(ref fmtdata); break; + case "WCNOFB.FMT": + AddWCNOFBFmt(ref fmtdata); + break; case "NSP.FMT": AddNSPFMT(ref fmtdata); break; @@ -334,6 +337,59 @@ namespace fmtxml fmtdata.StepData[9].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone "; fmtdata.StepData[18].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone "; } + private void AddWCNOFBFmt(ref FormatData fmtdata) + { + fmtdata.SectData.StepSectionData.StpSectLayData.WidSTablePrint = "495,216,144"; + fmtdata.StepData[20].PageBreakOnStep = "False"; + fmtdata.StepData[43].ColOverride = "86.4"; + fmtdata.ROData.UpRoAftrDash = "False"; + fmtdata.ROData.UpRoImmAftrDashSpace = "True"; + + // tabbing for hls types: + fmtdata.StepData[2].TabData.IdentEdit=@"STEP: {Section Prefix}{numeric}"; + fmtdata.StepData[2].TabData.Ident=@"STEP: {Section Prefix}{numeric} "; + fmtdata.StepData[2].TabData.IdentAltPrint=@"STEP: {Section Prefix}{numeric}\STEP: {Section Prefix}{numeric}"; + fmtdata.StepData[2].TabData.RNOIdentEdit="STEP {Section Prefix}: "; + fmtdata.StepData[2].TabData.RNOIdent = "STEP: {Section Prefix} "; + fmtdata.StepData[2].TabData.IdentWid = "100"; + fmtdata.StepData[3].TabData.IdentEdit = @"STEP: {Section Prefix}{numeric}"; + fmtdata.StepData[3].TabData.Ident = @"STEP: {Section Prefix}{numeric} "; + fmtdata.StepData[3].TabData.IdentAltPrint = @"STEP: {Section Prefix}{numeric}\STEP: {Section Prefix}{numeric}"; + fmtdata.StepData[3].TabData.RNOIdentEdit = "STEP {Section Prefix}: "; + fmtdata.StepData[3].TabData.RNOIdent = "STEP: {Section Prefix} "; + fmtdata.StepData[3].TabData.IdentWid = "100"; + fmtdata.StepData[9].TabData.IdentEdit = @"STEP: {Section Prefix}{numeric}"; + fmtdata.StepData[9].TabData.Ident = @"STEP: {Section Prefix}{numeric} "; + fmtdata.StepData[9].TabData.IdentAltPrint = @"STEP: {Section Prefix}{numeric}\STEP: {Section Prefix}{numeric}"; + fmtdata.StepData[9].TabData.RNOIdentEdit = "STEP {Section Prefix}: "; + fmtdata.StepData[9].TabData.RNOIdent = "STEP: {Section Prefix} "; + fmtdata.StepData[9].TabData.IdentWid = "100"; + fmtdata.StepData[18].TabData.IdentEdit = @"STEP: {Section Prefix}{numeric}"; + fmtdata.StepData[18].TabData.Ident = @"STEP: {Section Prefix}{numeric} "; + fmtdata.StepData[18].TabData.IdentAltPrint = @"STEP: {Section Prefix}{numeric}\STEP: {Section Prefix}{numeric}"; + fmtdata.StepData[18].TabData.RNOIdentEdit = "STEP {Section Prefix}: "; + fmtdata.StepData[18].TabData.RNOIdent = "STEP: {Section Prefix} "; + fmtdata.StepData[18].TabData.IdentWid = "100"; + + // tabbing for cautions/notes + // cautions: + fmtdata.StepData[6].TabData.Ident = @"STEP: {Section Prefix}{LNK Step Num}-CAUTION {LNK C/N Num} "; + fmtdata.StepData[6].TabData.IdentAltPrint = @"STEP: {Section Prefix}{LNK Step Num}-CAUTION {LNK C/N Num} /STEP: {Section Prefix}{LNK Step Num}-CAUTION {LNK C/N Num} "; + fmtdata.StepData[6].TabData.RNOIdent = @"STEP: {Section Prefix}{LNK Step Num}-CAUTION {LNK C/N Num} "; + // notes: + fmtdata.StepData[7].TabData.Ident = @"STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} "; + fmtdata.StepData[7].TabData.IdentAltPrint = @"STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} \STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} "; + fmtdata.StepData[7].TabData.RNOIdent = @"STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} "; + fmtdata.StepData[22].TabData.Ident = @"STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} "; + fmtdata.StepData[22].TabData.IdentAltPrint = @"STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} \STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} "; + fmtdata.StepData[22].TabData.RNOIdent = @"STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} "; + fmtdata.StepData[23].TabData.Ident = @"STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} "; + fmtdata.StepData[23].TabData.IdentAltPrint = @"STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} \STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} "; + fmtdata.StepData[23].TabData.RNOIdent = @"STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} "; + fmtdata.StepData[26].TabData.Ident = @"STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} "; + fmtdata.StepData[26].TabData.IdentAltPrint = @"STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} \STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} "; + fmtdata.StepData[26].TabData.RNOIdent = @"STEP: {Section Prefix}{LNK Step Num}-NOTE {LNK C/N Num} "; + } private void AddTPFmt(ref FormatData fmtdata) { /* Under development @@ -1397,14 +1453,11 @@ namespace fmtxml switch (genName.ToUpper()) { case "WCN2": + case "WCN1": // same cover page box as wcn2 + case "WCNBCK": // same cover page box as wcn2 + case "WCNOFB": // same cover page box as wcn2 AddWCN2(myDoc); break; - case "WCN1": - AddWCN2(myDoc); // same cover page box as wcn2 - break; - case "WCNBCK": - AddWCN2(myDoc); // same cover page box as wcn2 - break; case "NSP": AddNSP(myDoc); break; diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index ceda9823..8e330f27 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -1036,7 +1036,7 @@ public struct Tab public string RNOIdentEdit; public string RNOIdent; //public string IdentEditWid; - //public string IdentWid; + public string IdentWid; //public string RNOIdentEditWid; //public string RNOIdentWid; public string Justify; // from tbstyle - None, CENTER, LEFT, RIGHT @@ -5330,10 +5330,11 @@ namespace fmtxml private string StepPartTabIdentEdit(Step stp) { return stp.TabData.IdentEdit; } private string StepPartTabIdent(Step stp) { return stp.TabData.Ident; } + private string StepPartTabIdentAltPrint(Step stp) { return stp.TabData.IdentAltPrint; } private string StepPartTabRNOIdentEdit(Step stp) { return stp.TabData.RNOIdentEdit; } private string StepPartTabRNOIdent(Step stp) { return stp.TabData.RNOIdent; } //private string StepPartTabIdentEditWid(Step stp) { return stp.TabData.IdentEditWid; } - //private string StepPartTabIdentWid(Step stp) { return stp.TabData.IdentWid; } + private string StepPartTabIdentWid(Step stp) { return stp.TabData.IdentWid; } //private string StepPartTabRNOIdentEditWid(Step stp) { return stp.TabData.RNOIdentEditWid; } //private string StepPartTabRNOIdentWid(Step stp) { return stp.TabData.RNOIdentWid; } private string StepPartTabJustify(Step stp) { return stp.TabData.Justify; } @@ -5547,10 +5548,11 @@ namespace fmtxml //RHM/KBR added this - not sure: if (mstp.TabData.IdentEdit == sstp.TabData.IdentEdit) subFmt.StepData[i].TabData.IdentEdit = null; if (CheckInheritedStr(new StepPartStr(StepPartTabIdentEdit), step, dicParents)) step.TabData.IdentEdit = null; if (CheckInheritedStr(new StepPartStr(StepPartTabIdent), step, dicParents)) step.TabData.Ident = null; + if (CheckInheritedStr(new StepPartStr(StepPartTabIdentAltPrint), step, dicParents)) step.TabData.IdentAltPrint = null; if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdentEdit), step, dicParents)) step.TabData.RNOIdentEdit = null; if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdent), step, dicParents)) step.TabData.RNOIdent = null; //if (CheckInheritedStr(new StepPartStr(StepPartTabIdentEditWid), step, dicParents)) step.TabData.IdentEditWid = NullString; - //if (CheckInheritedStr(new StepPartStr(StepPartTabIdentWid), step, dicParents)) step.TabData.IdentWid = NullString; + if (CheckInheritedStr(new StepPartStr(StepPartTabIdentWid), step, dicParents)) step.TabData.IdentWid = NullString; //if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdentEditWid), step, dicParents)) step.TabData.RNOIdentEditWid = NullString; //if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdentWid), step, dicParents)) step.TabData.RNOIdentWid = NullString; if (CheckInheritedStr(new StepPartStr(StepPartTabJustify), step, dicParents)) step.TabData.Justify = null; diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 4af01f8f..ebb05b9c 100644 Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ