Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Corrected third level section numbers in transitions

Browse Source 
Removed bracketed text from section titles within transitions
This commit is contained in:
Rich 2014-12-04 05:05:58 +00:00
parent 06df9a9233
commit 78b211c90a
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
View File

@ -605,8 +605,19 @@ namespace VEPROMS.CSLA.Library
//itm.Save(); //itm.Save();
//} //}
} }
if (Regex.IsMatch(retval, @".*\[B[0-9]{4,4}\].*") && tb._ToItem.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert ) //if (Regex.IsMatch(retval, @".*\[[BP][0-9]{4,4}\].*")
retval = Regex.Replace(retval, @" *(\[[BP][0-9]{4,4}\])+",""); // && tb._ToItem.ActiveFormat != null
// && tb._ToItem.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert )
// retval = Regex.Replace(retval, @" *(\[[BP][0-9]{4,4}\])+","");
//return retval;
if (Regex.IsMatch(retval, @".* *\[([A-Z0-9 ]|\\u160\?)+\] *.*")
&& tb._ToItem.ActiveFormat != null
&& tb._ToItem.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
retval = Regex.Replace(retval, @" *(\[([A-Z0-9 ]|\\u160\?)+\])+ *", "");
if (Regex.IsMatch(retval, @".* *\(([A-Z ]|\\u160\?)+\) *.*")
&& tb._ToItem.ActiveFormat != null
&& tb._ToItem.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
retval = Regex.Replace(retval, @" *(\(([A-Z ]|\\u160\?)+\))+ *", "");
return retval; return retval;
} }
private static TransitionBuilder SetupTransitionBuilder(FormatInfo formatInfo, ItemInfo fromInfo, int tranType, ItemInfo toItem, ItemInfo rangeItem) private static TransitionBuilder SetupTransitionBuilder(FormatInfo formatInfo, ItemInfo fromInfo, int tranType, ItemInfo toItem, ItemInfo rangeItem)
@ -1234,6 +1245,8 @@ namespace VEPROMS.CSLA.Library
} }
if (si.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && thisPart == lastPart && IsRoman(lastPart)) if (si.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && thisPart == lastPart && IsRoman(lastPart))
lastPart = ""; lastPart = "";
if (si.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && thisPart.StartsWith(lastPart+"."))
lastPart = "";
sb.Append(sep + lastPart.TrimEnd(" .".ToCharArray())); sb.Append(sep + lastPart.TrimEnd(" .".ToCharArray()));
if (sb.Length > 0) sep = "."; if (sb.Length > 0) sep = ".";
lastPart = thisPart; lastPart = thisPart;