From 482199f4b2adce1b61a9aa3ed7e5fcaee243c129 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 20 Dec 2017 16:06:06 -0600 Subject: [PATCH] Order Book - taking my first step into a larger world --- .../Modules/Trading/OrderBookWindowFactory.cs | 38 +++++-- .../Modules/Trading/TradingShellModule.cs | 4 +- .../view/Spark/Shell/OrderBook/OrderBookVM.cs | 104 +++++++++--------- .../Spark/Shell/OrderBook/OrderBookView.xaml | 87 +-------------- .../Shell/OrderBook/OrderBookView.xaml.cs | 2 + 5 files changed, 86 insertions(+), 149 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBookWindowFactory.cs b/src/client/spark/Modules/Trading/OrderBookWindowFactory.cs index 1fac76f52..f06b3f5b8 100644 --- a/src/client/spark/Modules/Trading/OrderBookWindowFactory.cs +++ b/src/client/spark/Modules/Trading/OrderBookWindowFactory.cs @@ -1,33 +1,49 @@ using bts.api; using mbts.spark; using mbts.ui; +using mbts; using System; using System.Reactive.Linq; using System.Threading.Tasks; +using bts.spark; namespace bts.shell { internal class OrderBookWindowFactory : ShellWindowFactory { readonly IBus _bus; - public OrderBookWindowFactory(IShellModule owner, IBus bus) : base(owner, "SparkOrderBookWindow") { + readonly OrdersModel _model; + public OrderBookWindowFactory(IShellModule owner, IBus bus, OrdersModel model) : base(owner, "SparkOrderBookWindow") { _bus = bus; + _model = model; - _dispose = - bus.subscribe(SparkTags.ShowOrderBookTag).ObserveOnDispatcher().Subscribe(_ => show_order_book()); + _dispose = Disposable.Create( + bus.subscribe(SparkTags.ShowOrderBookTag).ObserveOnDispatcher().Subscribe(_ => show(new OrderBookState())) + ); } public override Task load(OrderBookState state) { - return Task.FromResult(create_order_book(state)); + var w = new OrderBookWindow(_model, this, _bus, SparkCommands.ShowOrders.icon) as IShellWindow; + return Task.FromResult(w); } - public void show_order_book() { - var w = create_order_book(new OrderBookState()); + public async void show(OrderBookState state) { + var w = await load(state); _bus.post(SparkTags.ShowWindow, w); } - IShellWindow create_order_book(OrderBookState state) { - var vm = new OrderBookVM(this, _bus, new DemoOrdersModel(_bus), state, Observable.Return(new OrderBookSettings())); - var view = new OrderBookView(vm) { Width = 1526, Height = 800 }; - return ShellWindow.create(module, "Order Book", view, vm.get_state); - } + //public override Task load(OrderBookState state) { + // return Task.FromResult(create_order_book(state)); + //} + + + //public void show_order_book() { + // var w = create_order_book(new OrderBookState()); + // _bus.post(SparkTags.ShowWindow, w); + //} + + //IShellWindow create_order_book(OrderBookState state) { + // var vm = new OrderBookVM(this, _bus, new DemoOrdersModel(_bus), state, Observable.Return(new OrderBookSettings())); + // var view = new OrderBookView(vm) { Width = 1526, Height = 800 }; + // return ShellWindow.create(module, "Order Book", view, vm.get_state); + //} } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/TradingShellModule.cs b/src/client/spark/Modules/Trading/TradingShellModule.cs index a3de778bd..135868333 100644 --- a/src/client/spark/Modules/Trading/TradingShellModule.cs +++ b/src/client/spark/Modules/Trading/TradingShellModule.cs @@ -24,9 +24,9 @@ namespace bts.shell { ShowOrderTicketHandler _order_tickets; [ImportingConstructor] - public TradingShellModule(IBus bus, IWindowManager wm, SecuritySource ssrc) { + public TradingShellModule(IBus bus, IWindowManager wm, SecuritySource ssrc, OrdersModel orders_model) { _lwf = new LadderWindowFactory(this, bus, wm); - _obwf = new OrderBookWindowFactory(this, bus); + _obwf = new OrderBookWindowFactory(this, bus, orders_model); _fwf = new FillsWindowFactory(this, bus, ssrc); _plwf = new PositionWindowFactory(this, bus); _order_tickets = new ShowOrderTicketHandler(bus); diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs index 0918c10f2..b3abd270e 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs +++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs @@ -18,34 +18,34 @@ using System.Windows.Input; namespace mbts.spark { class OrderBookVM : DisposableViewModelBase { readonly OrderBookWindowFactory _creator; - readonly DemoOrdersModel _model; + //readonly DemoOrdersModel _model; - public OrderBookVM(OrderBookWindowFactory factory, IBus bus, DemoOrdersModel model, OrderBookState state, IObservable settings) { + public OrderBookVM(OrderBookWindowFactory factory, IBus bus, OrdersModel model, OrderBookState state, IObservable settings) { _creator = factory; _bus = bus; - _model = model; + //_model = model; _order_books = new ObservableCollection(); - orders = ObservableAutoWrapper.Create(_order_books, wrap); + //orders = ObservableAutoWrapper.Create(_order_books, wrap); - calculator = new CalculatorLogic(0, settings.Select(s => s.CalculatorButtons.Tokens)); - _settings = backing(nameof(settings), settings); - set_dispose( - calculator, - model.on_orderbook().ObserveOnDispatcher().Subscribe(orders_updated)); + //calculator = new CalculatorLogic(0, settings.Select(s => s.CalculatorButtons.Tokens)); + //_settings = backing(nameof(settings), settings); + //set_dispose( + // calculator, + // model.on_orderbook().ObserveOnDispatcher().Subscribe(orders_updated)); - // Commands - cancel_command = top_bar_command(_model.cancel_order); - tick_up_command = top_bar_command(_model.tick_up); - tick_down_command = top_bar_command(_model.tick_down); - pause_command = top_bar_command(_model.pause); - unpause_command = top_bar_command(_model.unpause); - commit_change_command = new DelegateCommand>(commit, _ => _enable_calculator.Value); + //// Commands + //cancel_command = top_bar_command(_model.cancel_order); + //tick_up_command = top_bar_command(_model.tick_up); + //tick_down_command = top_bar_command(_model.tick_down); + //pause_command = top_bar_command(_model.pause); + //unpause_command = top_bar_command(_model.unpause); + //commit_change_command = new DelegateCommand>(commit, _ => _enable_calculator.Value); _enable_calculator = backing(nameof(enable_calculator), false); _calculator_price = backing(nameof(calculator_price), double.NaN); - _dispose = _context_menu = new ContextMenuVM(_context_menu_item_factory); + //_dispose = _context_menu = new ContextMenuVM(_context_menu_item_factory); } public void get_state(System.IO.Stream output) { @@ -72,24 +72,24 @@ namespace mbts.spark { } } - OrderBookRowVM wrap(OrderBookEntry entry) => new OrderBookRowVM(this, _model, entry); + //OrderBookRowVM wrap(OrderBookEntry entry) => new OrderBookRowVM(this, _model, entry); - private IEnumerable _context_menu_item_factory() { - var selected_rows = this.orders.Where(vm => vm.is_selected && vm.is_visible).ToList(); - var orders = selected_rows.Select(vm => vm.order).ToList(); - var securities = new HashSet(selected_rows.Select(vm => vm.security.value)); - yield return MenuItemVM.Create(new LadderMenuItem(_bus), securities); - yield return MenuItemVM.Create(new OrderTicketMenuItem(_model), securities); - yield return MenuItemVM.Create(new MarketViewMenuItem(_bus), securities); - yield return MenuItemVM.Create(new SpreadMatrixMenuItem(_bus), securities); - yield return MenuItemVM.Create(new SyntheticCreateMenuItem(_bus), securities); - yield return MenuItemVM.Create(new SyntheticStrategyMenuItem(_bus), securities); - yield return MenuItemVM.Create(new ModifyOrderRootMenuItem(_model, selected_rows.Select(vm => vm.order.order()).ToList()), securities); - yield return MenuItemVM.Create(new CancelOrderRootMenuItem(_model, selected_rows.Where(vm => vm.order.status() != OrderStatus.Types.Status.Canceled).Select(vm => vm.order.order()).ToList()), securities); - yield return MenuItemVM.Create(new CancelBuyOrdersMenuItem(_model), securities); - yield return MenuItemVM.Create(new CancelSellOrdersMenuItem(_model), securities); - yield return MenuItemVM.Create(new CancelOrdersMenuItem(_model), securities); - } + //private IEnumerable _context_menu_item_factory() { + // var selected_rows = this.orders.Where(vm => vm.is_selected && vm.is_visible).ToList(); + // var orders = selected_rows.Select(vm => vm.order).ToList(); + // var securities = new HashSet(selected_rows.Select(vm => vm.security.value)); + // yield return MenuItemVM.Create(new LadderMenuItem(_bus), securities); + // yield return MenuItemVM.Create(new OrderTicketMenuItem(_model), securities); + // yield return MenuItemVM.Create(new MarketViewMenuItem(_bus), securities); + // yield return MenuItemVM.Create(new SpreadMatrixMenuItem(_bus), securities); + // yield return MenuItemVM.Create(new SyntheticCreateMenuItem(_bus), securities); + // yield return MenuItemVM.Create(new SyntheticStrategyMenuItem(_bus), securities); + // yield return MenuItemVM.Create(new ModifyOrderRootMenuItem(_model, selected_rows.Select(vm => vm.order.order()).ToList()), securities); + // yield return MenuItemVM.Create(new CancelOrderRootMenuItem(_model, selected_rows.Where(vm => vm.order.status() != OrderStatus.Types.Status.Canceled).Select(vm => vm.order.order()).ToList()), securities); + // yield return MenuItemVM.Create(new CancelBuyOrdersMenuItem(_model), securities); + // yield return MenuItemVM.Create(new CancelSellOrdersMenuItem(_model), securities); + // yield return MenuItemVM.Create(new CancelOrdersMenuItem(_model), securities); + //} private ICommand top_bar_command(Action> call) { return new DelegateCommand>(items => { @@ -133,29 +133,29 @@ namespace mbts.spark { public double calculator_price { get => _calculator_price.Value; set => _calculator_price.set(value); } public CalculatorLogic calculator { get; } public ICommand commit_change_command { get; } - void commit(IEnumerable selection) { - var item = selection.Cast().First(); - bool price_change = _calculator_price.Value != item.raw_price; - bool size_change = calculator.value != item.raw_size; - if (price_change && size_change) { - _model.change_price_and_quantity(item.order_id, _calculator_price.Value, calculator.value); - } - else if (price_change) { - _model.change_price(item.order_id, _calculator_price.Value); - } - else if (size_change) { - _model.change_qty(item.order_id, calculator.value); - } - } + //void commit(IEnumerable selection) { + // var item = selection.Cast().First(); + // bool price_change = _calculator_price.Value != item.raw_price; + // bool size_change = calculator.value != item.raw_size; + // if (price_change && size_change) { + // _model.change_price_and_quantity(item.order_id, _calculator_price.Value, calculator.value); + // } + // else if (price_change) { + // _model.change_price(item.order_id, _calculator_price.Value); + // } + // else if (size_change) { + // _model.change_qty(item.order_id, calculator.value); + // } + //} #endregion - private ContextMenuVM _context_menu; - public ContextMenuVM context_menu => _context_menu; + //private ContextMenuVM _context_menu; + //public ContextMenuVM context_menu => _context_menu; public ObservableCollection orders { get; } // Bind column visibility - Property _settings; - public OrderBookSettings settings => _settings.Value; + //Property _settings; + //public OrderBookSettings settings => _settings.Value; public double row_height { get; set; } = 18; } diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml index fbdee466e..75021df17 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml +++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml @@ -25,103 +25,22 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -231,7 +150,7 @@ - + diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml.cs index 89835f4b6..54e9187fb 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml.cs +++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml.cs @@ -17,6 +17,8 @@ namespace mbts.spark { internal partial class OrderBookView : UserControl { public OrderBookView(OrderBookVM vm) { InitializeComponent(); + var x = 1; + x += 1; DataContext = vm; }