diff --git a/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs b/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs index fe758d00c..117d9ad42 100644 --- a/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs @@ -29,6 +29,9 @@ namespace System.Collections.Generic public static IEnumerable Intersect(this IEnumerable enumerable, IEnumerable intersection, Func key_selector) { return enumerable.Where(t => intersection.Contains(key_selector(t))); } + + public static T[] ToLArray(this IEnumerable enumerable) => + enumerable.ToList().ToArray(); } public static class CollectionExtensions diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/IDataGridColumnFilter.cs b/src/client/spark/view/Controls/DataGridEx/Filters/IDataGridColumnFilter.cs index c2108f1c3..781f02b75 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/IDataGridColumnFilter.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/IDataGridColumnFilter.cs @@ -361,8 +361,8 @@ namespace mbts.spark public class DiscreteValues : DiscreteValues { - public DiscreteValues(ObservableCollection rows, Func get_row_val, string prop_name) : base(rows, get_row_val, v => v.ToArray(), v => v, prop_name) { } - public DiscreteValues(ObservableCollection rows, Func get_row_val, string prop_name, IEqualityComparer equality_comparer) : base(rows, get_row_val, v => v.ToArray(), v => v, prop_name, equality_comparer) { } + public DiscreteValues(ObservableCollection rows, Func get_row_val, string prop_name) : base(rows, get_row_val, v => v.ToLArray(), v => v, prop_name) { } + public DiscreteValues(ObservableCollection rows, Func get_row_val, string prop_name, IEqualityComparer equality_comparer) : base(rows, get_row_val, v => v.ToLArray(), v => v, prop_name, equality_comparer) { } } #endregion diff --git a/src/client/spark/view/Converters/EnumStringConverters/EnumCaseStringConverter.cs b/src/client/spark/view/Converters/EnumStringConverters/EnumCaseStringConverter.cs index 6954c53fd..b267e2d86 100644 --- a/src/client/spark/view/Converters/EnumStringConverters/EnumCaseStringConverter.cs +++ b/src/client/spark/view/Converters/EnumStringConverters/EnumCaseStringConverter.cs @@ -14,7 +14,7 @@ namespace mbts.ui.converters if (value is T) t = (T)value; string raw_str = t.ToString(); - return raw_str.Substring(0, 1) + new String(raw_str.Skip(1).Select(Char.ToLower).ToArray()); + return raw_str.Substring(0, 1) + new String(raw_str.Skip(1).Select(Char.ToLower).ToLArray()); } public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) { diff --git a/src/client/spark/view/Spark/Utilities/SecurityDataHelper.cs b/src/client/spark/view/Spark/Utilities/SecurityDataHelper.cs index 3119c69cf..b0c7b2644 100644 --- a/src/client/spark/view/Spark/Utilities/SecurityDataHelper.cs +++ b/src/client/spark/view/Spark/Utilities/SecurityDataHelper.cs @@ -17,8 +17,8 @@ namespace mbts.spark if (y == null) return 1; if (x.ContractCase == ContractOneofCase.Future) return y.ContractCase == ContractOneofCase.Future ? Compare(x.Symbol, x.Future, y.Symbol, y.Future) : -1; if (y.ContractCase == ContractOneofCase.Future) return 1; - var xlegs = SecurityHelper.get_flat_future_legs(x).ToArray(); - var ylegs = SecurityHelper.get_flat_future_legs(y).ToArray(); + var xlegs = SecurityHelper.get_flat_future_legs(x).ToLArray(); + var ylegs = SecurityHelper.get_flat_future_legs(y).ToLArray(); int max = Math.Min(xlegs.Length, ylegs.Length); for (int i = 0; i < max; i++) { int rv = Compare(xlegs[i].Item2, xlegs[i].Item3, ylegs[i].Item2, ylegs[i].Item3);