diff --git a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookCell.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookCell.cs similarity index 75% rename from src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookCell.cs rename to src/client/spark/Modules/Trading/OrderBook/OrderBookCell.cs index 5a5c4ead0..7439bb61f 100644 --- a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookCell.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookCell.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.ComponentModel; namespace mbts.spark { - partial class CVOrderBookRowVM { + partial class OrderBookRowVM { public interface IOrderBookCell : IComparable { string text { get; } } @@ -15,55 +15,55 @@ namespace mbts.spark { } public interface IOrderBookCellStore { - CVOrderBookRowVM row { get; } + OrderBookRowVM row { get; } ICVOrderBookColumn column { get; } string prop_name { get; } IOrderBookCell current { get; } // - IOrderBookCellStore select_other(CVOrderBookRowVM row); + IOrderBookCellStore select_other(OrderBookRowVM row); bool refresh(bool force_refresh); void regenerate_cell(); } public interface IOrderBookCellStore : IOrderBookCellStore, IComparer, IEqualityComparer { new IOrderBookCell current { get; } - new IOrderBookCellStore select_other(CVOrderBookRowVM row); + new IOrderBookCellStore select_other(OrderBookRowVM row); // - T get_value(CVOrderBookRowVM row); + T get_value(OrderBookRowVM row); string format(T value); } public static class CellFactory { - public static IOrderBookCellStore create(CVOrderBookRowVM row, ICVOrderBookColumn column, string prop_name, Func get_value, Func> select_other, Func format = null) => + public static IOrderBookCellStore create(OrderBookRowVM row, ICVOrderBookColumn column, string prop_name, Func get_value, Func> select_other, Func format = null) => new OrderBookCellStore(row, column, prop_name, get_value, select_other, format, new Comparison(Comparer.Default.Compare), EqualityComparer.Default); - public static IOrderBookCellStore create(CVOrderBookRowVM row, ICVOrderBookColumn column, string prop_name, Func get_value, Func> select_other, Comparison comparison, Func format = null) => + public static IOrderBookCellStore create(OrderBookRowVM row, ICVOrderBookColumn column, string prop_name, Func get_value, Func> select_other, Comparison comparison, Func format = null) => new OrderBookCellStore(row, column, prop_name, get_value, select_other, format, comparison, EqualityComparer.Default); - public static IOrderBookCellStore create_nullable(CVOrderBookRowVM row, ICVOrderBookColumn column, string prop_name, Func get_value, Func> select_other, Func format = null) + public static IOrderBookCellStore create_nullable(OrderBookRowVM row, ICVOrderBookColumn column, string prop_name, Func get_value, Func> select_other, Func format = null) where T : struct => new OrderBookCellStore(row, column, prop_name, get_value, select_other, format, CompareUtils.nullable_comparison(Comparer.Default.Compare), EqualityComparer.CreateNullable(EqualityComparer.Default.Equals)); - public static IOrderBookCellStore create_nullable(CVOrderBookRowVM row, ICVOrderBookColumn column, string prop_name, Func get_value, Func> select_other, Func compare, Func format = null) + public static IOrderBookCellStore create_nullable(OrderBookRowVM row, ICVOrderBookColumn column, string prop_name, Func get_value, Func> select_other, Func compare, Func format = null) where T : struct => new OrderBookCellStore(row, column, prop_name, get_value, select_other, format, CompareUtils.nullable_comparison(compare), EqualityComparer.CreateNullable(EqualityComparer.Default.Equals)); class OrderBookCellStore : IOrderBookCellStore { - readonly CVOrderBookRowVM _row; + readonly OrderBookRowVM _row; readonly ICVOrderBookColumn _column; readonly string _prop_name; - readonly Func _get_value; - readonly Func> _select_other; + readonly Func _get_value; + readonly Func> _select_other; readonly Func _format; readonly Comparison _comparison; readonly IEqualityComparer _eq_comparer; OrderBookCell _current; public OrderBookCellStore( - CVOrderBookRowVM row, + OrderBookRowVM row, ICVOrderBookColumn column, string prop_name, - Func get_value, - Func> select_other, + Func get_value, + Func> select_other, Func format, Comparison comparison, IEqualityComparer eq_comparer) { @@ -79,7 +79,7 @@ namespace mbts.spark { _current = new OrderBookCell(this, _get_value(_row)); } - public CVOrderBookRowVM row => _row; + public OrderBookRowVM row => _row; public ICVOrderBookColumn column => _column; public string prop_name => _prop_name; public IOrderBookCell current => _current; @@ -89,9 +89,9 @@ namespace mbts.spark { public bool Equals(T x, T y) => _eq_comparer.Equals(x, y); public string format(T value) => _format(value); public int GetHashCode(T obj) => _eq_comparer.GetHashCode(obj); - public T get_value(CVOrderBookRowVM row) => _get_value(row); - public IOrderBookCellStore select_other(CVOrderBookRowVM row) => _select_other(row); - IOrderBookCellStore IOrderBookCellStore.select_other(CVOrderBookRowVM row) => select_other(row); + public T get_value(OrderBookRowVM row) => _get_value(row); + public IOrderBookCellStore select_other(OrderBookRowVM row) => _select_other(row); + IOrderBookCellStore IOrderBookCellStore.select_other(OrderBookRowVM row) => select_other(row); public bool refresh(bool force_refresh = false) { T v = _get_value(_row); diff --git a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs similarity index 68% rename from src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs rename to src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 505115545..dc4606786 100644 --- a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -37,171 +37,171 @@ namespace mbts.spark { interface ICVOrderBookColumn : IKeyedColumn { string sort_member_path { get; } ListSortDirection? SortDirection { get; } - IDataGridColumnFilter filter { get; } + IDataGridColumnFilter filter { get; } } - partial class CVOrderBookVM { + partial class OrderBookVM { public class CVOrderBookColumnCollection : ObservableCollection, IDisposable { public CVOrderBookColumnCollection(IBus bus, OrdersModel model, OrderBookStartupData startup_data, IObservable<(IEnumerable added, IEnumerable removed)> order_securities) { // security Add(security_column = new SecurityColumn(this, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( order_securities, r => r.security.value.GetValueOrDefault(SecurityDataHelper.Defaults.SecurityImmutable), SecurityCriteria.from_securities, SecurityCriteria.get_to_securities(bus), - nameof(CVOrderBookRowVM.security), + nameof(OrderBookRowVM.security), EqualityComparer.Create(s => s.Id), SecurityHelper.Comparer.InstanceImmutable ))); // time_created Add(time_created_column = new TimeCreatedColumn( - new TimeFilterVM(r => r.time_created.value, value_path(nameof(OrderBookRowVM.time_created))))); + new TimeFilterVM(r => r.time_created.value, value_path(nameof(OrderBookRowVM.time_created))))); // last_change Add(last_change_column = new LastChangeTimeColumn( - new TimeFilterVM(r => r.last_change.value, value_path(nameof(CVOrderBookRowVM.last_change))))); + new TimeFilterVM(r => r.last_change.value, value_path(nameof(OrderBookRowVM.last_change))))); // user Add(user_column = new SimpleTextColumn( Columns.User, DefaultColumnHeaders.User, - nameof(CVOrderBookRowVM.user), + nameof(OrderBookRowVM.user), r => r.user.value, DefaultColumnWidths.User, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( model.factory.subscribe_users(), r => r.user.value, - value_path(nameof(CVOrderBookRowVM.user))), + value_path(nameof(OrderBookRowVM.user))), DataGridFilterKnownTemplates.DiscreteValues)); // account Add(account_column = new SimpleTextColumn( Columns.Account, DefaultColumnHeaders.Account, - nameof(CVOrderBookRowVM.account), + nameof(OrderBookRowVM.account), r => r.account.value, DefaultColumnWidths.Account, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( model.factory.subscribe_accounts(), r => r.account.value, vals => vals.ToArray(), vals => Observable.Return(vals), - value_path(nameof(CVOrderBookRowVM.account))), + value_path(nameof(OrderBookRowVM.account))), DataGridFilterKnownTemplates.DiscreteValues)); // exchange Add(exchange_column = new SimpleTextColumn( Columns.Exchange, DefaultColumnHeaders.Exchange, - nameof(CVOrderBookRowVM.exchange), + nameof(OrderBookRowVM.exchange), r => r.exchange.text, DefaultColumnWidths.Exchange, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( EnumHelper.get_values_except(Venue.Unset).ToList(), r => r.exchange.value, - value_path(nameof(CVOrderBookRowVM.exchange))), + value_path(nameof(OrderBookRowVM.exchange))), DataGridFilterKnownTemplates.EnumValues)); // time in force Add(time_in_force_column = new SimpleTextColumn( Columns.TimeInForce, DefaultColumnHeaders.TimeInForce, - nameof(CVOrderBookRowVM.time_in_force), + nameof(OrderBookRowVM.time_in_force), r => r.time_in_force.text, DefaultColumnWidths.TimeInForce, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( EnumHelper.get_values().ToList(), r => r.time_in_force.value, - value_path(nameof(CVOrderBookRowVM.time_in_force))), + value_path(nameof(OrderBookRowVM.time_in_force))), DataGridFilterKnownTemplates.EnumValues)); // order type Add(order_type_column = new OrderBookOrderTypeColumn( - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( EnumHelper.get_values_except(OrderType.None).ToList(), r => r.order_type.value, - value_path(nameof(CVOrderBookRowVM.order_type))))); + value_path(nameof(OrderBookRowVM.order_type))))); // order sub type Add(sub_type_column = new SimpleTextColumn( Columns.SubType, "Sub Type", - nameof(CVOrderBookRowVM.order_sub_type), + nameof(OrderBookRowVM.order_sub_type), r => r.order_sub_type.text, 80, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( EnumHelper.get_values().ToList(), r => r.order_sub_type.value, - value_path(nameof(CVOrderBookRowVM.order_sub_type))), + value_path(nameof(OrderBookRowVM.order_sub_type))), SubTypeFilterTemplateKey)); // side Add(side_column = new SideColumn( - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( new[] { Side.Buy, Side.Sell }, r => r.side.value, - value_path(nameof(CVOrderBookRowVM.side))))); + value_path(nameof(OrderBookRowVM.side))))); // quantity Add(qty_column = new SizeColumn( - new UIntMinMax(r => r.quantity.value, value_path(nameof(CVOrderBookRowVM.quantity))))); + new UIntMinMax(r => r.quantity.value, value_path(nameof(OrderBookRowVM.quantity))))); // price Add(price_column = new PriceColumn( - new DoubleMinMax(r => r.price.value, value_path(nameof(CVOrderBookRowVM.price))))); + new DoubleMinMax(r => r.price.value, value_path(nameof(OrderBookRowVM.price))))); // filled quantity Add(filled_qty_column = new FilledColumn( - new UIntMinMax(r => r.filled_quantity.value, value_path(nameof(CVOrderBookRowVM.filled_quantity))))); + new UIntMinMax(r => r.filled_quantity.value, value_path(nameof(OrderBookRowVM.filled_quantity))))); // avg filled price Add(avg_price_column = new AvgFilledColumn( - new DoubleMinMax(r => r.avg_price.value, value_path(nameof(CVOrderBookRowVM.avg_price))))); + new DoubleMinMax(r => r.avg_price.value, value_path(nameof(OrderBookRowVM.avg_price))))); // last filled price Add(last_price_column = new LastFilledColumn( - new DoubleMinMax(r => r.last_price.value, value_path(nameof(CVOrderBookRowVM.last_price))))); + new DoubleMinMax(r => r.last_price.value, value_path(nameof(OrderBookRowVM.last_price))))); // status Add(status_column = new SimpleTextColumn( Columns.Status, "Status", - nameof(CVOrderBookRowVM.status), + nameof(OrderBookRowVM.status), r => r.status.text, 80, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( EnumHelper.get_values().ToList(), r => r.status.value, - value_path(nameof(CVOrderBookRowVM.status))), + value_path(nameof(OrderBookRowVM.status))), DataGridFilterKnownTemplates.EnumValues)); // last message Add(last_message_column = new OrderBookLastMessageColumn( - new RegexFilterVM( + new RegexFilterVM( r => r.last_msg.value, - value_path(nameof(CVOrderBookRowVM.last_msg))))); + value_path(nameof(OrderBookRowVM.last_msg))))); // security key Add(security_key_column = new SimpleTextColumn( Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, - nameof(CVOrderBookRowVM.security_key), + nameof(OrderBookRowVM.security_key), r => r.security_key.text, DefaultColumnWidths.SecurityKey, - new RegexFilterVM( + new RegexFilterVM( r => r.security_key.text, - value_path(nameof(CVOrderBookRowVM.security_key))), + value_path(nameof(OrderBookRowVM.security_key))), DataGridFilterKnownTemplates.Regex)); // order key Add(order_key_column = new SimpleTextColumn( Columns.OrderKey, DefaultColumnHeaders.OrderKey, - nameof(CVOrderBookRowVM.order_key), + nameof(OrderBookRowVM.order_key), r => r.order_key.text, DefaultColumnWidths.OrderKey, - new RegexFilterVM( + new RegexFilterVM( r => r.order_key.text, - value_path(nameof(CVOrderBookRowVM.order_key))), + value_path(nameof(OrderBookRowVM.order_key))), DataGridFilterKnownTemplates.Regex)); // parent key (this is for diagnostic purposes, remove this column once OrderBook seems stable again) Add(parent_key_column = new SimpleTextColumn( Columns.ParentKey, "Parent Key", - nameof(CVOrderBookRowVM.parent_order_key), + nameof(OrderBookRowVM.parent_order_key), r => r.parent_order_key.text, 80, - new RegexFilterVM( + new RegexFilterVM( r => r.parent_order_key.text, - value_path(nameof(CVOrderBookRowVM.parent_order_key))), + value_path(nameof(OrderBookRowVM.parent_order_key))), DataGridFilterKnownTemplates.Regex)); string value_path(string cell_name) => - string.Join(".", cell_name, nameof(CVOrderBookRowVM.IOrderBookCell.value)); //uint is an arbitrary 'T', just want to get compile check on 'value' path. + string.Join(".", cell_name, nameof(OrderBookRowVM.IOrderBookCell.value)); //uint is an arbitrary 'T', just want to get compile check on 'value' path. if (startup_data?.filters is FilterStates fs) { security_column.filter.load_state(fs.security_criteria); @@ -233,7 +233,7 @@ namespace mbts.spark { _set_active_filters(); } - List> _active_filters; + List> _active_filters; public event Action filter_changed; @@ -258,7 +258,7 @@ namespace mbts.spark { public SimpleTextColumn order_key_column { get; } public SimpleTextColumn parent_key_column { get; } - public bool filter(CVOrderBookRowVM row) => _active_filters.All(f => f.filter(row)); + public bool filter(OrderBookRowVM row) => _active_filters.All(f => f.filter(row)); public FilterStates get_filter_states() => new FilterStates { @@ -303,7 +303,7 @@ namespace mbts.spark { ListSortDirection? _cached_sort_direction; readonly string _filter_template; - protected OrderbookColumnBase(Columns col_key, string header, string sort_prop, double width, IDataGridColumnPersistentFilter filter, string filter_template) : base(col_key) { + protected OrderbookColumnBase(Columns col_key, string header, string sort_prop, double width, IDataGridColumnPersistentFilter filter, string filter_template) : base(col_key) { Width = width; Header = header; sort_member_path = sort_prop; @@ -312,9 +312,9 @@ namespace mbts.spark { _cached_sort_direction = SortDirection; } - public IDataGridColumnPersistentFilter filter { get; } + public IDataGridColumnPersistentFilter filter { get; } - IDataGridColumnFilter ICVOrderBookColumn.filter => filter; + IDataGridColumnFilter ICVOrderBookColumn.filter => filter; IDataGridColumnFilter IFilterableColumn.filter => filter; string IFilterableColumn.filter_template => _filter_template; ListSortDirection? ICVOrderBookColumn.SortDirection => _cached_sort_direction; @@ -325,12 +325,12 @@ namespace mbts.spark { } } - public class SimpleTextColumn : OrderbookColumnBase, IRenderColumn { - readonly Func _get_text; - public SimpleTextColumn(Columns key, string header, string sort_prop, Func get_text, double width, IDataGridColumnPersistentFilter filter, string filter_template) + public class SimpleTextColumn : OrderbookColumnBase, IRenderColumn { + readonly Func _get_text; + public SimpleTextColumn(Columns key, string header, string sort_prop, Func get_text, double width, IDataGridColumnPersistentFilter filter, string filter_template) : base(key, header, sort_prop, width, filter, filter_template) => _get_text = get_text; - public void draw(CVOrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) { + public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) { string text = _get_text(row); if (!string.IsNullOrEmpty(text)) CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, text, position, RowHeight, @@ -339,96 +339,96 @@ namespace mbts.spark { } #region Explicit Column Defs - public class SideColumn : OrderbookColumnBase, IRenderColumn { - public SideColumn(IDataGridColumnPersistentFilter filter) - : base(Columns.Side, "B/S", nameof(CVOrderBookRowVM.side), DefaultColumnWidths.Side, filter, DataGridFilterKnownTemplates.EnumValues) { } + public class SideColumn : OrderbookColumnBase, IRenderColumn { + public SideColumn(IDataGridColumnPersistentFilter filter) + : base(Columns.Side, "B/S", nameof(OrderBookRowVM.side), DefaultColumnWidths.Side, filter, DataGridFilterKnownTemplates.EnumValues) { } - public void draw(CVOrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => + public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, row.side.text, position, RowHeight, RenderUtils.get_side_brush(row), null, HorizontalAlignment.Left, VerticalAlignment.Center, DefaultCellPadding); } - public class SizeColumn : OrderbookColumnBase, IRenderColumn { - public SizeColumn(IDataGridColumnPersistentFilter filter) - : base(Columns.Size, "Qty", nameof(CVOrderBookRowVM.quantity), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax) { - sort_member_path = nameof(CVOrderBookRowVM.quantity); + public class SizeColumn : OrderbookColumnBase, IRenderColumn { + public SizeColumn(IDataGridColumnPersistentFilter filter) + : base(Columns.Size, "Qty", nameof(OrderBookRowVM.quantity), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax) { + sort_member_path = nameof(OrderBookRowVM.quantity); } - public void draw(CVOrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => + public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, row.quantity.text, position, RowHeight, RenderUtils.get_side_brush(row), null, HorizontalAlignment.Right, VerticalAlignment.Center, DefaultCellPadding); } - public class FilledColumn : OrderbookColumnBase, IRenderColumn { - public FilledColumn(IDataGridColumnPersistentFilter filter) - : base(Columns.Filled, "Filled Qty", nameof(CVOrderBookRowVM.filled_quantity), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax) { - sort_member_path = nameof(CVOrderBookRowVM.filled_quantity); + public class FilledColumn : OrderbookColumnBase, IRenderColumn { + public FilledColumn(IDataGridColumnPersistentFilter filter) + : base(Columns.Filled, "Filled Qty", nameof(OrderBookRowVM.filled_quantity), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax) { + sort_member_path = nameof(OrderBookRowVM.filled_quantity); } - public void draw(CVOrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => + public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, row.filled_quantity.text, position, RowHeight, RenderUtils.get_side_brush(row), null, HorizontalAlignment.Right, VerticalAlignment.Center, DefaultCellPadding); } - public class PriceColumn : OrderbookColumnBase, IRenderColumn { - public PriceColumn(IDataGridColumnPersistentFilter filter) - : base(Columns.Price, "Price", nameof(CVOrderBookRowVM.price), DefaultColumnWidths.Price, filter, DataGridFilterKnownTemplates.DoubleMinMax) { } + public class PriceColumn : OrderbookColumnBase, IRenderColumn { + public PriceColumn(IDataGridColumnPersistentFilter filter) + : base(Columns.Price, "Price", nameof(OrderBookRowVM.price), DefaultColumnWidths.Price, filter, DataGridFilterKnownTemplates.DoubleMinMax) { } - public void draw(CVOrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => + public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, row.price.text, position, RowHeight, Brushes.Black, null, HorizontalAlignment.Right, VerticalAlignment.Center, DefaultCellPadding); } - public class AvgFilledColumn : OrderbookColumnBase, IRenderColumn { - public AvgFilledColumn(IDataGridColumnPersistentFilter filter) - : base(Columns.AvgFilled, "Avg Filled", nameof(CVOrderBookRowVM.avg_price), DefaultColumnWidths.Price, filter, DataGridFilterKnownTemplates.DoubleMinMax) { } + public class AvgFilledColumn : OrderbookColumnBase, IRenderColumn { + public AvgFilledColumn(IDataGridColumnPersistentFilter filter) + : base(Columns.AvgFilled, "Avg Filled", nameof(OrderBookRowVM.avg_price), DefaultColumnWidths.Price, filter, DataGridFilterKnownTemplates.DoubleMinMax) { } - public void draw(CVOrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) { + public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) { CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, row.avg_price.text, position, RowHeight, Brushes.Black, null, HorizontalAlignment.Right, VerticalAlignment.Center, DefaultCellPadding); } } - public class LastFilledColumn : OrderbookColumnBase, IRenderColumn { - public LastFilledColumn(IDataGridColumnPersistentFilter filter) - : base(Columns.LastPrice, "Last Filled", nameof(CVOrderBookRowVM.last_price), DefaultColumnWidths.Price, filter, DataGridFilterKnownTemplates.DoubleMinMax) { } + public class LastFilledColumn : OrderbookColumnBase, IRenderColumn { + public LastFilledColumn(IDataGridColumnPersistentFilter filter) + : base(Columns.LastPrice, "Last Filled", nameof(OrderBookRowVM.last_price), DefaultColumnWidths.Price, filter, DataGridFilterKnownTemplates.DoubleMinMax) { } - public void draw(CVOrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => + public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, row.last_price.text, position, RowHeight, Brushes.Black, null, HorizontalAlignment.Right, VerticalAlignment.Center, DefaultCellPadding); } - public class TimeCreatedColumn : OrderbookColumnBase, IRenderColumn { - public TimeCreatedColumn(IDataGridColumnPersistentFilter filter) - : base(Columns.Time, "Time", nameof(CVOrderBookRowVM.time_created), DefaultColumnWidths.Time, filter, DataGridFilterKnownTemplates.TimeFilter) { } + public class TimeCreatedColumn : OrderbookColumnBase, IRenderColumn { + public TimeCreatedColumn(IDataGridColumnPersistentFilter filter) + : base(Columns.Time, "Time", nameof(OrderBookRowVM.time_created), DefaultColumnWidths.Time, filter, DataGridFilterKnownTemplates.TimeFilter) { } - public void draw(CVOrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => + public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, row.time_created.text, position, RowHeight, Brushes.Black, null, HorizontalAlignment.Left, VerticalAlignment.Center, DefaultCellPadding); } - public class LastChangeTimeColumn : OrderbookColumnBase, IRenderColumn { - public LastChangeTimeColumn(IDataGridColumnPersistentFilter filter) - : base(Columns.LastChange, "Last Change", nameof(CVOrderBookRowVM.last_change), DefaultColumnWidths.Time, filter, DataGridFilterKnownTemplates.TimeFilter) { } + public class LastChangeTimeColumn : OrderbookColumnBase, IRenderColumn { + public LastChangeTimeColumn(IDataGridColumnPersistentFilter filter) + : base(Columns.LastChange, "Last Change", nameof(OrderBookRowVM.last_change), DefaultColumnWidths.Time, filter, DataGridFilterKnownTemplates.TimeFilter) { } - public void draw(CVOrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => + public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, row.last_change.text, position, RowHeight, Brushes.Black, null, HorizontalAlignment.Left, VerticalAlignment.Center, DefaultCellPadding); } public class OrderBookOrderTypeColumn : OrderTypeColumn, ICVOrderBookColumn { ListSortDirection? _cached_sort_direction; - public OrderBookOrderTypeColumn(IDataGridColumnPersistentFilter filter) - : base(Columns.OrderType, new Binding($"{nameof(CVOrderBookRowVM.order_type)}.{nameof(CVOrderBookRowVM.IOrderBookCell.value)}"), new Binding(nameof(CVOrderBookRowVM.order_metadata)), filter) { + public OrderBookOrderTypeColumn(IDataGridColumnPersistentFilter filter) + : base(Columns.OrderType, new Binding($"{nameof(OrderBookRowVM.order_type)}.{nameof(OrderBookRowVM.IOrderBookCell.value)}"), new Binding(nameof(OrderBookRowVM.order_metadata)), filter) { this.filter = filter; - sort_member_path = nameof(CVOrderBookRowVM.order_type); + sort_member_path = nameof(OrderBookRowVM.order_type); font_weight_binding = RenderUtils.get_font_weight_binding(); _cached_sort_direction = SortDirection; } - public new IDataGridColumnPersistentFilter filter { get; } + public new IDataGridColumnPersistentFilter filter { get; } - IDataGridColumnFilter ICVOrderBookColumn.filter => filter; + IDataGridColumnFilter ICVOrderBookColumn.filter => filter; ListSortDirection? ICVOrderBookColumn.SortDirection => _cached_sort_direction; protected override void OnSortDirectionChanged(ListSortDirection? new_value) { @@ -440,18 +440,18 @@ namespace mbts.spark { public class OrderBookLastMessageColumn : TextColumn, ICVOrderBookColumn { ListSortDirection? _cached_sort_direction; - public OrderBookLastMessageColumn(IDataGridColumnPersistentFilter filter) - : base(Columns.LastMessage, new Binding($"{nameof(CVOrderBookRowVM.last_msg)}.{nameof(CVOrderBookRowVM.IOrderBookCell.value)}"), filter, DataGridFilterKnownTemplates.Regex) { + public OrderBookLastMessageColumn(IDataGridColumnPersistentFilter filter) + : base(Columns.LastMessage, new Binding($"{nameof(OrderBookRowVM.last_msg)}.{nameof(OrderBookRowVM.IOrderBookCell.value)}"), filter, DataGridFilterKnownTemplates.Regex) { this.filter = filter; Header = "Last Message"; Width = 80; - sort_member_path = nameof(CVOrderBookRowVM.last_msg); - tooltip_binding = new Binding(nameof(CVOrderBookRowVM.last_msg)); + sort_member_path = nameof(OrderBookRowVM.last_msg); + tooltip_binding = new Binding(nameof(OrderBookRowVM.last_msg)); } - public new IDataGridColumnPersistentFilter filter { get; } + public new IDataGridColumnPersistentFilter filter { get; } - IDataGridColumnFilter ICVOrderBookColumn.filter => filter; + IDataGridColumnFilter ICVOrderBookColumn.filter => filter; ListSortDirection? ICVOrderBookColumn.SortDirection => _cached_sort_direction; protected override void OnSortDirectionChanged(ListSortDirection? new_value) { @@ -467,17 +467,17 @@ namespace mbts.spark { ListSortDirection? _cached_sort_direction; - public SecurityColumn(CVOrderBookColumnCollection owner, IDataGridColumnPersistentFilter filter) : base(Columns.Security) { + public SecurityColumn(CVOrderBookColumnCollection owner, IDataGridColumnPersistentFilter filter) : base(Columns.Security) { this.filter = filter; Header = DefaultColumnHeaders.Security; Width = DefaultColumnWidths.Security; - sort_member_path = nameof(CVOrderBookRowVM.security); + sort_member_path = nameof(OrderBookRowVM.security); _cached_sort_direction = SortDirection; } - public IDataGridColumnPersistentFilter filter { get; } + public IDataGridColumnPersistentFilter filter { get; } - IDataGridColumnFilter ICVOrderBookColumn.filter => filter; + IDataGridColumnFilter ICVOrderBookColumn.filter => filter; IDataGridColumnFilter IFilterableColumn.filter => filter; string IFilterableColumn.filter_template => DataGridFilterKnownTemplates.DiscreteValues; ListSortDirection? ICVOrderBookColumn.SortDirection => _cached_sort_direction; @@ -485,13 +485,13 @@ namespace mbts.spark { public override FrameworkElement view_factory() { // expander var toggle_button = new ToggleButton { ClickMode = ClickMode.Press, IsThreeState = false }; - toggle_button.SetBinding(ToggleButton.IsCheckedProperty, new Binding(nameof(CVOrderBookRowVM.is_expanded))); - toggle_button.SetBinding(ToggleButton.MarginProperty, new Binding(nameof(CVOrderBookRowVM.depth_level)) { Converter = _margin_converter }); - toggle_button.SetBinding(ToggleButton.VisibilityProperty, new Binding(nameof(CVOrderBookRowVM.is_parent)) { Converter = _expander_visiblilty_converter }); + toggle_button.SetBinding(ToggleButton.IsCheckedProperty, new Binding(nameof(OrderBookRowVM.is_expanded))); + toggle_button.SetBinding(ToggleButton.MarginProperty, new Binding(nameof(OrderBookRowVM.depth_level)) { Converter = _margin_converter }); + toggle_button.SetBinding(ToggleButton.VisibilityProperty, new Binding(nameof(OrderBookRowVM.is_parent)) { Converter = _expander_visiblilty_converter }); toggle_button.SetResourceReference(ToggleButton.StyleProperty, ExpandCollapseToggleStyleKey); // var security_view = new TextBlock(); - security_view.SetBinding(TextBlock.TextProperty, $"{nameof(CVOrderBookRowVM.security)}.{nameof(CVOrderBookRowVM.IOrderBookCell.text)}"); + security_view.SetBinding(TextBlock.TextProperty, $"{nameof(OrderBookRowVM.security)}.{nameof(OrderBookRowVM.IOrderBookCell.text)}"); security_view.SetBinding(TextBlock.FontWeightProperty, _font_weight_binding); // var grid = new Grid(); @@ -526,13 +526,13 @@ namespace mbts.spark { public static BindingBase _get_background_binding() { var mb = new MultiBinding { Converter = _background_converter }; mb.Bindings.Add(new Binding(nameof(ListBoxItem.IsSelected)) { RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(ListBoxItem), 1) }); - mb.Bindings.Add(new Binding(nameof(CVOrderBookRowVM.status))); + mb.Bindings.Add(new Binding(nameof(OrderBookRowVM.status))); return mb; } - public static GlyphContext get_glyph_context(CVOrderBookRowVM r) => r.is_child ? _child_glyph_context : TextUtils.StandardGlyphContext; - public static Brush get_side_brush(CVOrderBookRowVM r) => r.side.value == Side.Buy ? BTSColors.MarketData.bid : BTSColors.MarketData.ask; - public static BindingBase get_font_weight_binding() => new Binding(nameof(CVOrderBookRowVM.is_child)) { Converter = _font_weight_converter }; + public static GlyphContext get_glyph_context(OrderBookRowVM r) => r.is_child ? _child_glyph_context : TextUtils.StandardGlyphContext; + public static Brush get_side_brush(OrderBookRowVM r) => r.side.value == Side.Buy ? BTSColors.MarketData.bid : BTSColors.MarketData.ask; + public static BindingBase get_font_weight_binding() => new Binding(nameof(OrderBookRowVM.is_child)) { Converter = _font_weight_converter }; } } } \ No newline at end of file diff --git a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs similarity index 89% rename from src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs rename to src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 40887578d..5c16729c0 100644 --- a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -11,19 +11,19 @@ using static mbts.spark.OrderBookView; using OrderStatus = bts.api.orderman.OrderStatus; namespace mbts.spark { - partial class CVOrderBookRowVM : DisposableViewModelBase, IEquatable, ui.controls.DIYGrid.IRowVM, ui.controls.DIYGrid.IActionableRowVM { + partial class OrderBookRowVM : DisposableViewModelBase, IEquatable, ui.controls.DIYGrid.IRowVM, ui.controls.DIYGrid.IActionableRowVM { const string _unknown_security_price_format_string = "0.#########"; const int _unknown_security_price_num_fractional_digits = 9; - readonly CVOrderBookVM _book_vm; + readonly OrderBookVM _book_vm; readonly OrdersModel _model; readonly Property _visible, _expanded, _passes_filter; readonly DelegateProperty _depth_level; - readonly HashSet _child_rows = new HashSet(); + readonly HashSet _child_rows = new HashSet(); readonly ObservantCommand _show_order_modify_cmd; OrderRecordImmutable _order; SecurityImmutable? _security; - CVOrderBookRowVM _parent; - CVOrderBookVM.BranchFilterSource _branch_filter_source; + OrderBookRowVM _parent; + OrderBookVM.BranchFilterSource _branch_filter_source; IDisposable _branch_filter_sub; // Core IOrderBookCellStore _order_key_store; @@ -49,7 +49,7 @@ namespace mbts.spark { IOrderBookCellStore _last_msg_store; IOrderBookCellStore _order_sub_type_store; - public CVOrderBookRowVM(IBus bus, CVOrderBookVM source_vm, OrdersModel model, OrderRecordImmutable record, SecurityImmutable? s) { + public OrderBookRowVM(IBus bus, OrderBookVM source_vm, OrdersModel model, OrderRecordImmutable record, SecurityImmutable? s) { _book_vm = source_vm; _model = model; _order = record; @@ -113,7 +113,7 @@ namespace mbts.spark { public OrderRecordImmutable order => _order; public OrderMetadata order_metadata => _model.factory.get_metadata(order_type.value); - public CVOrderBookRowVM parent => _parent; + public OrderBookRowVM parent => _parent; // Core public IOrderBookCell order_key => _order_key_store.current; public IOrderBookCell parent_order_key => _parent_order_key_store.current; @@ -143,8 +143,8 @@ namespace mbts.spark { // Accessories public bool is_parent => _child_rows.Count > 0; public bool is_child => _order.has_parent(); - public IReadOnlyCollection child_orders => _child_rows; - public CVOrderBookVM.BranchFilterSource branch_filter_source => _branch_filter_source; + public IReadOnlyCollection child_orders => _child_rows; + public OrderBookVM.BranchFilterSource branch_filter_source => _branch_filter_source; public bool passes_filter => _passes_filter.Value; public bool row_passes_filter { get; private set; } public bool is_visible { @@ -193,15 +193,15 @@ namespace mbts.spark { } } - public static Stack lineage(CVOrderBookRowVM node) { - var rv = new Stack(); + public static Stack lineage(OrderBookRowVM node) { + var rv = new Stack(); rv.Push(node); while (node._parent != null) rv.Push((node = node._parent)); return rv; } - public void join_branch_filter_source(CVOrderBookVM.BranchFilterSource new_branch_filter_source) { + public void join_branch_filter_source(OrderBookVM.BranchFilterSource new_branch_filter_source) { _branch_filter_source = new_branch_filter_source; _branch_filter_source.set_row_passes_filter(_order.Key, row_passes_filter); _branch_filter_source_changed?.Invoke(_branch_filter_source); @@ -212,7 +212,7 @@ namespace mbts.spark { /// /// Attaches the child-row to this row's branch-filter-source, and recursively refreshes sort/filter properties for the child and it's descendents. /// - public void add_child_order(CVOrderBookRowVM child_row) { + public void add_child_order(OrderBookRowVM child_row) { if (_child_rows.Add(child_row) && _child_rows.Count == 1) RaisePropertyChanged(nameof(is_parent)); child_row._parent = this; @@ -224,19 +224,19 @@ namespace mbts.spark { child_row._on_lineage_changed(); } - public void remove_child_order(CVOrderBookRowVM child_row) { + public void remove_child_order(OrderBookRowVM child_row) { if (_child_rows.Remove(child_row) && _child_rows.Count == 0) RaisePropertyChanged(nameof(is_parent)); } - public void remove_parent(CVOrderBookVM.BranchFilterSource new_branch_filter_source) { + public void remove_parent(OrderBookVM.BranchFilterSource new_branch_filter_source) { _parent = null; join_branch_filter_source(new_branch_filter_source); refresh_row_passes_filter(); foreach (var p in _book_vm.live_sorting_props) RaisePropertyChanged(p); _depth_level.refresh(); - foreach (CVOrderBookRowVM child_row in _child_rows) + foreach (OrderBookRowVM child_row in _child_rows) child_row._on_lineage_changed(); } @@ -261,14 +261,14 @@ namespace mbts.spark { } } - public bool Equals(CVOrderBookRowVM other) => other != null && other._order.Key == _order.Key; - public override bool Equals(object obj) => Equals(obj as CVOrderBookRowVM); + public bool Equals(OrderBookRowVM other) => other != null && other._order.Key == _order.Key; + public override bool Equals(object obj) => Equals(obj as OrderBookRowVM); public override int GetHashCode() => (int)_order.Key; public override string ToString() => $"{order_key} {last_change} {parent_order_key}"; protected override void Dispose(bool disposing) => Disposable.dispose(ref _branch_filter_sub); - static IEnumerable _descendents(CVOrderBookRowVM root) { + static IEnumerable _descendents(OrderBookRowVM root) { foreach (var child in root.child_orders) { yield return child; foreach (var grand_child in _descendents(child)) @@ -276,7 +276,7 @@ namespace mbts.spark { } } - static IOrderBookCellStore _cell_store_from_column(CVOrderBookRowVM row, Columns column) { + static IOrderBookCellStore _cell_store_from_column(OrderBookRowVM row, Columns column) { switch (column) { case Columns.OrderKey: return row._order_key_store; case Columns.ParentKey: return row._parent_order_key_store; @@ -330,7 +330,7 @@ namespace mbts.spark { invalidate = true; if (_book_vm.live_sorting_columns.Contains(cell_store.column.key)) { // refresh the sort by calling regenerate_cell() for each descendent-row - foreach (CVOrderBookRowVM dr in _descendents(this)) + foreach (OrderBookRowVM dr in _descendents(this)) cell_store.select_other(dr).regenerate_cell(); } } diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookTests.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookTests.cs similarity index 100% rename from src/client/spark/view/Spark/Shell/OrderBook/OrderBookTests.cs rename to src/client/spark/Modules/Trading/OrderBook/OrderBookTests.cs diff --git a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs similarity index 78% rename from src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookVM.cs rename to src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index d53bc3205..ef298167f 100644 --- a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -21,29 +21,29 @@ using static mbts.spark.OrderBookView; using static mbts.ui.controls.DIYGrid; namespace mbts.spark { - partial class CVOrderBookVM : DisposableViewModelBase, IHandleRowSelection, IOrderBookVM { + partial class OrderBookVM : DisposableViewModelBase, IHandleRowSelection { // these come from -> ((ICollectionViewLiveShaping)rows_view).LiveSortingProperties // each row accesses the public 'live_sorting_props' when it, or an ancestor order, is updated, // copying the collection locally avoids constantly casting rows_view to ICollectionViewLiveShaping. readonly ObservableCollection _live_sorting_props; readonly LiveSortingColumKeys _live_sorting_columns; - readonly Property _current_row; + readonly Property _current_row; readonly Subject<(IEnumerable added, IEnumerable removed)> _order_securities_subject = new Subject<(IEnumerable added, IEnumerable removed)>(); - Dictionary _order_rows_cache = new Dictionary(); + Dictionary _order_rows_cache = new Dictionary(); Dictionary _branch_filter_roots = new Dictionary(); - ObservableCollection _order_rows = new ObservableCollection(); - ObservableCollection _selected_rows = new ObservableCollection(); + ObservableCollection _order_rows = new ObservableCollection(); + ObservableCollection _selected_rows = new ObservableCollection(); SetMap _parent_to_children = new SetMap(); SetMap _security_orders = new SetMap(); - public CVOrderBookVM(IBus bus, OrdersModel model, OrderBookStartupData state) { + public OrderBookVM(IBus bus, OrdersModel model, OrderBookStartupData state) { columns = new CVOrderBookColumnCollection(bus, model, state, _order_securities_subject); foreach (ColumnBase col in columns) col.sort_direction_changed += on_column_sort_direction_changed; rows_view = CollectionViewSource.GetDefaultView(_order_rows); - rows_view.Filter = obj => obj is CVOrderBookRowVM vm && vm.is_visible && vm.passes_filter; + rows_view.Filter = obj => obj is OrderBookRowVM vm && vm.is_visible && vm.passes_filter; columns.filter_changed += () => { foreach (var vm in _order_rows) vm.refresh_row_passes_filter(); @@ -52,8 +52,8 @@ namespace mbts.spark { _live_sorting_props = cvls.LiveSortingProperties; cvls.IsLiveFiltering = true; cvls.IsLiveSorting = true; - cvls.LiveFilteringProperties.AddRange(nameof(CVOrderBookRowVM.is_visible), nameof(CVOrderBookRowVM.passes_filter)); - _current_row = backing(nameof(current_row)); + cvls.LiveFilteringProperties.AddRange(nameof(OrderBookRowVM.is_visible), nameof(OrderBookRowVM.passes_filter)); + _current_row = backing(nameof(current_row)); if (state?.sort_criteria is List lsc && lsc.Count > 0) { foreach (var sc in lsc) { rows_view.SortDescriptions.Add(new SortDescription(sc.col_name, sc.is_ascending ? ListSortDirection.Ascending : ListSortDirection.Descending)); @@ -61,8 +61,8 @@ namespace mbts.spark { _live_sorting_props.Add(sc.col_name); } } else { - rows_view.SortDescriptions.Add(new SortDescription(nameof(CVOrderBookRowVM.time_created), ListSortDirection.Descending)); - _live_sorting_props.Add(nameof(CVOrderBookRowVM.time_created)); + rows_view.SortDescriptions.Add(new SortDescription(nameof(OrderBookRowVM.time_created), ListSortDirection.Descending)); + _live_sorting_props.Add(nameof(OrderBookRowVM.time_created)); } _live_sorting_columns = new LiveSortingColumKeys(_live_sorting_props); @@ -96,7 +96,7 @@ namespace mbts.spark { if (table.state.TryGetValue(o.Key, out OrderRecordImmutable changed_order)) { changed_keys.Add(o.Key); _order_rows_cache[o.Key].update_order(changed_order); - } else if (_order_rows_cache.TryPopValue(o.Key, out CVOrderBookRowVM row)) { + } else if (_order_rows_cache.TryPopValue(o.Key, out OrderBookRowVM row)) { row.Dispose(); _order_rows.Remove(row); if (_security_orders.removes_key(o.Def.SecurityKey, o.Key)) { @@ -123,7 +123,7 @@ namespace mbts.spark { missing_security_orders.remove(o.Key); } } - var orphans = new Dictionary(); + var orphans = new Dictionary(); foreach (var o in table.added) { if (changed_keys.Contains(o.Key)) continue; @@ -137,7 +137,7 @@ namespace mbts.spark { security = null; _security_orders.add(o.Def.SecurityKey, o.Key); } - CVOrderBookRowVM row = new CVOrderBookRowVM(bus, this, model, o, security); + OrderBookRowVM row = new OrderBookRowVM(bus, this, model, o, security); if (!o.has_parent()) { // if it doesn't have a parent, it must be a root; create a new BranchFilterSource var bfs = new BranchFilterSource(); @@ -145,7 +145,7 @@ namespace mbts.spark { row.join_branch_filter_source(bfs); } else { _parent_to_children.add(o.ParentKey, o.Key); - if (_order_rows_cache.TryGetValue(o.ParentKey, out CVOrderBookRowVM pvm)) { + if (_order_rows_cache.TryGetValue(o.ParentKey, out OrderBookRowVM pvm)) { pvm.add_child_order(row); } else { // (**) look for orphans' parents again after all new orders have been added to _order_vm_cache @@ -162,7 +162,7 @@ namespace mbts.spark { } // (**) since all new rows have been added by now, any remaining orphans will be assigned their own branch-filter-roots // (usually, rows are tempororily added to orphans bc their parent is just behind them in the list of added orders) (**) - foreach (CVOrderBookRowVM row in orphans.Values) { + foreach (OrderBookRowVM row in orphans.Values) { var bfs = new BranchFilterSource(); row.join_branch_filter_source(bfs); _branch_filter_roots.Add(row.order.Key, bfs); @@ -171,10 +171,10 @@ namespace mbts.spark { if (added_securities.Count > 0 || removed_securities.Count > 0) _order_securities_subject.OnNext((added_securities, removed_securities)); - void try_add_children(CVOrderBookRowVM row) { + void try_add_children(OrderBookRowVM row) { if (_parent_to_children.try_lookup(row.order.Key, out ISet children)) foreach (uint child_key in children) { - CVOrderBookRowVM child_vm = _order_rows_cache[child_key]; + OrderBookRowVM child_vm = _order_rows_cache[child_key]; // (**) if children arrived in an earlier update, this will notify them that their parent has arrived (**) // - their tempororary branch-filter-roots will be removed, and they will join that of their parent's // - for the live-filter-properties, their corresponding cells will be regenerated and they will be re-inserted beneath their new parent. @@ -227,12 +227,9 @@ namespace mbts.spark { public IReadOnlyList live_sorting_props => _live_sorting_props; public ISet live_sorting_columns => _live_sorting_columns; public ICollectionView rows_view { get; } - // this is a misnomer, but i want to support both kinds of OrderBookVMs, and OrderBookView currently binds to 'visible_orders,' - public ICollectionView visible_orders => rows_view; - public CVOrderBookRowVM current_row { get => _current_row.Value; set => _current_row.Value = value ?? _selected_rows.FirstOrDefault(); } + public OrderBookRowVM current_row { get => _current_row.Value; set => _current_row.Value = value ?? _selected_rows.FirstOrDefault(); } public OrderRecordImmutable? current_order => current_row?.order; public IEnumerable selected_orders => _selected_rows.Select(r => r.order); - void IOrderBookVM.on_sorting(DIYGridSortingEventArgs e) { } public void row_selection_changed(SelectionChangedEventArgs e) { RowSelectionHelper.apply_changes(_selected_rows, e); @@ -286,26 +283,26 @@ namespace mbts.spark { public static bool try_parse(string prop_name, out Columns result) { switch (prop_name) { - case nameof(CVOrderBookRowVM.security): result = Columns.Security; break; - case nameof(CVOrderBookRowVM.time_created): result = Columns.Time; break; - case nameof(CVOrderBookRowVM.last_change): result = Columns.LastChange; break; - case nameof(CVOrderBookRowVM.user): result = Columns.User; break; - case nameof(CVOrderBookRowVM.account): result = Columns.Account; break; - case nameof(CVOrderBookRowVM.exchange): result = Columns.Exchange; break; - case nameof(CVOrderBookRowVM.time_in_force): result = Columns.TimeInForce; break; - case nameof(CVOrderBookRowVM.order_type): result = Columns.OrderType; break; - case nameof(CVOrderBookRowVM.order_sub_type): result = Columns.SubType; break; - case nameof(CVOrderBookRowVM.side): result = Columns.Side; break; - case nameof(CVOrderBookRowVM.quantity): result = Columns.Size; break; - case nameof(CVOrderBookRowVM.filled_quantity): result = Columns.Filled; break; - case nameof(CVOrderBookRowVM.price): result = Columns.Price; break; - case nameof(CVOrderBookRowVM.avg_price): result = Columns.AvgFilled; break; - case nameof(CVOrderBookRowVM.last_price): result = Columns.LastPrice; break; - case nameof(CVOrderBookRowVM.status): result = Columns.Status; break; - case nameof(CVOrderBookRowVM.last_msg): result = Columns.LastMessage; break; - case nameof(CVOrderBookRowVM.security_key): result = Columns.SecurityKey; break; - case nameof(CVOrderBookRowVM.order_key): result = Columns.OrderKey; break; - case nameof(CVOrderBookRowVM.parent_order_key): result = Columns.ParentKey; break; + case nameof(OrderBookRowVM.security): result = Columns.Security; break; + case nameof(OrderBookRowVM.time_created): result = Columns.Time; break; + case nameof(OrderBookRowVM.last_change): result = Columns.LastChange; break; + case nameof(OrderBookRowVM.user): result = Columns.User; break; + case nameof(OrderBookRowVM.account): result = Columns.Account; break; + case nameof(OrderBookRowVM.exchange): result = Columns.Exchange; break; + case nameof(OrderBookRowVM.time_in_force): result = Columns.TimeInForce; break; + case nameof(OrderBookRowVM.order_type): result = Columns.OrderType; break; + case nameof(OrderBookRowVM.order_sub_type): result = Columns.SubType; break; + case nameof(OrderBookRowVM.side): result = Columns.Side; break; + case nameof(OrderBookRowVM.quantity): result = Columns.Size; break; + case nameof(OrderBookRowVM.filled_quantity): result = Columns.Filled; break; + case nameof(OrderBookRowVM.price): result = Columns.Price; break; + case nameof(OrderBookRowVM.avg_price): result = Columns.AvgFilled; break; + case nameof(OrderBookRowVM.last_price): result = Columns.LastPrice; break; + case nameof(OrderBookRowVM.status): result = Columns.Status; break; + case nameof(OrderBookRowVM.last_msg): result = Columns.LastMessage; break; + case nameof(OrderBookRowVM.security_key): result = Columns.SecurityKey; break; + case nameof(OrderBookRowVM.order_key): result = Columns.OrderKey; break; + case nameof(OrderBookRowVM.parent_order_key): result = Columns.ParentKey; break; default: result = default; return false; } return true; diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml similarity index 86% rename from src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml rename to src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml index 61f839d1f..5281f2844 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml @@ -44,20 +44,6 @@ - - - - - - - @@ -86,11 +67,10 @@ Grid.Row="2" Columns="{Binding columns}" CurrentRow="{Binding current_row, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" - Rows="{Binding visible_orders}" + Rows="{Binding rows_view}" RowHeight="{x:Static sp:OrderBookView.RowHeight}" - RowStyle="{StaticResource {x:Static sp:OrderBookView.ActiveRowStyleKey}}" - RowTemplate="{StaticResource {x:Static sp:OrderBookView.ActiveRowTemplateKey}}" - Sorting="data_grid_sorting" + RowStyle="{StaticResource {x:Static sp:OrderBookView.RowStyleKey}}" + RowTemplate="{StaticResource {x:Static sp:OrderBookView.RowTemplateKey}}" > diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs new file mode 100644 index 000000000..85b316e1b --- /dev/null +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs @@ -0,0 +1,28 @@ +using mbts.ui.controls; +using System.Windows.Controls; + +namespace mbts.spark { + internal partial class OrderBookView : UserControl { + public enum Columns { Security, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey } + public const string + SubTypeFilterTemplateKey = "SubTypeFilterTemplate", + ExpandCollapseToggleStyleKey = "ExpandCollapseToggleStyle", + RowStyleKey = "RowStyle", + RowTemplateKey = "RowTemplateKey", + CVRowStyleKey = "CVRowStyle", + CVRowTemplateKey = "CVRowTemplateKey"; + + public const double RowHeight = 17; + OrderBookVM _vm; + + public OrderBookView(OrderBookVM vm) { + InitializeComponent(); + _vm = vm; + DataContext = vm; + } + } + + class OrderBookRowView : DIYGrid.HighPerformanceRow { + public OrderBookRowView() : base(OrderBookView.RowHeight) { } + } +} \ No newline at end of file diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs similarity index 83% rename from src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs rename to src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs index b3ed798c8..86423d6bd 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs @@ -12,12 +12,10 @@ using System.Windows.Media; namespace mbts.spark { internal class OrderBookWindow : SparkWindow, ISharedWindow { - public static readonly bool cv_orderbook_enabled = config.Configuration.get().enabled; - const string _window_type = "OrderBook", ORDERBOOK_THREAD_ID = "OrderBook"; OrderBookWindowFactory.OrderBookStartupData _state; OrdersModel _model; - IOrderBookVM _vm; + OrderBookVM _vm; OrderBookView _view; OrderBookWindowFactory _factory; SparkCommand[] _commands; @@ -37,19 +35,13 @@ namespace mbts.spark { _state = state; } - public static OrderBookWindowFactory.OrderBookStartupData default_startup_data => cv_orderbook_enabled ? + public static OrderBookWindowFactory.OrderBookStartupData default_startup_data => new OrderBookWindowFactory.OrderBookStartupData( new List { - new SortingCriteria(nameof(CVOrderBookRowVM.time_created), false) + new SortingCriteria(nameof(OrderBookRowVM.time_created), false) }, new OrderBookWindowFactory.FilterStates { statuses = new[] { OrderStatus.Working } - }) - : new OrderBookWindowFactory.OrderBookStartupData( - new List { - new SortingCriteria(nameof(OrderBookRowVM.time_created), false) - }, new OrderBookWindowFactory.FilterStates { - statuses = new[] { OrderStatus.Working } - }); + }); public override OrderBookWindowFactory.OrderBookStartupData SaveState => _state = new OrderBookWindowFactory.OrderBookStartupData( @@ -70,11 +62,7 @@ namespace mbts.spark { } public void thread_init() { - _vm = cv_orderbook_enabled ? - (IOrderBookVM)new CVOrderBookVM(_bus, _model, _state) : - (IOrderBookVM)new OrderBookVM(_factory, base._bus, _model, _state); - _view = new OrderBookView(_vm); - _view.DataContext = _vm; + _view = new OrderBookView(_vm = new OrderBookVM(_bus, _model, _state)); _show_fills_command = SparkCommands.ShowFills.complete(() => new FillsWindowFactory.StartupData(_vm.selected_orders.Select(r => r.Key).ToArray())); diff --git a/src/client/spark/Modules/Trading/OrderBookWindowFactory.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs similarity index 94% rename from src/client/spark/Modules/Trading/OrderBookWindowFactory.cs rename to src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs index 4c2f7521a..baed8302f 100644 --- a/src/client/spark/Modules/Trading/OrderBookWindowFactory.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs @@ -83,8 +83,8 @@ namespace bts.shell { public string exchange_message_regex; [ProtoMember(17)] public TimeFilterTuple last_change; - [ProtoMember(18)] - public string security_regex; + //[ProtoMember(18)] + //public string security_regex; [ProtoMember(19)] public api.orderman.OrderSubType[] order_sub_types; } diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderNode.cs b/src/client/spark/Modules/Trading/OrderBook/OrderNode.cs similarity index 100% rename from src/client/spark/view/Spark/Shell/OrderBook/OrderNode.cs rename to src/client/spark/Modules/Trading/OrderBook/OrderNode.cs diff --git a/src/client/spark/view/Spark/Shell/OrderBook/ParentOrderSortWrapper.cs b/src/client/spark/Modules/Trading/OrderBook/ParentOrderSortWrapper.cs similarity index 100% rename from src/client/spark/view/Spark/Shell/OrderBook/ParentOrderSortWrapper.cs rename to src/client/spark/Modules/Trading/OrderBook/ParentOrderSortWrapper.cs diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookColumns.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookColumns.cs deleted file mode 100644 index 401900572..000000000 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookColumns.cs +++ /dev/null @@ -1,176 +0,0 @@ -using bts.api; -using bts.api.orderman; -using mbts.spark.filters; -using mbts.ui; -using mbts.ui.converters; -using mbts.ui.utility.text; -using System; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Controls.Primitives; -using System.Windows.Data; -using System.Windows.Media; -using static mbts.spark.OrderBookView; -using static mbts.ui.controls.DIYGrid; - -namespace mbts.spark { - partial class OrderBookVM { - static class RenderUtils { - public static readonly Brush _working_order_brush = 0xffedcdu.rgb_brush(); - public static readonly GlyphContext _child_glyph_context = TextUtils.StandardGlyphContext.with(FontWeights.Light); - public static double font_size = FontSizes.Small; - - public static readonly IValueConverter - _sub_type_text_converter = new ui.spark.converters.OrderSubTypeDisplayTextConverter(), - _side_brush_converter = new AnonymousValueConverter(s => s == Side.Buy ? BTSColors.MarketData.bid : BTSColors.MarketData.ask), - _font_weight_converter = new AnonymousValueConverter(is_child => is_child ? FontWeights.Light : FontWeights.Normal); - public static readonly IMultiValueConverter - _price_text_converter = new ui.spark.converters.TickDisplayConverter(), - _background_converter = new AnonymousMultiValueConverter( - (selected, status) => selected || status != OrderStatus.Working ? Brushes.Transparent : _working_order_brush); - - public static BindingBase _get_background_binding() { - var mb = new MultiBinding { Converter = _background_converter }; - mb.Bindings.Add(new Binding(nameof(ListBoxItem.IsSelected)) { RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(ListBoxItem), 1) }); - mb.Bindings.Add(new Binding(nameof(OrderBookRowVM.status))); - return mb; - } - - static RenderUtils() => _working_order_brush.Freeze(); - - public static GlyphContext get_glyph_context(OrderBookRowVM r) => r.is_child ? _child_glyph_context : TextUtils.StandardGlyphContext; - public static Brush get_side_brush(OrderBookRowVM r) => r.side == Side.Buy ? BTSColors.MarketData.bid : BTSColors.MarketData.ask; - public static BindingBase get_font_weight_binding() => new Binding(nameof(OrderBookRowVM.is_child)) { Converter = _font_weight_converter }; - public static string format_price(OrderBookRowVM row, double price) => row.security.HasValue ? row.security.Value.ContractSpec.format(price) : row.price.ToString(); - } - - abstract class OrderbookColumnBase : ColumnBase, IKeyedColumn, IFilterableColumn { - protected OrderbookColumnBase(Columns col_key, string header, string sort_prop, double width, IDataGridColumnFilter filter, string filter_template) : base(col_key) { - Width = width; - Header = header; - sort_member_path = sort_prop; - this.filter = filter; - this.filter_template = filter_template; - } - - public IDataGridColumnFilter filter { get; } - public string filter_template { get; } - } - - class SimpleTextColumn : OrderbookColumnBase, IRenderColumn { - readonly Func _get_text; - public SimpleTextColumn(Columns key, string header, string sort_prop, Func get_text, double width, IDataGridColumnFilter filter, string filter_template) - : base(key, header, sort_prop, width, filter, filter_template) => _get_text = get_text; - - public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) { - string text = _get_text(row); - if (!string.IsNullOrEmpty(text)) - CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, text, position, RowHeight, - Brushes.Black, null, HorizontalAlignment.Left, VerticalAlignment.Center, DefaultCellPadding); - } - } - - class SideColumn : OrderbookColumnBase, IRenderColumn { - public SideColumn(IDataGridColumnFilter filter) - : base(Columns.Side, "B/S", nameof(OrderBookRowVM.side), DefaultColumnWidths.Side, filter, DataGridFilterKnownTemplates.EnumValues) { } - - public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, row.side.ToString(), position, RowHeight, - RenderUtils.get_side_brush(row), null, HorizontalAlignment.Left, VerticalAlignment.Center, DefaultCellPadding); - } - - class SizeColumn : OrderbookColumnBase, IRenderColumn { - public SizeColumn(IDataGridColumnFilter filter) - : base(Columns.Size, "Qty", nameof(OrderBookRowVM.quantity), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax) { } - - public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, row.quantity.ToString(), position, RowHeight, - RenderUtils.get_side_brush(row), null, HorizontalAlignment.Right, VerticalAlignment.Center, DefaultCellPadding); - } - - class FilledColumn : OrderbookColumnBase, IRenderColumn { - public FilledColumn(IDataGridColumnFilter filter) - : base(Columns.Filled, "Filled Qty", nameof(OrderBookRowVM.filled_quantity), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax) { } - - public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, row.filled_quantity.ToString(), position, RowHeight, - RenderUtils.get_side_brush(row), null, HorizontalAlignment.Right, VerticalAlignment.Center, DefaultCellPadding); - } - - class PriceColumn : OrderbookColumnBase, IRenderColumn { - public PriceColumn(IDataGridColumnFilter filter) - : base(Columns.Price, "Price", nameof(OrderBookRowVM.price), DefaultColumnWidths.Price, filter, DataGridFilterKnownTemplates.DoubleMinMax) { } - - public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, RenderUtils.format_price(row, row.price), - position, RowHeight, Brushes.Black, null, HorizontalAlignment.Right, VerticalAlignment.Center, DefaultCellPadding); - } - - class AvgFilledColumn : OrderbookColumnBase, IRenderColumn { - public AvgFilledColumn(IDataGridColumnFilter filter) - : base(Columns.AvgFilled, "Avg Filled", nameof(OrderBookRowVM.avg_price), DefaultColumnWidths.Price, filter, DataGridFilterKnownTemplates.DoubleMinMax) { } - - public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) { - CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, RenderUtils.format_price(row, row.avg_price), - position, RowHeight, Brushes.Black, null, HorizontalAlignment.Right, VerticalAlignment.Center, DefaultCellPadding); - } - } - - class LastFilledColumn : OrderbookColumnBase, IRenderColumn { - public LastFilledColumn(IDataGridColumnFilter filter) - : base(Columns.LastPrice, "Last Filled", nameof(OrderBookRowVM.last_price), DefaultColumnWidths.Price, filter, DataGridFilterKnownTemplates.DoubleMinMax) { } - - public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, RenderUtils.format_price(row, row.last_price), - position, RowHeight, Brushes.Black, null, HorizontalAlignment.Right, VerticalAlignment.Center, DefaultCellPadding); - } - - class TimeCreatedColumn : OrderbookColumnBase, IRenderColumn { - public TimeCreatedColumn(IDataGridColumnFilter filter) - : base(Columns.Time, "Time", nameof(OrderBookRowVM.time_created), DefaultColumnWidths.Time, filter, DataGridFilterKnownTemplates.TimeFilter) { } - - public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, $"{row.time_created:M/d} {row.time_created:h:mm:ss.fff tt}", - position, RowHeight, Brushes.Black, null, HorizontalAlignment.Left, VerticalAlignment.Center, DefaultCellPadding); - } - - class LastChangeTimeColumn : OrderbookColumnBase, IRenderColumn { - public LastChangeTimeColumn(IDataGridColumnFilter filter) - : base(Columns.LastChange, "Last Change", nameof(OrderBookRowVM.last_change), DefaultColumnWidths.Time, filter, DataGridFilterKnownTemplates.TimeFilter) { } - - public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, RenderUtils.get_glyph_context(row), RenderUtils.font_size, $"{row.time_created:M/d} {row.time_created:h:mm:ss.fff tt}", - position, RowHeight, Brushes.Black, null, HorizontalAlignment.Left, VerticalAlignment.Center, DefaultCellPadding); - } - - class SecurityColumn : FrameworkElementColumnBase { - readonly BindingBase _font_weight_binding = RenderUtils.get_font_weight_binding(); - - public SecurityColumn(IDataGridColumnFilter filter) : base(Columns.Security) { - this.filter = filter; - Header = DefaultColumnHeaders.Security; - Width = DefaultColumnWidths.Security; - } - - public IDataGridColumnFilter filter { get; } - public string filter_template => DataGridFilterKnownTemplates.Regex; - - public override FrameworkElement view_factory() { - var toggle_button = new ToggleButton { ClickMode = ClickMode.Press, IsThreeState = false }; - toggle_button.SetBinding(ToggleButton.IsCheckedProperty, new Binding(nameof(OrderBookRowVM.is_expanded))); - toggle_button.SetBinding(ToggleButton.MarginProperty, new Binding(nameof(OrderBookRowVM.Margin))); - toggle_button.SetResourceReference(ToggleButton.StyleProperty, ExpandCollapseToggleStyleKey); - var security_view = new TextBlock(); - security_view.SetBinding(TextBlock.TextProperty, nameof(OrderBookRowVM.security_text)); - security_view.SetBinding(TextBlock.FontWeightProperty, _font_weight_binding); - var grid = new Grid(); - Grid.SetColumn(security_view, 1); - grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto }); - grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) }); - grid.Children.Add(toggle_button); - grid.Children.Add(security_view); - return grid; - } - } - } -} \ No newline at end of file diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookRowVM.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookRowVM.cs deleted file mode 100644 index f14192fe8..000000000 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookRowVM.cs +++ /dev/null @@ -1,302 +0,0 @@ -using bts.api; -using bts.api.orderman; -using bts.spark; -using mbts.ui; -using mbts.ui.shell; -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Input; -using static mbts.spark.SparkTags; -using OrderStatus = bts.api.orderman.OrderStatus; - -namespace mbts.spark -{ - class OrderBookRowVM : ViewModelBase, IEquatable, ui.controls.DIYGrid.IRowVM, ui.controls.DIYGrid.IActionableRowVM { - // implement Equals to be sync_with -friendly; Equals will defer to the OrderRecordImmutable - readonly IBus _bus; - readonly OrderBookVM _book_vm; - readonly OrdersModel _model; - OrderRecordImmutable _order; - List _child_order_ids = new List(); - - //ParentOrderDateSortWrapper _time_created_parent_wrapper; - - - public OrderBookRowVM(IBus bus, OrderBookVM source_vm, OrdersModel model, OrderRecordImmutable record, SecurityImmutable? s /*, OrderRecordImmutable? parent_order, bool sort_ascending*/) { - _bus = bus; - _book_vm = source_vm; - _model = model; - _order = record; - security = s; - _visible = backing(nameof(is_visible), true); - _expanded = backing(nameof(is_expanded), true); - toggle_command = new DelegateCommand(() => is_expanded = !is_expanded); - show_order_modify_command = new DelegateCommand( - execute: _ => _bus.post(ShowModifyOrderTag, _order.Key), - can_execute: _ => { return _order.State.Status == bts.api.orderman.OrderStatus.Working; } - ); - - //_time_created_parent_wrapper = new ParentOrderDateSortWrapper(_order, parent_order, sort_ascending); - } - - void ignore() {/*These setters are just for WPF databinding :(*/ throw new NotImplementedException(); } - - // we need the equality to look at is_parent since - // spreader orders parents can and will arrive - // before there are any child orders - // and we need to compare the security b/c we can get spreads - // securities later than the orders on startup - public bool Equals(OrderBookRowVM other) { - if (other == null) { return false; } - return this._order.Equals(other._order) && is_parent == other.is_parent && security == other.security; - } - - public override bool Equals(object obj) { - return this.Equals(obj as OrderBookRowVM); - } - - public override int GetHashCode() { - return this._order.GetHashCode(); - } - - // the grid view uses this for sorting, it was just a bts.api.Security once upon a time, but that class no longer implements IComparable - // this SelectableViewModeBase is essentially a wrapper class, which implements ISelecatble and IComparable - public SecurityImmutable? security { get; } - public OrderRecordImmutable order => _order; - - public string order_key { - get => _order.Key.ToString(); - set => ignore(); - } - - public uint parent_order_key { - get => _order.ParentKey; - set => ignore(); - } - - public uint security_key { - get => _order.Def.SecurityKey; - set => ignore(); - } - - public Side side { - get => _order.Def.Side; - set => ignore(); - } - - public string user { - get => _order.Def.User; - set => ignore(); - } - - public string account { - get => _order.Def.Account; - set => ignore(); - } - - public TimeInForce tif { - get => _order.Def.TimeInForce; - set => ignore(); - } - - public ManualOrderIndicator manual_order_indicator { - get => _order.Def.ManualOrderIndicator; - set => ignore(); - } - - public string cti_code { - get => _order.Def.CtiCode.ToString(); - set => ignore(); - } - - public string customer_or_firm { - get => _order.Def.CustomerOrFirm.ToString(); - set => ignore(); - } - - public OrderStatus status { - get => _order.State.Status; - set => ignore(); - } - - public double price { - get => _order.State.Price; - set => ignore(); - } - - public uint quantity { - get => _order.State.Quantity; - set => ignore(); - } - - public uint filled_quantity { - get => _order.State.FilledQuantity; - set => ignore(); - } - - public double last_price { - get => _order.State.LastPrice; - set => ignore(); - } - - public double avg_price { - get => _order.State.AvgPrice; - set => ignore(); - } - - public string last_msg { - get => _order.State.LastMsg; - set => ignore(); - } - - public DateTime last_change { - get { - if (_order.HasState && _order.State.LastChange != null) { - return _order.State.LastChange.ToDateTime().ToLocalTime(); - } - return DateTime.MinValue; - } - set => ignore(); - } - - public DateTime time_created { - get { - if (_order.HasState && _order.State.HasCreated) { - return _order.State.Created.ToDateTime().ToLocalTime(); - } - return DateTime.MinValue; - } - set => ignore(); - } - - public string security_text { - get { - return security.HasValue ? security.Value.ToString() : "Unkown security"; - } - } - - public Thickness Margin { - get { - int level = _book_vm.depth_level(this.order.Key); - double left_margin = 10.0 * level; - return new Thickness(left_margin, 0, 0, 0); - } - } - - public string security_text_for_depth { - // indent child 3 spaces - // can probably figure out levels and indent more - get { - int level = _book_vm.depth_level(this.order.Key); - int num_spaces_for_indent = 3 * level; - return new string(' ', num_spaces_for_indent) + security_text; - } - set => ignore(); - } - - public Venue exchange { - get => security.HasValue ? security.Value.Exchange : bts.api.Venue.Unset; - set => ignore(); - } - public CustomOrderDefinition.CustomOneofCase order_type { - get => _order.Def.CustomDef.CustomCase; - set => ignore(); - } - - public OrderSubType order_sub_type { - get => _order.Def.SubType; - set => ignore(); - } - - - public string order_sub_type_abbreviation { - get => _order.Def.SubType == OrderSubType.None ? string.Empty : _order.Def.SubType.ToString().Substring(0,1); - set => ignore(); - } - - public OrderMetadata order_metadata { - get => _model.factory.get_metadata(order_type); - set => ignore(); - } - - public bool is_selected { get; set; } - - public bool is_paused { get; set; } - - public bool is_parent { - get => this._child_order_ids.Count > 0; - set => ignore(); - } - public bool is_child => _order.ParentKey != 0; - - public void add_child_order(uint child_order_id) { - _child_order_ids.Add(child_order_id); - // we don't need to raise this every single time - if (_child_order_ids.Count <= 1) { - RaisePropertyChanged("is_parent"); - } - } - - private bool _i_match_a_filter = true; - public bool i_match_a_filter { - get { return _i_match_a_filter; } - set { _i_match_a_filter = value; } - } - - - // the root node will contain the bit that says yah or nay regarding - // the whole branch. - public bool branch_matches_filter { - get { - if (this.order.has_parent()) { - var parent_order = _book_vm.get_parent_order_vm(this.order.ParentKey); - if (parent_order != null) { - return parent_order.branch_matches_filter; - } - // parent can't be found, so can't check status, so show by default - return true; - } else { - return i_match_a_filter; - } - } - } - - public OrderBookRowVM root_vm { - get { - if (this.order.has_parent()) { - if(_book_vm.get_parent_order_vm(this.order.ParentKey) != null) { - return _book_vm.get_parent_order_vm(this.order.ParentKey).root_vm; - } - return null; - } else { - return this; - } - } - } - - Property _expanded; - public bool is_expanded { - get => _expanded.Value; - set { - _expanded.set(value); - _book_vm.set_expanded(value, _order.Key); - } - } - - Property _visible; - - public event Action invalidated; - void _unused_invalidate() => invalidated?.Invoke(); - - public bool is_visible { get => _visible.Value; set => _visible.set(value); } - - public ICommand toggle_command { get; } - public ICommand show_order_modify_command { get; } - public ICommand default_command => show_order_modify_command; - - public override string ToString() { - return $"{order_key} {last_change} {parent_order_key}"; - } - } -} diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs deleted file mode 100644 index 424e75697..000000000 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs +++ /dev/null @@ -1,477 +0,0 @@ -using bts.api; -using bts.api.core; -using bts.api.orderman; -using bts.collections; -using bts.shell; -using mbts.spark.filters; -using mbts.ui; -using mbts.ui.controls; -using mbts.ui.shell; -using mbts.ui.utility; -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Diagnostics; -using System.Linq; -using System.Reactive.Linq; -using System.Windows.Controls; -using System.Windows.Data; -using static bts.shell.OrderBookWindowFactory; -using static mbts.spark.OrderBookView; -using static mbts.ui.controls.DIYGrid; - -namespace mbts.spark { - partial class OrderBookVM : DisposableViewModelBase, IHandleRowSelection, IOrderBookVM { - readonly OrderBookWindowFactory _creator; - readonly OrdersModel _model; - ObservableCollection _selected_rows = new ObservableCollection(); - - public OrderBookVM(OrderBookWindowFactory factory, IBus bus, OrdersModel model, OrderBookWindowFactory.OrderBookStartupData state) { - // may not need the factory any longer since savestate is handled by the window - _creator = factory; - _bus = bus; - _model = model; - _visible_orders = new ObservableFilterCollection(_orders, o => o.is_visible && o.branch_matches_filter); - - #region Create grid filters and load state - side_filter = DiscreteValuesFilterVM.Create(new[] { Side.Buy, Side.Sell }, r => r.side, nameof(OrderBookRowVM.side)); - order_type_filter = DiscreteValuesFilterVM.Create(EnumHelper.get_values().ToLArray(), r => r.order_type, nameof(OrderBookRowVM.order_type)); - order_sub_type_filter = DiscreteValuesFilterVM.Create(EnumHelper.get_values().ToLArray(), r => r.order_sub_type, nameof(OrderBookRowVM.order_sub_type)); - tif_filter = DiscreteValuesFilterVM.Create(EnumHelper.get_values().ToLArray(), r => r.tif, nameof(OrderBookRowVM.tif)); - exchange_filter = DiscreteValuesFilterVM.Create(EnumHelper.get_values().ToLArray(), r => r.exchange, nameof(OrderBookRowVM.exchange)); - account_filter = DiscreteValuesFilterVM.Create(_model.factory.subscribe_accounts(), r => r.account, nameof(OrderBookRowVM.account)); - user_filter = DiscreteValuesFilterVM.Create(_model.factory.subscribe_users(), r => r.user, nameof(OrderBookRowVM.user)); - order_key_filter = new RegexFilterVM(r => r.order_key, nameof(OrderBookRowVM.order_key)); - security_key_filter = new RegexFilterVM(r => r.security_key.ToString(), nameof(OrderBookRowVM.security_key)); - status_filter = DiscreteValuesFilterVM.Create(EnumHelper.get_values().ToLArray(), r => r.status, nameof(OrderBookRowVM.status)); - exchange_message_filter = new RegexFilterVM(r => r.last_msg, nameof(OrderBookRowVM.last_msg)); - - if (state.filters != null) - { - order_key_filter.load_state(state.filters.order_key_regex); - time_created_filter.load_state(state.filters.time_created); - user_filter.load_state(state.filters.users); - account_filter.load_state(state.filters.accounts); - exchange_filter.load_state(state.filters.exchanges); - tif_filter.load_state(state.filters.tifs); - order_type_filter.load_state(state.filters.order_types); - side_filter.load_state(state.filters.sides); - qty_filter.load_state(state.filters.qty); - price_filter.load_state(state.filters.price); - qty_filled_filter.load_state(state.filters.qty_filled); - avg_price_filter.load_state(state.filters.avg_price); - last_price_filter.load_state(state.filters.last_price); - status_filter.load_state(state.filters.statuses); - exchange_message_filter.load_state(state.filters.exchange_message_regex); - last_change_filter.load_state(state.filters.last_change); - security_filter.load_state(state.filters.security_regex); - } - else - { - // default order form filter to only show status == working - status_filter.load_state(new OrderStatus[] { OrderStatus.Working }); - } - - var fs = new List>() { - security_filter - , time_created_filter - , last_change_filter - , user_filter - , account_filter - , exchange_filter - , tif_filter - , order_type_filter - , order_sub_type_filter - , side_filter - , qty_filter - , price_filter - , qty_filled_filter - , avg_price_filter - , last_price_filter - , status_filter - , exchange_message_filter - , security_key_filter - , order_key_filter - }.ToArray(); - #endregion - - // restore sort criteria if any - if (state.sort_criteria.Count > 0) { - var saved_criteria = state.sort_criteria[0]; - current_sort_description = new SortDescription(saved_criteria.col_name, saved_criteria.is_ascending ? ListSortDirection.Ascending : ListSortDirection.Descending); - } - - _current_row = backing(nameof(current_row)); - - var securities_sequence = _bus.subscribe(SparkTags.SecuritiesTag); - var orders_with_found_securities_sub = _model.on_orders - .Sample(TimeSpan.FromMilliseconds(333)) - .CombineLatest(securities_sequence, - (order_list, security_dict) => { - List<(OrderRecordImmutable order, SecurityImmutable? security)> orders_and_securities = new List<(OrderRecordImmutable, SecurityImmutable?)>(order_list.state.Count); - foreach (var order in order_list.state.Values) { - if (security_dict.TryGetValue(order.Def.SecurityKey, out SecurityMD sec_md)) { - orders_and_securities.Add((order, sec_md.security)); - } else { - orders_and_securities.Add((order, null)); - } - } - return orders_and_securities; - }) - .OnDispatcher() - .Subscribe(order_security_pairs => { - using (_visible_orders.defer_refresh()) - { - apply_sort(order_security_pairs); - apply_filter(fs); - } - }); - - columns.Add(new SecurityColumn(security_filter)); - columns.Add(new TimeCreatedColumn(time_created_filter)); - columns.Add(new LastChangeTimeColumn(last_change_filter)); - add_text_col(Columns.User, DefaultColumnHeaders.User, nameof(OrderBookRowVM.user), r => r.user, DefaultColumnWidths.User, user_filter, DataGridFilterKnownTemplates.DiscreteValues); - add_text_col(Columns.Account, DefaultColumnHeaders.Account, nameof(OrderBookRowVM.account), r => r.account, DefaultColumnWidths.Account, account_filter, DataGridFilterKnownTemplates.DiscreteValues); - add_text_col(Columns.Exchange, DefaultColumnHeaders.Exchange, nameof(OrderBookRowVM.exchange), r => r.exchange.ToString(), DefaultColumnWidths.Exchange, exchange_filter, DataGridFilterKnownTemplates.EnumValues); - add_text_col(Columns.TimeInForce, DefaultColumnHeaders.TimeInForce, nameof(OrderBookRowVM.tif), r => r.tif.ToString(), DefaultColumnWidths.TimeInForce, tif_filter, DataGridFilterKnownTemplates.EnumValues); - columns.Add(new OrderTypeColumn(Columns.OrderType, new Binding(nameof(OrderBookRowVM.order_type)), new Binding(nameof(OrderBookRowVM.order_metadata)), order_type_filter) { - font_weight_binding = RenderUtils.get_font_weight_binding() - }); - add_text_col(Columns.SubType, "Sub Type", nameof(OrderBookRowVM.order_sub_type), r => r.order_sub_type.ToString(), 80, order_sub_type_filter, SubTypeFilterTemplateKey); - columns.Add(new SideColumn(side_filter)); - columns.Add(new SizeColumn(qty_filter)); - columns.Add(new PriceColumn(price_filter)); - columns.Add(new FilledColumn(qty_filled_filter)); - columns.Add(new AvgFilledColumn(avg_price_filter)); - columns.Add(new LastFilledColumn(last_price_filter)); - add_text_col(Columns.Status, "Status", nameof(OrderBookRowVM.status), r => r.status.ToString(), 80, status_filter, DataGridFilterKnownTemplates.EnumValues); - columns.Add(new TextColumn(Columns.LastMessage, new Binding(nameof(OrderBookRowVM.last_msg)), exchange_message_filter, DataGridFilterKnownTemplates.Regex) { - Header = "Last Message", - Width = 80, - tooltip_binding = new Binding(nameof(OrderBookRowVM.last_msg)) - }); - add_text_col(Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, nameof(OrderBookRowVM.security_key), r => r.security_key.ToString(), DefaultColumnWidths.SecurityKey, security_key_filter, DataGridFilterKnownTemplates.Regex); - add_text_col(Columns.OrderKey, DefaultColumnHeaders.OrderKey, nameof(OrderBookRowVM.order_key), r => r.order_key.ToString(), DefaultColumnWidths.OrderKey, order_key_filter, DataGridFilterKnownTemplates.Regex); - // - void add_text_col(Columns key, string header, string sort_prop, Func get_text, double width, IDataGridColumnFilter filter, string filter_template) => - columns.Add(new SimpleTextColumn(key, header, sort_prop, get_text, width, filter, filter_template)); - // - foreach (var col in columns) - if (col.sort_member_path == current_sort_description.PropertyName) - col.SortDirection = current_sort_description.Direction; - - _dispose = Disposable.Create( - orders_with_found_securities_sub, - DataGridFilterHelper.hook_filters(visible_orders - , () => { - using (_visible_orders.defer_refresh()) { - apply_filter(fs); - } - } - , fs - )); - } - - public ObservableCollection columns { get; } = new ObservableCollection(); - - private void apply_sort(List<(OrderRecordImmutable order, SecurityImmutable? security)> order_security_pairs) { - // create OrderBookRowVMs for all order_security_pairs - Dictionary dict = new Dictionary(order_security_pairs.Count()); - foreach (var entry in order_security_pairs) { - dict.Add(entry.order.Key, new OrderBookRowVM(_bus, this, _model, entry.order, entry.security)); - } - - // call add_child_order on the row_vm so make children known - foreach (var i in dict.Values) { - if (i.is_child && dict.ContainsKey(i.parent_order_key)) { - dict[i.parent_order_key].add_child_order(i.order.Key); - } - } - - if (_get_comparer_for_sort_description(current_sort_description, out Comparer sorter)) { - SortedTree forest = new SortedTree( - sorter - , row_vm => row_vm.order.Key - , row_vm => row_vm.order.ParentKey - , dict.Values - ); - _orders.sync_with(forest); - } - } - - //FIXME Jake -- this might be slow, consider trying to work the meat of this into the _visible_orders lambda - private void apply_filter(IDataGridColumnFilter[] fs) { - // make everything invisble - foreach (var z in _orders) { - if (z.root_vm != null) { - z.root_vm.i_match_a_filter = false; - } - } - - // find the rows that match the filter - var active_filters = fs.Where(f => f.active.HasValue && f.active.Value).ToList(); - Func x = r => active_filters.All(f => f.filter(r)); - var rows_matching_filter = _orders.Where(x); - - // set their root nodes to filtered - foreach (var row_vm in rows_matching_filter) { - if (row_vm.root_vm != null) { - row_vm.root_vm.i_match_a_filter = true; - } - } - } - - public void on_sorting(DIYGridSortingEventArgs e) { - e.Column.SortDirection = e.Column.SortDirection.HasValue && e.Column.SortDirection.Value == ListSortDirection.Ascending ? ListSortDirection.Descending : ListSortDirection.Ascending; - if (_get_comparer_for_column(e.Column, out Comparer sorter)) { - SortedTree forest = new SortedTree( - sorter - , row_vm => row_vm.order.Key - , row_vm => row_vm.order.ParentKey - , _orders - ); - // we don't want the filter firing while the internal list is changing - // b/c parent discovery wono't work while the list is in trasitional - // states - using (_visible_orders.defer_refresh()) { - _orders.sync_with(forest); - } - } - // We ALWAYS want to set this here, else the grid tries to be helpful - // and sort with its own CollectionView, which destroys the SortedTree - // sort order; we want it to never use the CollectionView - e.Handled = true; - } - - private bool _get_comparer_for_sort_description(SortDescription sc, out Comparer s) { - int mult = sc.Direction == ListSortDirection.Ascending ? 1 : -1; - switch (sc.PropertyName) { - case nameof(OrderBookRowVM.security_text): - s = Comparer.Create((first, second) => - mult * first.security_text.CompareTo(second.security_text) - ); - return true; - case nameof(OrderBookRowVM.time_created): - s = Comparer.Create((first, second) => - mult * first.time_created.CompareTo(second.time_created) - ); - return true; - case nameof(OrderBookRowVM.last_change): - s = Comparer.Create((first, second) => - mult * first.last_change.CompareTo(second.last_change) - ); - return true; - case nameof(OrderBookRowVM.user): - s = Comparer.Create((first, second) => - mult * first.user.CompareTo(second.user) - ); - return true; - case nameof(OrderBookRowVM.account): - s = Comparer.Create((first, second) => - mult * first.account.CompareTo(second.account) - ); - return true; - case nameof(OrderBookRowVM.exchange): - s = Comparer.Create((first, second) => - mult * first.exchange.CompareTo(second.exchange) - ); - return true; - case nameof(OrderBookRowVM.tif): - s = Comparer.Create((first, second) => - mult * first.tif.CompareTo(second.tif) - ); - return true; - case nameof(OrderBookRowVM.order_type): - s = Comparer.Create((first, second) => - mult * first.order_type.CompareTo(second.order_type) - ); - return true; - case nameof(OrderBookRowVM.order_sub_type): - s = Comparer.Create((first, second) => - mult * first.order_sub_type.CompareTo(second.order_sub_type) - ); - return true; - case nameof(OrderBookRowVM.side): - s = Comparer.Create((first, second) => - mult * first.side.CompareTo(second.side) - ); - return true; - case nameof(OrderBookRowVM.quantity): - s = Comparer.Create((first, second) => - mult * first.quantity.CompareTo(second.quantity) - ); - return true; - case nameof(OrderBookRowVM.price): - s = Comparer.Create((first, second) => - mult * first.price.CompareTo(second.price) - ); - return true; - case nameof(OrderBookRowVM.filled_quantity): - s = Comparer.Create((first, second) => - mult * first.filled_quantity.CompareTo(second.filled_quantity) - ); - return true; - case nameof(OrderBookRowVM.avg_price): - s = Comparer.Create((first, second) => - mult * first.avg_price.CompareTo(second.avg_price) - ); - return true; - case nameof(OrderBookRowVM.last_price): - s = Comparer.Create((first, second) => - mult * first.last_price.CompareTo(second.last_price) - ); - return true; - case nameof(OrderBookRowVM.status): - s = Comparer.Create((first, second) => - mult * first.status.CompareTo(second.status) - ); - return true; - case nameof(OrderBookRowVM.last_msg): - s = Comparer.Create((first, second) => - mult * first.last_msg.CompareTo(second.last_msg) - ); - return true; - case nameof(OrderBookRowVM.security_key): - s = Comparer.Create((first, second) => - mult * first.security_key.CompareTo(second.security_key) - ); - return true; - case nameof(OrderBookRowVM.order_key): - s = Comparer.Create((first, second) => - mult * first.order_key.CompareTo(second.order_key) - ); - return true; - default: - s = null; - return false; - } - } - - private bool _get_comparer_for_column(ColumnBase c, out Comparer sorter) { - if (!(c.sort_member_path is string sort_path)) - sorter = null; - else { - var proposed_sort = new SortDescription(sort_path, c.SortDirection.Value); - if (_get_comparer_for_sort_description(proposed_sort, out sorter)) { - current_sort_description = proposed_sort; - return true; - } - } - return false; - } - - - private readonly IBus _bus; - - public OrderBookRowVM get_parent_order_vm(uint target_parent_key) => - _orders.FirstOrDefault(x => x.order.Key == target_parent_key); - - internal void set_expanded(bool visible, uint target_parent_key) { - foreach (var order in _orders) { - if (order.parent_order_key == target_parent_key) { - order.is_visible = visible; - set_expanded(visible, order.order.Key); - } - } - _visible_orders.trigger_filter(); - } - - internal bool order_has_children(uint order_key) { - bool found = _orders.Any(row_vm => row_vm.parent_order_key == order_key); - if (!found) { Debug.WriteLine($"no orders found with {order_key} as a parent ==> no children"); } - return found; - } - - internal int depth_level(uint order_key) { - int i = -1; - while (order_key != 0) { - i++; - var found_order_for_key = _orders.Where(x => x.order.Key == order_key); - if (found_order_for_key.Count() > 0) { - order_key = found_order_for_key.First().parent_order_key; - } else { - // can't traverse list, so stick it at depth 1 - return 0; - } - } - return i; - } - - public void row_selection_changed(SelectionChangedEventArgs e) { - RowSelectionHelper.apply_changes(_selected_rows, e); - on_selected_order_changed(current_order); - } - - public event Action selected_order_changed; - - void on_selected_order_changed(OrderRecordImmutable? order) { - selected_order_changed?.Invoke(order); - } - - private ObservableCollection _orders = new ObservableCollection(); - - private ObservableFilterCollection _visible_orders; - public ObservableFilterCollection visible_orders { - get { - return _visible_orders; - } - } - - public SortDescription current_sort_description { get; set; } = new SortDescription(nameof(OrderBookRowVM.time_created), ListSortDirection.Descending); - - Property _current_row; - public OrderBookRowVM current_row { get => _current_row.Value; set => _current_row.Value = value ?? _selected_rows.FirstOrDefault(); } - public OrderRecordImmutable? current_order => current_row?.order; - public ObservableCollection selected_rows => _selected_rows; - public IEnumerable selected_orders => _selected_rows.Select(r => r.order); - - #region Filters - public IDataGridColumnPersistentFilter price_filter { get; } = new DoubleMinMax(r => r.price, nameof(OrderBookRowVM.price)); - public IDataGridColumnPersistentFilter qty_filter { get; } = new UIntMinMax(r => r.quantity, nameof(OrderBookRowVM.quantity)); - public IDataGridColumnPersistentFilter qty_filled_filter { get; } = new UIntMinMax(r => r.filled_quantity, nameof(OrderBookRowVM.filled_quantity)); - public IDataGridColumnPersistentFilter side_filter { get; } - public IDataGridColumnPersistentFilter order_type_filter { get; } - public IDataGridColumnPersistentFilter order_sub_type_filter { get; } - public IDataGridColumnPersistentFilter tif_filter { get; } - public IDataGridColumnPersistentFilter exchange_filter { get; } - public IDataGridColumnPersistentFilter account_filter { get; } - public IDataGridColumnPersistentFilter user_filter { get; } - public IDataGridColumnPersistentFilter time_created_filter { get; } = new TimeFilterVM(r => r.time_created, nameof(OrderBookRowVM.time_created)); - public IDataGridColumnPersistentFilter last_change_filter { get; } = new TimeFilterVM(r => r.last_change, nameof(OrderBookRowVM.last_change)); - public IDataGridColumnPersistentFilter order_key_filter { get; } - public IDataGridColumnPersistentFilter security_key_filter { get; } - public IDataGridColumnPersistentFilter avg_price_filter { get; } = new DoubleMinMax(r => r.avg_price, nameof(OrderBookRowVM.avg_price)); - public IDataGridColumnPersistentFilter last_price_filter { get; } = new DoubleMinMax(r => r.last_price, nameof(OrderBookRowVM.last_price)); - public IDataGridColumnPersistentFilter status_filter { get; } - public IDataGridColumnPersistentFilter exchange_message_filter { get; } - public IDataGridColumnPersistentFilter security_filter { get; } = new RegexFilterVM(r => r.security_text, nameof(OrderBookRowVM.security_text)); - - - public FilterStates get_filter_states() => - new FilterStates { - order_key_regex = order_key_filter.get_state(), - time_created = time_created_filter.get_state(), - users = user_filter.get_state(), - accounts = account_filter.get_state(), - exchanges = exchange_filter.get_state(), - tifs = tif_filter.get_state(), - order_types = order_type_filter.get_state(), - sides = side_filter.get_state(), - qty = qty_filter.get_state(), - price = price_filter.get_state(), - qty_filled = qty_filled_filter.get_state(), - avg_price = avg_price_filter.get_state(), - last_price = last_price_filter.get_state(), - statuses = status_filter.get_state(), - exchange_message_regex = exchange_message_filter.get_state(), - last_change = last_change_filter.get_state(), - security_regex = security_filter.get_state() - }; - - public List get_sorting_states() => - new List() { new SortingCriteria(current_sort_description) }; - #endregion - } -} \ No newline at end of file diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml.cs deleted file mode 100644 index 4e0577ed4..000000000 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml.cs +++ /dev/null @@ -1,58 +0,0 @@ -using bts.api.core; -using bts.api.orderman; -using bts.shell; -using mbts.ui; -using mbts.ui.controls; -using System; -using System.Collections.Generic; -using System.Windows.Controls; - -namespace mbts.spark { - interface IOrderBookVM : IDisposable { - event Action selected_order_changed; - // - OrderRecordImmutable? current_order { get; } - IEnumerable selected_orders { get; } - // - void on_sorting(DIYGridSortingEventArgs e); - List get_sorting_states(); - OrderBookWindowFactory.FilterStates get_filter_states(); - } - - internal partial class OrderBookView : UserControl { - public enum Columns { Security, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey } - public const string - SubTypeFilterTemplateKey = "SubTypeFilterTemplate", - ExpandCollapseToggleStyleKey = "ExpandCollapseToggleStyle", - RowStyleKey = "RowStyle", - RowTemplateKey = "RowTemplateKey", - CVRowStyleKey = "CVRowStyle", - CVRowTemplateKey = "CVRowTemplateKey"; - - public static string ActiveRowStyleKey => - OrderBookWindow.cv_orderbook_enabled ? CVRowStyleKey : RowStyleKey; - - public static string ActiveRowTemplateKey => - OrderBookWindow.cv_orderbook_enabled ? CVRowTemplateKey : RowTemplateKey; - - public const double RowHeight = 17; - IOrderBookVM _vm; - - public OrderBookView(IOrderBookVM vm) { - InitializeComponent(); - _vm = vm; - DataContext = vm; - } - - void data_grid_sorting(object sender, DIYGridSortingEventArgs args) => - _vm.on_sorting(args); - } - - class OrderBookRowView : DIYGrid.HighPerformanceRow { - public OrderBookRowView() : base(OrderBookView.RowHeight) { } - } - - class CVOrderBookRowView : DIYGrid.HighPerformanceRow { - public CVOrderBookRowView() : base(OrderBookView.RowHeight) { } - } -} \ No newline at end of file