OrderPropertiesEditorVM - more refactoring (use new CompositeDisposable)

This commit is contained in:
John Colvin committed 2018-11-28 11:49:51 -06:00
1 parent 831ca6d4ed
commit 5e7e7d4e68
2 files changed
+43 -13

No files matched your search

@@ -118,15 +118,14 @@ namespace mbts.spark {
_model = model;
var security_source = security_md_source.Select(smd => smd.security);
_security = backing(nameof(security), SecurityDataHelper.Defaults.SecurityImmutable);
var resources = new List<IDisposable> {
security_source.OnDispatcher().Subscribe(s => {
using (_definition_refresh_model.defer_execution()) {
_security.set(s);
foreach(var tvm in algo_templates)
tvm.definition = OrderDataHelper.with_security(tvm.definition, s);
}
})
};
var resources = new CompositeDisposable();
resources.add(security_source.OnDispatcher().Subscribe(s => {
using (_definition_refresh_model.defer_execution()) {
_security.set(s);
foreach (var tvm in algo_templates)
tvm.definition = OrderDataHelper.with_security(tvm.definition, s);
}
}));
// guarentee that "this.security" will always be set before observers are notified
// this is important bc some observers will reference "this.security" in their callbacks
// - namely the [SelectorProperty]order_type's "get_default" function,
@@ -152,7 +151,7 @@ namespace mbts.spark {
order_properties.Select(get_order_type_vm_prop),
get_default_order_type_vm,
EqualityComparer.null_check_wrapper(OrderTypeVMExtensions.key_comparer));
resources.Add(_order_type.Subscribe(on_selected_order_type_changed));
resources.add(_order_type.Subscribe(on_selected_order_type_changed));
_time_in_force = backing(
nameof(selected_time_in_force),
// remember, both observables must fire once to start the CombineLatest sequence
@@ -162,7 +161,7 @@ namespace mbts.spark {
() => model.factory.default_time_in_force(security),
tif => time_in_forces.Contains(tif));
_selected_algo_template = backing<AlgoTemplateItemVM>(nameof(selected_algo_template));
resources.Add(_selected_algo_template.Subscribe(on_selected_algo_changed));
resources.add(_selected_algo_template.Subscribe(on_selected_algo_changed));
_selected_algo_template.Changed += on_selected_algo_changed;
_selected_favorite_algo_template = backing<AlgoTemplateItemVM>(nameof(selected_favorite_algo_template));
// definition refresh model
@@ -192,7 +191,7 @@ namespace mbts.spark {
});
// remove template
remove_template_cmd = new AsyncCommand<AlgoTemplateItemVM>(tvm => model.template_service.delete(tvm.id));
resources.Add(model.template_service.subscribe().OnDispatcher().Subscribe(d => {
resources.add(model.template_service.subscribe().OnDispatcher().Subscribe(d => {
var old_selected_template = selected_algo_template;
var remove_keys = _algo_templates.Keys.Except(d.Keys).ToList();
foreach (var k in remove_keys) _algo_templates.Remove(k);
@@ -212,7 +211,7 @@ namespace mbts.spark {
}
}
}));
_dispose = Disposable.Create(resources.ToArray());
_dispose = resources;
// add to favorites
add_to_favorites_cmd = new DelegateCommand<AlgoTemplateItemVM>(tvm => _favorite_templates.Add(tvm));
// toggle favorite
@@ -0,0 +1,31 @@
using System;
using System.Collections.Generic;
namespace mbts.utils {
class CompositeDisposable : IDisposable {
List<IDisposable> _disposables;
public CompositeDisposable() =>
_disposables = new List<IDisposable>(2);
public CompositeDisposable(IEnumerable<IDisposable> disposables) =>
_disposables = new List<IDisposable>(disposables);
public void add(IDisposable disposable) {
if (_disposables == null) throw new ObjectDisposedException(nameof(CompositeDisposable));
_disposables.Add(disposable);
}
public void Dispose() {
foreach (var d in _disposables)
d.Dispose();
_disposables.Clear();
_disposables = null;
}
}
static class CompositeDisposableExtensions {
public static void add(this CompositeDisposable composite_disposable, Action dispose_action) =>
composite_disposable.add(Disposable.Create(dispose_action));
}
}