diff --git a/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.Designer.cs b/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.Designer.cs
index a9b1f4fce..155faa570 100644
--- a/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.Designer.cs
+++ b/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.Designer.cs
@@ -2,21 +2,6 @@
{
public partial class MainForm
{
- ///
- /// Clean up any resources being used.
- ///
- protected override void Dispose(bool disposing)
- {
- if (disposing)
- {
- if (components != null)
- {
- components.Dispose();
- }
- }
- base.Dispose(disposing);
- }
-
#region Windows Form Designer generated code
///
/// Required method for Designer support - do not modify
diff --git a/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs b/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs
index ae227430f..b36b16d4a 100644
--- a/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs
+++ b/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs
@@ -1,15 +1,23 @@
using bts;
+using Bts.DataStream;
using Bts.DataStreamExpressions;
using Bts.PubSub;
+using Spark.Core.Disposables;
+using Spark.Core.Reactive;
+
using System;
-using System.Collections.Generic;
using System.Collections;
+using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
using System.IO;
+using System.Linq;
+using System.Reactive;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
using System.Text.RegularExpressions;
using System.Windows.Forms;
@@ -35,8 +43,10 @@ namespace BCG
private string mySite = "TODO";
private string myLastClassName = "MyView";
private ViewStream? myAllTagsStream;
+ IBlueRowCollection? tagRows;
private string myKQ;
private TextWriter? myConsoleOutput;
+ IDisposable? titleSub;
public MainForm()
{
@@ -44,6 +54,17 @@ namespace BCG
InitializeComponent();
// myKQ = ConfigurationRequester.getApplicationQualifier();
myKQ = "TODO";
+ var handleCreatedSubject = new Subject();
+ HandleCreated += (s, e) => handleCreatedSubject.OnNext(true);
+ titleSub = Disposable.Create(
+ handleCreatedSubject.SelectSeries(_ =>
+ Observable.FromEvent(
+ cb => Invoke(() => titleInvalidated += cb),
+ cb => Invoke(() => titleInvalidated -= cb))
+ .Prepend(Unit.Default)
+ .SelectSeries(_ => new PubsubRoutesStream().AsObservable().Take(1)))
+ .Subscribe(dp => BeginInvoke(() => refreshTitle(dp.newRows))),
+ handleCreatedSubject);
mySetText();
myWindowState = new PersistWindowState();
@@ -58,11 +79,25 @@ namespace BCG
};
}
+ event Action? titleInvalidated;
+
public string query_text
{
get { return myQueryTextBox.Text; }
set { myQueryTextBox.Text = value; }
}
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ protected override void Dispose(bool disposing) {
+ if (disposing) {
+ Disposable.Dispose(ref titleSub);
+ components?.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
private ViewStream myGetAllTagsStream()
{
// TODO: Port PublishedTagsStream from edge (then we can uncomment impl below)
@@ -74,9 +109,10 @@ namespace BCG
private void mySetText()
{
- ViewStream routes = new PubsubRoutesStream();
- routes.onChange += (o) => { };
- var rows = routes.rows;
+ titleInvalidated?.Invoke();
+ }
+
+ void refreshTitle(IBlueRowCollection rows) {
string route_txt = String.Empty;
foreach (IBlueRow r in rows)
{
@@ -144,8 +180,10 @@ namespace BCG
private void myHandleTableListChange(object o)
{
- IBlueRowCollection rows = (o as DataPacket).newRows;
- myUpdateTableList();
+ BeginInvoke(() => {
+ tagRows = ((IDataPacket)o).newRows;
+ myUpdateTableList();
+ });
}
@@ -684,7 +722,7 @@ namespace BCG
private void myUpdateTableList()
{
- IBlueRowCollection rows = myAllTagsStream.rows;
+ var rows = tagRows;
if (rows == null)
return;
@@ -742,20 +780,25 @@ namespace BCG
ViewStream s = new LoaderStream(@"P:\Dropbox\Data\spread_md_esoa_cme");
s = new MutableAppendStream(s, s);
- //s = new MutableAppendStream(s, s);
- List rows = new List();
- foreach (IBlueRow r in s.rows)
- rows.Add(r);
+ s.onChange += OnChange;
- for (int i = 0; i < 100; i++)
- {
- timer.Restart();
- rows.Sort(delegate (IBlueRow r1, IBlueRow r2)
+ void OnChange(object? obj) {
+ s.onChange -= OnChange;
+ //s = new MutableAppendStream(s, s);
+ var rowCollection = ((IDataPacket)obj!).newRows;
+ var rows = new List(rowCollection.Count);
+ rows.AddRange(rowCollection.Cast());
+
+ for (int i = 0; i < 100; i++)
{
- return _sort_dicts_index(r1, r2, 5, true);
- });
- timer.Stop();
- Log.Ui.diag($"nrows = {rows.Count} sorting time = {timer.Elapsed.TotalMilliseconds:0.00}ms");
+ timer.Restart();
+ rows.Sort(delegate (IBlueRow r1, IBlueRow r2)
+ {
+ return _sort_dicts_index(r1, r2, 5, true);
+ });
+ timer.Stop();
+ Log.Ui.diag($"nrows = {rows.Count} sorting time = {timer.Elapsed.TotalMilliseconds:0.00}ms");
+ }
}
}