diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs index 11d101cad..0fddc084d 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs @@ -102,7 +102,7 @@ namespace mbts.spark { // Columns const string working_col_header = "Working"; const double working_orders_col_width = 105; - var price_converter = new ui.spark.converters.TickDisplayConverter(); + var price_converter = new TickDisplayConverter(); add_col(ColKey.Security, r => r.security.ToString(), nameof(Row.security), security_filter, FilterType.Regex, ColWidth.Security); add_col(ColKey.Volume, r => r.volume_text, nameof(Row.volume), volume_filter, FilterType.ULongMinMax, ColWidth.Volume); diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml b/src/client/spark/Modules/Trading/Fills/FillsView.xaml index 0e032fec1..ef86e72c8 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml @@ -5,7 +5,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:c="clr-namespace:mbts.ui.controls" xmlns:usp="clr-namespace:mbts.ui.spark" - xmlns:uspcv="clr-namespace:mbts.ui.spark.converters" xmlns:cv="clr-namespace:mbts.ui.converters" xmlns:u="clr-namespace:mbts.ui" xmlns:api="clr-namespace:bts.api;assembly=spark_api" @@ -17,7 +16,7 @@ - + diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index 9b89398f5..be776eb03 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -8,6 +8,7 @@ xmlns:sp="clr-namespace:mbts.spark" xmlns:u="clr-namespace:mbts.ui" xmlns:c="clr-namespace:mbts.ui.controls" + xmlns:cv="clr-namespace:mbts.ui.converters" xmlns:usp="clr-namespace:mbts.ui.spark" xmlns:uspcv="clr-namespace:mbts.ui.spark.converters" xmlns:sys="clr-namespace:System;assembly=mscorlib" @@ -23,7 +24,7 @@ - + (is_child => is_child ? child_font_weight : root_font_weight); public static readonly IMultiValueConverter - _price_text_converter = new ui.spark.converters.TickDisplayConverter(), + _price_text_converter = new TickDisplayConverter(), _background_converter = new AnonymousMultiValueConverter( (selected, status) => selected || status != OrderStatus.Working ? Brushes.Transparent : BTSColors.Orders.working_order_background_brush); diff --git a/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml b/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml index 960795ec5..f58cf54a5 100644 --- a/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml +++ b/src/client/spark/view/Controls/TickUpDown/PriceEntryCommitControl.xaml @@ -6,13 +6,12 @@ mc:Ignorable="d" xmlns:u="clr-namespace:mbts.ui" xmlns:cv="clr-namespace:mbts.ui.converters" - xmlns:uspcv="clr-namespace:mbts.ui.spark.converters" xmlns:c="clr-namespace:mbts.ui.controls" xmlns:usp="clr-namespace:mbts.ui.spark" d:DesignHeight="100" d:DesignWidth="800" x:Name="_me_price"> - + diff --git a/src/client/spark/view/Converters/TickDisplayConverter.cs b/src/client/spark/view/Converters/TickDisplayConverter.cs index f9a39e9cd..44a820e16 100644 --- a/src/client/spark/view/Converters/TickDisplayConverter.cs +++ b/src/client/spark/view/Converters/TickDisplayConverter.cs @@ -1,30 +1,30 @@ -using bts.api; - -using mbts; -using mbts.spark; - -using System; -using System.Globalization; -using System.Windows.Data; - -namespace mbts.ui.spark.converters { - class TickDisplayConverter : IMultiValueConverter { - static T get_val(object[] values, int index) { - if (values.Length > index) { - if (values[index] is T t) { - return t; - } - } - return default; - } - public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) { - var price = get_val(values, 0); - var spec = get_val(values, 1) ?? SecurityDataHelper.Defaults.ContractSpecificationImmutable; - var settings = get_val(values, 2); - return spec.format(price, settings); - } - - public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => - throw new NotImplementedException(); - } -} +using bts.api; + +using mbts; +using mbts.spark; + +using System; +using System.Globalization; +using System.Windows.Data; + +namespace mbts.ui.converters { + class TickDisplayConverter : IMultiValueConverter { + static T get_val(object[] values, int index) { + if (values.Length > index) { + if (values[index] is T t) { + return t; + } + } + return default; + } + public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) { + var price = get_val(values, 0); + var spec = get_val(values, 1) ?? SecurityDataHelper.Defaults.ContractSpecificationImmutable; + var settings = get_val(values, 2); + return spec.format(price, settings); + } + + public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => + throw new NotImplementedException(); + } +} diff --git a/src/client/spark/view/Resources/Converters.xaml b/src/client/spark/view/Resources/Converters.xaml index f28fdc658..045208614 100644 --- a/src/client/spark/view/Resources/Converters.xaml +++ b/src/client/spark/view/Resources/Converters.xaml @@ -77,7 +77,7 @@ - + 0 0