Change TimeAndSales to SparkWindow pattern
This commit is contained in:
1 parent
2397bde141
commit
1d70aa55a6
15 files changed
+163
-128
No files matched your search
@@ -23,7 +23,7 @@ namespace bts.shell
|
||||
|
||||
[ImportingConstructor]
|
||||
public MarketShellModule(IBus bus, SecuritySource ssrc, IWindowManager wm, [Import("username")]string user_name) {
|
||||
_tsf = new TimeAndSalesWindowFactory(this, bus, ssrc);
|
||||
_tsf = new TimeAndSalesWindowFactory(this, bus);
|
||||
_mvf = new MarketWindowFactory(this, bus, ssrc, wm);
|
||||
}
|
||||
|
||||
|
||||
@@ -17,25 +17,26 @@ using System.Linq;
|
||||
using System.Reactive.Linq;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using static mbts.ui.spark.TimeAndSalesView;
|
||||
|
||||
namespace mbts.spark
|
||||
{
|
||||
internal class TimeAndSalesVM : IDisposable
|
||||
class TimeAndSalesVM : IDisposable
|
||||
{
|
||||
public TimeAndSalesVM(IBus bus, IReadOnlyCollection<SecurityImmutable> securities, SecuritySource ssrc, IReadOnlyCollection<SortingCriteria> sorting_criteria = null) {
|
||||
_bus = bus;
|
||||
_ssrc = ssrc;
|
||||
_resources.Add(_model = new TimeAndSalesModel(bus, securities));
|
||||
public enum Columns { TradeTime, Security, Price, Size, OrderType }
|
||||
|
||||
public TimeAndSalesVM(TimeAndSalesModel model, IReadOnlyCollection<SortingCriteria> sorting_criteria) {
|
||||
_model = model;
|
||||
_rows = new ObservableAutoWrapper<Row, Tuple<SecurityImmutable, TradeMessage>>(_trades, tup => new Row(tup.Item1, tup.Item2));
|
||||
_rows.ViewDestroyed += r => r.Dispose();
|
||||
_resources.Add(Disposable.Create(() => _rows.Clear()));
|
||||
_dispose.Add(Disposable.Create(() => _rows.Clear()));
|
||||
rows_view = CollectionViewSource.GetDefaultView(_rows);
|
||||
if (sorting_criteria != null) rows_view.SortDescriptions.AddRange(sorting_criteria.Select(sc => sc.to_sort_description()));
|
||||
else rows_view.SortDescriptions.Add(new SortDescription(nameof(Row.trade_time), ListSortDirection.Descending));
|
||||
_resources.Add(_context_menu = new ContextMenuVM(_context_menu_item_factory));
|
||||
_resources.Add(_model.orders_model.on_orderbook().ObserveOnDispatcher().Subscribe(ob => _order_book = ob));
|
||||
_resources.Add(_model.trades.ObserveOnDispatcher().Subscribe(ts => {
|
||||
if (sorting_criteria != null && sorting_criteria.Any()) {
|
||||
rows_view.SortDescriptions.AddRange(sorting_criteria.Select(sc => sc.to_sort_description()));
|
||||
}
|
||||
else {
|
||||
rows_view.SortDescriptions.Add(new SortDescription(nameof(Row.trade_time), ListSortDirection.Descending));
|
||||
}
|
||||
_dispose.Add(_model.trades.ObserveOnDispatcher().Subscribe(ts => {
|
||||
if (ts.Count >= 1000) {
|
||||
_trades.Clear();
|
||||
for (int i = ts.Count - 1000; i < ts.Count; i++) _trades.Add(ts[i]);
|
||||
@@ -46,48 +47,22 @@ namespace mbts.spark
|
||||
_trades.AddRange(ts);
|
||||
}
|
||||
}));
|
||||
_resources.Add(_current_cell);
|
||||
_dispose.Add(_current_cell);
|
||||
}
|
||||
|
||||
private readonly IBus _bus;
|
||||
readonly SecuritySource _ssrc;
|
||||
private readonly TimeAndSalesModel _model;
|
||||
private readonly ObservableCollection<Tuple<SecurityImmutable, TradeMessage>> _trades = new ObservableCollection<Tuple<SecurityImmutable, TradeMessage>>();
|
||||
private readonly ObservableAutoWrapper<Row, Tuple<SecurityImmutable, TradeMessage>> _rows;
|
||||
private readonly ContextMenuVM _context_menu;
|
||||
private readonly ColdObseravbleProperty<DataGridCellInfo> _current_cell = new ColdObseravbleProperty<DataGridCellInfo>();
|
||||
private IList<IDisposable> _resources = new List<IDisposable>();
|
||||
private IOrderBook _order_book = new OrderBook();
|
||||
|
||||
private IEnumerable<MenuItemVM> _context_menu_item_factory() {
|
||||
yield return MenuItemVM.Create(new ModifySecuritySelectionMenuItem(new HashSet<SecurityImmutable>(_rows.Select(r => r.security.value)), _ssrc, _model.set_securities));
|
||||
if (current_cell != null && current_cell.Column != null && current_cell.Item != null && !current_cell.Item.Equals(System.Windows.DependencyProperty.UnsetValue)) {
|
||||
var securities = _rows.Where(r => r.is_selected).Select(r => r.security.value).ToList();
|
||||
yield return MenuItemVM.Create(new LadderMenuItem(_bus), securities);
|
||||
yield return MenuItemVM.Create(new LinkedLadderMenuItem(_bus, _get_current_security_observable().ToSecurityMD(_bus)));
|
||||
yield return MenuItemVM.Create(new OrderTicketMenuItem(_model.orders_model), securities);
|
||||
yield return MenuItemVM.Create(new LinkedOrderTicketMenuItem(_bus, _get_current_security_observable().Select(OrderDataHelper.Defaults.Order)));
|
||||
yield return MenuItemVM.Create(new MarketViewMenuItem(_bus), securities);
|
||||
yield return MenuItemVM.Create(new SpreadMatrixMenuItem(_bus), securities);
|
||||
yield return MenuItemVM.Create(new SyntheticCreateMenuItem(_bus), securities);
|
||||
yield return MenuItemVM.Create(new SyntheticStrategyMenuItem(_bus), securities);
|
||||
yield return MenuItemVM.Create(new ModifyOrderRootMenuItem(_model.orders_model, _order_book.get_active_orders_for_security(securities).Select(e => e.order()).ToList()), securities);
|
||||
yield return MenuItemVM.Create(new CancelOrderRootMenuItem(_model.orders_model, _order_book.get_active_orders_for_security(securities).Select(e => e.order()).ToList()), securities);
|
||||
yield return MenuItemVM.Create(new CancelBuyOrdersMenuItem(_model.orders_model), securities);
|
||||
yield return MenuItemVM.Create(new CancelSellOrdersMenuItem(_model.orders_model), securities);
|
||||
yield return MenuItemVM.Create(new CancelOrdersMenuItem(_model.orders_model), securities);
|
||||
}
|
||||
}
|
||||
private IList<IDisposable> _dispose = new List<IDisposable>();
|
||||
|
||||
private IObservable<SecurityImmutable> _get_current_security_observable() { return _current_cell.Select(_get_security).DistinctUntilChanged(); }
|
||||
private static SecurityImmutable _get_security(DataGridCellInfo cell) { return ((Row)cell.Item).security.value; }
|
||||
|
||||
public ICollectionView rows_view { get; private set; }
|
||||
public DataGridCellInfo current_cell { get => _current_cell.Value; set => _current_cell.set(value); }
|
||||
public ContextMenuVM context_menu => _context_menu;
|
||||
|
||||
public StartupData get_startup_data() { return new StartupData(_model.securities, rows_view.SortDescriptions.Select(sd => new SortingCriteria(sd)).ToArray()); }
|
||||
public void Dispose() { Disposable.dispose(_resources); }
|
||||
public void Dispose() { Disposable.dispose(_dispose); }
|
||||
|
||||
private class Row : GridRowViewModelBase<Columns> {
|
||||
public Row(SecurityImmutable security, TradeMessage trade) {
|
||||
@@ -105,18 +80,5 @@ namespace mbts.spark
|
||||
public SelectableViewModelBase<Order.AlgoOrderTypeOneofCase> order_type { get; }
|
||||
}
|
||||
|
||||
[ProtoContract]
|
||||
public class StartupData {
|
||||
public const int Version = 1;
|
||||
public StartupData() { }
|
||||
public StartupData(IEnumerable<SecurityImmutable> securities, SortingCriteria[] sorting_criteria) {
|
||||
if (securities != null) this.securities = securities.Select(s => ((IImmutableMessage)s).ToByteArray()).ToArray();
|
||||
this.sorting_criteria = sorting_criteria;
|
||||
}
|
||||
[ProtoMember(1)]
|
||||
public byte[][] securities;
|
||||
[ProtoMember(2)]
|
||||
public SortingCriteria[] sorting_criteria;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -18,7 +18,7 @@
|
||||
<Setter Property="IsSelected" Value="{Binding price.is_selected, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
</Style>
|
||||
<Style x:Key="SizeCell" TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
|
||||
<Setter Property="IsSelected" Value="{Binding size.is_selected, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
<!--<Setter Property="IsSelected" Value="{Binding size.is_selected, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged}"/>-->
|
||||
</Style>
|
||||
<Style x:Key="OrderTypeCell" TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
|
||||
<Setter Property="IsSelected" Value="{Binding order_type.is_selected, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
@@ -28,11 +28,6 @@
|
||||
<Grid>
|
||||
<c:DataGridEx ItemsSource="{Binding rows_view}" IsReadOnly="True" SelectionUnit="Cell" CanUserSortColumns="True" GridLinesVisibility="None"
|
||||
CurrentCell="{Binding current_cell, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged}" u:DataGridBehavior.NotifyColumnsOfSorting="True">
|
||||
<DataGrid.ContextMenu>
|
||||
<ContextMenu ItemsSource="{Binding context_menu.items_view}"
|
||||
IsOpen="{Binding context_menu.is_open, Mode=OneWayToSource}">
|
||||
</ContextMenu>
|
||||
</DataGrid.ContextMenu>
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="Time" CellStyle="{StaticResource TradeTimeCell}" Binding="{Binding trade_time.value, StringFormat='M/d H:mm:ss'}"/>
|
||||
<DataGridTextColumn Header="Security" CellStyle="{StaticResource SecurityCell}" Binding="{Binding security}"/>
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
using System.Windows.Controls;
|
||||
using mbts.spark;
|
||||
using System.Windows.Controls;
|
||||
|
||||
namespace mbts.ui.spark
|
||||
{
|
||||
public partial class TimeAndSalesView : UserControl
|
||||
{
|
||||
public enum Columns { TradeTime, Security, Price, Size, OrderType }
|
||||
|
||||
public TimeAndSalesView() {
|
||||
internal TimeAndSalesView(TimeAndSalesVM vm) {
|
||||
InitializeComponent();
|
||||
DataContext = vm;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,47 +6,74 @@ using System.Windows.Media;
|
||||
using mbts.ui.spark;
|
||||
using bts.api;
|
||||
using System.Collections.Generic;
|
||||
using static mbts.ui.shell.ProtoBufSerializationHelper;
|
||||
using bts.shell;
|
||||
using bts.spark;
|
||||
using System.Windows;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace mbts.spark
|
||||
{
|
||||
internal class TimeAndSalesWindow : IShellWindow
|
||||
{
|
||||
public TimeAndSalesWindow(TimeAndSalesWindowFactory factory, IBus bus, IReadOnlyCollection<SecurityImmutable> securities, SecuritySource ssrc) :
|
||||
this (factory, bus, securities, ssrc, null) { }
|
||||
public TimeAndSalesWindow(TimeAndSalesWindowFactory factory, IBus bus, TimeAndSalesVM.StartupData startup_data, SecuritySource ssrc) :
|
||||
this(factory, bus, startup_data.securities.Select(x => (SecurityImmutable)deserialize<Security>(x)).ToList(), ssrc, startup_data.sorting_criteria) { }
|
||||
namespace mbts.spark {
|
||||
internal class TimeAndSalesWindow : SparkWindow<TimeAndSalesStartupData> {
|
||||
readonly IBus _bus;
|
||||
|
||||
private TimeAndSalesWindow(TimeAndSalesWindowFactory factory, IBus bus, IReadOnlyCollection<SecurityImmutable> securities, SecuritySource ssrc, IReadOnlyCollection<SortingCriteria> sorting_criteria) {
|
||||
TimeAndSalesStartupData _state;
|
||||
|
||||
TimeAndSalesVM _vm;
|
||||
TimeAndSalesModel _model;
|
||||
TimeAndSalesView _view;
|
||||
TimeAndSalesWindowFactory _factory;
|
||||
|
||||
public static async Task<TimeAndSalesWindow> create(TimeAndSalesWindowFactory factory, IBus bus, TimeAndSalesStartupData state, ImageSource icon) {
|
||||
var window = new TimeAndSalesWindow(factory, bus, state, icon);
|
||||
await window.initialize();
|
||||
return window;
|
||||
}
|
||||
|
||||
private TimeAndSalesWindow(TimeAndSalesWindowFactory factory, IBus bus, TimeAndSalesStartupData state, ImageSource icon) : base("Time And Sales", bus, factory) {
|
||||
Logger.notnull(state);
|
||||
_bus = bus;
|
||||
_ssrc = ssrc;
|
||||
_securities = securities;
|
||||
_sorting_criteria = sorting_criteria;
|
||||
_state = state;
|
||||
_factory = factory;
|
||||
}
|
||||
|
||||
private readonly IBus _bus;
|
||||
readonly SecuritySource _ssrc;
|
||||
private readonly IReadOnlyCollection<SecurityImmutable> _securities;
|
||||
private readonly IReadOnlyCollection<SortingCriteria> _sorting_criteria;
|
||||
private TimeAndSalesVM _vm;
|
||||
private TimeAndSalesWindowFactory _factory;
|
||||
private string _title = "Time And Sales";
|
||||
private ImageSource _icon = Icons.Clock;
|
||||
public async Task initialize() {
|
||||
Logger.notnull(_state);
|
||||
var secmd = await _state.security_criteria.securities(_bus);
|
||||
var securities = secmd.Select(s => s.security).ToList();
|
||||
_model = new TimeAndSalesModel(_bus, securities);
|
||||
_vm = new TimeAndSalesVM(_model, _state.sort_criteria);
|
||||
_view = new TimeAndSalesView(_vm);
|
||||
}
|
||||
|
||||
public string Title { get => _title; set { _title = value; TitleChanged(); } }
|
||||
public ImageSource Icon { get => _icon; set { _icon = value; IconChanged(); } }
|
||||
public IShellModule Owner => _factory.owner;
|
||||
public override UIElement Content => _view;
|
||||
|
||||
public event Action TitleChanged;
|
||||
public event Action IconChanged;
|
||||
public void Dispose() { Disposable.dispose(ref _vm); }
|
||||
public ShellWindowUI GetContent() { return new ShellWindowUI(new TimeAndSalesView { DataContext = _vm = new TimeAndSalesVM(_bus, _securities, _ssrc, _sorting_criteria), Width = 400, Height = 500 }); }
|
||||
public void GetState(Stream save_here) {
|
||||
if (_vm != null) {
|
||||
_factory.save(_vm.get_startup_data(), save_here);
|
||||
public override IEnumerable<SparkCommand> Commands => new[] {
|
||||
SparkCommands.ShowLadder
|
||||
// linked ladder
|
||||
// OrderTicket
|
||||
// LinkedOrderTicket
|
||||
// MarketView
|
||||
// SpreadMatrix
|
||||
// SyntheticCreate
|
||||
// SyntheticStrategy
|
||||
// ModifyOrder
|
||||
// CancelOrdersRoot ?
|
||||
// CancelBuyOrders
|
||||
// CancelSellOrders
|
||||
// CancelOrders
|
||||
};
|
||||
|
||||
//public StartupData get_startup_data() { return new StartupData(_model.securities, rows_view.SortDescriptions.Select(sd => new SortingCriteria(sd)).ToArray()); }
|
||||
public override TimeAndSalesStartupData SaveState { get {
|
||||
_state =
|
||||
new TimeAndSalesStartupData(_state.security_criteria,
|
||||
_vm.rows_view.SortDescriptions.Select(sd => new SortingCriteria(sd)).ToList());
|
||||
return _state;
|
||||
}
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
Disposable.dispose(ref _vm);
|
||||
Disposable.dispose(ref _model);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,34 +7,50 @@ using System;
|
||||
using System.Reactive.Linq;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using ProtoBuf;
|
||||
using bts.spark;
|
||||
|
||||
namespace bts.shell {
|
||||
class TimeAndSalesWindowFactory : ShellWindowFactory<TimeAndSalesVM.StartupData> {
|
||||
readonly IShellModule _module;
|
||||
class TimeAndSalesWindowFactory : ShellWindowFactory<TimeAndSalesStartupData> {
|
||||
readonly IBus _bus;
|
||||
readonly SecuritySource _ssrc;
|
||||
IReadOnlyDictionary<uint, SecurityMD> _securities = new Dictionary<uint, SecurityMD>();
|
||||
|
||||
public TimeAndSalesWindowFactory(IShellModule module, IBus bus, SecuritySource ssrc) : base("TimeAndSales") {
|
||||
_module = module;
|
||||
public TimeAndSalesWindowFactory(IShellModule module, IBus bus) : base(module, "TimeAndSales") {
|
||||
_bus = bus;
|
||||
_ssrc = ssrc;
|
||||
|
||||
_dispose = Disposable.Create(
|
||||
bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s),
|
||||
bus.subscribe(SparkTags.ShowTimeAndSalesTag).ObserveOnDispatcher().Subscribe(show)
|
||||
);
|
||||
}
|
||||
public IShellModule owner => _module;
|
||||
public override Task<IShellWindow> load(TimeAndSalesVM.StartupData state) {
|
||||
return
|
||||
Task.FromResult<IShellWindow>( new TimeAndSalesWindow(this, _bus, state, _ssrc));
|
||||
public override async Task<IShellWindow> load(TimeAndSalesStartupData state) {
|
||||
return await TimeAndSalesWindow.create(this, _bus, state, SparkCommands.ShowTimeAndSales.icon);
|
||||
}
|
||||
|
||||
public async void show(SecurityCriteria criteria) {
|
||||
var securities = await criteria.securities(_bus);
|
||||
_bus.post(SparkTags.ShowWindow,
|
||||
new TimeAndSalesWindow(this, _bus, securities.Select(s => s.security).ToList(), _ssrc));
|
||||
var w = await load(new TimeAndSalesStartupData(criteria));
|
||||
_bus.post(SparkTags.ShowWindow, w);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[ProtoContract]
|
||||
class TimeAndSalesStartupData {
|
||||
[ProtoMember(100)]
|
||||
public readonly SecurityCriteria security_criteria;
|
||||
[ProtoMember(200)]
|
||||
public readonly List<SortingCriteria> sort_criteria;
|
||||
|
||||
private TimeAndSalesStartupData() {}//for ptorobuf
|
||||
public TimeAndSalesStartupData(SecurityCriteria securityCrit, List<SortingCriteria> sortCrit) {
|
||||
security_criteria = securityCrit;
|
||||
sort_criteria = sortCrit;
|
||||
}
|
||||
public TimeAndSalesStartupData(SecurityCriteria securityCrit) {
|
||||
security_criteria = securityCrit;
|
||||
sort_criteria = new List<SortingCriteria>();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -5,6 +5,7 @@ using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using mbts.ui;
|
||||
using mbts.spark;
|
||||
using static mbts.spark.SparkBusData;
|
||||
|
||||
namespace bts.spark
|
||||
{
|
||||
@@ -13,9 +14,9 @@ namespace bts.spark
|
||||
|
||||
// Market
|
||||
public static SparkCommand ShowMarketView { get; } =
|
||||
SparkCommand.create("Market View", Icons.Sheets, SparkTags.ShowPickMultiple, new SparkBusData.ContractPickerNMessage(SparkTags.ShowMarketViewTag, "Market View", Icons.Sheets));
|
||||
SparkCommand.create("Market View", Icons.Sheets, SparkTags.ShowPickMultiple, new ContractPickerNMessage(SparkTags.ShowMarketViewTag, "Market View", Icons.Sheets));
|
||||
public static SparkCommand ShowTimeAndSales { get; } =
|
||||
SparkCommand.create("Time and Sales", Icons.Clock, SparkTags.ShowPickMultiple, new SparkBusData.ContractPickerNMessage(SparkTags.ShowTimeAndSalesTag, "Time and Sales", Icons.Clock));
|
||||
SparkCommand.create("Time and Sales", Icons.Clock, SparkTags.ShowPickMultiple, new ContractPickerNMessage(SparkTags.ShowTimeAndSalesTag, "Time and Sales", Icons.Clock));
|
||||
|
||||
// Trading
|
||||
public static SparkCommand ShowOrders { get; } =
|
||||
@@ -25,7 +26,7 @@ namespace bts.spark
|
||||
public static SparkCommand ShowPAndL { get; } =
|
||||
SparkCommand.create("Position/P&L", Icons.Accounting, SparkTags.ShowPositionsTag);
|
||||
public static SparkCommand ShowLadder { get; }
|
||||
= SparkCommand.create("Ladder", Icons.Depth, SparkTags.ShowPickOne, new SparkBusData.ContractPickerOneMessage(SparkTags.ShowLadderTag, "Ladder", Icons.Depth));
|
||||
= SparkCommand.create("Ladder", Icons.Depth, SparkTags.ShowPickOne, new ContractPickerOneMessage(SparkTags.ShowLadderTag, "Ladder", Icons.Depth));
|
||||
public static SparkCommand ShowOrderTicket { get; } =
|
||||
SparkCommand.create("Order Ticket", Icons.Ticket, SparkTags.ShowOrderTicketTag);
|
||||
|
||||
|
||||
@@ -19,8 +19,6 @@ namespace mbts.ui.controls {
|
||||
ItemsSource = commands.Select(c => new SparkCommandVM(c, bus)).ToList();
|
||||
}
|
||||
|
||||
|
||||
|
||||
public bool ShowText {
|
||||
get { return (bool)GetValue(ShowTextProperty); }
|
||||
set { SetValue(ShowTextProperty, value); }
|
||||
|
||||
@@ -50,6 +50,7 @@
|
||||
<Style x:Key="LauncherMenuButton" TargetType="controls:SparkMenuItem">
|
||||
<Setter Property="SnapsToDevicePixels" Value="true" />
|
||||
<Setter Property="OverridesDefaultStyle" Value="true" />
|
||||
<Setter Property="ClipToBounds" Value="True" />
|
||||
<Setter Property="Foreground" Value="{mbts:BTSColor UI.Button.normal_foreground}" />
|
||||
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
|
||||
<Setter Property="Margin" Value="0"/>
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
</Storyboard>
|
||||
|
||||
<DataTemplate x:Key="HorizontalTemplate">
|
||||
<Button Style="{StaticResource StartMenuButton}" MouseEnter="button_MouseEnter"
|
||||
<Button Style="{StaticResource StartMenuButton}" MouseEnter="button_MouseEnter" Click="button_click"
|
||||
HorizontalAlignment="Stretch" Background="{StaticResource CommonBackground}" x:Name="button" Command="{Binding start_command}">
|
||||
<Button.Resources>
|
||||
<SolidColorBrush x:Key="StartMenuMouseOverBackground" Color="{Binding Name, Converter={StaticResource ModuleToColor}}" />
|
||||
@@ -75,7 +75,7 @@
|
||||
</DataTemplate>
|
||||
|
||||
<DataTemplate x:Key="VerticalTemplate">
|
||||
<Button Style="{StaticResource StartMenuButton}" MouseEnter="button_MouseEnter"
|
||||
<Button Style="{StaticResource StartMenuButton}" MouseEnter="button_MouseEnter" Click="button_click"
|
||||
HorizontalAlignment="Stretch" Background="{StaticResource CommonBackground}" x:Name="button" Command="{Binding start_command}">
|
||||
<Button.Resources>
|
||||
<SolidColorBrush x:Key="StartMenuMouseOverBackground" Color="{Binding Name, Converter={StaticResource ModuleToColor}}" />
|
||||
|
||||
@@ -125,6 +125,14 @@ namespace mbts.ui.shell
|
||||
foreach (var m in _menus) m.IsOpen = false;
|
||||
}
|
||||
|
||||
private void button_click(object sender, RoutedEventArgs e) {
|
||||
var b = (Button)sender;
|
||||
var popup = b.visual_children_where(v => v is Popup).Cast<Popup>().FirstOrDefault();
|
||||
if (popup != null) {
|
||||
popup.IsOpen = true;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ using bts.shell;
|
||||
using bts.view;
|
||||
using System.Windows;
|
||||
using bts.api;
|
||||
using mbts.ui.shell;
|
||||
|
||||
namespace bts.spark {
|
||||
abstract class SparkWindow<T> : IShellWindow {
|
||||
@@ -18,10 +19,11 @@ namespace bts.spark {
|
||||
string _title;
|
||||
ImageSource _icon;
|
||||
|
||||
public SparkWindow(string title, IBus bus, ISaveWindow<T> isw) {
|
||||
public SparkWindow(string title, IBus bus, ISaveWindow<T> isw, ImageSource icon=null) {
|
||||
_bus = bus;
|
||||
_title = title;
|
||||
_save = isw;
|
||||
_icon = icon;
|
||||
}
|
||||
|
||||
public string Title {
|
||||
@@ -35,7 +37,7 @@ namespace bts.spark {
|
||||
}
|
||||
|
||||
public ImageSource Icon {
|
||||
get => _icon;
|
||||
get => _icon ?? Owner.icon;
|
||||
set {
|
||||
_icon = value;
|
||||
IconChanged?.Invoke();
|
||||
|
||||
@@ -7,20 +7,39 @@ using System.Windows.Controls;
|
||||
|
||||
namespace bts.view {
|
||||
public partial class SparkWindowView : Control {
|
||||
readonly Grid _grid = new Grid();
|
||||
readonly IBus _bus;
|
||||
readonly IEnumerable<spark.SparkCommand> _commands;
|
||||
UIElement _content;
|
||||
|
||||
public SparkWindowView(IBus bus, IEnumerable<spark.SparkCommand> commands, UIElement content) {
|
||||
Template = new ControlTemplate(typeof(SparkWindowView)) { VisualTree = new FrameworkElementFactory(typeof(Grid)) };
|
||||
_grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = GridLength.Auto });
|
||||
_grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Star) });
|
||||
var menu = new SparkMenu(commands, bus);
|
||||
Grid.SetColumn(menu, 0);
|
||||
_grid.Children.Add(menu);
|
||||
Grid.SetColumn(content, 1);
|
||||
_grid.Children.Add(content);
|
||||
Template = new ControlTemplate(typeof(SparkWindowView)) {
|
||||
VisualTree = new FrameworkElementFactory() {
|
||||
Type = typeof(Grid),
|
||||
Name = "_grid",
|
||||
}
|
||||
};
|
||||
_bus = bus;
|
||||
_commands = commands;
|
||||
_content = content;
|
||||
}
|
||||
|
||||
internal IEnumerable<Grid> children() { yield return _grid; }
|
||||
private void assign_children(Grid grid, IBus bus, IEnumerable<spark.SparkCommand> commands, UIElement content) {
|
||||
grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = GridLength.Auto });
|
||||
grid.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Star) });
|
||||
var menu = new SparkMenu(commands, bus);
|
||||
Grid.SetColumn(menu, 0);
|
||||
grid.Children.Add(menu);
|
||||
Grid.SetColumn(content, 1);
|
||||
grid.Children.Add(content);
|
||||
|
||||
protected override IEnumerator LogicalChildren => children().GetEnumerator();
|
||||
ContextMenu = new ContextMenu() {
|
||||
ItemsSource = commands
|
||||
};
|
||||
}
|
||||
|
||||
public override void OnApplyTemplate() {
|
||||
var grid = GetTemplateChild("_grid") as Grid;
|
||||
assign_children(grid, _bus, _commands, _content);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -22,6 +22,8 @@ namespace mbts.co2
|
||||
}
|
||||
|
||||
private static Lazy<Co2RelayControl> _instance = new Lazy<Co2RelayControl>(() => new Co2RelayControl(new MDConsumer()), true);
|
||||
|
||||
//[Obsolete]
|
||||
public static Co2RelayControl instance {
|
||||
get {
|
||||
return _instance.Value;
|
||||
|
||||
@@ -91,6 +91,9 @@ namespace mbts
|
||||
public static void notnull<T>(T o) where T : class {
|
||||
assert(o != null);
|
||||
}
|
||||
public static void isnull<T>(T o) where T : class {
|
||||
assert(o == null);
|
||||
}
|
||||
|
||||
public static string read_logs() {
|
||||
var log_path = Path.Combine(Configuration.get<bts.config.System>().data_path, "logging", "log");
|
||||
|
||||
Reference in new issue
Block a user