From 193cfc507fbb7595b99bf774111901bd1a21ee25 Mon Sep 17 00:00:00 2001 From: Kathy Date: Fri, 8 Jun 2012 13:04:41 +0000 Subject: [PATCH] --- PROMS/fmtxml/FmtFileToXml.cs | 5 +++-- PROMS/fmtxml/TranslateFMT.XSL | Bin 194578 -> 194880 bytes 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 6d6f1c2e..b2de36ef 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -979,6 +979,7 @@ public struct Print public string ForeColor; // Doesn't exist in old format - See StepLayoutData public string BackColor; // Doesn't exist in old format - See StepLayoutData public string PosAdjust; + public string Justify; // added for wolf creek checklist procedures. } [Serializable] public struct Layout @@ -1559,7 +1560,7 @@ namespace fmtxml fmtName = alias; //if (fmtName.ToUpper() != "CPLS" && fmtName.ToUpper() != "BASE") return; //if (fmtName.ToUpper() != "OHLP" && fmtName.ToUpper() != "BASE" && fmtName.ToUpper() != "WCN2") return; - //if (fmtName.ToUpper() != "WCN1" && fmtName.ToUpper() != "BASE") return; + //if (fmtName.ToUpper() != "WCNCKL" && fmtName.ToUpper() != "BASE") return; try { LoadFormatFile(nm + ".fmt", ref SubXtraFlags); @@ -2581,7 +2582,7 @@ namespace fmtxml { fmtdata.StepData[i].VertPos = null; for (int j = 0; j < 15; j++) - fmtdata.StepData[i].VertPos = fmtdata.StepData[i].VertPos + string.Format("{0},", vp[j]); + fmtdata.StepData[i].VertPos = fmtdata.StepData[i].VertPos + string.Format("{0},", ColToPoints(vp[j], _PlantDefaultFontStyle)); fmtdata.StepData[i].VertPos = fmtdata.StepData[i].VertPos.Substring(0, fmtdata.StepData[i].VertPos.Length - 1); // remove last "," } } diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 5d61e3aaa6c0a44f659d9c508a3aca9c49336146..f64aac9fa4e938b4aab4b6cca4e8a865f6594ab8 100644 GIT binary patch delta 97 zcmV-n0G|Jn@C(553xI?Hv;u^Fm)Phl5~m*8ju5SMy;0uqy~1T2$49WJ*7e*zA9 DqEjJm delta 50 zcmX@`iF?uq?uHh|Ele$SlLL4;CI?8fOiz$vWSQQO&%`pls+vh?@){PM$qur5+l?BS G_$mR`))2!0