From 2e49534483cf25cb4e413c35b129eb6477aef030 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 30 Apr 2019 11:14:10 -0500 Subject: [PATCH] move OrderBookGridSettingsManager into its own file --- .../Settings/OrderBookGridSettingsManager.cs | 115 ++++++++++++++++ .../OrderBook/Settings/OrderBookSettingsVM.cs | 130 ------------------ 2 files changed, 115 insertions(+), 130 deletions(-) create mode 100644 src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookGridSettingsManager.cs diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookGridSettingsManager.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookGridSettingsManager.cs new file mode 100644 index 000000000..5101d7fe7 --- /dev/null +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookGridSettingsManager.cs @@ -0,0 +1,115 @@ +using bts.api; +using bts.api.orderman; +using mbts; +using mbts.spark; +using mbts.ui; +using mbts.ui.controls; +using mbts.ui.settings; +using mbts.ui.utility; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using Columns = mbts.spark.OrderBookGridView.ColumnKeys; + +namespace bts.shell.orderbook { + class OrderBookGridSettingsManager : IDisposable, IObserver { + readonly IObserver _core_man_as_observer; + AlgoTreeDisplayMode _algo_tree_display_mode; + + public OrderBookGridSettingsManager( + IObservable owner_title, + IBus bus, + INotificationService notification_service, + OrdersModel model, + IEnumerable rows, + ObservableCollection columns) { + // make font-weight immutable for all columns (the font-weight rule is hard-coded: Regular for root-orders, Light for all others) + // TODO: Remove the immutable font-weight flags when cell animation is ready + var col_settings_flags = EnumHelper.get_values().ToDictionary( + c => c.ToString(), c => GridColumnSettingsFeatureFlags.ImmutableFontWeight); + // make font-color immutable for Side, Size, and Filled columns (the font-color rule is hard-coded: MarketData.bid for Buy orders, MarketData.ask for Sells) + // TODO: Remove the immutable font-color flags when cell animation is ready + foreach (var c in new[] { Columns.Side, Columns.Size, Columns.Filled }) { + col_settings_flags[c.ToString()] = GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableFontWeight; + } + core_manager = new GridSettingsManager( + owner_title, bus, model, rows, columns, + () => new OrderRecordTuplePredicate(), + () => { + var pvm = PredicateVMWrapper.create( + OrderRecordTuplePredicateVMFactory.get_oneofs(bus, model), rp => rp.predicate_type_case); + pvm.selected_predicate_type = pvm.predicate_types.FirstOrDefault(); + return pvm; + }, + col_id => { + var pvm = PredicateVMWrapper.create( + OrderRecordTuplePredicateVMFactory.get_oneofs(bus, model), rp => rp.predicate_type_case); + pvm.selected_predicate_type = _corresponding_predicate_type(EnumHelper.parse_or_default(col_id)); + return pvm; + }, + (gen, anims) => new OrderBookGridSettings(gen, anims.Select(a => new OrderRecordTuplePredicateAnimations(a.predicate_data, a.cell_animations, a.row_animations, a.sound_notifications))) { algo_tree_display_mode = _algo_tree_display_mode }, + p => p.create_predicate(notification_service.data_cache), + p => p.create_notification_predicate(notification_service.data_cache), + notification_service == null ? new Func, SoundNotification, IDisposable>((p, sn) => Disposable.empty) : notification_service.link_to_order, + notification_service == null ? new Func, IDisposable>(t => Disposable.empty) : notification_service.link_to_order, + col_settings_flags); + _core_man_as_observer = core_manager; + } + + public GridSettingsManager core_manager { get; } + + public void load_from(OrderBookGridSettings gs) { + core_manager.load_from(gs); + _algo_tree_display_mode = gs.algo_tree_display_mode; + } + + public OrderBookGridSettings create(IEnumerable sorting_criterion) { + var gs = core_manager.create(); + gs.general = gs.general.with(sorting_criterion: sorting_criterion); + gs.algo_tree_display_mode = _algo_tree_display_mode; + return gs; + } + + public OrderBookSettingsVM create_vm(OrderBookGridSettings gs, IObservable owner_title) => + new OrderBookSettingsVM(core_manager.create_vm(gs.general, owner_title)) { + algo_tree_display_mode = gs.algo_tree_display_mode + }; + + public void Dispose() => core_manager.Dispose(); + + static OrderRecordTuplePredicate.PredicateTypeOneofCase _corresponding_predicate_type(Columns col) { + switch (col) { + case Columns.Security: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Security; + case Columns.Time: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Time; + case Columns.LastChange: return OrderRecordTuplePredicate.PredicateTypeOneofCase.LastChange; + case Columns.User: return OrderRecordTuplePredicate.PredicateTypeOneofCase.User; + case Columns.Account: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Account; + case Columns.Exchange: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Exchange; + case Columns.TimeInForce: return OrderRecordTuplePredicate.PredicateTypeOneofCase.TimeInForce; + case Columns.OrderType: return OrderRecordTuplePredicate.PredicateTypeOneofCase.OrderType; + case Columns.SubType: return OrderRecordTuplePredicate.PredicateTypeOneofCase.SubType; + case Columns.Side: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Side; + case Columns.Size: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Size; + case Columns.Price: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Price; + case Columns.Filled: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Filled; + case Columns.AvgFilled: return OrderRecordTuplePredicate.PredicateTypeOneofCase.AvgFilled; + case Columns.LastPrice: return OrderRecordTuplePredicate.PredicateTypeOneofCase.LastPrice; + case Columns.Status: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Status; + case Columns.LastMessage: return OrderRecordTuplePredicate.PredicateTypeOneofCase.LastMessage; + case Columns.SecurityKey: return OrderRecordTuplePredicate.PredicateTypeOneofCase.SecurityKey; + case Columns.OrderKey: return OrderRecordTuplePredicate.PredicateTypeOneofCase.OrderKey; + case Columns.ParentKey: return OrderRecordTuplePredicate.PredicateTypeOneofCase.ParentKey; + case Columns.AttachedTargetOrderKey: return OrderRecordTuplePredicate.PredicateTypeOneofCase.AttachedTargetOrderKey; + default: return default; + } + } + + void IObserver.OnNext(OrderBookGridSettings value) { + _core_man_as_observer.OnNext(value); + _algo_tree_display_mode = value.algo_tree_display_mode; + } + void IObserver.OnError(Exception error) => _core_man_as_observer.OnError(error); + void IObserver.OnCompleted() => _core_man_as_observer.OnCompleted(); + } +} \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettingsVM.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettingsVM.cs index 70c1a4b3e..6791e07c4 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettingsVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettingsVM.cs @@ -3,118 +3,13 @@ using bts.api.orderman; using mbts; using mbts.spark; using mbts.ui; -using mbts.ui.controls; using mbts.ui.settings; using mbts.ui.shell; using mbts.ui.spark; -using mbts.ui.utility; using System; using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using Columns = mbts.spark.OrderBookGridView.ColumnKeys; namespace bts.shell.orderbook { - class OrderBookGridSettingsManager : IDisposable, IObserver { - readonly IObserver _core_man_as_observer; - AlgoTreeDisplayMode _algo_tree_display_mode; - - public OrderBookGridSettingsManager( - IObservable owner_title, - IBus bus, - INotificationService notification_service, - OrdersModel model, - IEnumerable rows, - ObservableCollection columns) { - // make font-weight immutable for all columns (the font-weight rule is hard-coded: Regular for root-orders, Light for all others) - // TODO: Remove the immutable font-weight flags when cell animation is ready - var col_settings_flags = EnumHelper.get_values().ToDictionary( - c => c.ToString(), c => GridColumnSettingsFeatureFlags.ImmutableFontWeight); - // make font-color immutable for Side, Size, and Filled columns (the font-color rule is hard-coded: MarketData.bid for Buy orders, MarketData.ask for Sells) - // TODO: Remove the immutable font-color flags when cell animation is ready - foreach (var c in new[] { Columns.Side, Columns.Size, Columns.Filled }) { - col_settings_flags[c.ToString()] = GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableFontWeight; - } - core_manager = new GridSettingsManager( - owner_title, bus, model, rows, columns, - () => new OrderRecordTuplePredicate(), - () => { - var pvm = PredicateVMWrapper.create( - OrderRecordTuplePredicateVMFactory.get_oneofs(bus, model), rp => rp.predicate_type_case); - pvm.selected_predicate_type = pvm.predicate_types.FirstOrDefault(); - return pvm; - }, - col_id => { - var pvm = PredicateVMWrapper.create( - OrderRecordTuplePredicateVMFactory.get_oneofs(bus, model), rp => rp.predicate_type_case); - pvm.selected_predicate_type = _corresponding_predicate_type(EnumHelper.parse_or_default(col_id)); - return pvm; - }, - (gen, anims) => new OrderBookGridSettings(gen, anims.Select(a => new OrderRecordTuplePredicateAnimations(a.predicate_data, a.cell_animations, a.row_animations, a.sound_notifications))) { algo_tree_display_mode = _algo_tree_display_mode }, - p => p.create_predicate(notification_service.data_cache), - p => p.create_notification_predicate(notification_service.data_cache), - notification_service == null ? new Func, SoundNotification, IDisposable>((p, sn) => Disposable.empty) : notification_service.link_to_order, - notification_service == null ? new Func, IDisposable>(t => Disposable.empty) : notification_service.link_to_order, - col_settings_flags); - _core_man_as_observer = core_manager; - } - - public GridSettingsManager core_manager { get; } - - public void load_from(OrderBookGridSettings gs) { - core_manager.load_from(gs); - _algo_tree_display_mode = gs.algo_tree_display_mode; - } - - public OrderBookGridSettings create(IEnumerable sorting_criterion) { - var gs = core_manager.create(); - gs.general = gs.general.with(sorting_criterion: sorting_criterion); - gs.algo_tree_display_mode = _algo_tree_display_mode; - return gs; - } - - public OrderBookSettingsVM create_vm(OrderBookGridSettings gs, IObservable owner_title) => - new OrderBookSettingsVM(core_manager.create_vm(gs.general, owner_title)) { - algo_tree_display_mode = gs.algo_tree_display_mode - }; - - public void Dispose() => core_manager.Dispose(); - - static OrderRecordTuplePredicate.PredicateTypeOneofCase _corresponding_predicate_type(Columns col) { - switch (col) { - case Columns.Security: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Security; - case Columns.Time: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Time; - case Columns.LastChange: return OrderRecordTuplePredicate.PredicateTypeOneofCase.LastChange; - case Columns.User: return OrderRecordTuplePredicate.PredicateTypeOneofCase.User; - case Columns.Account: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Account; - case Columns.Exchange: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Exchange; - case Columns.TimeInForce: return OrderRecordTuplePredicate.PredicateTypeOneofCase.TimeInForce; - case Columns.OrderType: return OrderRecordTuplePredicate.PredicateTypeOneofCase.OrderType; - case Columns.SubType: return OrderRecordTuplePredicate.PredicateTypeOneofCase.SubType; - case Columns.Side: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Side; - case Columns.Size: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Size; - case Columns.Price: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Price; - case Columns.Filled: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Filled; - case Columns.AvgFilled: return OrderRecordTuplePredicate.PredicateTypeOneofCase.AvgFilled; - case Columns.LastPrice: return OrderRecordTuplePredicate.PredicateTypeOneofCase.LastPrice; - case Columns.Status: return OrderRecordTuplePredicate.PredicateTypeOneofCase.Status; - case Columns.LastMessage: return OrderRecordTuplePredicate.PredicateTypeOneofCase.LastMessage; - case Columns.SecurityKey: return OrderRecordTuplePredicate.PredicateTypeOneofCase.SecurityKey; - case Columns.OrderKey: return OrderRecordTuplePredicate.PredicateTypeOneofCase.OrderKey; - case Columns.ParentKey: return OrderRecordTuplePredicate.PredicateTypeOneofCase.ParentKey; - case Columns.AttachedTargetOrderKey: return OrderRecordTuplePredicate.PredicateTypeOneofCase.AttachedTargetOrderKey; - default: return default; - } - } - - void IObserver.OnNext(OrderBookGridSettings value) { - _core_man_as_observer.OnNext(value); - _algo_tree_display_mode = value.algo_tree_display_mode; - } - void IObserver.OnError(Exception error) => _core_man_as_observer.OnError(error); - void IObserver.OnCompleted() => _core_man_as_observer.OnCompleted(); - } - class OrderBookSettingsVM : DisposableViewModelBase, IWindowSettingsVM, ITemplateSelectorKey { AlgoTreeDisplayMode _algo_tree_display_mode; @@ -147,29 +42,4 @@ namespace bts.shell.orderbook { return gs; } } - //class OrderBookSettingsVM : GridSettingsVM { - // AlgoTreeDisplayMode _algo_tree_display_mode; - - // public OrderBookSettingsVM( - // IObservable owner_title, IBus bus, OrdersModel orders_model, - // Func predicate_data_factory, - // Func> notification_predicate_factory, - // Func> create_predicate_vm, - // Func> create_column_predicate_vm, - // Func>, OrderBookGridSettings> create_settings_obj, - // IReadOnlyDictionary column_flags = null) - // : base(owner_title, bus, orders_model, predicate_data_factory, notification_predicate_factory, create_predicate_vm, create_column_predicate_vm, create_settings_obj, column_flags) { } - - // public AlgoTreeDisplayMode algo_tree_display_mode { get => _algo_tree_display_mode; set => Set(ref _algo_tree_display_mode, value); } - - // public override void load(OrderBookGridSettings grid_settings) { - // base.load(grid_settings); - // algo_tree_display_mode = grid_settings.algo_tree_display_mode; - // } - // public override OrderBookGridSettings get_result() { - // var gs = base.get_result(); - // gs.algo_tree_display_mode = algo_tree_display_mode; - // return gs; - // } - //} } \ No newline at end of file