diff --git a/doc/user/docs/release_notes.md b/doc/user/docs/release_notes.md index 77eb815cc..10120db8c 100644 --- a/doc/user/docs/release_notes.md +++ b/doc/user/docs/release_notes.md @@ -11,7 +11,7 @@ - Improved the exchange simulator to track real market data more closely ### Bug Fixes - Fixed a UI crash in some cases when attempting to sort the order book by time - - + ## 1.4.5 - Fixed entitlement validation for ICS spreads - Tuned performance logging diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index 4dce5ec3a..5eda77cdf 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -210,36 +210,28 @@ namespace mbts.spark { var order = _orders_model.factory.order(security); switch (col) { case MarketViewView.Columns.Bid: - order.Side = Side.Sell; - _bus.post(SparkTags.ShowOrderTicketTag, (order, bid_price, 0u)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Sell), bid_price, 0u)); break; case MarketViewView.Columns.BidMergedSize: - order.Side = Side.Sell; - _bus.post(SparkTags.ShowOrderTicketTag, (order, bid_price, bid_merged_size)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Sell), bid_price, bid_merged_size)); break; case MarketViewView.Columns.BidDirectSize: - order.Side = Side.Sell; - _bus.post(SparkTags.ShowOrderTicketTag, (order, bid_price, bid_direct_size)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Sell), bid_price, bid_direct_size)); break; case MarketViewView.Columns.BidImpliedSize: - order.Side = Side.Sell; - _bus.post(SparkTags.ShowOrderTicketTag, (order, bid_price, bid_implied_size)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Sell), bid_price, bid_implied_size)); break; case MarketViewView.Columns.Ask: - order.Side = Side.Buy; - _bus.post(SparkTags.ShowOrderTicketTag, (order, ask_price, 0u)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Buy), ask_price, 0u)); break; case MarketViewView.Columns.AskMergedSize: - order.Side = Side.Buy; - _bus.post(SparkTags.ShowOrderTicketTag, (order, ask_price, ask_merged_size)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Buy), ask_price, ask_merged_size)); break; case MarketViewView.Columns.AskDirectSize: - order.Side = Side.Sell; - _bus.post(SparkTags.ShowOrderTicketTag, (order, ask_price, ask_direct_size)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Sell), ask_price, ask_direct_size)); break; case MarketViewView.Columns.AskImpliedSize: - order.Side = Side.Sell; - _bus.post(SparkTags.ShowOrderTicketTag, (order, ask_price, ask_implied_size)); + _bus.post(SparkTags.ShowOrderTicketTag, (order.with(side:Side.Sell), ask_price, ask_implied_size)); break; case MarketViewView.Columns.Last: _bus.post(SparkTags.ShowOrderTicketTag, (order, last_price, 0u)); diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs index fb5b92f62..48a11aff0 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs @@ -97,8 +97,11 @@ namespace mbts.spark { public IEnumerable read_trades() { var copy = _securities; foreach (var tm in _channel.read_trades(ref _cursor)) { - if (copy.TryGetValue(tm.Key, out SecurityImmutable sec)) - yield return new TradeInfo(sec, tm); + if (tm != null) { + if (copy.TryGetValue(tm.Key, out SecurityImmutable sec)) { + yield return new TradeInfo(sec, new TradeMessageImmutable(tm)); + } + } } } } diff --git a/src/client/spark/Modules/Spreader/SpreaderModel.cs b/src/client/spark/Modules/Spreader/SpreaderModel.cs index c1f82ab8a..346f74e22 100644 --- a/src/client/spark/Modules/Spreader/SpreaderModel.cs +++ b/src/client/spark/Modules/Spreader/SpreaderModel.cs @@ -53,8 +53,8 @@ namespace mbts.spark { return null; } - public async Task create_synthetic(SecurityImmutable synthetic) { - var result = await _service.create_synthetic_async(synthetic); + public async Task create_synthetic(SecurityImmutable? synthetic) { + var result = await _service.create_synthetic_async(synthetic.Value); return _error.handle_error(result, "Error creating synthetic: {0}", r => r.Error, e => e == CreateResult.Types.Error.Ok, r => new uint?(r.Key), () => null).result; } diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs index 6381e8f5d..093d9f4d9 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs @@ -294,9 +294,9 @@ namespace mbts.spark { base.Dispose(disposing); } - static string _deduce_symbol(SecurityImmutable security) { - if (!string.IsNullOrWhiteSpace(security.Symbol)) return security.Symbol; - if (security.Synthetic.Legs.Count() > 0) return security.Synthetic.Legs.First().Security.Symbol; + static string _deduce_symbol(SecurityImmutable? security) { + if (!string.IsNullOrWhiteSpace(security?.Symbol)) return security?.Symbol; + if (security?.Synthetic.Legs.Count() > 0) return security?.Synthetic.Legs.First().Security.Symbol; return string.Empty; } diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 320db04d9..595108167 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -178,7 +178,7 @@ namespace mbts.spark { } else return model.on_fill_tuples; } - static IConnectableObservable> _get_observable(IBus bus, OrdersModel model, IObservable state) => + static IConnectableObservable> _get_observable(IBus bus, OrdersModel model, IObservable state) => state.SelectManyInSeries(s => _get_observable(bus, model, s)); public class Row : SecurityRow, IEquatable, IRowVM { @@ -186,7 +186,7 @@ namespace mbts.spark { readonly FillImmutable _fill; readonly OrderRecordImmutable _order; - public Row(FillTuple fill_tuple, OrdersModel model) : base(fill_tuple.security_md.HasValue ? fill_tuple.security_md.Value.security : SecurityDataHelper.Defaults.Security) { + public Row(FillTuple fill_tuple, OrdersModel model) : base(fill_tuple.security_md.HasValue ? fill_tuple.security_md.Value.security : SecurityDataHelper.Defaults.SecurityImmutable) { _fill = fill_tuple.fill; _order = fill_tuple.order ?? OrderDataHelper.Defaults.OrderRecordImmutable; _model = model; diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index 509c67f35..53cb911f1 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -139,13 +139,13 @@ namespace mbts.spark { tif => time_in_forces.Contains(tif)); _dispose = Disposable.Create(() => _order_type.Changed -= on_selected_order_type_changed); // local methods - IOrderTypeVM create_order_type_vm(CustomOrderDefinitionImmutable cd, string id, string display_name) { + IOrderTypeVM create_order_type_vm(CustomOrderDefinitionImmutable? cd, string id, string display_name) { IOrderTypeVM vm = null; - if(cd.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic) - vm = OrderTypeVMFactory.create(cd.CustomCase, id, display_name, model, security_md_source, cd.Dynamic.DynamicOrderType); + if(cd?.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic) + vm = OrderTypeVMFactory.create(cd.Value.CustomCase, id, display_name, model, security_md_source, cd.Value.Dynamic.DynamicOrderType); else - vm = OrderTypeVMFactory.create(cd.CustomCase, id, display_name, model, security_md_source); - vm.load_from(cd); + vm = OrderTypeVMFactory.create(cd.Value.CustomCase, id, display_name, model, security_md_source); + vm.load_from(cd.Value); return vm; } InlineUserProperty get_order_type_vm_prop(InlineOrderProperties p) { diff --git a/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs index 7ac53dcc6..f869cc4fd 100644 --- a/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/SpreaderOrderVM.cs @@ -19,7 +19,8 @@ namespace mbts.spark { var so = model.factory.spreader_order(); so.Security = s.CloneToMutable(); so.ExecutionStrategy = strategy.CloneToMutable(); - return new InlineUserProperty(so, true); + var soi = new SpreaderOrderDefinitionImmutable(so); + return new InlineUserProperty(soi, true); })), id, display_name) { } public SpreaderOrderVM( diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index bf24da63c..eba27fea3 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -93,10 +93,13 @@ namespace mbts.spark { #endregion #region Input - public async Task send_order(OrderDefinitionImmutable order, double price, uint size) { - var result = (await send_order_get_error(order, price, size)); - _activity.on_send_order(order, price, size, result.key, result.error); - return result.key; + public async Task send_order(OrderDefinitionImmutable? order, double price, uint size) { + if (order.HasValue) { + var result = (await send_order_get_error(order.Value, price, size)); + _activity.on_send_order(order.Value, price, size, result.key, result.error); + return result.key; + } + return 0; } async Task<(uint? key, string error)> send_order_get_error(OrderDefinitionImmutable order, double price, uint size) { diff --git a/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs b/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs index 5f4638b6b..89e202b05 100644 --- a/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs +++ b/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs @@ -34,9 +34,11 @@ namespace bts.view.controls { private void any_button_click(object sender, RoutedEventArgs e) { Close(); } - internal static void Show(ErrorReportService srv, ErrorReport report) { - var window = new SupportRequestWindow(new SupportRequestVM(srv, report)); - window.Show(); + internal static void Show(ErrorReportService srv, ErrorReportImmutable? report) { + if (report.HasValue) { + var window = new SupportRequestWindow(new SupportRequestVM(srv, report.Value)); + window.Show(); + } } } diff --git a/src/client/spark/view/Spark/Core/TickUtils.cs b/src/client/spark/view/Spark/Core/TickUtils.cs index 180f1a3b1..e2658ce21 100644 --- a/src/client/spark/view/Spark/Core/TickUtils.cs +++ b/src/client/spark/view/Spark/Core/TickUtils.cs @@ -123,7 +123,7 @@ namespace mbts.spark { return intpart + floatpart; } - public static RegionalTickFactors get_regional_ticks(ContractSpecificationImmutable spec) => + public static RegionalTickFactors get_regional_ticks(ContractSpecificationImmutable? spec) => TickStore.get(spec); public static RegionalTickFactors get_regional_ticks(SecurityImmutable security) => @@ -177,8 +177,14 @@ namespace mbts.spark { public static RegionalTickFactors get(ContractSpecification spec) => _exchange_ticks.GetOrAdd(new SpecKey(spec), _create_rtf); - public static RegionalTickFactors get(ContractSpecificationImmutable spec) => - _exchange_ticks.GetOrAdd(new SpecKey(spec), _create_rtf); + public static RegionalTickFactors get(ContractSpecificationImmutable? spec) { + if (spec.HasValue) { + return _exchange_ticks.GetOrAdd(new SpecKey(spec.Value), _create_rtf); + } + else { + return null; + } + } public static RegionalTickFactors get(SecurityImmutable security) => security.HasContractSpec ? get(security.ContractSpec) : default_rtf; diff --git a/src/client/spark/view/Spark/Ladder/LadderSettings.cs b/src/client/spark/view/Spark/Ladder/LadderSettings.cs index 9b884bab0..7fce37546 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettings.cs +++ b/src/client/spark/view/Spark/Ladder/LadderSettings.cs @@ -181,6 +181,7 @@ namespace mbts.spark { [ProtoContract] class LadderSettings : IEquatable { const double _default_order_entry_panel_width = 110.0; + const double _default_zoom_factor = 1.0; // Default proto constructor // Added this so that when clients upgrade to a version with new settings, @@ -203,6 +204,7 @@ namespace mbts.spark { auto_clear_visible = true; clear_visible = true; order_entry_panel_initial_width = _default_order_entry_panel_width; + zoom_factor = _default_zoom_factor; use_defaults = true; } @@ -260,7 +262,9 @@ namespace mbts.spark { cancel_all_visible = true, auto_clear_visible = true, clear_visible = true, - order_entry_panel_initial_width = _default_order_entry_panel_width + order_entry_panel_initial_width = _default_order_entry_panel_width, + zoom_slider_visible = false, + zoom_factor = _default_zoom_factor, }; } } @@ -357,10 +361,19 @@ namespace mbts.spark { public bool clear_visible { get; set; } // [ProtoMember(43), DefaultValue(_default_order_entry_panel_width)] - public double order_entry_panel_initial_width { get; set; } + public double order_entry_panel_initial_width { get; set; } + [ProtoMember(44), DefaultValue(true)] public bool use_defaults { get; set; } + // the zoom slider is the first new widget on the panel + // since our initial general release, so its enablement + // will be opt-in (default not visible) + [ProtoMember(45)] + public bool zoom_slider_visible { get; set; } + [ProtoMember(46), DefaultValue(_default_zoom_factor)] + public double zoom_factor { get; set; } + public bool Equals(LadderSettings other) => other != null && row_height == other.row_height && @@ -403,6 +416,8 @@ namespace mbts.spark { auto_clear_visible == other.auto_clear_visible && clear_visible == other.clear_visible && order_entry_panel_initial_width == other.order_entry_panel_initial_width && + zoom_slider_visible == other.zoom_slider_visible && + zoom_factor == other.zoom_factor && use_defaults == other.use_defaults; public override bool Equals(object obj) => Equals(obj as LadderSettings); @@ -449,16 +464,18 @@ namespace mbts.spark { auto_clear_visible.GetHashCode(), clear_visible.GetHashCode(), order_entry_panel_initial_width.GetHashCode(), + zoom_slider_visible.GetHashCode(), + zoom_factor.GetHashCode(), use_defaults.GetHashCode()); public struct WindowSpecifics { - public readonly double order_entry_panel_width; + public readonly double order_entry_panel_width, zoom_factor; public readonly uint orders_column_width, bid_column_width, price_column_width, ask_column_width, last_column_width, volume_column_width; public WindowSpecifics(LadderSettings s) - : this(s.order_entry_panel_initial_width, s.orders_column.width, s.bid_column.width, s.price_column.width, s.ask_column.width, s.last_column.width, s.volume_column.general.width) { } + : this(s.order_entry_panel_initial_width, s.orders_column.width, s.bid_column.width, s.price_column.width, s.ask_column.width, s.last_column.width, s.volume_column.general.width, s.zoom_factor) { } - public WindowSpecifics(double order_entry_panel_width, uint orders_column_width, uint bid_column_width, uint price_column_width, uint ask_column_width, uint last_column_width, uint volume_column_width) { + public WindowSpecifics(double order_entry_panel_width, uint orders_column_width, uint bid_column_width, uint price_column_width, uint ask_column_width, uint last_column_width, uint volume_column_width, double zoom_factor) { this.order_entry_panel_width = order_entry_panel_width; this.orders_column_width = orders_column_width; this.bid_column_width = bid_column_width; @@ -466,6 +483,7 @@ namespace mbts.spark { this.ask_column_width = ask_column_width; this.last_column_width = last_column_width; this.volume_column_width = volume_column_width; + this.zoom_factor = zoom_factor; } } } @@ -496,6 +514,7 @@ namespace mbts.spark { source.ask_column.width = specifics.ask_column_width; source.last_column.width = specifics.last_column_width; source.volume_column.general.width = specifics.volume_column_width; + source.zoom_factor = specifics.zoom_factor; return source; } } diff --git a/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs b/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs index 3c5d297c6..4a3c0dfb5 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs @@ -17,7 +17,7 @@ namespace mbts.spark { readonly Property _badge_style; readonly Property _alternate_order_size; readonly DelegateProperty _row_height; - Func _get_order_entry_panel_width; + Func _get_order_entry_panel_width, _get_zoom_factor; LadderSettings _current; LadderColumnSettingsVM _orders = new OrdersColumnSettingsVM(), @@ -34,6 +34,7 @@ namespace mbts.spark { _session_high_mkt_line = new LadderMarketBreakLineVM("Session High", 2, 1, false), _session_range_fill = new LadderMarketBreakLineVM("Session Range", 0, 0, false); OrderEntryPanelItemVisibilityVM + _zoom_slider_visbility = new OrderEntryPanelItemVisibilityVM("Zoom Slider"), _day_visibility = new OrderEntryPanelItemVisibilityVM("Day Change"), _high_visibility = new OrderEntryPanelItemVisibilityVM("High"), _low_visibility = new OrderEntryPanelItemVisibilityVM("Low"), @@ -51,7 +52,7 @@ namespace mbts.spark { _cancel_sells_visibility = new OrderEntryPanelItemVisibilityVM("Cancel Sells"), _cancel_all_visibility = new OrderEntryPanelItemVisibilityVM("Cancel All"); - public LadderSettingsVM(bool is_synthetic, Func get_left_panel_width) { + public LadderSettingsVM(bool is_synthetic, Func get_left_panel_width, Func get_zoom_factor) { this.is_synthetic = is_synthetic; size_presets = new ObservableEditableCollection>(_create_size_preset_vm); size_presets.CollectionChanged += (s, e) => RaisePropertyChanged(nameof(size_presets_text)); @@ -59,6 +60,7 @@ namespace mbts.spark { _badge_style.Changed += _badge_style_Changed; _alternate_order_size = backing(nameof(alternate_order_size)); _get_order_entry_panel_width = get_left_panel_width; + _get_zoom_factor = get_zoom_factor; // be sure to initialize backings before this measure_row_height call _row_height = backing(nameof(row_height), () => LadderRender.measure_row_height(get_result())); _orders.font_size_changed += on_font_size_changed; @@ -130,6 +132,7 @@ namespace mbts.spark { public IEnumerable order_entry_panel_items { get { + yield return _zoom_slider_visbility; yield return _day_visibility; yield return _high_visibility; yield return _low_visibility; @@ -169,6 +172,7 @@ namespace mbts.spark { _session_low_mkt_line.assign_from(_current.session_low_line); _session_high_mkt_line.assign_from(_current.session_high_line); _session_range_fill.assign_from(_current.session_range_fill); + _zoom_slider_visbility.show = settings.zoom_slider_visible; _day_visibility.show = settings.day_visible; _high_visibility.show = settings.high_visible; _low_visibility.show = settings.low_visible; @@ -227,6 +231,8 @@ namespace mbts.spark { clone.cancel_sells_visible = _cancel_sells_visibility.show; clone.cancel_all_visible = _cancel_all_visibility.show; clone.order_entry_panel_initial_width = _get_order_entry_panel_width(); + clone.zoom_slider_visible = _zoom_slider_visbility.show; + clone.zoom_factor = _get_zoom_factor(); return clone; } diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index 42ead9405..4b7528808 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -24,12 +24,13 @@ namespace mbts.spark { readonly IBus _bus; readonly LadderModel _model; - readonly Property _high, _low, _change, _open, _settlement, _position, _left_panel_width; + readonly Property _high, _low, _change, _open, _settlement, _position, _left_panel_width, _zoom_factor; + //readonly Property _window_width, _window_height; readonly Property _orders_column_width, _bid_column_width, _price_column_width, _ask_column_width, _last_column_width, _volume_column_width; readonly Property _volume; readonly Property _auto_clear, _show_day, _show_high, _show_low, _show_open, _show_settle, _show_volume, _show_account, _show_tif, _show_order_type, _show_account_position, _show_size_preset, _show_auto_clear, _show_clear, _show_cancel_buys, - _show_cancel_sells, _show_cancel_all; + _show_cancel_sells, _show_cancel_all, _show_zoom; readonly Property _bid_background, _bid_foreground, _ask_background, _ask_foreground; IWindowSettingsManager _settings_manager; ulong _misc_time = 0; @@ -58,6 +59,7 @@ namespace mbts.spark { _last_column_width = backing(nameof(last_column_width), ws.last_column_width); _volume_column_width = backing(nameof(volume_column_width), ws.volume_column_width); _left_panel_width = backing(nameof(left_panel_width), ws.order_entry_panel_width); + _zoom_factor = backing(nameof(zoom_factor), ws.zoom_factor); // remember: account_positions needs to subscribe to selected_account; both the sub and account_positions need to be disposed var account_positions = new KeyDrivenObservableSeries(a => _model.order_gateway.security_total_position(security.Id, a)); _position = backing(nameof(position), account_positions.OnDispatcher()); @@ -89,11 +91,14 @@ namespace mbts.spark { _show_cancel_buys = bool_prop(nameof(show_cancel_buys), s => s.cancel_buys_visible); _show_cancel_sells = bool_prop(nameof(show_cancel_sells), s => s.cancel_sells_visible); _show_cancel_all = bool_prop(nameof(show_cancel_all), s => s.cancel_all_visible); + _show_zoom = bool_prop(nameof(show_zoom), s => s.zoom_slider_visible); Property bool_prop(string name, Func get_bool) => backing(name, settings_manager.subscribe_current().OnDispatcher(), get_bool); // + //_window_height = backing(nameof(window_height), settings_manager.subscribe_current().OnDispatcher().Select(s => s.zoom_factor), (scale) => scale * 600); + //_window_width = backing(nameof(window_width), settings_manager.subscribe_current().OnDispatcher().Select(s => s.zoom_factor), (scale) => scale * 420); position_click_command = new DelegateCommand(() => size_calculator.value = DoubleHelper.safe_convert_to_uint(Math.Abs(position))); send_order_command = new DelegateCommand<(double price, Side? side, bool size_from_alternate)>(send_order); cancel_command = new AsyncCommand(_model.cancel_orders, true); @@ -103,7 +108,7 @@ namespace mbts.spark { var vm = new WindowSettingsDialogVM( settings_manager, s => s.ladder, UserSettings.FileExtensions.LADDER, s => { - var svm = new LadderSettingsVM(security.ContractCase == Security.ContractOneofCase.Synthetic, () => left_panel_width); + var svm = new LadderSettingsVM(security.ContractCase == Security.ContractOneofCase.Synthetic, () => left_panel_width, () => zoom_factor); svm.load(s); return svm; }, s => s.with_window_specifics(get_save_state().get_window_specifics())); @@ -284,7 +289,11 @@ namespace mbts.spark { public bool show_cancel_buys { get => _show_cancel_buys.Value; set => _show_cancel_buys.set(value); } public bool show_cancel_sells { get => _show_cancel_sells.Value; set => _show_cancel_sells.set(value); } public bool show_cancel_all { get => _show_cancel_all.Value; set => _show_cancel_all.set(value); } + public bool show_zoom { get => _show_zoom.Value; set => _show_zoom.set(value); } public double left_panel_width { get => _left_panel_width.Value; set => _left_panel_width.set(value); } + public double zoom_factor { get => _zoom_factor.Value; set => _zoom_factor.set(value); } + //public double window_height { get => _window_height.Value; set => _window_height.set(value); } + //public double window_width { get => _window_width.Value; set => _window_width.set(value); } public uint orders_column_width { get => _orders_column_width.Value; set => _orders_column_width.set(value); } public uint bid_column_width { get => _bid_column_width.Value; set => _bid_column_width.set(value); } public uint price_column_width { get => _price_column_width.Value; set => _price_column_width.set(value); } @@ -296,7 +305,7 @@ namespace mbts.spark { public LadderSettings get_save_state() { var state = _settings_manager.current_settings(); - state = state.with_window_specifics(new LadderSettings.WindowSpecifics(left_panel_width, orders_column_width, bid_column_width, price_column_width, ask_column_width, last_column_width, volume_column_width)); + state = state.with_window_specifics(new LadderSettings.WindowSpecifics(left_panel_width, orders_column_width, bid_column_width, price_column_width, ask_column_width, last_column_width, volume_column_width, zoom_factor)); state.use_defaults = _settings_manager.instance_settings == null; return state; } diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index 00d67185d..65b738d80 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -9,6 +9,7 @@ xmlns:uag="clr-namespace:mbts.ui.spark.algo" xmlns:converters="clr-namespace:mbts.ui.converters" xmlns:txt="clr-namespace:mbts.ui.utility.text" + xmlns:sys="clr-namespace:System;assembly=mscorlib" Height="600" Width="420" Background="{x:Static mbts:BTSColors.common_background_brush}" @@ -273,10 +274,18 @@ + 1.5 + 0.5 + + + @@ -298,6 +307,13 @@ + + + diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml.cs b/src/client/spark/view/Spark/Ladder/LadderView.xaml.cs index 3b045d0d9..273bb4d9a 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml.cs +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml.cs @@ -5,9 +5,12 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; using System.Windows.Data; +using System.Windows.Input; namespace mbts.spark { partial class LadderView : UserControl { + readonly double _max_zoom, _min_zoom; + internal LadderView(LadderVM vm) { InitializeComponent(); _column_headers_presenter.Columns = new GridViewColumnCollection(); @@ -16,8 +19,58 @@ namespace mbts.spark { this.vm = vm; DataContext = vm; DataContextChanged += datacontext_changed; + if (TryFindResource("MaxZoomFactor") is double found_max) { + _max_zoom = found_max; + } else { + // is there a better way of not specifying the constant twice ? + // once in the resource dictionary here and again in the xaml, seems like there has to be a better way + _max_zoom = 1.5; + } + // ditto + if (TryFindResource("MinZoomFactor") is double found_min) { + _min_zoom = found_min; + } else { + _min_zoom = 0.5; + } + _ui_scaler.MouseDoubleClick += _ui_scaler_MouseDoubleClick; + this.PreviewMouseWheel += LadderView_PreviewMouseWheel; + this.PreviewMouseDown += LadderView_PreviewMouseDown; } + + + // (Left|Right) CTRL + Wheel to zoom + // This is neat b/c the user doesn't even need to have the slider visible to zoom + private void LadderView_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e) { + base.OnPreviewMouseWheel(e); + if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl)) { + var delta = (e.Delta > 0) ? 0.1 : -0.1; + var proposed_scaler_value = _ui_scaler.Value + delta; + // Here we enforce the same contraints that are on the gui slider regarding min and max + if (_min_zoom < proposed_scaler_value && proposed_scaler_value < _max_zoom) { + _ui_scaler.Value = proposed_scaler_value; + } + } + } + + // (Left|Right) CTRL + Wheel Click to reset + private void LadderView_PreviewMouseDown(object sender, MouseButtonEventArgs e) { + base.OnPreviewMouseDown(e); + if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl)) { + if (e.MiddleButton == MouseButtonState.Pressed) { + _ui_scaler_MouseDoubleClick(_ui_scaler, e); + } + } + } + + // Double click on scaler itself to reset + private void _ui_scaler_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e) { + if (sender is Slider _the_slider) { + _the_slider.Value = 1.0; + } + } + + private void datacontext_changed(object sender, DependencyPropertyChangedEventArgs e) { this.vm = DataContext as LadderVM; } diff --git a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs index e9ef09d5b..922765656 100644 --- a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs +++ b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs @@ -165,7 +165,8 @@ namespace mbts.spark.utilities { } #endregion - public OrderDefinition order(SecurityImmutable security) => order(security, _admin_model.get_default_account()); + public OrderDefinitionImmutable order(SecurityImmutable security) => + new OrderDefinitionImmutable(order(security, _admin_model.get_default_account())); public OrderDefinition order(SecurityImmutable security, AccountTuple? account) { var rv = new OrderDefinition { SecurityKey = security.Id, diff --git a/src/client/spark_api/md/MDSource.cs b/src/client/spark_api/md/MDSource.cs index c329f6216..9fdebb63b 100644 --- a/src/client/spark_api/md/MDSource.cs +++ b/src/client/spark_api/md/MDSource.cs @@ -54,7 +54,7 @@ namespace bts.md { foreach (var v in values) { - var smd = new SecurityMD(v.security, v.handle); + var smd = new SecurityMD(new SecurityImmutable(v.security), v.handle); _exchange_sec_map.AddOrUpdate(smd.security.Id, smd, (_, __) => smd); } _version += 1; diff --git a/src/client/spark_api/security/SecurityFormatter.cs b/src/client/spark_api/security/SecurityFormatter.cs index c03482ef1..0a328cdf2 100644 --- a/src/client/spark_api/security/SecurityFormatter.cs +++ b/src/client/spark_api/security/SecurityFormatter.cs @@ -37,17 +37,17 @@ namespace bts.api { $"{symbol}{DateFormatter.Format(future.ExpirationYear, future.ExpirationMonth, future.ExpirationDay, DateFormat.MonthCodeLastDigitYear)}" : exch_desc; - static string _format(SecurityImmutable security) { - switch (security.ContractCase) { - case ContractOneofCase.Future: return format_future(security.Symbol, security.glbx_desc(), security.Future); + static string _format(SecurityImmutable? security) { + switch (security?.ContractCase) { + case ContractOneofCase.Future: return format_future(security?.Symbol, security?.glbx_desc(), security.Value.Future); case ContractOneofCase.Spread: - if (security.HasGlbx) { + if (security?.HasGlbx == true) { // In case we ever bring it back, pretty printed spread names can be found here: // GlbxSecurityFormatter.FormatSpread(security, out string result) - return security.Glbx.SecurityDesc; + return security?.Glbx.SecurityDesc; } - return string.Join("", _format_future_legs(SecurityHelper.get_flat_future_legs(security.Spread.Legs))); - case ContractOneofCase.Synthetic: return security.Synthetic.Name; + return string.Join("", _format_future_legs(SecurityHelper.get_flat_future_legs(security?.Spread.Legs))); + case ContractOneofCase.Synthetic: return security?.Synthetic.Name; default: return "Unknown-security"; } } diff --git a/src/client/spark_api/security/SecurityHelper.cs b/src/client/spark_api/security/SecurityHelper.cs index af11abc23..7ef75b988 100644 --- a/src/client/spark_api/security/SecurityHelper.cs +++ b/src/client/spark_api/security/SecurityHelper.cs @@ -66,24 +66,10 @@ namespace bts.api { public static readonly IComparer InstanceImmutable = Comparer.Create(Compare); public static int Compare(Security x, Security y) { - if (x.ContractCase == ContractOneofCase.Future) return y.ContractCase == ContractOneofCase.Future ? Compare(x.Symbol, x.Future, y.Symbol, y.Future) : -1; - else if (y.ContractCase == ContractOneofCase.Future) return 1; - var xlegs = get_flat_future_legs(x).ToList(); - var ylegs = get_flat_future_legs(y).ToList(); - int max = Math.Min(xlegs.Count, ylegs.Count); - for (int i = 0; i < max; i++) { - int rv = Compare(xlegs[i].symbol, xlegs[i].future, ylegs[i].symbol, ylegs[i].future); - if (rv != 0) return rv; - } - for (int i = 0; i < max; i++) { - int rv = xlegs[i].quantity.CompareTo(ylegs[i].quantity); - if (rv != 0) return rv; - } - for (int i = 0; i < max; i++) { - int rv = xlegs[i].exchange.CompareTo(ylegs[i].exchange); - if (rv != 0) return rv; - } - return xlegs.Count.CompareTo(ylegs.Count); + if (ReferenceEquals(x, y)) return 0; // x ==y + if (x == null) return 1; // y > x + if (y == null) return -1; // x > y + return Compare(new SecurityImmutable(x), new SecurityImmutable(y)); } public static int Compare(SecurityImmutable x, SecurityImmutable y) { diff --git a/src/client/spark_test/Security/SecurityTests.cs b/src/client/spark_test/Security/SecurityTests.cs index 63104702a..f564bd858 100644 --- a/src/client/spark_test/Security/SecurityTests.cs +++ b/src/client/spark_test/Security/SecurityTests.cs @@ -12,9 +12,10 @@ namespace bts.mcore class SecurityTests { [Test] public void test_security_equal() { - SecurityImmutable a = new Security() { Id = 42 }; - SecurityImmutable b = new Security() { Id = 42 }; - SecurityImmutable c = new Security() { Id = 4 }; + + SecurityImmutable a = new SecurityImmutable(new Security() { Id = 42 }); + SecurityImmutable b = new SecurityImmutable(new Security() { Id = 42 }); + SecurityImmutable c = new SecurityImmutable(new Security() { Id = 4 }); Assert.IsTrue(a == b); Assert.IsTrue(a.Equals(b)); diff --git a/src/lib/api/service_compiler/templates/c#/immutable.pb.cs b/src/lib/api/service_compiler/templates/c#/immutable.pb.cs index 4972886db..06c8260c6 100644 --- a/src/lib/api/service_compiler/templates/c#/immutable.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/immutable.pb.cs @@ -31,8 +31,9 @@ namespace {{package}} { public {{name}} CloneToMutable() { return _impl.Clone(); } // Implicit conversion operator - public static implicit operator {{name}}Immutable({{name}} other) { - return new {{name}}Immutable(other, false); + public static implicit operator Nullable<{{name}}Immutable>({{name}} other) { + if (other == null) return null; + else return new {{name}}Immutable(other, false); } public override bool Equals(object other) { diff --git a/src/lib/config/protos/MarketData.proto b/src/lib/config/protos/MarketData.proto index 5ad80beea..90b204f74 100755 --- a/src/lib/config/protos/MarketData.proto +++ b/src/lib/config/protos/MarketData.proto @@ -123,8 +123,8 @@ message RecordOptions { // message ReplayOptions { optional string host = 1 [default = "mdreplay"]; - optional string base_path = 2 [default = "/md"]; - optional string file_name = 3 [default = "options.coconut"]; + optional string base_path = 2 [default = "/spark"]; + optional string file_name = 3 [default = "futures.coconut"]; // 2.0 = double speed, 0.5 = half speed optional double speed = 11 [default = 1.0]; diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index 678b5f9c9..38ea850b4 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -25,8 +25,10 @@ class OrderStateUpdateEvent : public mercury::Event { last_price = state.last_price(); avg_price = state.avg_price(); last_msg = state.last_msg(); + display_status = state.display_status(); + custom = state.custom_case(); - + auto native_state = get_native_state(state); if (native_state) { exchange_order_id = native_state->exchange_order_id(); @@ -50,7 +52,8 @@ class OrderStateUpdateEvent : public mercury::Event { double last_price; double avg_price; std::string last_msg; - + api::orderman::OrderState::DisplayStatus display_status; + trace::CorID trace; api::orderman::OrderState::CustomCase custom; @@ -74,7 +77,8 @@ class OrderStateUpdateEvent : public mercury::Event { result.set_last_price(last_price); result.set_avg_price(avg_price); result.set_last_msg(last_msg); - + result.set_display_status(display_status); + switch (custom) { case api::orderman::OrderState::kMarket: rebuild_native_state(result.mutable_market()->mutable_native_state());