diff --git a/src/client/spark/Modules/Trading/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/LadderWindowFactory.cs index 12dd3610b..e7be51cb8 100644 --- a/src/client/spark/Modules/Trading/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/LadderWindowFactory.cs @@ -21,7 +21,6 @@ namespace bts.shell { _bus = bus; _wm = wm; _orders_model = orders_model; - _dispose = Disposable.Create( bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s), bus.subscribe(SparkTags.ShowLadderTag).ObserveOnDispatcher().Subscribe(show_window), @@ -37,6 +36,9 @@ namespace bts.shell { return null; } + static LadderSaveState _get_state(LadderVM vm) => + new LadderSaveState { security_key = vm.security.Id, settings = vm.current_settings }; + IObservable default_ladder_settings() { var settings = new mbts.spark.LadderSettings(); return Observable.Return(settings); @@ -47,23 +49,25 @@ namespace bts.shell { var vm = new LadderVM(_bus, model, settings); var view = new LadderView { DataContext = vm }; var state = new LadderSaveState { security_key = md.security.Id, settings = vm.current_settings }; - return ShellWindow.create(module, md.security.ToString(), view, vm, s => save(state, s), Icons.Depth); + return ShellWindow.create(module, md.security.ToString(), view, vm, s => save(_get_state(vm), s), Icons.Depth); } void show_window(SecurityMD md) => _wm.Windows.Add(create_ladder_window(md, default_ladder_settings())); + // TODO: whenever we re-implement the linked ladder, need to add some field to the LadderSaveState to indicate the owning window void show_linked(IObservable keystream) { var view = new LadderView(); IDisposable sub = null; - var window = - ShellWindow.create(module, "loading", view, + var window = + ShellWindow.create(module, "loading", view, Disposable.Create(() => { (view.DataContext as LadderVM)?.Dispose(); sub?.Dispose(); - }), - s => save(new LadderSaveState() { security_key = ((LadderVM)view.DataContext).security.Id }, s), - Icons.Depth); + }), s => { + var vm = view.DataContext as LadderVM; + if (vm != null) save(_get_state(vm), s); + }, Icons.Depth); sub = keystream .Select(md => new LadderVM(_bus, new LadderModel(md, _orders_model), default_ladder_settings())) diff --git a/src/client/spark/view/Spark/Ladder/LadderSettings.cs b/src/client/spark/view/Spark/Ladder/LadderSettings.cs index df6ed263c..271fd7db8 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettings.cs +++ b/src/client/spark/view/Spark/Ladder/LadderSettings.cs @@ -15,7 +15,7 @@ namespace mbts.spark { public double font_size { get; set; } = 10; } - [ProtoContract(ImplicitFields = ImplicitFields.AllPublic)] + [ProtoContract] public class LadderSettings { public double row_height { get; set; } = 20; public UInt32 grid_line_color { get; set; } = 0x535353; @@ -23,44 +23,58 @@ namespace mbts.spark { // Column settings + [ProtoMember(1)] public LadderColumnSettings orders_column { get; set; } = new LadderColumnSettings() { show = true, background = 0XBABABA, //background = 0xFF3399 // for taha }; + [ProtoMember(2)] public LadderColumnSettings bid_column { get; set; } = new LadderColumnSettings() { show = true, foreground = 0xFFFFFF, background = ui.BTSColors.MarketData.bid }; + + [ProtoMember(3)] public LadderColumnSettings ask_column { get; set; } = new LadderColumnSettings() { show = true, foreground = 0xFFFFFF, background = ui.BTSColors.MarketData.ask }; + + [ProtoMember(4)] public LadderColumnSettings price_column { get; set; } = new LadderColumnSettings() { show = true, foreground = 0x000000, background = 0xBABABA, }; + [ProtoMember(5)] public LadderColumnSettings last_column { get; set; } = new LadderColumnSettings() { show = true, foreground = 0x000000, background = 0xBABABA, }; + [ProtoMember(6, OverwriteList = true)] public int[] calculator_buttons { get; set; } = new int[] { 1,5,10,25,50,100 }; + [ProtoMember(7)] public bool scroll_bar_visible { get; set; } + [ProtoMember(8)] public int ticks_to_recenter { get; set; } = 300000; + [ProtoMember(9)] public int seconds_to_recenter { get; set; } = 3000000; + [ProtoMember(10)] public string SelectedAlgo { get; set; } = "LimitOrder"; + [ProtoMember(11)] public string DefaultTimeInForce { get; set; } = "Day"; + [ProtoMember(12)] public uint size { get; set; } = 0; - + [ProtoMember(13)] public bool animate_recenter { get; set; } = true; } } \ No newline at end of file