From d9b171c061b04b99f1dfa080cb39d6a0e4518731 Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 22 Jan 2014 18:43:15 +0000 Subject: [PATCH] Added logic for an alphabetical sort if the RO Menu Items begins with numbers and slashes. --- PROMS/Volian.Controls.Library/DisplayRO.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs index eb2b87c1..e1d686ce 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.cs @@ -367,12 +367,13 @@ namespace Volian.Controls.Library } return index; } - private static Regex _RegExGetNumber = new Regex(@"^ *[+-]?[.,0-9]+(E[+-]?[0-9]+)?"); + private static Regex _RegExGetNumber = new Regex(@"^ *[+-]?[.,0-9/]+(E[+-]?[0-9]+)?"); + // Sort by numeric value if possible, Otherwise sort alphabetically. private bool GreaterValue(string value1, string value2) { Match match1 = _RegExGetNumber.Match(value1); Match match2 = _RegExGetNumber.Match(value2); - if (match1.Success && match2.Success) // Compare the numeric value + if (match1.Success && !match1.Value.Contains("/") && match2.Success && !match2.Value.Contains("/")) // Compare the numeric value { double dbl1 = double.Parse(match1.ToString()); double dbl2 = double.Parse(match2.ToString());