refactor: Move ObservableExtensions to Spark.Core.Reactive

This commit is contained in:
John Colvin committed 2023-03-20 13:26:44 -04:00
1 parent 8b26ac4456
commit 198d26fda1
45 files changed
+61 -14

No files matched your search

@@ -12,7 +12,7 @@ namespace mbts.spark {
using Spark.Analytics.View;
using Spark.Core.Disposables;
using Spark.Core.Protobuf;
using Spark.Core.Reactive;
using System;
using System.Collections;
@@ -9,6 +9,7 @@ namespace mbts.spark {
using mbts.ui.utility;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
+1
View File
@@ -6,6 +6,7 @@ using bts.collections;
using bts.utils;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -11,6 +11,7 @@ using mbts.utils;
using Spark.Api.Orders;
using Spark.Core;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -6,6 +6,7 @@ using mbts.ui;
using Spark.Api.Orders;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -8,6 +8,7 @@ namespace bts.daemons {
using mbts.ui;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -9,6 +9,7 @@ using mbts.ui.spark;
using mbts.ui.utilities;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Composition;
+1
View File
@@ -15,6 +15,7 @@ namespace bts {
using Spark.Core.Data;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Concurrent;
@@ -11,6 +11,7 @@ namespace Spark.Model.Trading {
using Spark.Api.Orders;
using Spark.Api.Reactive;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Composition;
@@ -4,6 +4,8 @@ namespace mbts.spark {
using mbts.ui;
using Spark.Core.Reactive;
using System;
using System.Reactive.Linq;
using System.Threading.Tasks;
@@ -23,6 +23,7 @@ namespace mbts.spark {
using Spark.Core.Data;
using Spark.Core.Disposables;
using Spark.Core.Reflection;
using Spark.Core.Reactive;
using Spark.Trading;
using System;
@@ -18,6 +18,7 @@ using mbts.utils;
using Spark.Core;
using Spark.Core.Data;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using Spark.Trading;
using System;
@@ -16,6 +16,7 @@
using mbts.utils;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -8,6 +8,7 @@ using bts.spark;
using mbts.utils;
using Spark.Core;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -13,6 +13,7 @@ using mbts.ui.utility;
using mbts.utils;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -7,6 +7,7 @@ using mbts.ui.spark;
using mbts.utils;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using Spark.ViewModel.Commands;
using System;
@@ -6,6 +6,7 @@ using bts.spark;
using mbts.utils;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -16,6 +16,7 @@ using Spark.Api.Orders;
using Spark.Core;
using Spark.Core.Collections;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -14,6 +14,7 @@ using mbts.utils;
using Spark.Core.Collections;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using Spark.ViewModel.Commands;
using System;
@@ -6,6 +6,7 @@ using mbts.utils;
using Spark.Core.Collections;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.ObjectModel;
@@ -7,6 +7,7 @@ namespace Spark.Trading {
using mbts.spark;
using Spark.Api.MarketData;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -14,6 +14,7 @@
using Spark.Core.Data;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using Spark.Trading;
using System;
@@ -5,6 +5,7 @@ namespace mbts.spark {
using mbts.ui.shell;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using Spark.Trading;
using System;
@@ -23,6 +23,7 @@ namespace mbts.spark {
using Spark.Core.Collections;
using Spark.Core.Data;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using Spark.Trading;
using Spark.ViewModel.Commands;
using Spark.ViewModel.Trading;
@@ -14,6 +14,7 @@ namespace Spark.Trading {
using Spark.Core.Data;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -23,6 +23,7 @@ using Spark.Api.Orders;
using Spark.Core.Collections;
using Spark.Core.Data;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using Spark.Trading;
using Spark.ViewModel.Commands;
@@ -13,6 +13,7 @@ using mbts.utils;
using Spark.Api.Orders;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections;
@@ -481,7 +481,7 @@ namespace bts.shell.pnl {
switch (header) {
case PNLHeaderRowDisplay.SelectedTotal:
// throttle selection changes (they have a potentially high frequency)
var filter_src = System.Reactive.Linq.ObservableExtensions.FromEventThrottle<SelectionChangedEventArgs, Func<FillTuple, bool>>(
var filter_src = Spark.Core.Reactive.ObservableExtensions.FromEventThrottle<SelectionChangedEventArgs, Func<FillTuple, bool>>(
cb => _selection_changed += cb,
cb => _selection_changed -= cb,
_ => _mk_selected_items_filter(_fill_pnl_key_fn),
@@ -503,7 +503,7 @@ namespace bts.shell.pnl {
switch (header) {
case PNLHeaderRowDisplay.SelectedTotal:
// throttle selection changes (they have a potentially high frequency)
var filter_src = System.Reactive.Linq.ObservableExtensions.FromEventThrottle<SelectionChangedEventArgs, Func<OrderRecordTupleWithRoot, bool>>(
var filter_src = Spark.Core.Reactive.ObservableExtensions.FromEventThrottle<SelectionChangedEventArgs, Func<OrderRecordTupleWithRoot, bool>>(
cb => _selection_changed += cb,
cb => _selection_changed -= cb,
_ => _mk_selected_items_filter(_order_pnl_key_fn),
@@ -13,6 +13,7 @@ using mbts.utils;
using Spark.Api.Orders;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -15,6 +15,7 @@ using mbts.utils;
using Spark.Core.Collections;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using Spark.ViewModel.Commands;
using System;
@@ -150,11 +151,11 @@ namespace mbts.spark {
save_definition_cmd = new AsyncCommand<AlgoDefinitionVM>(save_definition_async);
undo_definition_cmd = ObservantCommand.create(
d => d?.undo(),
d => d == null ? Observable.Return(false) : System.Reactive.Linq.ObservableExtensions.FromEvent(cb => d.can_undo_changed += cb, cb => d.can_undo_changed -= cb, () => d.can_undo).OnDispatcher(),
d => d == null ? Observable.Return(false) : Spark.Core.Reactive.ObservableExtensions.FromEvent(cb => d.can_undo_changed += cb, cb => d.can_undo_changed -= cb, () => d.can_undo).OnDispatcher(),
out IObserver<AlgoDefinitionVM> undo_definition_observer);
redo_definition_cmd = ObservantCommand.create(
d => d?.redo(),
d => d == null ? Observable.Return(false) : System.Reactive.Linq.ObservableExtensions.FromEvent(cb => d.can_redo_changed += cb, cb => d.can_redo_changed -= cb, () => d.can_redo).OnDispatcher(),
d => d == null ? Observable.Return(false) : Spark.Core.Reactive.ObservableExtensions.FromEvent(cb => d.can_redo_changed += cb, cb => d.can_redo_changed -= cb, () => d.can_redo).OnDispatcher(),
out IObserver<AlgoDefinitionVM> redo_definition_observer);
revert_definition_cmd = ObservantCommand.create(
d => d.load_committed(),
@@ -11,6 +11,7 @@ using mbts.utils;
using Spark.Core.Collections;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -18,6 +18,7 @@ using Spark.Api.Orders;
using Spark.Core;
using Spark.Core.Collections;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -10,6 +10,7 @@ namespace mbts.analytics {
using Microsoft.VisualStudio.TestPlatform.Utilities;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -9,6 +9,7 @@ using bts;
using System.Reactive.Linq;
using BCG;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
namespace mbts.analytics {
@@ -15,6 +15,7 @@ using bts.collections;
using BCG;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using SlideTags = mbts.spark.SparkTags.ReportBlackboardTags.Slide;
@@ -6,6 +6,7 @@ namespace mbts.ui {
using mbts.ui.shell;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -1,4 +1,6 @@
using System;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reactive.Linq;
@@ -1,6 +1,7 @@
using mbts.ui.utilities;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections;
@@ -26,7 +27,7 @@ namespace mbts.ui.spark.algo {
DefaultStyleKeyProperty.OverrideMetadata(typeof(AlgoTemplateFavoriteButtonsView), new FrameworkPropertyMetadata(typeof(AlgoTemplateFavoriteButtonsView)));
public AlgoTemplateFavoriteButtonsView() =>
System.Reactive.Linq.ObservableExtensions.FromAction(_items_source_changed)
Spark.Core.Reactive.ObservableExtensions.FromAction(_items_source_changed)
.SubscribeEach(items_source => items_source is null ? Disposable.empty :
items_source.Subscribe(_on_items_source_CollectionChanged));
@@ -4,6 +4,8 @@ using bts.api.core;
using mbts.ui;
using Spark.Core.Reactive;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@@ -6,6 +6,7 @@ namespace Spark.Api.Admin {
using bts.utils;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -9,6 +9,7 @@
using mbts.co2;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -11,6 +11,7 @@ namespace Spark.Api.Orders {
using Spark.Api.Admin;
using Spark.Api.Reactive;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System;
using System.Reactive.Concurrency;
@@ -9,6 +9,7 @@ namespace spark_api_server {
using Spark.Api.MarketData;
using Spark.Api.Server;
using Spark.Core;
using Spark.Core.Reactive;
using System;
using System.Collections.Generic;
@@ -7,6 +7,7 @@ namespace spark_api_server {
using mbts.spark;
using Spark.Api.Server;
using Spark.Core.Reactive;
using System;
using System.Linq;
@@ -1,12 +1,14 @@
using Spark.Core;
using Spark.Core.Disposables;
using Spark.Core.Reactive;
namespace Spark.Core.Reactive {
using Spark.Core.Disposables;
using Spark.Core.Reactive;
using System.Reactive.Subjects;
using System.Threading;
using System.Threading.Tasks;
using System;
using System.Reactive;
using System.Reactive.Linq;
using System.Reactive.Subjects;
using System.Threading;
using System.Threading.Tasks;
namespace System.Reactive.Linq {
public static class ObservableExtensions {
public static IObservable<bool> And(this IObservable<bool> source1, IObservable<bool> source2) =>
source1.CombineLatest(source2).Select(tup => tup.Item1 && tup.Item2);