diff --git a/src/DataStreamSuite/DataStream/DataStream.csproj b/src/DataStreamSuite/DataStream/DataStream.csproj index db079e6d4..7c481a120 100644 --- a/src/DataStreamSuite/DataStream/DataStream.csproj +++ b/src/DataStreamSuite/DataStream/DataStream.csproj @@ -9,6 +9,7 @@ + diff --git a/src/DataStreamSuite/DataStream/Primitives/Filter/BooleanExpressionFilter.cs b/src/DataStreamSuite/DataStream/Primitives/Filter/BooleanExpressionFilter.cs index 2b2214363..13cbb98de 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Filter/BooleanExpressionFilter.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Filter/BooleanExpressionFilter.cs @@ -1,18 +1,18 @@ -// using System; -// using System.Collections; +using System; +using System.Collections; -// using BCG.Utilities; +using BCG.Utilities; -// namespace BCG -// { -// public class BooleanExpressionFilter : IStreamFilter -// { -// public BooleanExpressionFilter(string exp) -// {myInterpreter = new BooleanExpressionsInterpreter(exp);} +namespace BCG +{ + public class BooleanExpressionFilter : IStreamFilter + { + public BooleanExpressionFilter(string exp) + {myInterpreter = new BooleanExpressionsInterpreter(exp);} -// public bool filter(IBlueRow dr) -// { return myInterpreter.eval(dr); } + public bool filter(IBlueRow dr) + { return myInterpreter.eval(dr); } -// private BooleanExpressionsInterpreter myInterpreter; -// } -// } + private BooleanExpressionsInterpreter myInterpreter; + } +} diff --git a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs index 9dd0c5097..38b4a3b23 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs @@ -1,306 +1,306 @@ -// using BCG; -// using System; -// using System.Data; -// using System.Collections; -// using BCG.Utilities; -// using System.Text.RegularExpressions; -// using mbts; +using BCG; +using System; +using System.Data; +using System.Collections; +using BCG.Utilities; +using System.Text.RegularExpressions; +using mbts; -// namespace BCG.StreamWorld.Addition -// { -// [DataStreamUserRespresentation (false)] -// public class FilterStream : ViewStream -// { -// private ViewStream myBaseStream; -// private BlueTable myBaseTable, myStateTable; -// private IStreamFilter myFilter; +namespace BCG.StreamWorld.Addition +{ + [DataStreamUserRespresentation (false)] + public class FilterStream : ViewStream + { + private ViewStream myBaseStream; + private BlueTable myBaseTable, myStateTable; + private IStreamFilter myFilter; -// public FilterStream(ViewStream vs) -// : this(vs, "1=1") -// { } + public FilterStream(ViewStream vs) + : this(vs, "1=1") + { } -// public FilterStream(ViewStream vs, string filterExp) -// : this(vs, new BooleanExpressionFilter(filterExp)) -// { } + public FilterStream(ViewStream vs, string filterExp) + : this(vs, new BooleanExpressionFilter(filterExp)) + { } -// public FilterStream(ViewStream vs, IStreamFilter filter) -// { -// myBaseStream = vs; -// myFilter = filter; -// if (filter is IDynamicStreamFilter) -// (filter as IDynamicStreamFilter).onFilterChange += new FilterChangeDelegate(myHandleFilterChange); -// } + public FilterStream(ViewStream vs, IStreamFilter filter) + { + myBaseStream = vs; + myFilter = filter; + if (filter is IDynamicStreamFilter) + (filter as IDynamicStreamFilter).onFilterChange += new FilterChangeDelegate(myHandleFilterChange); + } -// protected override void myOnFirstSubscriber() -// { -// myBaseStream.onChange += new ChangeDelegate(myHandleChanges); -// } + protected override void myOnFirstSubscriber() + { + myBaseStream.onChange += new ChangeDelegate(myHandleChanges); + } -// protected override void myOnLastSubscriber() -// { -// myBaseStream.onChange -= new ChangeDelegate(myHandleChanges); -// myBaseTable.clear(); -// myStateTable.clear(); -// } + protected override void myOnLastSubscriber() + { + myBaseStream.onChange -= new ChangeDelegate(myHandleChanges); + myBaseTable.clear(); + myStateTable.clear(); + } -// private void myHandleChanges(object newValue) -// { -// DataPacket dp = newValue as DataPacket; -// if (myStateTable == null) -// { -// BlueEventLog.logAssert(myBaseTable == null); -// myStateTable = new BlueTable(dp.schema); -// myBaseTable = new BlueTable(dp.schema); -// } -// BlueTable dels = new BlueTable(dp.schema), -// adds = new BlueTable(dp.schema); -// foreach (IBlueRow r in dp.deletedRows) -// { -// myBaseTable.deleteRow(r); -// if (myStateTable.containsID((int)r["id"])) -// { -// dels.addRow(r); -// myStateTable.deleteRow(r); -// } -// } -// foreach (IBlueRow r in dp.addedRows) -// { -// myBaseTable.addRow(r); -// if (myFilter.filter(r)) -// { -// adds.addRow(r); -// myStateTable.addRow(r); -// } -// } -// if ((dels.Count > 0 || adds.Count > 0) || (myLastValue == null)) -// myFireEvent(new DataPacket(myStateTable, adds, dels)); -// } + private void myHandleChanges(object newValue) + { + DataPacket dp = newValue as DataPacket; + if (myStateTable == null) + { + bts.Log.assert(myBaseTable == null); + myStateTable = new BlueTable(dp.schema); + myBaseTable = new BlueTable(dp.schema); + } + BlueTable dels = new BlueTable(dp.schema), + adds = new BlueTable(dp.schema); + foreach (IBlueRow r in dp.deletedRows) + { + myBaseTable.deleteRow(r); + if (myStateTable.containsID((int)r["id"])) + { + dels.addRow(r); + myStateTable.deleteRow(r); + } + } + foreach (IBlueRow r in dp.addedRows) + { + myBaseTable.addRow(r); + if (myFilter.filter(r)) + { + adds.addRow(r); + myStateTable.addRow(r); + } + } + if ((dels.Count > 0 || adds.Count > 0) || (myLastValue == null)) + myFireEvent(new DataPacket(myStateTable, adds, dels)); + } -// public IStreamFilter filter -// { -// set -// { -// myFilter = value; -// if (myBaseTable != null) -// { -// IBlueRowCollection oldState = new BlueTable(myStateTable); -// myStateTable.clear(); -// foreach (IBlueRow r in myBaseTable) -// if (myFilter.filter(r)) -// myStateTable.addRow(r); -// IBlueRowCollection dels, adds; -// BlueDataUtility.computeDifferences(myStateTable, oldState, out dels, out adds); -// myFireEvent(new DataPacket(myStateTable, adds, dels)); -// } -// } -// get { return myFilter; } -// } + public IStreamFilter filter + { + set + { + myFilter = value; + if (myBaseTable != null) + { + IBlueRowCollection oldState = new BlueTable(myStateTable); + myStateTable.clear(); + foreach (IBlueRow r in myBaseTable) + if (myFilter.filter(r)) + myStateTable.addRow(r); + IBlueRowCollection dels, adds; + BlueDataUtility.computeDifferences(myStateTable, oldState, out dels, out adds); + myFireEvent(new DataPacket(myStateTable, adds, dels)); + } + } + get { return myFilter; } + } -// //public string filterString { set { filter = new BooleanExpressionFilter(value); } } + //public string filterString { set { filter = new BooleanExpressionFilter(value); } } -// private void myHandleFilterChange() { filter = myFilter; } -// } -// } + private void myHandleFilterChange() { filter = myFilter; } + } +} -// namespace BCG -// { -// public class RegExpFilter : IStreamFilter -// { -// private Regex[] myRegExps; -// private string[] myCols; +namespace BCG +{ + public class RegExpFilter : IStreamFilter + { + private Regex[] myRegExps; + private string[] myCols; -// public RegExpFilter(string col, string regExp) -// : this (new string[]{col}, new string[] {regExp}) -// {} + public RegExpFilter(string col, string regExp) + : this (new string[]{col}, new string[] {regExp}) + {} -// public RegExpFilter (string[] cols, string[] regExps) -// { -// myCols = cols; -// myRegExps = new Regex[regExps.Length]; -// for (int i = 0; i < regExps.Length; i++) -// myRegExps[i] = new Regex(regExps[i]); -// } + public RegExpFilter (string[] cols, string[] regExps) + { + myCols = cols; + myRegExps = new Regex[regExps.Length]; + for (int i = 0; i < regExps.Length; i++) + myRegExps[i] = new Regex(regExps[i]); + } -// #region IStreamFilter Members -// public bool filter(IBlueRow dr) -// { -// bool rv = true; -// for (int i = 0; i < myCols.Length; i++) -// { -// rv &= myRegExps[i].IsMatch(dr[myCols[i]] is DBNull ? "" : dr[myCols[i]].ToString()); -// if (!rv) -// return rv; -// } -// return rv; -// } -// #endregion -// } + #region IStreamFilter Members + public bool filter(IBlueRow dr) + { + bool rv = true; + for (int i = 0; i < myCols.Length; i++) + { + rv &= myRegExps[i].IsMatch(dr[myCols[i]] is DBNull ? "" : dr[myCols[i]].ToString()); + if (!rv) + return rv; + } + return rv; + } + #endregion + } -// public class FilterStream : ViewStream -// { -// private BlueTable myLastFiredRows; -// private IBlueRowCollection myLastReceivedRows; -// private IStreamFilter myFilter; -// private ViewStream myParentStream; -// private string myFilterString; -// private BCG.StreamWorld.Addition.FilterStream myFilterStream; -// private bool myUseNewFilter = DataStreamLoadFileConfig.instance.useNewFilter; -// private HighPerformanceTimer _timer = new HighPerformanceTimer(); + public class FilterStream : ViewStream + { + private BlueTable myLastFiredRows; + private IBlueRowCollection myLastReceivedRows; + private IStreamFilter myFilter; + private ViewStream myParentStream; + private string myFilterString; + private BCG.StreamWorld.Addition.FilterStream myFilterStream; + private bool myUseNewFilter = DataStreamLoadFileConfig.instance.useNewFilter; + private HighPerformanceTimer _timer = new HighPerformanceTimer(); -// #region constructors -// public delegate bool OnFilter(IBlueRow r); -// private class OnFilterWrapper : IStreamFilter -// { -// public OnFilterWrapper(OnFilter f) -// { this.f = f; } + #region constructors + public delegate bool OnFilter(IBlueRow r); + private class OnFilterWrapper : IStreamFilter + { + public OnFilterWrapper(OnFilter f) + { this.f = f; } -// public bool filter(IBlueRow dr) -// { return f(dr); } + public bool filter(IBlueRow dr) + { return f(dr); } -// private OnFilter f; -// } -// public FilterStream(ViewStream vs, OnFilter f) -// : this(vs, new OnFilterWrapper(f)) -// { } + private OnFilter f; + } + public FilterStream(ViewStream vs, OnFilter f) + : this(vs, new OnFilterWrapper(f)) + { } -// public FilterStream(ViewStream vs, IStreamFilter filter) -// { -// if (myUseNewFilter) -// { -// myFilterStream = new BCG.StreamWorld.Addition.FilterStream(vs, filter); -// mySetRealSource(myFilterStream); -// } -// else -// { -// myParentStream = vs; -// myFilter = filter; -// myFilterString = filter.ToString(); -// if (filter is IDynamicStreamFilter) -// (filter as IDynamicStreamFilter).onFilterChange += new FilterChangeDelegate(myHandleFilterChange); -// } -// } + public FilterStream(ViewStream vs, IStreamFilter filter) + { + if (myUseNewFilter) + { + myFilterStream = new BCG.StreamWorld.Addition.FilterStream(vs, filter); + mySetRealSource(myFilterStream); + } + else + { + myParentStream = vs; + myFilter = filter; + myFilterString = filter.ToString(); + if (filter is IDynamicStreamFilter) + (filter as IDynamicStreamFilter).onFilterChange += new FilterChangeDelegate(myHandleFilterChange); + } + } -// public FilterStream(ViewStream vs, string filterExpression) -// : this(vs, new BooleanExpressionFilter(filterExpression)) -// { -// myFilterString = filterExpression; -// } + public FilterStream(ViewStream vs, string filterExpression) + : this(vs, new BooleanExpressionFilter(filterExpression)) + { + myFilterString = filterExpression; + } -// public FilterStream(ViewStream vs, string col, string regExp) -// : this(vs, new RegExpFilter(col, regExp)) -// { -// myFilterString = col + " , " + regExp; -// } + public FilterStream(ViewStream vs, string col, string regExp) + : this(vs, new RegExpFilter(col, regExp)) + { + myFilterString = col + " , " + regExp; + } -// public FilterStream(ViewStream vs) -// : this(vs, new BinaryFilter(true)) -// { -// myFilterString = true.ToString(); -// } -// #endregion + public FilterStream(ViewStream vs) + : this(vs, new BinaryFilter(true)) + { + myFilterString = true.ToString(); + } + #endregion -// #region overridden methods -// protected override void myOnFirstSubscriber() -// { myParentStream.onChange += new ChangeDelegate(myHandleCallbacks); } + #region overridden methods + protected override void myOnFirstSubscriber() + { myParentStream.onChange += new ChangeDelegate(myHandleCallbacks); } -// protected override void myOnLastSubscriber() -// { -// myLastFiredRows = null; -// myParentStream.onChange -= new ChangeDelegate(myHandleCallbacks); -// } + protected override void myOnLastSubscriber() + { + myLastFiredRows = null; + myParentStream.onChange -= new ChangeDelegate(myHandleCallbacks); + } -// protected override void myFireEvent(object o) -// { -// DataPacket dp = o as DataPacket; -// if (myLastValue == null || dp.addedRows.Count + dp.deletedRows.Count > 0) -// base.myFireEvent(o); -// } -// #endregion + protected override void myFireEvent(object o) + { + DataPacket dp = o as DataPacket; + if (myLastValue == null || dp.addedRows.Count + dp.deletedRows.Count > 0) + base.myFireEvent(o); + } + #endregion -// private void myHandleCallbacks(object newValue) -// { -// _timer.start(); -// DataPacket retVal; -// DataPacket arrivedPacket = newValue as DataPacket; -// myLastReceivedRows = arrivedPacket.newRows; -// if (myLastFiredRows != null) -// { -// retVal = new DataPacket(myLastFiredRows, new BlueTable(myLastFiredRows.schema), -// new BlueTable(myLastFiredRows.schema)); -// foreach (IBlueRow r in arrivedPacket.deletedRows) -// if (myLastFiredRows.containsID((int)r["id"])) -// { -// myLastFiredRows.deleteRow(r); -// (retVal.deletedRows as BlueTable).addRow(r); -// } -// foreach (IBlueRow r in arrivedPacket.addedRows) -// if (myFilter.filter(r)) -// { -// myLastFiredRows.addRow(r); -// (retVal.addedRows as BlueTable).addRow(r); -// } -// } -// else -// { -// myLastFiredRows = new BlueTable(arrivedPacket.schema); -// retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema)); -// foreach (IBlueRow r in arrivedPacket.newRows) -// if (myFilter.filter(r)) -// myLastFiredRows.addRow(r); -// } -// _timer.stop(); -// myFireEvent(retVal); -// } + private void myHandleCallbacks(object newValue) + { + _timer.start(); + DataPacket retVal; + DataPacket arrivedPacket = newValue as DataPacket; + myLastReceivedRows = arrivedPacket.newRows; + if (myLastFiredRows != null) + { + retVal = new DataPacket(myLastFiredRows, new BlueTable(myLastFiredRows.schema), + new BlueTable(myLastFiredRows.schema)); + foreach (IBlueRow r in arrivedPacket.deletedRows) + if (myLastFiredRows.containsID((int)r["id"])) + { + myLastFiredRows.deleteRow(r); + (retVal.deletedRows as BlueTable).addRow(r); + } + foreach (IBlueRow r in arrivedPacket.addedRows) + if (myFilter.filter(r)) + { + myLastFiredRows.addRow(r); + (retVal.addedRows as BlueTable).addRow(r); + } + } + else + { + myLastFiredRows = new BlueTable(arrivedPacket.schema); + retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema)); + foreach (IBlueRow r in arrivedPacket.newRows) + if (myFilter.filter(r)) + myLastFiredRows.addRow(r); + } + _timer.stop(); + myFireEvent(retVal); + } -// public IStreamFilter filter -// { -// set -// { -// if (myUseNewFilter) -// { -// myFilterStream.filter = filter; -// } -// else -// { -// myFilter = value; -// if (numberOfSubscribers > 0) -// { -// if (myLastReceivedRows != null) -// { -// BlueTable nRows = new BlueTable(myLastReceivedRows.schema); -// foreach (IBlueRow r in myLastReceivedRows) -// if (myFilter.filter(r)) -// nRows.addRow(r); -// IBlueRowCollection dRows = new BlueTable(nRows.schema), -// aRows = new BlueTable(nRows.schema); -// BlueDataUtility.computeDifferences(nRows, myLastFiredRows, out dRows, out aRows); -// myLastFiredRows = nRows; -// myFireEvent(new DataPacket(nRows, aRows, dRows)); -// } -// } -// } -// } -// get -// { -// if (myUseNewFilter) -// return myFilterStream.filter; -// else -// return myFilter; -// } -// } + public IStreamFilter filter + { + set + { + if (myUseNewFilter) + { + myFilterStream.filter = filter; + } + else + { + myFilter = value; + if (numberOfSubscribers > 0) + { + if (myLastReceivedRows != null) + { + BlueTable nRows = new BlueTable(myLastReceivedRows.schema); + foreach (IBlueRow r in myLastReceivedRows) + if (myFilter.filter(r)) + nRows.addRow(r); + IBlueRowCollection dRows = new BlueTable(nRows.schema), + aRows = new BlueTable(nRows.schema); + BlueDataUtility.computeDifferences(nRows, myLastFiredRows, out dRows, out aRows); + myLastFiredRows = nRows; + myFireEvent(new DataPacket(nRows, aRows, dRows)); + } + } + } + } + get + { + if (myUseNewFilter) + return myFilterStream.filter; + else + return myFilter; + } + } -// //public string filterString { set { filter = new BooleanExpressionFilter(value); } } + //public string filterString { set { filter = new BooleanExpressionFilter(value); } } -// public override string ToString() -// { -// return GetType().ToString() + " " + myFilterString; -// } + public override string ToString() + { + return GetType().ToString() + " " + myFilterString; + } -// private void myHandleFilterChange() -// { -// filter = myFilter; -// } -// } -// } + private void myHandleFilterChange() + { + filter = myFilter; + } + } +} diff --git a/src/DataStreamSuite/DataStreamQueryAnalyzer/HScrollGrid.cs b/src/DataStreamSuite/DataStreamQueryAnalyzer/HScrollGrid.cs index d343d7dfd..6f0c6b6ef 100644 --- a/src/DataStreamSuite/DataStreamQueryAnalyzer/HScrollGrid.cs +++ b/src/DataStreamSuite/DataStreamQueryAnalyzer/HScrollGrid.cs @@ -15,7 +15,7 @@ namespace BCG } set { - GridHScrolled (this, new ScrollEventArgs (System.Windows.Forms.ScrollEventType.LargeIncrement, value)); + HorizontalScrollingOffset = value; } } diff --git a/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs b/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs index c12ab93fe..7f67c7c99 100644 --- a/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs +++ b/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs @@ -24,7 +24,8 @@ namespace BCG private string myLastFileName; private ViewStream myCurrentStream; private List mySiteItems = new List (); - private string mySite = SitesCore.getMySiteName (); + // private string mySite = SitesCore.getMySiteName (); + private string mySite = "TODO"; private string myLastClassName = "MyView"; private ViewStream myAllTagsStream; private PubSubConfigureForm myPubSubConForm = new PubSubConfigureForm (); @@ -34,7 +35,8 @@ namespace BCG public MainForm() { InitializeComponent(); - myKQ = ConfigurationRequester.getApplicationQualifier(); + // myKQ = ConfigurationRequester.getApplicationQualifier(); + myKQ = "TODO"; mySetText(); myWindowState = new PersistWindowState ();