diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index d28299d4..f11e736e 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -226,6 +226,9 @@ namespace fmtxml case "WPB.X20": AddWPB20fmt(ref fmtdata); break; + case "WPB.X22": + AddWPB22fmt(ref fmtdata); + break; case "WEPENB.FMT": AddWEPENBFmt(ref fmtdata); break; @@ -1318,6 +1321,12 @@ namespace fmtxml case "WEP2.DOC": AddWEP2DOC(ref dcstyles); break; + case "WPB.Y20": + AddWPB20DOC(ref dcstyles); + break; + case "WPB.Y22": + AddWPB20DOC(ref dcstyles); // subformat 22 change is same as 20 + break; case "WEPENB.DOC": AddWEPENBDOC(ref dcstyles); break; diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index af619df0..9764c471 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -825,6 +825,7 @@ public struct StepSectionPrint public string LowerCaseRevNum; public string UseXtraRevNumber; public string SpecialLandscapeMode; + public string LimitWidToPageWid; /* End of format flags */ public VE_Font ModifiedTextStyle; public VE_Font ImmStepHdrStyle; @@ -5197,6 +5198,8 @@ namespace fmtxml if (msctpr.LowerCaseRevNum != null && msctpr.LowerCaseRevNum == ssctpr.LowerCaseRevNum) subFmt.SectData.StepSectionData.StpSectPrtData.LowerCaseRevNum = "null"; if (msctpr.UseXtraRevNumber != null && msctpr.UseXtraRevNumber == ssctpr.UseXtraRevNumber) subFmt.SectData.StepSectionData.StpSectPrtData.UseXtraRevNumber = "null"; if (msctpr.SpecialLandscapeMode != null && msctpr.SpecialLandscapeMode == ssctpr.SpecialLandscapeMode) subFmt.SectData.StepSectionData.StpSectPrtData.SpecialLandscapeMode = "null"; + if (msctpr.LimitWidToPageWid != null && msctpr.LimitWidToPageWid == ssctpr.LimitWidToPageWid) subFmt.SectData.StepSectionData.StpSectPrtData.LimitWidToPageWid = "null"; + for (int i = 0; i < MAXSEQ; i++) { if (msctpr.LeftJustifyList[i].Size == ssctpr.LeftJustifyList[i].Size) subFmt.SectData.StepSectionData.StpSectPrtData.LeftJustifyList[i].Size = NullInt; diff --git a/PROMS/fmtxml/PlantSpecific_PointBeach.cs b/PROMS/fmtxml/PlantSpecific_PointBeach.cs index 92eb193c..dcac081b 100644 --- a/PROMS/fmtxml/PlantSpecific_PointBeach.cs +++ b/PROMS/fmtxml/PlantSpecific_PointBeach.cs @@ -50,7 +50,63 @@ namespace fmtxml } private void AddWPB20fmt(ref FormatData fmtdata) { + fmtdata.SectData.StepSectionData.StpSectLayData.ColS = 50; + fmtdata.SectData.StepSectionData.StpSectPrtData.LimitWidToPageWid = "True"; fmtdata.TransData.DoSectionTransitions = "True"; + fmtdata.PrintData.ProcDescrList[0].ProcDescr1 = "{null}"; + fmtdata.StepData[2].TabData.IdentEdit = "STEP {numeric} : "; + fmtdata.StepData[2].TabData.Ident = "STEP {numeric} : "; + fmtdata.StepData[2].TabData.RNOIdentEdit = "STEP {numeric} : "; + fmtdata.StepData[2].TabData.RNOIdent = "STEP {numeric} : "; + fmtdata.StepData[2].StepPrintData.PosAdjust = "36"; //HLSs + fmtdata.StepData[3].StepPrintData.PosAdjust = "36"; + fmtdata.StepData[18].StepPrintData.PosAdjust = "36"; + fmtdata.StepData[40].StepPrintData.PosAdjust = "36"; // (RNO inherits from HLS) + fmtdata.StepData[41].StepPrintData.PosAdjust = "36"; + fmtdata.StepData[6].StepPrintData.PosAdjust = "50"; //Cautions + fmtdata.StepData[20].StepPrintData.PosAdjust = "50"; + fmtdata.StepData[21].StepPrintData.PosAdjust = "50"; + fmtdata.StepData[27].StepPrintData.PosAdjust = "50"; + fmtdata.StepData[29].StepPrintData.PosAdjust = "50"; + fmtdata.StepData[7].StepPrintData.PosAdjust = "67"; //Notes + fmtdata.StepData[22].StepPrintData.PosAdjust = "67"; + fmtdata.StepData[23].StepPrintData.PosAdjust = "67"; + fmtdata.StepData[26].StepPrintData.PosAdjust = "67"; + fmtdata.StepData[28].StepPrintData.PosAdjust = "67"; + fmtdata.StepData[32].StepPrintData.PosAdjust = "67"; + fmtdata.StepData[9].StepPrintData.PosAdjust = "0"; + fmtdata.StepData[24].StepPrintData.PosAdjust = "-50"; + } + private void AddWPB22fmt(ref FormatData fmtdata) + { + fmtdata.SectData.StepSectionData.StpSectLayData.ColS = 50; + fmtdata.SectData.StepSectionData.StpSectPrtData.LimitWidToPageWid = "True"; + fmtdata.TransData.DoSectionTransitions = "True"; + fmtdata.PrintData.ProcDescrList[0].ProcDescr1 = "{null}"; + fmtdata.StepData[2].TabData.IdentEdit = "STEP {numeric} : "; + fmtdata.StepData[2].TabData.Ident = "STEP {numeric} : "; + fmtdata.StepData[2].TabData.RNOIdentEdit = "STEP {numeric} : "; + fmtdata.StepData[2].TabData.RNOIdent = "STEP {numeric} : "; + //fmtdata.StepData[23].StepPrintData.PosAdjust = "46"; + //fmtdata.StepData[24].StepPrintData.PosAdjust = "-50"; + fmtdata.StepData[2].StepPrintData.PosAdjust = "36"; //HLSs + fmtdata.StepData[3].StepPrintData.PosAdjust = "36"; + fmtdata.StepData[18].StepPrintData.PosAdjust = "36"; + fmtdata.StepData[40].StepPrintData.PosAdjust = "36"; // (RNO inherits from HLS) + fmtdata.StepData[41].StepPrintData.PosAdjust = "36"; + fmtdata.StepData[6].StepPrintData.PosAdjust = "50"; //Cautions + fmtdata.StepData[20].StepPrintData.PosAdjust = "50"; + fmtdata.StepData[21].StepPrintData.PosAdjust = "50"; + fmtdata.StepData[27].StepPrintData.PosAdjust = "50"; + fmtdata.StepData[29].StepPrintData.PosAdjust = "50"; + fmtdata.StepData[7].StepPrintData.PosAdjust = "67"; //Notes + fmtdata.StepData[22].StepPrintData.PosAdjust = "67"; + fmtdata.StepData[23].StepPrintData.PosAdjust = "67"; + fmtdata.StepData[26].StepPrintData.PosAdjust = "67"; + fmtdata.StepData[28].StepPrintData.PosAdjust = "67"; + fmtdata.StepData[32].StepPrintData.PosAdjust = "67"; + fmtdata.StepData[9].StepPrintData.PosAdjust = "0"; + fmtdata.StepData[24].StepPrintData.PosAdjust = "-50"; } } public partial class FmtToXml @@ -81,6 +137,11 @@ namespace fmtxml pgstyles.PgStyles[1].Items[15].Col = 288; pgstyles.PgStyles[2].Items[1].Token = "{BOX3}"; } + private void AddWPB20DOC(ref DocStyles dcstyles) + { + dcstyles.DcStyles[0].ContTop = ". . . Step %3d Continued from Previous Page . . ."; + dcstyles.DcStyles[0].ContBottom = ". . . Step %3d Continued on Next Page . . ."; + } private void AddWEPENBDOC(ref DocStyles dcstyles) { dcstyles.DcStyles[0].PageWidth = 500; diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index dd4c8cbf..de1a2932 100644 Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ