diff --git a/src/client/spark/Modules/Market/TimeAndSales/Settings/TimeAndSalesSettings.cs b/src/client/spark/Modules/Market/TimeAndSales/Settings/TimeAndSalesSettings.cs index 35fc8eebe..8aea45626 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/Settings/TimeAndSalesSettings.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/Settings/TimeAndSalesSettings.cs @@ -9,7 +9,7 @@ using System.Linq; using static mbts.ui.controls.DIYGrid; -using Columns = bts.shell.time_and_sales.TimeAndSalesView.Columns; +using Columns = bts.shell.time_and_sales.TimeAndSalesColumnType; namespace bts.shell.time_and_sales { [ProtoContract] diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesColumnType.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesColumnType.cs new file mode 100644 index 000000000..0958a1e88 --- /dev/null +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesColumnType.cs @@ -0,0 +1,11 @@ +namespace bts.shell.time_and_sales { + enum TimeAndSalesColumnType { + Time, + Security, + Price, + Size, + SecurityKey, + Aggressor, + RowKey + } +} diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs index 78f35c73b..2a2369cfa 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs @@ -63,7 +63,7 @@ namespace bts.shell.time_and_sales { _sort_change_count; public TimeAndSalesVM(IWindowSettingsManager settings_manager, Func get_display_qty_divisor) { - _sort_manager = new ColumnSortManager(columns.WrapSelector(c => c as ISortableDIYGridColumn, null), TimeAndSalesView.Columns.RowKey.ToString()); + _sort_manager = new ColumnSortManager(columns.WrapSelector(c => c as ISortableDIYGridColumn, null), TimeAndSalesColumnType.RowKey.ToString()); _get_display_qty_divisor = get_display_qty_divisor ?? new Func(sec => 1); _comparer_backing = _sort_manager.BuildComparer(_get_column_comparer); _log = new LoggerContext(Log.Ui, $"Time And Sales VM ({Interlocked.Increment(ref _id_counter)})", null); @@ -77,21 +77,21 @@ namespace bts.shell.time_and_sales { grid_settings_manager.load_from(settings_manager.current_settings()); // Columns add_column( - TimeAndSalesView.Columns.Security, + TimeAndSalesColumnType.Security, r => r.security.ToString(), DefaultColumnHeaders.Security, DefaultColumnWidths.Security, security_filter, DataGridFilterKnownTemplates.Regex); add_column( - TimeAndSalesView.Columns.Time, + TimeAndSalesColumnType.Time, r => r.time.ToString("h:mm:ss tt"), DefaultColumnHeaders.Time, DefaultColumnWidths.Time, time_filter, DataGridFilterKnownTemplates.TimeFilter); add_column( - TimeAndSalesView.Columns.Price, + TimeAndSalesColumnType.Price, r => r.security.spec_or_default().format(r.price), DefaultColumnHeaders.Price, DefaultColumnWidths.Price, @@ -99,7 +99,7 @@ namespace bts.shell.time_and_sales { DataGridFilterKnownTemplates.DoubleMinMax, System.Windows.HorizontalAlignment.Right); add_column( - TimeAndSalesView.Columns.Size, + TimeAndSalesColumnType.Size, r => r.display_size.ToString(), DefaultColumnHeaders.Qty, DefaultColumnWidths.Qty, @@ -107,14 +107,14 @@ namespace bts.shell.time_and_sales { DataGridFilterKnownTemplates.UIntMinMax, System.Windows.HorizontalAlignment.Right); add_column( - TimeAndSalesView.Columns.Aggressor, + TimeAndSalesColumnType.Aggressor, r => r.aggressor_side.ToString(), DefaultColumnHeaders.Aggressor, DefaultColumnWidths.Aggressor, aggressor_filter, DataGridFilterKnownTemplates.EnumValues); add_column( - TimeAndSalesView.Columns.SecurityKey, + TimeAndSalesColumnType.SecurityKey, r => r.security_key.ToString(), DefaultColumnHeaders.SecurityKey, DefaultColumnWidths.SecurityKey, @@ -138,14 +138,14 @@ namespace bts.shell.time_and_sales { _dispose = Disposable.Create(resources.ToArray()); // local methods void add_column( - TimeAndSalesView.Columns col_key, + TimeAndSalesColumnType col_key, Func get_cell_text, string header, double width, IDataGridColumnFilter filter, string filter_template, System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) => - columns.Add(new RenderTextColumn( + columns.Add(new RenderTextColumn( col_key, get_cell_text, filter, filter_template, _get_aggressor_brush) { id = col_key.col_id(), Header = header, @@ -348,17 +348,17 @@ namespace bts.shell.time_and_sales { } static IComparer _get_column_comparer(string column_name) => - _get_column_comparer(EnumHelper.parse(column_name)); + _get_column_comparer(EnumHelper.parse(column_name)); - static IComparer _get_column_comparer(TimeAndSalesView.Columns column) { + static IComparer _get_column_comparer(TimeAndSalesColumnType column) { switch (column) { - case TimeAndSalesView.Columns.Aggressor: return wrap(r => r.aggressor_side); - case TimeAndSalesView.Columns.Time: return wrap(r => r.time); - case TimeAndSalesView.Columns.Security: return wrap(r => r.security); - case TimeAndSalesView.Columns.Price: return wrap(r => r.price); - case TimeAndSalesView.Columns.Size: return wrap(r => r.size); - case TimeAndSalesView.Columns.SecurityKey: return wrap(r => r.security_key); - case TimeAndSalesView.Columns.RowKey: return wrap(r => r.row_key); + case TimeAndSalesColumnType.Aggressor: return wrap(r => r.aggressor_side); + case TimeAndSalesColumnType.Time: return wrap(r => r.time); + case TimeAndSalesColumnType.Security: return wrap(r => r.security); + case TimeAndSalesColumnType.Price: return wrap(r => r.price); + case TimeAndSalesColumnType.Size: return wrap(r => r.size); + case TimeAndSalesColumnType.SecurityKey: return wrap(r => r.security_key); + case TimeAndSalesColumnType.RowKey: return wrap(r => r.row_key); default: throw ExceptionBuilder.Argument.unexpected_case(column, nameof(column)); } IComparer wrap(Func selector) => diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs index 3fed8171e..26e53a5d9 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs @@ -16,7 +16,7 @@ namespace bts.shell.time_and_sales { class TimeAndSalesRowView : DIYGrid.HighPerformanceRow { } static class TimeAndSalesViewColumnsExtensions { - public static string col_id(this TimeAndSalesView.Columns column) => + public static string col_id(this TimeAndSalesColumnType column) => column.ToString(); } } diff --git a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs index 29884dac0..48edfb757 100644 --- a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs +++ b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs @@ -15,8 +15,6 @@ using System.Collections.Generic; using System.Reactive.Linq; using System.Threading.Tasks; -using Columns = bts.shell.time_and_sales.TimeAndSalesView.Columns; - namespace bts.shell { class TimeAndSalesWindowFactory : ShellWindowFactory { readonly IBus _bus; @@ -39,8 +37,6 @@ namespace bts.shell { ); } - public static string col_id(Columns col) => col.ToString(); - public override Task load(TimeAndSalesSettings state) => Task.FromResult(new TimeAndSalesWindow(this, _bus, _consumer, state, SparkCommands.PickTimeAndSales.icon, new WindowSettingsManager(_settings_hub, state.grid, s => s.time_and_sales_grid, (s, g) => s.with(time_and_sales: g)),