Merge branch 'master' of bitbucket.org:bluetradesys/spark

This commit is contained in:
Taha Afzal committed 2017-12-01 15:57:34 -05:00
commit 9e5c0e9c68
5 files changed
+9 -8

No files matched your search

+2 -2
View File
@@ -24,7 +24,7 @@ namespace mbts.spark {
#region Show Window
public static ITag<ShowAuditLogsMessage> ShowAuditLogsTag { get; } = new SparkTag<ShowAuditLogsMessage>(nameof(ShowAuditLogsTag));
public static ITag<SecurityList> ShowFillsTag { get; } = new SparkTag<SecurityList>(nameof(ShowFillsTag));
public static ITag<security_key> ShowLadderTag { get; } = new SparkTag<security_key>("Show Ladder");
public static ITag<SecurityMD> ShowLadderTag { get; } = new SparkTag<SecurityMD>("Show Ladder");
public static ITag<IObservable<uint>> ShowLinkedLadder { get; } = new SparkTag<IObservable<uint>>("Linked Ladder");
public static ITag<SecurityList> ShowMarketViewTag { get; } = new SparkTag<SecurityList>("Show MarketView");
public static ITag<Nothing> ShowOrderBookTag { get; } = new SparkTag<Nothing>(nameof(ShowOrderBookTag));
@@ -49,7 +49,7 @@ namespace mbts.spark {
public static ITag<IShellWindow> ShowWindow { get; } = new SparkTag<IShellWindow>("Show Window");
public static ITag<ITag<SecurityCriteria>> ShowPickMultiple { get; } = new SparkTag<ITag<SecurityCriteria>>("PickN");
public static ITag<ITag<security_key>> ShowPickOne { get; } = new SparkTag<ITag<security_key>>("Pick1");
public static ITag<ITag<SecurityMD>> ShowPickOne { get; } = new SparkTag<ITag<SecurityMD>>("Pick1");
public static ITag<string> Support { get; } = new SparkTag<string>(nameof(Support));
public static ITag<Nothing> About { get; } = new SparkTag<Nothing>("About");
@@ -24,7 +24,7 @@ namespace bts {
);
}
void show_pick_one(ITag<uint> next) {
void show_pick_one(ITag<SecurityMD> next) {
// todo
//_bus.post(next, 0);
}
@@ -25,7 +25,7 @@ namespace bts.shell {
_dispose = Disposable.Create(
bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s),
//bus.subscribe(SparkTags.ShowLadderTag).ObserveOnDispatcher().Subscribe(show_window),
bus.subscribe(SparkTags.ShowLadderTag).ObserveOnDispatcher().Subscribe(show_window),
bus.subscribe(SparkTags.ShowLinkedLadder).ObserveOnDispatcher().Subscribe(show_linked)
);
}
@@ -48,9 +48,9 @@ namespace bts.shell {
return ShellWindow.create(_module, md.security.ToString(), view, vm, s => save(state, s), Icons.Depth);
}
private void show_window(SecurityCriteria md) {
//var window = create_ladder_window(md);
//_wm.Windows.Add(window);
private void show_window(SecurityMD md) {
var window = create_ladder_window(md);
_wm.Windows.Add(window);
}
private void show_linked(IObservable<uint> keystream) {
var orders = new DemoOrdersModel(_bus);
+1
View File
@@ -56,6 +56,7 @@
<Content Include="logo.ico" />
</ItemGroup>
<ItemGroup>
<Folder Include="Controls\SecurityPicker\" />
<Folder Include="uicore\Shell\Workspaces\Tests\" />
<Folder Include="view\Extensions\ItemsControl\ObservableItemsSource\" />
</ItemGroup>
@@ -34,7 +34,7 @@ namespace mbts.spark
public DemoOrdersModel orders_model => _orders_model;
public IObservable<int> security_position(security_key key) { return _positions_demuxer.subscribe(key).DistinctUntilChanged(); }
public void show_ladder(SecurityMD security) { _bus.post(ShowLadderTag, security.security.Id); }
public void show_ladder(SecurityMD security) { _bus.post(ShowLadderTag, security); }
public void show_order_modify(Order order) { _bus.post(ShowOrderModifyTag, new ShowOrderModifyMessage(order)); }
public void show_order_ticket(Order order) { _orders_model.show_order_ticket(order); }
public void set_securities(IEnumerable<SecurityImmutable> securities) { _securities_subject.OnNext(new HashSet<security_key>(securities.Select(s => s.Id))); }