MarketView observes securities from criteria (no longer depends on hard set)

This commit is contained in:
John Colvin committed 2018-01-25 12:05:10 -05:00
1 parent 969253dbc9
commit 9307eceb0e
4 files changed
+12 -46

No files matched your search

@@ -1,30 +0,0 @@
using bts.api;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reactive.Linq;
using static mbts.spark.SparkTags;
using SecurityKey = System.UInt32;
namespace mbts.spark
{
class MarketViewModel : IDisposable
{
public MarketViewModel(IBus bus, OrdersModel orders_model, IEnumerable<SecurityImmutable> securities) {
_bus = bus;
_securities = new HashSet<SecurityKey>(securities.Select(s => s.Id));
_orders_model = orders_model;
}
readonly IBus _bus;
readonly OrdersModel _orders_model;
readonly HashSet<SecurityKey> _securities;
IDisposable _sub;
public IObservable<IEnumerable<SecurityMD>> rows => _bus.subscribe(SecuritiesTag).Select(md => md.Intersect(_securities, kv => kv.Key).Select(kv => kv.Value));
public OrdersModel orders_model => _orders_model;
public void Dispose() =>
Disposable.dispose(ref _sub);
}
}
@@ -9,10 +9,10 @@ namespace mbts.spark
{
partial class MarketViewVM : SecurityMDGrid<MarketViewVM.Row, SecurityMD>
{
public MarketViewVM(IBus bus, MarketViewModel model, IReadOnlyCollection<SortingCriteria> sorting_criteria, FilterStates filters)
: base(new RXObservableCollection<SecurityMD>(model.rows, SecurityDataHelper.EqualityComparer.MDComparer), sorting_criteria) {
public MarketViewVM(IBus bus, OrdersModel orders_model, SecurityCriteria security_criteria, IReadOnlyCollection<SortingCriteria> sorting_criteria, FilterStates filters)
: base(new RXObservableCollection<SecurityMD>(security_criteria.subscribe(bus), SecurityDataHelper.EqualityComparer.MDComparer), sorting_criteria) {
_bus = bus;
_model = model;
_orders_model = orders_model;
security_filter = new DiscreteValues<Row, SecurityImmutable, SecurityCriteria>(_rows_vm, r => r.security, secs => new SecurityCriteria(secs), sc => sc.securities(bus), nameof(Row.security));
if (filters != null) {
security_filter.load_state(filters.security);
@@ -38,9 +38,9 @@ namespace mbts.spark
}
readonly IBus _bus;
readonly MarketViewModel _model;
readonly OrdersModel _orders_model;
protected override Row row_factory(SecurityMD smd) => new Row(_bus, smd, _model.orders_model.on_security_orders(smd.security.Id));
protected override Row row_factory(SecurityMD smd) => new Row(_bus, smd, _orders_model.on_security_orders(smd.security.Id));
protected override void on_row_removed(Row row) => row.Dispose();
protected override IEnumerable<SortingCriteria> get_default_sorting() { yield return new SortingCriteria(nameof(Row.security), true); }
@@ -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;
@@ -16,9 +15,9 @@ namespace mbts.spark
{
class MarketViewWindow : SparkWindow<MarketViewWindowFactory.StartupData>
{
public static async Task<MarketViewWindow> create(MarketViewWindowFactory factory, IBus bus, OrdersModel orders_model, MarketViewWindowFactory.StartupData state, ImageSource icon) {
public static MarketViewWindow create(MarketViewWindowFactory factory, IBus bus, OrdersModel orders_model, MarketViewWindowFactory.StartupData state, ImageSource icon) {
var window = new MarketViewWindow(factory, bus, orders_model, icon);
await window.initialize(state);
window._initialize(state);
return window;
}
@@ -53,17 +52,14 @@ namespace mbts.spark
SingleValuePump<MarketViewVM> _vm = new SingleValuePump<MarketViewVM>(destroy: vm => vm.Dispose());
MarketViewWindowFactory.StartupData _state;
MarketViewModel _model;
MarketViewView _view;
PartialCommand<SecurityCriteria> _criteria_callback_command;
IDisposable _subscriptions;
public async Task initialize(MarketViewWindowFactory.StartupData state) {
void _initialize(MarketViewWindowFactory.StartupData state) {
Logger.notnull(state);
_state = state;
var securities = await state.security_criteria.securities(_bus);
_model = new MarketViewModel(_bus, _orders_model, securities);
_vm.Push(new MarketViewVM(_bus, _model, state.sorting_criteria, state.filters));
_vm.Push(new MarketViewVM(_bus, _orders_model, state.security_criteria, state.sorting_criteria, state.filters));
if (_view == null) {
_view = new MarketViewView { DataContext = _vm.Current };
} else {
@@ -71,7 +67,7 @@ namespace mbts.spark
}
}
public void update_criteria(SecurityCriteria c) => initialize(new MarketViewWindowFactory.StartupData(c, _vm.Current.rows_view.GetSortingCriteria(), _vm.Current.get_filter_states())).ignore();
public void update_criteria(SecurityCriteria c) => _initialize(new MarketViewWindowFactory.StartupData(c, _vm.Current.rows_view.GetSortingCriteria(), _vm.Current.get_filter_states()));
public override UIElement Content => _view;
public override IEnumerable<SparkCommand> Commands { get; }
@@ -22,8 +22,8 @@ namespace bts.shell
readonly IBus _bus;
readonly OrdersModel _orders_model;
public override async Task<IShellWindow> load(StartupData state) =>
await MarketViewWindow.create(this, _bus, _orders_model, state, SparkCommands.PickMarketView.icon);
public override Task<IShellWindow> load(StartupData state) =>
Task.FromResult<IShellWindow>(MarketViewWindow.create(this, _bus, _orders_model, state, SparkCommands.PickMarketView.icon));
public async void show(SecurityCriteria criteria) =>
_bus.post(SparkTags.ShowWindow, await load(new StartupData(criteria)));