From 1fa17d63a2a2b36e969949a180eb5da59c63abc0 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 28 Jan 2022 11:58:42 -0500 Subject: [PATCH] refactor: Rename MarketViewView.Columns -> MarketViewColumnType --- .../MarketView/MarketViewAnimationManager.cs | 4 +- .../Market/MarketView/MarketViewCell.cs | 6 +-- .../Market/MarketView/MarketViewColumnType.cs | 39 +++++++++++++++ .../Market/MarketView/MarketViewRow.cs | 48 +++++++++---------- .../Modules/Market/MarketView/MarketViewVM.cs | 3 +- .../Market/MarketView/MarketViewView.xaml.cs | 40 +--------------- .../Market/MarketView/MarketViewWindow.cs | 14 +++--- .../MarketView/MarketViewWindowFactory.cs | 3 +- 8 files changed, 80 insertions(+), 77 deletions(-) create mode 100644 src/client/spark/Modules/Market/MarketView/MarketViewColumnType.cs diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewAnimationManager.cs b/src/client/spark/Modules/Market/MarketView/MarketViewAnimationManager.cs index 57672363c..cd9a7572a 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewAnimationManager.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewAnimationManager.cs @@ -1,14 +1,12 @@ using mbts.ui; -using mbts.ui.spark; using System; using System.Collections.Generic; using System.Threading.Tasks; using System.Windows.Media; -using static mbts.ui.spark.MarketViewView; - using CellAnimation = mbts.ui.spark.CellAnimation; +using Columns = mbts.spark.MarketViewColumnType; namespace mbts.spark { internal partial class MarketViewVM : IDisposable { diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewCell.cs b/src/client/spark/Modules/Market/MarketView/MarketViewCell.cs index bcb66e60e..8194e3057 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewCell.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewCell.cs @@ -3,11 +3,11 @@ namespace mbts.ui.spark { readonly struct MarketViewCell { public readonly MarketViewVM.Row row; - public readonly MarketViewView.Columns column; + public readonly MarketViewColumnType column; - public MarketViewCell(MarketViewVM.Row row, MarketViewView.Columns column) { + public MarketViewCell(MarketViewVM.Row row, MarketViewColumnType column) { this.row = row; this.column = column; } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewColumnType.cs b/src/client/spark/Modules/Market/MarketView/MarketViewColumnType.cs new file mode 100644 index 000000000..6ae4a8ef2 --- /dev/null +++ b/src/client/spark/Modules/Market/MarketView/MarketViewColumnType.cs @@ -0,0 +1,39 @@ +namespace mbts.spark { + public enum MarketViewColumnType { + None, + Security, + Volume, + Last, + LastSpd, + LastSize, + Position, + RawDayPosition, + WorkingBids, + Bid, + BidMergedSize, + BidDirectSize, + BidImpliedSize, + Ask, + AskMergedSize, + AskDirectSize, + AskImpliedSize, + WorkingAsks, + Settlement, + DayChange, + SessionLow, + SessionHigh, + SecurityKey, + MarketDescription, + ClearedAlias, + ProductDescription, + HubAlias, + StripName, + MicCode, + Theo, + Delta, + Gamma, + Vega, + Theta, + Rho + } +} diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index f5350101e..60f6c73c0 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -101,16 +101,16 @@ _working_best_ask = new CellProperty(this, nameof(working_best_ask), format_price, double.NaN); // default_command = new DelegateCommand(_show_ladder); - bid_price_click = new DelegateCommand(() => _show_order_ticket(MarketViewView.Columns.Bid)); - bid_merged_size_click = new DelegateCommand(() => _show_order_ticket(MarketViewView.Columns.BidMergedSize)); - bid_direct_size_click = new DelegateCommand(() => _show_order_ticket(MarketViewView.Columns.BidDirectSize)); - bid_implied_size_click = new DelegateCommand(() => _show_order_ticket(MarketViewView.Columns.BidImpliedSize)); - working_bids_click = new DelegateCommand(() => _show_order_book(MarketViewView.Columns.WorkingBids)); - ask_price_click = new DelegateCommand(() => _show_order_ticket(MarketViewView.Columns.Ask)); - ask_merged_size_click = new DelegateCommand(() => _show_order_ticket(MarketViewView.Columns.AskMergedSize)); - ask_direct_size_click = new DelegateCommand(() => _show_order_ticket(MarketViewView.Columns.AskDirectSize)); - ask_implied_size_click = new DelegateCommand(() => _show_order_ticket(MarketViewView.Columns.AskImpliedSize)); - working_asks_click = new DelegateCommand(() => _show_order_book(MarketViewView.Columns.WorkingAsks)); + bid_price_click = new DelegateCommand(() => _show_order_ticket(MarketViewColumnType.Bid)); + bid_merged_size_click = new DelegateCommand(() => _show_order_ticket(MarketViewColumnType.BidMergedSize)); + bid_direct_size_click = new DelegateCommand(() => _show_order_ticket(MarketViewColumnType.BidDirectSize)); + bid_implied_size_click = new DelegateCommand(() => _show_order_ticket(MarketViewColumnType.BidImpliedSize)); + working_bids_click = new DelegateCommand(() => _show_order_book(MarketViewColumnType.WorkingBids)); + ask_price_click = new DelegateCommand(() => _show_order_ticket(MarketViewColumnType.Ask)); + ask_merged_size_click = new DelegateCommand(() => _show_order_ticket(MarketViewColumnType.AskMergedSize)); + ask_direct_size_click = new DelegateCommand(() => _show_order_ticket(MarketViewColumnType.AskDirectSize)); + ask_implied_size_click = new DelegateCommand(() => _show_order_ticket(MarketViewColumnType.AskImpliedSize)); + working_asks_click = new DelegateCommand(() => _show_order_book(MarketViewColumnType.WorkingAsks)); _animation.AnimationsChanged += on_animations_changed; _dispose = Disposable.Create( attach_prop_changed_cb(_bid_direct_size, mk_echo_prop_changed_cb<(uint, uint)>(nameof(bid_direct_size_text))), @@ -333,10 +333,10 @@ void _show_ladder() => _bus.post(SparkTags.ShowLadderTag, security_md); - void _show_order_book(MarketViewView.Columns col) { + void _show_order_book(MarketViewColumnType col) { switch (col) { - case MarketViewView.Columns.WorkingBids: _show_order_book(Side.Buy); break; - case MarketViewView.Columns.WorkingAsks: _show_order_book(Side.Sell); break; + case MarketViewColumnType.WorkingBids: _show_order_book(Side.Buy); break; + case MarketViewColumnType.WorkingAsks: _show_order_book(Side.Sell); break; } } @@ -350,37 +350,37 @@ _bus.post(SparkTags.ShowOrderBookTag, ob_settings); } - void _show_order_ticket(MarketViewView.Columns col) { + void _show_order_ticket(MarketViewColumnType col) { var order = _orders_model.factory.order(security); switch (col) { - case MarketViewView.Columns.Bid: + case MarketViewColumnType.Bid: _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side: Side.Sell), bid_price, 0u)); break; - case MarketViewView.Columns.BidMergedSize: + case MarketViewColumnType.BidMergedSize: _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side: Side.Sell), bid_price, bid_merged_size)); break; - case MarketViewView.Columns.BidDirectSize: + case MarketViewColumnType.BidDirectSize: _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side: Side.Sell), bid_price, bid_direct_size)); break; - case MarketViewView.Columns.BidImpliedSize: + case MarketViewColumnType.BidImpliedSize: _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side: Side.Sell), bid_price, bid_implied_size)); break; - case MarketViewView.Columns.Ask: + case MarketViewColumnType.Ask: _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side: Side.Buy), ask_price, 0u)); break; - case MarketViewView.Columns.AskMergedSize: + case MarketViewColumnType.AskMergedSize: _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side: Side.Buy), ask_price, ask_merged_size)); break; - case MarketViewView.Columns.AskDirectSize: + case MarketViewColumnType.AskDirectSize: _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side: Side.Sell), ask_price, ask_direct_size)); break; - case MarketViewView.Columns.AskImpliedSize: + case MarketViewColumnType.AskImpliedSize: _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side: Side.Sell), ask_price, ask_implied_size)); break; - case MarketViewView.Columns.Last: + case MarketViewColumnType.Last: _bus.post(SparkTags.ShowOrderTicketTag, (order, last_price, 0u)); break; - case MarketViewView.Columns.LastSize: + case MarketViewColumnType.LastSize: _bus.post(SparkTags.ShowOrderTicketTag, (order, last_price, last_size)); break; } diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs index 15e062a99..0c6afc2d0 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs @@ -32,7 +32,8 @@ using System.Windows.Media; using static bts.shell.MarketViewWindowFactory; using static mbts.ui.controls.DIYGrid; -using static mbts.ui.spark.MarketViewView; + +using Columns = mbts.spark.MarketViewColumnType; namespace mbts.spark { /// diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs index 79967ceda..b8cf8540b 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs @@ -13,6 +13,8 @@ using System.Windows.Controls; using System.Windows.Data; using System.Windows.Input; +using Columns = mbts.spark.MarketViewColumnType; + namespace mbts.ui.spark { /// /// Interaction logic for MarketSheetsView.xaml @@ -32,44 +34,6 @@ namespace mbts.ui.spark { _grid); } - public enum Columns { - None, - Security, - Volume, - Last, - LastSpd, - LastSize, - Position, - RawDayPosition, - WorkingBids, - Bid, - BidMergedSize, - BidDirectSize, - BidImpliedSize, - Ask, - AskMergedSize, - AskDirectSize, - AskImpliedSize, - WorkingAsks, - Settlement, - DayChange, - SessionLow, - SessionHigh, - SecurityKey, - MarketDescription, - ClearedAlias, - ProductDescription, - HubAlias, - StripName, - MicCode, - Theo, - Delta, - Gamma, - Vega, - Theta, - Rho - } - public static ExecutedRoutedEventHandler CellClickExecuted => CommandImpl.cell_click; diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs index 0ca21573d..abd8ab288 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs @@ -30,10 +30,10 @@ namespace mbts.spark { const string _window_type = "MarketView", _window_type_display_name = "Market View"; // make font-color immutable for Side, Size, (the font-color rule is hard-coded: MarketData.bid for Buy orders, MarketData.ask for Sells) static readonly IReadOnlyDictionary _col_settings_flags = new Dictionary { - { MarketViewView.Columns.Bid.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableBackgroundColor }, - { MarketViewView.Columns.Ask.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableBackgroundColor}, - { MarketViewView.Columns.WorkingAsks.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor }, - { MarketViewView.Columns.WorkingBids.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor } + { MarketViewColumnType.Bid.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableBackgroundColor }, + { MarketViewColumnType.Ask.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableBackgroundColor}, + { MarketViewColumnType.WorkingAsks.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor }, + { MarketViewColumnType.WorkingBids.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor } }; readonly OrdersModel _orders_model; @@ -132,11 +132,11 @@ namespace mbts.spark { .Table(SecurityMD.key_fn) .Where(t => t.has_changes()) .OnDispatcher()); - var sort_man = new ColumnSortManager(_vm.columns, MarketViewView.Columns.Security.ToString()); + var sort_man = new ColumnSortManager(_vm.columns, MarketViewColumnType.Security.ToString()); _current_sorting_criteria = _state.sorting_criterion.ToList(); sort_man.SortingCriteria = _state.sorting_criterion; _vm.load_filters(_state.filters); - _vm.comparer = sort_man.BuildComparer(MarketViewVM.get_column_comparer); + _vm.comparer = sort_man.BuildComparer(MarketViewVM.get_column_comparer); _view = new MarketViewView { DataContext = _vm }; _view._grid.Sorting += on_grid_sorting; _grid_settings_manager = new SimpleGridSettingsManager(_vm.columns, _col_settings_flags, _vm.rows); @@ -251,7 +251,7 @@ namespace mbts.spark { void on_grid_sorting(object sender, ui.controls.DIYGridSortingEventArgs e) { _sorted_selected_security_criteria_backing = null; sort_man.OnColumnClick(e.Column, KeyboardExtensions.IsShiftDown()); - _vm.comparer = sort_man.BuildComparer(MarketViewVM.get_column_comparer); + _vm.comparer = sort_man.BuildComparer(MarketViewVM.get_column_comparer); _current_sorting_criteria = sort_man.SortingCriteria.ToList(); e.Handled = true; } diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs index cb79af1ed..8e01e1616 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs @@ -18,7 +18,8 @@ using System.Reactive.Linq; using System.Threading.Tasks; using static mbts.ui.controls.DIYGrid; -using static mbts.ui.spark.MarketViewView; + +using Columns = mbts.spark.MarketViewColumnType; namespace bts.shell { class MarketViewWindowFactory : ShellWindowFactory {