From 2d726d336aceba044242e7317c7556437aa76c96 Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 29 May 2014 14:26:20 +0000 Subject: [PATCH] Added TabPtsPerChar to allow fmtxml to set this format variable Adjust tab width for proportional font (m.1 was wrapping onto 2 lines) --- PROMS/fmtxml/FmtFileToXml.cs | 2 ++ PROMS/fmtxml/PlantSpecific_Calvert.cs | 1 + PROMS/fmtxml/TranslateFMT.XSL | Bin 211908 -> 212320 bytes 3 files changed, 3 insertions(+) diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 893ccf0e..448d8802 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -754,6 +754,7 @@ public struct StepSectionLayout public Int16 HLSWidthOVRD; public Int16 SubPaginationWght; public Int16 TextTitleAdjustment; + public float TabPtsPerChar; // added for BGE public string TableCenterPos; // string array with floats. public string LowerLimitDivisor; // pagination - should it be in print? - 16bit: quoted float public string NonLinkedStepNumber; @@ -4975,6 +4976,7 @@ namespace fmtxml if (msctlay.ColT == ssctlay.ColT) subFmt.SectData.StepSectionData.StpSectLayData.ColT = NullInt; if (msctlay.ColAbs == ssctlay.ColAbs) subFmt.SectData.StepSectionData.StpSectLayData.ColAbs = NullInt; if (msctlay.WidT == ssctlay.WidT) subFmt.SectData.StepSectionData.StpSectLayData.WidT = NullInt; + if (msctlay.TabPtsPerChar == ssctlay.TabPtsPerChar) subFmt.SectData.StepSectionData.StpSectLayData.TabPtsPerChar = NullInt; if (msctlay.PMode == ssctlay.PMode) subFmt.SectData.StepSectionData.StpSectLayData.PMode = NullInt; if (msctlay.MaxRNO == ssctlay.MaxRNO) subFmt.SectData.StepSectionData.StpSectLayData.MaxRNO = NullInt; if (msctlay.MaxRNOTable == ssctlay.MaxRNOTable) subFmt.SectData.StepSectionData.StpSectLayData.MaxRNOTable = null; diff --git a/PROMS/fmtxml/PlantSpecific_Calvert.cs b/PROMS/fmtxml/PlantSpecific_Calvert.cs index 24bf2591..2583ce2a 100644 --- a/PROMS/fmtxml/PlantSpecific_Calvert.cs +++ b/PROMS/fmtxml/PlantSpecific_Calvert.cs @@ -17,6 +17,7 @@ namespace fmtxml fmtdata.SectData.StepSectionData.StpSectLayData.ColRTable = "0,192,126"; fmtdata.SectData.StepSectionData.StpSectLayData.ColT = -16; fmtdata.SectData.StepSectionData.StpSectLayData.WidT = 442; + fmtdata.SectData.StepSectionData.StpSectLayData.TabPtsPerChar = 6.2f; fmtdata.SectData.StepSectionData.SequentialTabFormat[4].TabFormat = "{seq})"; fmtdata.SectData.StepSectionData.SequentialTabFormat[4].PrintTabFormat = "{seq})"; fmtdata.TransData.UseSpecificTransitionModifier = "true"; diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 6c47c98223453986499fbde9b3211a2e87216768..da4a0f11d30e98ea1ab548c09155601f6d0b7610 100644 GIT binary patch delta 121 zcmX@|o#(+Xo`x-qYHGp(3?&T33;_(O3`Gpi3>gfG3`N^z)fl%MP4~IS#36_wIh|3P uS$FyeekO^@ew;ef4