From cc188ce98f57dcc52e826672a15dd54278a2d745 Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 2 Oct 2013 10:38:54 +0000 Subject: [PATCH] CALBCK improvements --- PROMS/fmtxml/AppendPlantSpecific.cs | 5 +++++ PROMS/fmtxml/FmtFileToXml.cs | 3 +++ PROMS/fmtxml/TranslateFMT.XSL | Bin 202994 -> 203412 bytes 3 files changed, 8 insertions(+) diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index 88ed1c8f..51f97178 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -152,6 +152,11 @@ namespace fmtxml fmtdata.StepData[6].WidthOverride = "490"; fmtdata.StepData[7].WidthOverride = "490"; fmtdata.StepData[24].WidthOverride = "490"; + fmtdata.StepData[2].UseOldTemplate = "True"; + fmtdata.StepData[6].UseOldTemplate = "True"; + fmtdata.StepData[7].UseOldTemplate = "True"; + fmtdata.StepData[9].UseOldTemplate = "True"; + fmtdata.StepData[40].StepLayoutData.AlignWithParentTab = "True"; } private void AddFNPfmt(ref FormatData fmtdata) { diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 7c7bb630..b60961d5 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -906,6 +906,7 @@ public struct Step public string UnderlineAfterDashSpace; public string SpaceIn; // NoSpaceInNoteOrCaution public string PageBreakOnStep; // PageBreakOnHighLevelStep, PageBreakOnCautions, PageBreakOnNotes + public string UseOldTemplate; public string AlignNullTabWSectHead; public string TextSubFollowsTextStyle; public string CautionOrNoteSubstepIndent; @@ -5303,6 +5304,7 @@ namespace fmtxml private string StepPartUnderlineAfterDashSpace(Step stp) { return stp.UnderlineAfterDashSpace; } private string StepPartSpaceIn(Step stp) { return stp.SpaceIn; } private string StepPartPageBreakOnStep(Step stp) { return stp.PageBreakOnStep; } + private string StepPartUseOldTemplate(Step stp) { return stp.UseOldTemplate; } private string StepPartAlignNullTabWSectHead(Step stp) { return stp.AlignNullTabWSectHead; } private string StepPartTextSubFollowsTextStyle(Step stp) { return stp.TextSubFollowsTextStyle; } private string StepPartTreatAsSequential(Step stp) { return stp.TreatAsSequential; } @@ -5551,6 +5553,7 @@ namespace fmtxml if (CheckInheritedStr(new StepPartStr(StepPartUnderlineAfterDashSpace), step, dicParents)) step.UnderlineAfterDashSpace = null; if (CheckInheritedStr(new StepPartStr(StepPartSpaceIn), step, dicParents)) step.SpaceIn = null; if (CheckInheritedStr(new StepPartStr(StepPartPageBreakOnStep), step, dicParents)) step.PageBreakOnStep = null; + if (CheckInheritedStr(new StepPartStr(StepPartUseOldTemplate), step, dicParents)) step.UseOldTemplate = null; if (CheckInheritedStr(new StepPartStr(StepPartAlignNullTabWSectHead), step, dicParents)) step.AlignNullTabWSectHead = null; if (CheckInheritedStr(new StepPartStr(StepPartTextSubFollowsTextStyle), step, dicParents)) step.TextSubFollowsTextStyle = null; if (CheckInheritedStr(new StepPartStr(StepPartTreatAsSequential), step, dicParents)) step.TreatAsSequential = null; diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index a7a9bd72b9bf1dcab80911370433fb7eca1c9c03..55c891d7d74bc9e2c256ceb3b1058dd5d3d465d8 100644 GIT binary patch delta 111 zcmeygk!Q+Qo`x-qMvtUJ8HyQF8T=V?7*ZHQfUI1G0w6n)p@boIyZ$4_osN?ep0lxn z<)`zrFiB27HIGSda)7GT;r6 delta 28 kcmbQTmFLq&o`x-qMvt}!JYwADIQ_vJMwabes!VKO0mfVm`Tzg`