diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index 2a28fba8c..83077c7e2 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -40,6 +40,7 @@ namespace mbts.spark { TimeInForce _default_time_in_force; LadderSettings.NetChangeTerms _price_format; double _order_entry_panel_width, _zoom_factor; + bool _auto_clear; LadderSettings _current; LadderColumnSettingsVM _orders = new OrdersColumnSettingsVM(), @@ -168,6 +169,10 @@ namespace mbts.spark { // algo public AlgoDefinitionVM default_algo { get => _default_algo.Value; set => _default_algo.Value = value; } public IReadOnlyObservableCollection algo_definitions => _algo_definitions; + // left-panel (components) + public bool auto_clear { get => _auto_clear; set => Set(ref _auto_clear, value); } + public double order_entry_panel_width { get => _order_entry_panel_width; set => Set(ref _order_entry_panel_width, value); } + public double zoom_factor { get => _zoom_factor; set => Set(ref _zoom_factor, value); } // favorites public FavoriteAlgosVM favorite_algos_vm { get; } @@ -211,8 +216,6 @@ namespace mbts.spark { } } - public double order_entry_panel_width { get => _order_entry_panel_width; set => Set(ref _order_entry_panel_width, value); } - public double zoom_factor { get => _zoom_factor; set => Set(ref _zoom_factor, value); } public IEnumerable order_entry_panel_items { get { yield return _zoom_slider_visbility; @@ -313,9 +316,11 @@ namespace mbts.spark { // - algo _desired_algo = settings.default_algo; _try_select_desired_algo(true); - // left-panel (components) + // - components + auto_clear = settings.auto_clear; order_entry_panel_width = settings.order_entry_panel_initial_width; zoom_factor = settings.zoom_factor; + // left-panel (show/hide) _zoom_slider_visbility.show = settings.zoom_slider_visible; _day_visibility.show = settings.day_visible; _high_visibility.show = settings.high_visible; @@ -362,12 +367,18 @@ namespace mbts.spark { clone.session_high_line = _session_high_mkt_line.get_settings(); clone.session_range_fill = _session_range_fill.get_settings(); // left-panel (defaults) + clone.default_time_in_force = default_time_in_force; + // - account if (default_account.HasValue) clone.default_account = default_account.Value.id; - clone.default_time_in_force = default_time_in_force; + // - algo clone.default_algo = default_algo != null ? AlgoID.from_algo_key(default_algo.key, _model.dynamic_helper.dynamic_type_index) : (_desired_algo ?? LadderSettings.Default.default_algo); + // - components + clone.auto_clear = auto_clear; + clone.order_entry_panel_initial_width = _order_entry_panel_width; + clone.zoom_factor = zoom_factor; // left-panel (components) clone.day_visible = _day_visibility.show; clone.high_visible = _high_visibility.show; @@ -386,9 +397,7 @@ namespace mbts.spark { clone.cancel_buys_visible = _cancel_buys_visibility.show; clone.cancel_sells_visible = _cancel_sells_visibility.show; clone.cancel_all_visible = _cancel_all_visibility.show; - clone.order_entry_panel_initial_width = _order_entry_panel_width; clone.zoom_slider_visible = _zoom_slider_visbility.show; - clone.zoom_factor = zoom_factor; clone.net_change = price_format; return clone; } diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index 02c3a7799..b1ef30bfa 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -850,7 +850,7 @@ - + @@ -860,7 +860,7 @@ - + @@ -873,6 +873,8 @@ + + Left Panel Width @@ -882,6 +884,10 @@ Zoom Factor + + + Auto Clear + @@ -923,7 +929,7 @@ - +