SPARK-1184 shell crashed on launch

This commit is contained in:
John Colvin committed 2018-06-02 16:38:45 -04:00
1 parent 643482bb09
commit c56adb2dc0
5 files changed
+29 -14

No files matched your search

@@ -27,8 +27,8 @@ namespace mbts.spark {
FillsVM(IBus bus, OrdersModel model, IObservable<ITableUpdateTransform<FillTuple, string>> fills_source, IReadOnlyCollection<SortingCriteria> sorting_criteria, FilterStates filters)
: base(RXCollection.CreateTableUpdate(fills_source), sorting_criteria) {
_model = model;
account_filter = DiscreteValuesFilterVM.Create<Row, string>(_model.factory.accounts.ToArray(), r => r.account, nameof(Row.account));
user_filter = DiscreteValuesFilterVM.Create<Row, string>(_model.factory.users, r => r.user, nameof(Row.user));
account_filter = DiscreteValuesFilterVM.Create<Row, string>(_model.factory.subscribe_accounts(), r => r.account, nameof(Row.account));
user_filter = DiscreteValuesFilterVM.Create<Row, string>(_model.factory.subscribe_users(), r => r.user, nameof(Row.user));
var securities_source = fills_source
.Select(t => new HashSet<SecurityImmutable>(
t.state.Values
@@ -24,6 +24,12 @@ namespace mbts.spark.filters {
IEqualityComparer<TValue> comparer
) => new ReadOnlyItemsFilter<TRow, TValue>(items, get_row_val, prop_name, comparer);
public static IDataGridColumnPersistentFilter<TRow, TValue[]> Create<TRow, TValue>(
IObservable<IEnumerable<TValue>> items,
Func<TRow, TValue> get_row_val,
string prop_name
) => Create(items, get_row_val, s => s.ToArray(), s => Observable.Return(s), prop_name, EqualityComparer<TValue>.Default);
public static IDataGridColumnPersistentFilter<TRow, TState> Create<TRow, TValue, TState>(
IObservable<IEnumerable<TValue>> items,
Func<TRow, TValue> get_row_val,
@@ -67,7 +67,7 @@ namespace mbts.spark {
r => r.user.value,
DefaultColumnWidths.User,
DiscreteValuesFilterVM.Create<CVOrderBookRowVM, string>(
model.factory.users,
model.factory.subscribe_users(),
r => r.user.value,
value_path(nameof(CVOrderBookRowVM.user))),
DataGridFilterKnownTemplates.DiscreteValues));
@@ -41,8 +41,8 @@ namespace mbts.spark {
order_sub_type_filter = DiscreteValuesFilterVM.Create<OrderBookRowVM, OrderSubType>(EnumHelper.get_values<OrderSubType>().ToLArray(), r => r.order_sub_type, nameof(OrderBookRowVM.order_sub_type));
tif_filter = DiscreteValuesFilterVM.Create<OrderBookRowVM, TimeInForce>(EnumHelper.get_values<TimeInForce>().ToLArray(), r => r.tif, nameof(OrderBookRowVM.tif));
exchange_filter = DiscreteValuesFilterVM.Create<OrderBookRowVM, Venue>(EnumHelper.get_values<Venue>().ToLArray(), r => r.exchange, nameof(OrderBookRowVM.exchange));
account_filter = DiscreteValuesFilterVM.Create<OrderBookRowVM, string>(_model.factory.accounts.ToArray(), r => r.account, nameof(OrderBookRowVM.account));
user_filter = DiscreteValuesFilterVM.Create<OrderBookRowVM, string>(_model.factory.users, r => r.user, nameof(OrderBookRowVM.user));
account_filter = DiscreteValuesFilterVM.Create<OrderBookRowVM, string>(_model.factory.subscribe_accounts(), r => r.account, nameof(OrderBookRowVM.account));
user_filter = DiscreteValuesFilterVM.Create<OrderBookRowVM, string>(_model.factory.subscribe_users(), r => r.user, nameof(OrderBookRowVM.user));
order_key_filter = new RegexFilterVM<OrderBookRowVM>(r => r.order_key, nameof(OrderBookRowVM.order_key));
security_key_filter = new RegexFilterVM<OrderBookRowVM>(r => r.security_key.ToString(), nameof(OrderBookRowVM.security_key));
status_filter = DiscreteValuesFilterVM.Create<OrderBookRowVM, OrderStatus>(EnumHelper.get_values<OrderStatus>().ToLArray(), r => r.status, nameof(OrderBookRowVM.status));
@@ -39,11 +39,12 @@ namespace mbts.spark.utilities {
[ImportingConstructor]
public OrderFactory([Import("username")]string user, AdminModel admin_model) {
_user = user;
users = new[] { user }; // might as well initialize it with the one user we know exists
accounts = Enumerable.Empty<string>();
_admin_model = admin_model;
_user_map = new Dictionary<string, uint>();
_account_map = new Dictionary<string, uint>();
var admin_data_sequence = _admin_model.on_admin_data
.ObserveOnDispatcher()
.Subscribe(admin_data => {
@@ -66,17 +67,19 @@ namespace mbts.spark.utilities {
}
}
accounts = account_names;
account_arrived.OnNext(accounts);
users = new HashSet<string>(user_names).Ordered().ToLArray();
_accounts_subject.OnNext(accounts);
users = new HashSet<string>(user_names).Ordered().ToArray();
_users_subject.OnNext(users);
});
_dispose = Disposable.Create(admin_data_sequence);
}
private Subject<IEnumerable<string>> account_arrived = new Subject<IEnumerable<string>>();
readonly ReplaySubject<IEnumerable<string>>
_accounts_subject = new ReplaySubject<IEnumerable<string>>(1),
_users_subject = new ReplaySubject<IEnumerable<string>>(1);
public IObservable<IEnumerable<string>> subscribe_accounts() {
return account_arrived.StartWith(accounts).Where(vals => vals != null);
}
public IObservable<IEnumerable<string>> subscribe_accounts() => _accounts_subject.AsObservable();
public IObservable<IEnumerable<string>> subscribe_users() => _users_subject.AsObservable();
#region Defaults
public string default_account {
@@ -85,10 +88,16 @@ namespace mbts.spark.utilities {
}
}
private Dictionary<string, uint> _account_map;
readonly Dictionary<string, uint> _account_map;
/// <summary>
/// Warning: These values may change while the app is running, use subscribe_accounts() to observe changes.
/// </summary>
public IEnumerable<string> accounts { get; private set; }
private Dictionary<string, uint> _user_map;
readonly Dictionary<string, uint> _user_map;
/// <summary>
/// Warning: These values may change while the app is running, use subscribe_users() to observe changes.
/// </summary>
public string[] users { get; private set; }
public CustomOrderDefinition.CustomOneofCase default_order_type() =>