SPARK-386 in fills remove security picker preamble

This commit is contained in:
John Colvin committed 2018-01-17 15:42:32 -05:00
1 parent ec563ab5ab
commit ab02ef44e5
12 files changed
+88 -149

No files matched your search

@@ -1,33 +1,29 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Media;
using mbts.ui;
using System.ComponentModel.Composition;
using bts.api;
using bts.api;
using bts.spark;
using mbts.spark;
using mbts.ui.shell;
using static mbts.ui.shell.ProtoBufSerializationHelper;
using mbts;
using mbts.co2;
using mbts.ui;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;
using System.Threading.Tasks;
using System.Windows.Media;
using static mbts.ui.shell.ProtoBufSerializationHelper;
namespace bts.shell
{
[Export(typeof(IShellModule))]
class MarketShellModule : IShellModule {
class MarketShellModule : IShellModule
{
[ImportingConstructor]
public MarketShellModule(IBus bus, MDConsumer consumer, [Import("username")]string user_name) {
_tsf = new TimeAndSalesWindowFactory(this, bus, consumer);
_mvf = new MarketViewWindowFactory(this, bus);
}
TimeAndSalesWindowFactory _tsf;
MarketViewWindowFactory _mvf;
[ImportingConstructor]
public MarketShellModule(IBus bus, IWindowManager wm, MDConsumer consumer, [Import("username")]string user_name) {
_tsf = new TimeAndSalesWindowFactory(this, bus, consumer);
_mvf = new MarketViewWindowFactory(this, bus, wm);
}
#region IShellModule
public ImageSource icon => Icons.Date;
@@ -16,16 +16,6 @@ namespace mbts.spark
{
class MarketViewWindow : SparkWindow<MarketViewWindowFactory.StartupData>
{
SingleValuePump<MarketViewVM> _vm = new SingleValuePump<MarketViewVM>();
MarketViewWindowFactory.StartupData _state;
MarketViewModel _model;
MarketViewView _view;
MarketViewWindowFactory _factory;
IDisposable _subscriptions;
IReadOnlyDictionary<uint, SecurityMD> _md = new Dictionary<uint, SecurityMD>();
PartialCommand<SecurityCriteria> _criteria_callback_command;
public static async Task<MarketViewWindow> create(MarketViewWindowFactory factory, IBus bus, MarketViewWindowFactory.StartupData state, ImageSource icon) {
var window = new MarketViewWindow(factory, bus, icon);
await window.initialize(state);
@@ -38,11 +28,11 @@ namespace mbts.spark
_criteria_callback_command = SparkCommand.create("Update Market View", SparkCommands.ShowMarketView.icon, _updated_security_criteria_tag);
Commands = new SparkCommand[] {
SparkCommand.create("Change Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (_criteria_callback_command, _state.security_criteria)),
SparkCommands.ShowLadder.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value),
SparkCommands.ShowLadder.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(bus)), md => md.HasValue, md => md.Value),
// TODO: ShowLinkedLadder
SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value),
SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(bus)), md => md.HasValue, md => md.Value),
// TODO: ShowLinkedOrderTicket
SparkCommands.ShowFills.complete(_vm.Observable.SelectMany(vm => vm.selected_securities_observable()), secs => secs.Count > 0, secs => new SecurityCriteria(secs)),
SparkCommands.ShowFills,
SparkCommands.ShowTimeAndSales.complete(_vm.Observable.SelectMany(vm => vm.selected_securities_observable()), secs => secs.Count > 0, secs => new SecurityCriteria(secs)),
// SpreadMatrix ??
// SyntheticCreate
@@ -54,11 +44,18 @@ namespace mbts.spark
//SparkCommands.CancelSellOrders,
//SparkCommands.CancelOrders,
};
_subscriptions = Disposable.Create(
_bus.subscribe(_updated_security_criteria_tag).ObserveOnDispatcher().Subscribe(update_criteria),
_bus.subscribe(SparkTags.SecuritiesTag).Subscribe(md => _md = md));
_subscriptions = _bus.subscribe(_updated_security_criteria_tag).ObserveOnDispatcher().Subscribe(update_criteria);
}
readonly MarketViewWindowFactory _factory;
SingleValuePump<MarketViewVM> _vm = new SingleValuePump<MarketViewVM>();
MarketViewWindowFactory.StartupData _state;
MarketViewModel _model;
MarketViewView _view;
PartialCommand<SecurityCriteria> _criteria_callback_command;
IDisposable _subscriptions;
public async Task initialize(MarketViewWindowFactory.StartupData state) {
Logger.notnull(state);
_state = state;
@@ -1,6 +1,5 @@
using bts.api;
using bts.spark;
using mbts;
using mbts.spark;
using mbts.ui;
using ProtoBuf;
@@ -12,29 +11,20 @@ using static mbts.spark.DataGridColumnFilters;
namespace bts.shell
{
class MarketViewWindowFactory : ShellWindowFactory<MarketViewWindowFactory.StartupData> {
IBus _bus;
IWindowManager _wm;
IReadOnlyDictionary<uint, SecurityMD> _securities = new Dictionary<uint, SecurityMD>();
public MarketViewWindowFactory(MarketShellModule module, IBus bus, IWindowManager wm) : base(module, "MarketView") {
class MarketViewWindowFactory : ShellWindowFactory<MarketViewWindowFactory.StartupData>
{
public MarketViewWindowFactory(MarketShellModule module, IBus bus) : base(module, "MarketView") {
_bus = bus;
_wm = wm;
_dispose = Disposable.Create(
bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s),
bus.subscribe(SparkTags.ShowMarketViewTag).ObserveOnDispatcher().Subscribe(show)
);
_dispose = bus.subscribe(SparkTags.ShowMarketViewTag).ObserveOnDispatcher().Subscribe(show);
}
public override async Task<IShellWindow> load(StartupData state) {
return await MarketViewWindow.create(this, _bus, state, SparkCommands.PickMarketView.icon);
}
readonly IBus _bus;
public async void show(SecurityCriteria criteria) {
var w = await load(new StartupData(criteria));
_bus.post(SparkTags.ShowWindow, w);
}
public override async Task<IShellWindow> load(StartupData state) =>
await MarketViewWindow.create(this, _bus, state, SparkCommands.PickMarketView.icon);
public async void show(SecurityCriteria criteria) =>
_bus.post(SparkTags.ShowWindow, await load(new StartupData(criteria)));
[ProtoContract]
public class StartupData {
@@ -17,18 +17,6 @@ namespace mbts.spark
{
class TimeAndSalesWindow : SparkWindow<TimeAndSalesWindowFactory.StartupData>
{
SingleValuePump<TimeAndSalesVM> _vm = new SingleValuePump<TimeAndSalesVM>();
TimeAndSalesWindowFactory.StartupData _state;
MDConsumer _consumer;
TimeAndSalesModel _model;
TimeAndSalesView _view;
TimeAndSalesWindowFactory _factory;
IDisposable _subscriptions;
IReadOnlyDictionary<uint, SecurityMD> _md = new Dictionary<uint, SecurityMD>();
PartialCommand<SecurityCriteria> _criteria_callback_command;
public static async Task<TimeAndSalesWindow> create(TimeAndSalesWindowFactory factory, IBus bus, MDConsumer consumer, TimeAndSalesWindowFactory.StartupData state, ImageSource icon) {
var window = new TimeAndSalesWindow(factory, bus, consumer, icon);
await window.initialize(state);
@@ -38,21 +26,15 @@ namespace mbts.spark
private TimeAndSalesWindow(TimeAndSalesWindowFactory factory, IBus bus, MDConsumer consumer, ImageSource icon) : base("Time And Sales", bus, factory, SparkCommands.ShowTimeAndSales.icon) {
_consumer = consumer;
_factory = factory;
ITag<SecurityCriteria> _updated_security_criteria_tag = new SparkTags.SparkTag<SecurityCriteria>("TimeAndSales Callback");
_criteria_callback_command = SparkCommand.create("Update Time and Sales", SparkCommands.ShowTimeAndSales.icon, _updated_security_criteria_tag);
_subscriptions = Disposable.Create(
_bus.subscribe(_updated_security_criteria_tag).ObserveOnDispatcher().Subscribe(update_criteria),
_bus.subscribe(SparkTags.SecuritiesTag).Subscribe(md => _md = md));
Commands = new SparkCommand[] {
SparkCommand.create("Change Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (_criteria_callback_command, _state.security_criteria)),
SparkCommands.ShowLadder.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value),
SparkCommands.ShowLadder.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(bus)), md => md.HasValue, md => md.Value),
// TODO: ShowLinkedLadder
SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value),
SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(bus)), md => md.HasValue, md => md.Value),
// TODO: ShowLinkedOrderTicket
SparkCommands.ShowFills.complete(_vm.Observable.SelectMany(vm => vm.selected_securities_observable()), secs => secs.Count > 0, secs => new SecurityCriteria(secs)),
SparkCommands.ShowFills,
SparkCommands.ShowMarketView.complete(_vm.Observable.SelectMany(vm => vm.selected_securities_observable()), secs => secs.Count > 0, secs => new SecurityCriteria(secs)),
// SpreadMatrix ??
// SyntheticCreate
@@ -63,8 +45,19 @@ namespace mbts.spark
//SparkCommands.CancelSellOrders,
//SparkCommands.CancelOrders,
};
_subscriptions = _bus.subscribe(_updated_security_criteria_tag).ObserveOnDispatcher().Subscribe(update_criteria);
}
readonly MDConsumer _consumer;
readonly TimeAndSalesWindowFactory _factory;
SingleValuePump<TimeAndSalesVM> _vm = new SingleValuePump<TimeAndSalesVM>();
TimeAndSalesWindowFactory.StartupData _state;
TimeAndSalesModel _model;
TimeAndSalesView _view;
PartialCommand<SecurityCriteria> _criteria_callback_command;
IDisposable _subscriptions;
public async Task initialize(TimeAndSalesWindowFactory.StartupData state) {
Logger.notnull(state);
_state = state;
@@ -11,7 +11,8 @@ using bts.spark;
using mbts.co2;
using static mbts.spark.DataGridColumnFilters;
namespace bts.shell {
namespace bts.shell
{
class TimeAndSalesWindowFactory : ShellWindowFactory<TimeAndSalesWindowFactory.StartupData>
{
readonly IBus _bus;
@@ -14,18 +14,12 @@ namespace mbts.spark
{
class FillsVM : SecurityGrid<FillsVM.Row, FillTuple, Columns>
{
static IObservable<IEnumerable<FillTuple>> _row_models(DemoOrdersModel model, IReadOnlyCollection<SecurityImmutable> securities) =>
model.on_orderbook().Buffer(TimeSpan.FromSeconds(1)).Where(obs => obs.Count > 0).Select(obs => obs[obs.Count - 1]).Select(ob => {
var map = ob.get_fill_tuple_sec_map();
if (securities.Count == 0) return map.SelectMany(kv => kv.Value);
else {
var sec_keys = securities.Select(s => s.Id).ToList();
return map.Where(kv => sec_keys.Contains(kv.Key)).SelectMany(kv => kv.Value);
}
});
static IObservable<IEnumerable<FillTuple>> _row_models(DemoOrdersModel model) => model.on_orderbook()
.Buffer(TimeSpan.FromSeconds(1)).Where(obs => obs.Count > 0)
.Select(obs => obs[obs.Count - 1].get_fill_tuple_sec_map().SelectMany(kv => kv.Value));
public FillsVM(IBus bus, DemoOrdersModel model, IReadOnlyCollection<SecurityImmutable> securities, IReadOnlyCollection<SortingCriteria> sorting_criteria, FilterStates filters)
: base(_row_models(model, securities), sorting_criteria) {
public FillsVM(IBus bus, DemoOrdersModel model, IReadOnlyCollection<SortingCriteria> sorting_criteria, FilterStates filters)
: base(_row_models(model), sorting_criteria) {
_model = model;
if (sorting_criteria != null) rows_view.SortDescriptions.AddRange(sorting_criteria.Select(sc => sc.to_sort_description()));
else rows_view.SortDescriptions.Add(new SortDescription(nameof(Row.fill_time), ListSortDirection.Descending));
@@ -8,7 +8,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Reactive.Linq;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
@@ -21,14 +20,9 @@ namespace mbts.spark
FillsView _view;
FillsWindowFactory _factory;
IDisposable _subscriptions;
IReadOnlyDictionary<uint, SecurityMD> _md = new Dictionary<uint, SecurityMD>();
PartialCommand<SecurityCriteria> _criteria_callback_command;
public static async Task<FillsWindow> create(FillsWindowFactory factory, IBus bus, FillsWindowFactory.StartupData state, ImageSource icon) {
public static FillsWindow create(FillsWindowFactory factory, IBus bus, FillsWindowFactory.StartupData state, ImageSource icon) {
var window = new FillsWindow(factory, bus, icon);
await window.initialize(state);
window.initialize(state);
return window;
}
@@ -36,13 +30,11 @@ namespace mbts.spark
_factory = factory;
ITag<SecurityCriteria> _updated_security_criteria_tag = new SparkTags.SparkTag<SecurityCriteria>("Fills Callback");
_criteria_callback_command = SparkCommand.create("Update Fills", SparkCommands.ShowFills.icon, _updated_security_criteria_tag);
Commands = new SparkCommand[] {
SparkCommand.create("Update Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (_criteria_callback_command, _state.security_criteria)),
SparkCommands.ShowLadder.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value),
SparkCommands.ShowLadder.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(bus)), md => md.HasValue, md => md.Value),
// TODO: ShowLinkedLadder
SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value),
SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(bus)), md => md.HasValue, md => md.Value),
// TODO: ShowLinkedOrderTicket
SparkCommands.ShowTimeAndSales.complete(_vm.Observable.SelectMany(vm => vm.selected_securities_observable()), secs => secs.Count > 0, secs => new SecurityCriteria(secs)),
SparkCommands.ShowMarketView.complete(_vm.Observable.SelectMany(vm => vm.selected_securities_observable()), secs => secs.Count > 0, secs => new SecurityCriteria(secs)),
@@ -55,39 +47,23 @@ namespace mbts.spark
//SparkCommands.CancelSellOrders,
//SparkCommands.CancelOrders,
};
_subscriptions = Disposable.Create(
_bus.subscribe(_updated_security_criteria_tag).ObserveOnDispatcher().Subscribe(update_criteria),
_bus.subscribe(SparkTags.SecuritiesTag).Subscribe(md => _md = md));
}
public async Task initialize(FillsWindowFactory.StartupData state) {
public void initialize(FillsWindowFactory.StartupData state) {
Logger.notnull(state);
_state = state;
var securities = await state.security_criteria.securities(_bus);
_vm.Push(new FillsVM(_bus, new DemoOrdersModel(_bus), securities.ToList(), state.sorting_criteria, state.filters));
_vm.Push(new FillsVM(_bus, new DemoOrdersModel(_bus), state.sorting_criteria, state.filters));
if (_view == null) _view = new FillsView { DataContext = _vm.Current };
else _view.DataContext = _vm.Current;
}
public void update_criteria(SecurityCriteria c) => initialize(new FillsWindowFactory.StartupData(c, _vm.Current.rows_view.GetSortingCriteria(), _vm.Current.get_filters())).ignore();
public override UIElement Content => _view;
SecurityMD? current_security {
get {
var security = _vm.Current.current_security;
if (security.HasValue && _md.TryGetValue(security.Value.Id, out SecurityMD md)) return md;
else return null;
}
}
public override IEnumerable<SparkCommand> Commands { get; }
public override FillsWindowFactory.StartupData SaveState => _state = new FillsWindowFactory.StartupData(_state.security_criteria, _vm.Current.rows_view.GetSortingCriteria(), _vm.Current.get_filters());
public override FillsWindowFactory.StartupData SaveState => _state = new FillsWindowFactory.StartupData(_vm.Current.rows_view.GetSortingCriteria(), _vm.Current.get_filters());
public override void Dispose() {
Disposable.dispose(ref _subscriptions);
Disposable.dispose(ref _vm);
foreach (var c in Commands.OfType<IDisposable>()) c.Dispose();
}
@@ -1,6 +1,5 @@
using bts.api;
using bts.spark;
using mbts;
using mbts.spark;
using mbts.ui;
using ProtoBuf;
@@ -14,41 +13,30 @@ namespace bts.shell
{
class FillsWindowFactory : ShellWindowFactory<FillsWindowFactory.StartupData>
{
IBus _bus;
IWindowManager _wm;
IReadOnlyDictionary<uint, SecurityMD> _securities = new Dictionary<uint, SecurityMD>();
public FillsWindowFactory(TradingShellModule module, IBus bus, IWindowManager wm) : base(module, "Fills") {
_bus = bus;
_wm = wm;
_dispose = Disposable.Create(
bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s),
bus.subscribe(SparkTags.ShowFillsTag).ObserveOnDispatcher().Subscribe(show)
);
_dispose = bus.subscribe(SparkTags.ShowFillsTag).ObserveOnDispatcher().Subscribe(show);
}
public override async Task<IShellWindow> load(StartupData state) {
return await FillsWindow.create(this, _bus, state, SparkCommands.PickFills.icon);
}
readonly IBus _bus;
readonly IWindowManager _wm;
public async void show(SecurityCriteria criteria) {
var w = await load(new StartupData(criteria));
_bus.post(SparkTags.ShowWindow, w);
}
public override Task<IShellWindow> load(StartupData state) =>
Task.FromResult<IShellWindow>(FillsWindow.create(this, _bus, state, SparkCommands.ShowFills.icon));
public async void show(SparkTags.Nothing nothing) =>
_bus.post(SparkTags.ShowWindow, await load(new StartupData()));
[ProtoContract]
public class StartupData
{
public const int Version = 1;
public StartupData() { }
public StartupData(SecurityCriteria securities) : this(securities, null, null) { }
public StartupData(SecurityCriteria securities, List<SortingCriteria> sorting_criteria, FilterStates filters) {
this.security_criteria = securities;
public StartupData(List<SortingCriteria> sorting_criteria, FilterStates filters) {
this.sorting_criteria = sorting_criteria;
this.filters = filters;
}
[ProtoMember(1)]
public SecurityCriteria security_criteria;
[ProtoMember(2)]
public List<SortingCriteria> sorting_criteria;
[ProtoMember(3)]
@@ -38,7 +38,7 @@ namespace bts.shell
public IEnumerable<SparkCommand> actions => new [] {
SparkCommands.ShowOrders,
SparkCommands.PickFills,
SparkCommands.ShowFills,
//SparkCommands.ShowPAndL,
SparkCommands.PickLadder,
SparkCommands.PickOrderTicket
+1 -3
View File
@@ -24,10 +24,8 @@ namespace bts.spark
public static SparkCommand ShowOrders =>
SparkCommand.create("Order Book", Icons.Book, SparkTags.ShowOrderBookTag);
public static PartialCommand<SecurityCriteria> ShowFills =>
public static SparkCommand ShowFills =>
SparkCommand.create("Fills", Icons.Payment, SparkTags.ShowFillsTag);
public static SparkCommand PickFills =>
SparkCommand.create("Fills", Icons.Payment, SparkTags.ShowPickMultiple, ShowFills);
public static SparkCommand ShowPAndL =>
SparkCommand.create("Position/P&L", Icons.Accounting, SparkTags.ShowPositionsTag);
+1 -1
View File
@@ -31,7 +31,7 @@ namespace mbts.spark
#region Show Window
public static ITag<ShowAuditLogsMessage> ShowAuditLogsTag { get; } = new SparkTag<ShowAuditLogsMessage>(nameof(ShowAuditLogsTag));
public static ITag<SecurityCriteria> ShowFillsTag { get; } = new SparkTag<SecurityCriteria>(nameof(ShowFillsTag));
public static ITag<Nothing> ShowFillsTag { get; } = new SparkTag<Nothing>(nameof(ShowFillsTag));
public static ITag<SecurityMD> ShowLadderTag { get; } = new SparkTag<SecurityMD>("Show Ladder");
public static ITag<IObservable<SecurityMD>> ShowLinkedLadder { get; } = new SparkTag<IObservable<SecurityMD>>("Linked Ladder");
public static ITag<SecurityCriteria> ShowMarketViewTag { get; } = new SparkTag<SecurityCriteria>("Show MarketView");
@@ -59,10 +59,16 @@ namespace mbts.spark
static class SecurityGridExtensions
{
public static IObservable<SecurityMD?> current_security_md_observable<TRow, TRowModel, TCol>(this SecurityGrid<TRow, TRowModel, TCol> security_grid, IReadOnlyDictionary<uint, SecurityMD> map)
public static IObservable<SecurityMD?> current_security_md_observable<TRow, TRowModel, TCol>(this SecurityGrid<TRow, TRowModel, TCol> security_grid, IBus bus)
where TRow : class, ISecurityRow =>
from s in security_grid.current_security_observable
select s.HasValue ? new SecurityMD?(map[s.Value.Id]) : null;
current_security_md_observable(security_grid, bus.subscribe(SparkTags.SecuritiesTag));
public static IObservable<SecurityMD?> current_security_md_observable<TRow, TRowModel, TCol>(this SecurityGrid<TRow, TRowModel, TCol> security_grid, IObservable<IReadOnlyDictionary<uint, SecurityMD>> md)
where TRow : class, ISecurityRow =>
security_grid.current_security_observable
.CombineLatest(md, (s, m) => (s, m))
.Select(sm => sm.s.HasValue && sm.m != null && sm.m.TryGetValue(sm.s.Value.Id, out SecurityMD smd) ? new SecurityMD?(smd) : null);
public static IObservable<SecurityMD> current_security_md_observable_straight<TRow, TRowModel, TCol>(this SecurityGrid<TRow, TRowModel, TCol> security_grid, IReadOnlyDictionary<uint, SecurityMD> map)
where TRow : class, ISecurityRow =>