From 7ee3fde601e04e3f0bcc42b5c96c5b70fdbbda04 Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 5 Feb 2014 13:42:49 +0000 Subject: [PATCH] =?UTF-8?q?WCN=20changes=20for=20various=20improvements=20?= =?UTF-8?q?Added=20RO=20Format=20flag:=20UpRoImmAftrDashSpace=20(updates?= =?UTF-8?q?=20RO=20units=20if=20RO=20immediately=20follows=20a=20=E2=80=98?= =?UTF-8?q?-=20=E2=80=98,=20i.e.=20dash,=20space)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/fmtxml/AppendPlantSpecific.cs | 60 +++++++++++++++++++++++++++- PROMS/fmtxml/FmtFileToXml.cs | 2 + PROMS/fmtxml/TranslateFMT.XSL | Bin 206634 -> 207084 bytes 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index 7c4e674e..6d16c334 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -54,12 +54,18 @@ namespace fmtxml case "RGEDEV.FMT": AddRGEDEVFmt(ref fmtdata); break; + case "WCN1.FMT": + AddWCN1Fmt(ref fmtdata); + break; case "WCN2.FMT": AddWCN2Fmt(ref fmtdata); break; case "WCNCKL.FMT": AddWCNCKLFmt(ref fmtdata); break; + case "WCNBCK.FMT": + AddWCNBCKFmt(ref fmtdata); + break; case "NSP.FMT": AddNSPFMT(ref fmtdata); break; @@ -214,6 +220,8 @@ namespace fmtxml } } + + private void AddCALBCKfmt(ref FormatData fmtdata) { fmtdata.StepData[42].ReadOnly = "True"; @@ -311,8 +319,21 @@ namespace fmtxml fmtdata.StepData[30].StepLayoutData.AlignWithParentTab = "True"; fmtdata.StepData[2].StepPrintData.Justify = "Center"; fmtdata.StepData[9].StepPrintData.Justify = "Center"; + fmtdata.ROData.UpRoAftrDash = "False"; + fmtdata.ROData.UpRoImmAftrDashSpace = "True"; + } + private void AddWCNBCKFmt(ref FormatData fmtdata) + { + fmtdata.SectData.StepSectionData.StpSectLayData.WidSTablePrint = "485,216,144"; + fmtdata.StepData[20].ColOverride = "86.4"; + fmtdata.StepData[20].PageBreakOnStep = "False"; + fmtdata.ROData.UpRoAftrDash = "False"; + fmtdata.ROData.UpRoImmAftrDashSpace = "True"; + fmtdata.StepData[2].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone "; + fmtdata.StepData[3].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone "; + fmtdata.StepData[9].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone "; + fmtdata.StepData[18].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone "; } - private void AddTPFmt(ref FormatData fmtdata) { /* Under development @@ -432,6 +453,11 @@ namespace fmtxml fmtdata.Name = "CEG Ginna Background Subformat"; fmtdata.TransData.TStepNoFlag = "True"; // see comment in RgeCommonAdjustments } + private void AddWCN1Fmt(ref FormatData fmtdata) + { + fmtdata.ROData.UpRoAftrDash = "False"; + fmtdata.ROData.UpRoImmAftrDashSpace = "True"; + } private void AddWCN2Fmt(ref FormatData fmtdata) { // the WCN2 tab for continuous HLS type had only 1 space after the period ('.'). The other @@ -443,6 +469,8 @@ namespace fmtxml fmtdata.StepData[9].TabData.IdentEdit = fmtdata.StepData[9].TabData.IdentEdit + " "; fmtdata.StepData[9].TabData.RNOIdent = fmtdata.StepData[9].TabData.RNOIdent + " "; fmtdata.StepData[9].TabData.RNOIdentEdit = fmtdata.StepData[9].TabData.RNOIdentEdit + " "; + fmtdata.ROData.UpRoAftrDash = "False"; + fmtdata.ROData.UpRoImmAftrDashSpace = "True"; } private void AddNSPFMT(ref FormatData fmtdata) { @@ -1828,9 +1856,17 @@ namespace fmtxml case "EXCLN.Z00": AddEXCLN00fmt(ref pgstyles); break; + case "WCNBCK.PAG": + AddWCNBCKPage(ref pgstyles); + break; } } + private void AddWCNBCKPage(ref PageStyles pgstyles) + { + pgstyles.PgStyles[0].Items[9].Col = 518; + } + private void AddFNPCASPage(ref PageStyles pgstyles) { // adjust location of procedure title slightly to the right. Long section titles @@ -3285,6 +3321,12 @@ namespace fmtxml case "WCN1.DOC": AddWCN1Doc(ref dcstyles); break; + case "WCN2.DOC": + AddWCN2Doc(ref dcstyles); + break; + case "WCNBCK.DOC": + AddWCNBCKDoc(ref dcstyles); + break; // Adjusted the left margin to better align the procedure text case "NSP.DOC": AddNSPDOC(ref dcstyles); @@ -3417,6 +3459,18 @@ namespace fmtxml break; } } + private void AddWCNBCKDoc(ref DocStyles dcstyles) + { + dcstyles.DcStyles[0].ContTop = ""; + dcstyles.DcStyles[0].ContTopHLS = 0; + dcstyles.DcStyles[2].PageWidth = 592; + dcstyles.DcStyles[3].PageWidth = 592; + dcstyles.DcStyles[4].PageWidth = 592; + } + private void AddWCN2Doc(ref DocStyles dcstyles) + { + dcstyles.DcStyles[1].PageLength = 660; + } private void AddFNPCASDOC(ref DocStyles dcstyles) { dcstyles.DcStyles[0].TopMargin = 78; @@ -3550,6 +3604,7 @@ namespace fmtxml public void AddWCN1Doc(ref DocStyles dcstyles) { + dcstyles.DcStyles[1].PageLength = 606; // remove the 'DontCountInTabOfCont' flag on the cover page so that page counts in the // auto table of contents will be correct. dcstyles.DcStyles[3].DocStructStyle.DocStyle = dcstyles.DcStyles[3].DocStructStyle.DocStyle.Replace(", DontCountInTabOfCont", ""); @@ -3894,6 +3949,9 @@ namespace fmtxml 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 45a96390..ceda9823 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -1122,6 +1122,7 @@ public struct RO /* Format flags moved to here.... */ public string AllUnits; public string UpRoAftrDash; //UpSetpntAftrDash; + public string UpRoImmAftrDashSpace; //New - used this to differentiate from already (incorrect) existing UpRoAftrDash public string UpcaseAllRoUnits; //UpcaseAllSetpointUnits; public string CapHighRo; //CapHighSetpnt; public string CapRoIfLastLower; //Old CapsPIFLastLower; @@ -4112,6 +4113,7 @@ namespace fmtxml else fmtdata.TransData.DoSectionTransitions = "False"; #endregion #region RO + fmtdata.ROData.UpRoImmAftrDashSpace = "False"; if (XtraFlags.AllUnits == "True") fmtdata.ROData.AllUnits = "True"; else fmtdata.ROData.AllUnits = "False"; if (XtraFlags.UpSetpntAftrDash == "True") fmtdata.ROData.UpRoAftrDash = "True"; diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 0da60c04cd9dc40951ee5f43719ac89fdcf70560..4af01f8f61c8d89c8b6e05f1e85c668143635048 100644 GIT binary patch delta 149 zcmZ2=j_1uqo`x327N#xCVZzEm4EYS647ot)$dJZR!cfHE!jQ;N%#gtl%uoPiB{QUM z_ZMdFW#LCtIeoSolkD_go0wFl2dFYiOn;!wq%&PWo|%IaZWu(#o1=^-(-YJgy{0S3 dF-J_F_l=2TdV>VB%Jd8EjCtG3B$&7G0RXlRDc1l1 delta 27 jcmaEJk!RI8o`x327N#xCVZz%Rgqhn|w$GDf_TvWto%IQx