pr: finishing touches

This commit is contained in:
John Colvin committed 2018-05-30 20:54:01 -04:00
1 parent bbcc92c38c
commit 5a12a973f3
4 files changed
+94 -11

No files matched your search

@@ -33,7 +33,7 @@ namespace bts.shell {
public int priority => 20;
public IEnumerable<SparkCommand> actions => new [] {
SparkCommands.ShowOrders.complete(() => new OrderBookWindowFactory.OrderBookStartupData()),
SparkCommands.ShowOrders.complete(() => OrderBookWindow.default_startup_data),
SparkCommands.ShowFills.complete(() => new FillsWindowFactory.StartupData()),
SparkCommands.ShowPAndL.complete(() => new PAndLWindowFactory.PAndLStartupData()),
SparkCommands.PickLadder,
@@ -19,6 +19,7 @@ namespace mbts.spark {
readonly ObservantCommand _show_order_modify_cmd;
OrderRecordImmutable _order;
SecurityImmutable? _security;
bool _row_passes_filter;
public CVOrderBookRowVM(IBus bus, CVOrderBookVM source_vm, OrdersModel model, OrderRecordImmutable record, SecurityImmutable? s) {
_book_vm = source_vm;
@@ -59,6 +60,7 @@ namespace mbts.spark {
//
_visible = backing(nameof(is_visible), _order.has_parent() && source_vm.get_order_vm(record.ParentKey) is CVOrderBookRowVM parent ? parent.is_visible && parent.is_expanded : true);
_expanded = backing(nameof(is_expanded), true);
_row_passes_filter = _book_vm.columns.filter(this);
_passes_filter = backing(nameof(passes_filter), filter);
toggle_command = new DelegateCommand(() => is_expanded = !is_expanded);
_show_order_modify_cmd = new ObservantCommand(() => bus.post(SparkTags.ShowModifyOrderTag, _order.Key));
@@ -67,7 +69,7 @@ namespace mbts.spark {
bool filter() {
if (_order.has_parent() && _book_vm.get_order_vm(_order.ParentKey) is CVOrderBookRowVM pvm) {
return pvm.passes_filter;
} else return _book_vm.columns.filter(this) || _descendents(this).Any(_book_vm.columns.filter);
} else return _row_passes_filter || _descendents(this).Any(r => r._row_passes_filter);
}
}
@@ -157,12 +159,32 @@ namespace mbts.spark {
// we don't need to raise this every single time
if (_child_order_ids.Add(child_order_id) && _child_order_ids.Count == 1)
RaisePropertyChanged("is_parent");
_book_vm.get_order_vm(child_order_id)?.on_parent_updated();
if (_book_vm.get_order_vm(child_order_id) is CVOrderBookRowVM child_row) {
child_row.on_parent_updated();
var root = root_node(this);
if (child_row._row_passes_filter && !root.passes_filter) {
root._passes_filter.Value = true;
foreach (var d in _descendents(this))
d._passes_filter.Value = true;
}
}
}
public void remove_child_order(uint child_order_id) {
if (_child_order_ids.Remove(child_order_id) && _child_order_ids.Count == 0)
RaisePropertyChanged(nameof(is_parent));
if (_book_vm.get_order_vm(child_order_id) is CVOrderBookRowVM child_row) {
if (passes_filter) {
if (child_row._row_passes_filter || _descendents(child_row).Any(r => r._row_passes_filter)) {
var root = root_node(this);
root._passes_filter.refresh();
if (!root.passes_filter) {
foreach (var d in _descendents(this))
d._passes_filter.Value = false;
}
}
}
}
}
/// <summary>
@@ -186,10 +208,7 @@ namespace mbts.spark {
if (_dynamic_render_cells.Count(c => c.refresh()) > 0)
invalidated?.Invoke();
_show_order_modify_cmd.OnNext(status.value == OrderStatus.Working);
foreach (var p in _book_vm.live_sorting_props)
RaisePropertyChanged(p);
foreach (var child in _child_order_ids)
_book_vm.get_order_vm(child)?.on_parent_updated();
_on_update();
}
public void update_security(SecurityImmutable security) {
@@ -197,10 +216,46 @@ namespace mbts.spark {
// use Count(), as opposed to Any(), to force it to iterate through all cells
if (_security_dependent_cells.Count(c => c.refresh()) > 0)
invalidated?.Invoke();
if (_book_vm.live_sorting_props.Contains(nameof(security)))
RaisePropertyChanged(nameof(security));
_on_update();
}
void _on_update() {
foreach (var p in _book_vm.live_sorting_props)
RaisePropertyChanged(p);
foreach (var child in _child_order_ids)
_book_vm.get_order_vm(child)?.on_parent_updated();
bool new_row_passes_filter = _book_vm.columns.filter(this);
if (new_row_passes_filter != _row_passes_filter) {
_row_passes_filter = new_row_passes_filter;
if (passes_filter != _row_passes_filter) {
var root = root_node(this);
if (_row_passes_filter) {
root._passes_filter.Value = true;
foreach (var d in _descendents(root))
d._passes_filter.Value = true;
} else {
root._passes_filter.refresh();
if (!root.passes_filter) {
foreach (var d in _descendents(root))
d._passes_filter.Value = false;
}
}
}
}
}
public void refresh_row_passes_filter() =>
_row_passes_filter = _book_vm.columns.filter(this);
// NOTE: this was designed to be called by root orders,
// it refreshes the branch for this order and its descendents (does not look for ancestors).
public void refresh_branch_passes_filter() {
bool branch_passes_filter = _row_passes_filter || _descendents(this).Any(d => d._row_passes_filter);
if (passes_filter != branch_passes_filter) {
_passes_filter.Value = branch_passes_filter;
foreach (var d in _descendents(this))
d._passes_filter.Value = branch_passes_filter;
}
}
public void on_filter_changed() =>
@@ -220,5 +275,13 @@ namespace mbts.spark {
}
}
}
public static CVOrderBookRowVM root_node(CVOrderBookRowVM node) {
while (node._order.has_parent()) {
if (node._book_vm.get_order_vm(node._order.ParentKey) is CVOrderBookRowVM pnode)
node = pnode;
}
return node;
}
}
}
@@ -36,8 +36,13 @@ namespace mbts.spark {
rows_view = CollectionViewSource.GetDefaultView(_order_vms);
rows_view.Filter = obj => obj is CVOrderBookRowVM vm && vm.is_visible && vm.passes_filter;
columns.filter_changed += () => {
foreach (var vm in _order_vms)
vm.on_filter_changed(); // refreshes the 'passes_filter' value
var root_nodes = new HashSet<CVOrderBookRowVM>();
foreach (var vm in _order_vms) {
vm.refresh_row_passes_filter();
root_nodes.Add(CVOrderBookRowVM.root_node(vm));
}
foreach (var vm in root_nodes)
vm.refresh_branch_passes_filter();
};
var cvls = (ICollectionViewLiveShaping)rows_view;
_live_sorting_props = cvls.LiveSortingProperties;
@@ -84,6 +89,7 @@ namespace mbts.spark {
}
_orders_cache = table.state;
var changed_keys = new HashSet<uint>();
var affected_root_orders = new HashSet<uint>();
foreach (var o in removed) {
// if state has it, then it wasn't actually removed, just changed
if (table.state.TryGetValue(o.Key, out OrderRecordImmutable changed_order)) {
@@ -36,6 +36,20 @@ namespace mbts.spark {
_state = state;
}
public static OrderBookWindowFactory.OrderBookStartupData default_startup_data => cv_orderbook_enabled ?
new OrderBookWindowFactory.OrderBookStartupData(
new List<SortingCriteria> {
new SortingCriteria(nameof(CVOrderBookRowVM.time_created), false)
}, new OrderBookWindowFactory.FilterStates {
statuses = new[] { OrderStatus.Working }
})
: new OrderBookWindowFactory.OrderBookStartupData(
new List<SortingCriteria> {
new SortingCriteria(nameof(OrderBookRowVM.time_created), false)
}, new OrderBookWindowFactory.FilterStates {
statuses = new[] { OrderStatus.Working }
});
public override OrderBookWindowFactory.OrderBookStartupData SaveState => _state =
new OrderBookWindowFactory.OrderBookStartupData(
_vm.get_sorting_states(),