OrderBook - hook up mini fills grid sorting/filter settings

This commit is contained in:
John Colvin committed 2019-04-07 21:02:40 -05:00
1 parent 90499bd9fa
commit a7ae1a89ac
2 files changed
+53 -14

No files matched your search

@@ -51,6 +51,7 @@ namespace mbts.spark {
readonly IWindowSettingsManager<OrderBookGridSettings> _settings_manager;
readonly IWindowSettingsManager<GridSettings> _fills_settings_manager = new WindowSettingsManager<GridSettings>.DisconnectedImpl(FillsWindowFactory.StartupData.MiniGridSettings, FillsWindowFactory.StartupData.MiniGridSettings);
readonly SelectedOrderParamsMon _selected_params_mon;
OrderBookFillsGridSettings _cached_fills_settings = OrderBookStartupData.DefaultFillsGrid;
double
_raw_right_panel_width = OrderBookStartupData.Default.right_panel_width,
_order_params_height = OrderBookStartupData.Default.order_params_height,
@@ -142,12 +143,15 @@ namespace mbts.spark {
bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(_selected_params_mon.on_security_md_map),
attach_vm,
_show_fills.observe_current(true)
.Subscribe(is_visible => fills_vm.value = is_visible ?
new FillsVM(
bus, model, Observable.Return(FillsWindowFactory.StartupData.Default()),
model.on_fill_tuples.Filter(mk_fills_slave_predicate_src(), ft => ft.fill.FillKey, _ => false), _fills_settings_manager
) :
null),
.Subscribe(is_visible => {
if (is_visible) {
var init = _cached_fills_settings.to_startup_data();
fills_vm.value = new FillsVM(bus, model, Observable.Return(init), model.on_fill_tuples.Filter(mk_fills_slave_predicate_src(), ft => ft.fill.FillKey, _ => false), _fills_settings_manager);
} else if (fills_vm.value != null) {
_cached_fills_settings = _get_fills_settings(fills_vm.value);
fills_vm.value = null;
}
}),
Disposable.Create(() => {
_columns.filter_changed -= on_filter_changed;
_row_collection.CollectionChanged -= _row_collection_CollectionChanged;
@@ -357,8 +361,8 @@ namespace mbts.spark {
order_params_height = order_params_height,
show_ladder = show_ladder,
show_order_params = show_order_params,
fills_settings = _fills_settings_manager.current_settings(),
ladder_height = ladder_height
ladder_height = ladder_height,
fills_settings = _get_fills_settings(fills_vm.value)
};
}
@@ -368,10 +372,13 @@ namespace mbts.spark {
show_order_params = state.show_order_params;
right_panel_width = state.right_panel_width;
order_params_height = state.order_params_height;
fills_height = state.fills_height;
/// important: <see cref="_cached_fills_settings"/> must be assigned before <see cref="show_fills"/>, as the former is used to create the fills vm immediately after <see cref="show_fills"/> is set to true.
if (state.fills_settings != null) {
_cached_fills_settings = state.fills_settings;
_fills_settings_manager.instance_settings = state.fills_settings.general;
}
show_fills = state.show_fills;
if (state.fills_settings != null)
_fills_settings_manager.instance_settings = state.fills_settings;
fills_height = state.fills_height;
show_ladder = state.show_ladder;
ladder_height = state.ladder_height;
var gs = state.grid_settings_wrapper();
@@ -508,6 +515,14 @@ namespace mbts.spark {
IObservable<ObservableCollection<OrderBookRowVM>> _subscribe_throttled_selected_rows() =>
selected_rows.Observe().BufferLatest(TimeSpan.FromSeconds(0.2)).Select(_ => selected_rows);
static OrderBookFillsGridSettings _get_fills_settings(FillsVM fills_vm) =>
fills_vm == null ? OrderBookStartupData.DefaultFillsGrid :
new OrderBookFillsGridSettings {
sorting_criterion = fills_vm.get_sorting_criterion().ToList(),
filters = fills_vm.get_filters(),
general = fills_vm.grid_settings_manager.create()
};
static _GridSettingsManager _create_grid_settings_manager(
IObservable<string> owner_title, IBus bus, INotificationService notification_service, OrdersModel model, ObservableCollection<OrderBookRowVM> rows, ObservableCollection<DIYGrid.ColumnBase> columns) {
// make font-weight immutable for all columns (the font-weight rule is hard-coded: Regular for root-orders, Light for all others)
@@ -13,6 +13,7 @@ using ProtoBuf;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Reactive.Linq;
using System.Threading.Tasks;
using System.Windows;
@@ -94,7 +95,7 @@ namespace bts.shell {
public bool show_fills { get; set; }
// fills settings
[ProtoMember(26)]
public GridSettings fills_settings { get; set; }
public OrderBookFillsGridSettings fills_settings { get; set; }
// ladder height
[ProtoMember(21)]
[DefaultValue(_default_ladder_height)]
@@ -149,11 +150,22 @@ namespace bts.shell {
_default_fills_height,
use_defaults: true) {
show_order_params = _default_show_order_params,
order_params_height = _default_order_params_height
order_params_height = _default_order_params_height,
fills_settings = DefaultFillsGrid
};
public static OrderBookGridSettings DefaultGrid => new OrderBookGridSettings(_default_general_grid);
public static OrderBookFillsGridSettings DefaultFillsGrid {
get {
var default_fills = FillsWindowFactory.StartupData.Default();
var rv = new OrderBookFillsGridSettings {
sorting_criterion = default_fills.sorting_criterion.ToList(),
filters = default_fills.filters,
general = FillsWindowFactory.StartupData.MiniGridSettings
};
return rv;
}
}
static GridSettings _default_general_grid => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.sorting_criterion);
public static GridSettings default_mini_grid => GridSettings.Default.with(DefaultColumns.mini, DefaultColumns.sorting_criterion);
@@ -363,5 +375,17 @@ namespace bts.shell {
EqualityComparer.safe_get_hash_code(general),
EqualityComparer.safe_aggregate_hash(predicate_animations));
}
[ProtoContract]
public class OrderBookFillsGridSettings {
[ProtoMember(1)]
public GridSettings general { get; set; }
[ProtoMember(2)]
public FillsWindowFactory.FilterStates filters { get; set; }
[ProtoMember(3)]
public List<SortingCriteria> sorting_criterion { get; set; }
public FillsWindowFactory.StartupData to_startup_data() =>
new FillsWindowFactory.StartupData(null, sorting_criterion, filters, general);
}
}
}