From 4b26543dcacd03c5347cb35acae1f867e17837ac Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 26 Mar 2013 13:32:19 +0000 Subject: [PATCH] --- .../Extension/TransitionExt.cs | 21 +++++++++-- .../Format/PlantFormat.cs | 16 +++++++++ PROMS/Volian.Controls.Library/DisplayText.cs | 34 +++++++++++------- PROMS/fmtxml/WST1all.xml | Bin 92710 -> 92864 bytes PROMS/fmtxml/WST2all.xml | Bin 83730 -> 83882 bytes PROMS/fmtxml/WSTALRall.xml | Bin 57130 -> 57282 bytes PROMS/fmtxml/WSTBCKall.xml | Bin 71880 -> 72034 bytes PROMS/fmtxml/WSTCKLall.xml | Bin 39236 -> 39392 bytes PROMS/fmtxml/WSTDCSall.xml | Bin 82372 -> 84046 bytes 9 files changed, 56 insertions(+), 15 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 9ba61f6e..0d40aaef 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using System.Data; using System.Data.SqlClient; +using System.Text.RegularExpressions; using Csla; using Csla.Data; @@ -856,6 +857,8 @@ namespace VEPROMS.CSLA.Library { string tmpStr = tb.ToString(); if (tmpStr.ToUpper().EndsWith(", STEP ")) tb.Remove(tb.Length - 7, 7); // 7 is length of ", Step " + else if (tb.Prefix != null && tb.Prefix.StartsWith(")")) + tb.Append(")"); return true; } string retstr = TranGetSectionNumber(tb._ToItem); @@ -872,10 +875,20 @@ namespace VEPROMS.CSLA.Library tb.ReplaceToken(retstr); return (retstr != null && retstr != ""); } + private static string FixTitleCase(Match m) + { + if (Regex.IsMatch(m.Value, @"^[A-Za-z]+\.?$")) + { + string part1 = m.Value.Substring(0, 1); + string part2 = m.Value.Substring(1); + return part1.ToUpper() + part2.ToLower(); + } + return m.Value; + } private static string CapFirstLetterOnly(string retstr, int p) { - string lretstr = retstr; // LATER: write code to capitalize first letter (active plants) + string lretstr = Regex.Replace(retstr, @"([^ ,]+)", new MatchEvaluator(FixTitleCase)); return lretstr; } // TODO: Section methods are not complete.... @@ -897,7 +910,11 @@ namespace VEPROMS.CSLA.Library if (tb._FormatData.TransData.UseSecTitles) { ItemInfo tmpitm = TranGetSectionItem(itminfo); - return (tmpitm.MyContent.Text); + string sectionTitle = tmpitm.MyContent.Text; + sectionTitle = (tb._FormatData.TransData.CapsTransitionsSection ? sectionTitle.ToUpper().Replace(@"\U", @"\u") : + tb._FormatData.TransData.Cap1stCharTransSection ? CapFirstLetterOnly(sectionTitle, 0) : + sectionTitle); + return (sectionTitle); } return null; } diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index f6582616..640a7856 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -4926,6 +4926,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CapsTransitions, "@CapsTransitions"); } } + private LazyLoad _CapsTransitionsSection; + public bool CapsTransitionsSection + { + get + { + return LazyLoad(ref _CapsTransitionsSection, "@CapsTransitionsSection"); + } + } private LazyLoad _CapTranStep; public bool CapTranStep { @@ -4974,6 +4982,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Cap1stCharTrans, "@Cap1stCharTrans"); } } + private LazyLoad _Cap1stCharTransSection; + public bool Cap1stCharTransSection + { + get + { + return LazyLoad(ref _Cap1stCharTransSection, "@Cap1stCharTransSection"); + } + } private LazyLoad _UseTransitionModifier; public bool UseTransitionModifier { diff --git a/PROMS/Volian.Controls.Library/DisplayText.cs b/PROMS/Volian.Controls.Library/DisplayText.cs index 52018a71..5f0ba8f5 100644 --- a/PROMS/Volian.Controls.Library/DisplayText.cs +++ b/PROMS/Volian.Controls.Library/DisplayText.cs @@ -400,7 +400,7 @@ namespace Volian.Controls.Library private string DoTransitionAdjustments(string text, bool boldTran) { string strippedText = StaticStripRtfCommands(text); - string lookFor = string.Format(@""); + string lookFor = string.Format(@""); MatchCollection matches = Regex.Matches(text, lookFor); if (matches.Count == 0) return text; string retstr = text; @@ -413,7 +413,7 @@ namespace Volian.Controls.Library //if (!Char.IsDigit(m.Groups[3].Value[0])) continue; if (m != null && m.Groups.Count > 7 && m.Groups[6].ToString().StartsWith("Transition")) { - if (m.Groups[7].Value != "" && StepTransition(int.Parse(m.Groups[7].Value))) + if (m.Groups[7].Value != "") // && StepTransition(int.Parse(m.Groups[7].Value))) { System.Text.RegularExpressions.Group g = m.Groups[3]; string beforeTran = retstr.Substring(0, g.Index); @@ -423,19 +423,27 @@ namespace Volian.Controls.Library // i.e. there is a format flag 'BeforeTrans' that bolds text before the transition // (in wst formats). beforeTran = DoBeforeTransFlagSupport(beforeTran, _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ReplaceStrList); - string newvalue = g.ToString(); - int indexLastSpace = newvalue.LastIndexOf(' '); - if (indexLastSpace >= 0) - // Use a "\x1" as a token to replace later. Insert the unicode char, whose length is - // more than 1 character was throwing of the regexp Matches index, so that the resulting - // string may have been incorrect. - retstr = beforeTran + (boldTran ? @"\b " : null) + newvalue.Substring(0, indexLastSpace) + "\x1" + newvalue.Substring(indexLastSpace + 1) + (boldTran ? @"\b0" : null) + afterTran; - else - if (beforeTran.EndsWith(" ") ) - retstr = ReplaceLastSpaceWithHardSpace(beforeTran) + (boldTran ? @"\b " : null) + newvalue + (boldTran ? @"\b0" : null) + afterTran; + // if this is a 'step transition' type, i.e. includes a step number, in addition to other replacements, + // we want to change a space to a hardspace. + if (StepTransition(int.Parse(m.Groups[7].Value))) + { + int indexLastSpace = newvalue.LastIndexOf(' '); + if (indexLastSpace >= 0) + // Use a "\x1" as a token to replace later. Insert the unicode char, whose length is + // more than 1 character was throwing of the regexp Matches index, so that the resulting + // string may have been incorrect. + retstr = beforeTran + (boldTran ? @"\b " : null) + newvalue.Substring(0, indexLastSpace) + "\x1" + newvalue.Substring(indexLastSpace + 1) + (boldTran ? @"\b0" : null) + afterTran; else - Console.Write("");// Don't know where to put the Hard Space + if (beforeTran.EndsWith(" ")) + retstr = ReplaceLastSpaceWithHardSpace(beforeTran) + (boldTran ? @"\b " : null) + newvalue + (boldTran ? @"\b0" : null) + afterTran; + else + Console.Write("");// Don't know where to put the Hard Space + } + else if (boldTran) + { + retstr = beforeTran + @"\b " + newvalue + @"\b0" + afterTran; + } } } } diff --git a/PROMS/fmtxml/WST1all.xml b/PROMS/fmtxml/WST1all.xml index 5e783a1d0f745bd21cc5eeecb4676c1725a0ffea..096b0dda4b356613cfab35ddb03d8e4c5838398e 100644 GIT binary patch delta 104 zcmZ2>h4sKy)(t+#I29P284?)^7>Xy?Gl@^GaT1b-i5M~zGn4>jGl23%3?V?AIQhJ_ fxHL#L7CDAIpc#cMvXkXZc_v33+qYTbINxFbyjmPB delta 45 zcmV+|0Mh@!)di;11+YxUlO8n;lNibrlPu2?lYmhOlN`z-lW=1QlT62ElWNWoqrk_b D!O|2U diff --git a/PROMS/fmtxml/WST2all.xml b/PROMS/fmtxml/WST2all.xml index 0f89543d6332acaf19dc17ac63e433b48e321bc8..d2b6ac6f7a179750b7dd5d427e752121b9f8d4db 100644 GIT binary patch delta 136 zcmbQ#$GWPYb;Ga4oC*xi42cW{48@aIE|#7gRv_RF;Ttj(Gn4@3GJvv03?V?A$dCsV zvt>{M^GX>~fh?GA9I7WfvdB(On9VbpZOOjLL2CqIv9Ep1r{0DL$l A{Qv*} delta 37 vcmV+=0NVemj|GyB1+e;~lVF<+lQ^jqleVO)lB`0LprtUAkgiy>CZ>d;UCR=` diff --git a/PROMS/fmtxml/WSTALRall.xml b/PROMS/fmtxml/WSTALRall.xml index 8016e939a307dcc58caf6805027de2a9df9d6abd..05836de48ffc062a8c6deafb43211f17c4f76fde 100644 GIT binary patch delta 138 zcmZ3rkNMDk<_#LlxD^-_7@Qdr844JRC+9PX>)J9XF}MNwISj=NsX#VN))2@q0jkUZ z$`vt$0C6Hi-eg02VOfZ7tnxrJA6^umEVt~+$}QmJQdob1N_?FgP~fh?FQI8;xTWR;zqrNOgVC0juc04LEKW&i*H delta 18 acmaE`nd!(TrVSF=le08xK@U$sgEcg#8%`7*ZMX7!(*h8A^bxT!!Mw7ZoiTjVDi()StXT*?`j@ zC=&^kDW1HLQ-5-XtkUFL!hEd83?>XfH9WEGAbCHAe2^@o-{g_EACx>q9T`G^&=IK5gTa@< z6=*{ULomn$W@DhLL@8a6+qjWbO-44!66iLlNs=xM{yBy7i<#Pd~Yk0I#9(in9O9B{Q{Fe+}Sd@VVlP01@|~qfRZ9p4HyNG TwSyE*f56Bnw0#~kqnaH6Nw9&- delta 126 zcmX>%f%Ql;>xK@U$sfE}Hj5d@bWB$fVHBFYW|zR^geQw88$98gT(tYx