From f87bf4d09a75713dd8f60fd297516d418c6f9d5f Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 15 Feb 2012 12:38:35 +0000 Subject: [PATCH] --- PROMS/fmtxml/FmtFileToXml.cs | 24 ++++++++++++------------ PROMS/fmtxml/TranslateFMT.XSL | Bin 194476 -> 194578 bytes 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 220fbdd8..478b43b6 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -1559,7 +1559,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() != "OHLP" && fmtName.ToUpper() != "BASE") return; + //if (fmtName.ToUpper() != "WCN1" && fmtName.ToUpper() != "BASE") return; try { LoadFormatFile(nm + ".fmt", ref SubXtraFlags); @@ -3202,18 +3202,18 @@ namespace fmtxml if (fmtdata.TransData.TransTypeData[i].TransFormat != null && fmtdata.TransData.TransTypeData[i].TransMenu != null) fmtdata.TransData.TransTypeData[i].TransUI = GetTransUIEnum(fmtdata.TransData.TransTypeData[i].TransFormat, fmtdata.TransData.TransTypeData[i].TransMenu); } // if in dosectiontransitions, put the format/menu strings back to original - if (XtraFlags.DoSectionTrans == "True") - { - for (int i = 0; i < MAXTRANS; i++) - { - if (i < 6 && fmtdata.TransData.TransTypeData[i].TransMenu != null) - { - fmtdata.TransData.TransTypeData[i].TransFormat = DefaultSectionTransFormatStr[i]; - fmtdata.TransData.TransTypeData[i].TransMenu = DefaultSectionTransFormatStr[i]; + //if (XtraFlags.DoSectionTrans == "True") + //{ + // for (int i = 0; i < MAXTRANS; i++) + // { + // if (i < 6 && fmtdata.TransData.TransTypeData[i].TransMenu != null) + // { + // fmtdata.TransData.TransTypeData[i].TransFormat = DefaultSectionTransFormatStr[i]; + // fmtdata.TransData.TransTypeData[i].TransMenu = DefaultSectionTransFormatStr[i]; - } - } - } + // } + // } + //} //arcnt = arcnt + MAXTRANS; // not used OutsideTransFmt & OutsideTransMenu diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 618911dce7138dd7917a539a428a3d72a321b380..5d61e3aaa6c0a44f659d9c508a3aca9c49336146 100644 GIT binary patch delta 89 zcmZ4Uo_o>agjF+FcG6W{cJ tU`Cbcb&r_Drk{Gu delta 57 zcmV-90LK54@C&T(3xI?Hv;silmr&sXM3>s)0uYy4Y63)-;Q|VmFyjIemvC