hook up pnl header row background setting

This commit is contained in:
John Colvin committed 2019-09-13 19:19:27 -05:00
1 parent 419e8550c1
commit 95b6382a3a
5 files changed
+37 -17

No files matched your search

@@ -100,7 +100,7 @@ namespace bts.shell.pnl {
font_color = Colors.Black.rgb_color(),
font_size = 12
},
background = Colors.Transparent.rgb_color()
background = BTSColors.PNL.header_row_background_color.rgb_color()
}
};
@@ -220,11 +220,13 @@ namespace bts.shell.pnl {
foreground: grid.font_color.rgb_color());
// Group
public Color group_background_color => group_cell_appearance.background?.argb_color() ?? Colors.Transparent;
public PNLCellAppearanceProto group_cell_appearance { get => _group_cell_appearance ?? _grid_cell_appearance; set => _group_cell_appearance = value; }
public IReadOnlyList<GridColumnSettings> group_columns => _group_columns ?? (_group_columns = DefaultColumns.group_columns.ToArray());
public PNLCellAppearance group_defaults => group_cell_appearance.to_appearance().merge(grid_defaults);
public IReadOnlyList<PNLAnimationTriggerData> group_header_animations => _group_header_animations ?? (_group_header_animations = default_group_header_animations.ToArray());
// Header
public Color header_background_color => header_cell_appearance.background?.argb_color() ?? Colors.Transparent;
public PNLCellAppearanceProto header_cell_appearance { get => _header_cell_appearance ?? _grid_cell_appearance; set => _header_cell_appearance = value; }
public IReadOnlyList<GridColumnSettings> header_columns => _header_columns ?? (_header_columns = DefaultColumns.header_columns.ToArray());
public PNLCellAppearance header_defaults => header_cell_appearance.to_appearance().merge(grid_defaults);
@@ -4,10 +4,11 @@ using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.ComponentModel;
using System.Windows.Media;
using ColumnKeys = bts.shell.pnl.PNLView.Columns;
namespace bts.shell.pnl {
class PNLHeaderRowVM : IRaiseNotifyPropertyChanged, INotifyPropertyChanged {
class PNLHeaderRowVM : ViewModelBase, IRaiseNotifyPropertyChanged, INotifyPropertyChanged {
static readonly IPropertyChangedDetector<PNLHeaderRowVM> _change_detector =
ObjectSnapshot.build_detector_except<PNLHeaderRowVM>(nameof(data));
@@ -16,8 +17,14 @@ namespace bts.shell.pnl {
ImmutableDictionary<ColumnKeys, PNLCellAppearance> _default_appearances;
IReadOnlyList<IPNLAnimationTrigger<PNLNormalizedData>> _triggers;
PNLNormalizedData _data = PNLNormalizedData.zero;
Color _background_color;
public PNLHeaderRowVM(ImmutableDictionary<ColumnKeys, PNLCellAppearance> default_appearances, IReadOnlyList<IPNLAnimationTrigger<PNLNormalizedData>> triggers) {
public PNLHeaderRowVM(
Color background_color,
ImmutableDictionary<ColumnKeys, PNLCellAppearance> default_appearances,
IReadOnlyList<IPNLAnimationTrigger<PNLNormalizedData>> triggers) {
//
_background_color = background_color;
_default_appearances = default_appearances;
_triggers = triggers;
_animator = new PNLCellEmbeddedAnimationModel<PNLNormalizedData>(default_appearances, triggers);
@@ -47,7 +54,6 @@ namespace bts.shell.pnl {
total_short_pos = _cell_map.add_short_pos(ColumnKeys.TotalShortPos, d => d.total_short_pos);
}
public event PropertyChangedEventHandler PropertyChanged;
public event Action data_changed;
public PNLNormalizedData data {
@@ -62,6 +68,10 @@ namespace bts.shell.pnl {
}
}
}
public Color background_color {
get => _background_color;
set => Set(ref _background_color, value);
}
// day
public PNLCellVM<PNLNormalizedData, decimal> day_pnl { get; }
@@ -87,14 +97,16 @@ namespace bts.shell.pnl {
public PNLCellVM<PNLNormalizedData, decimal> working_short_pos { get; }
public PNLCellVM<PNLNormalizedData, decimal> working_net_pos { get; }
public void on_settings(ImmutableDictionary<ColumnKeys, PNLCellAppearance> default_appearances, IReadOnlyList<IPNLAnimationTrigger<PNLNormalizedData>> triggers) {
public void on_settings(
Color background_color,
ImmutableDictionary<ColumnKeys, PNLCellAppearance> default_appearances,
IReadOnlyList<IPNLAnimationTrigger<PNLNormalizedData>> triggers) {
//
this.background_color = background_color;
_default_appearances = default_appearances;
_triggers = triggers;
_animator.on_settings(_default_appearances, triggers);
_cell_map.set_appearances(_animator.cell_appearances);
}
void IRaiseNotifyPropertyChanged.raise_notify_property_changed(string prop) =>
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(prop));
}
}
@@ -86,8 +86,8 @@ namespace bts.shell.pnl {
foreach (var f in _all_filters)
f.filter_changed += _refresh_filter.execute;
// totals/selected headers
total_aggregate = new PNLHeaderRowVM(_default_header_appearances, _header_triggers);
selected_aggregate = new PNLHeaderRowVM(_default_header_appearances, _header_triggers);
total_aggregate = new PNLHeaderRowVM(settings.header_background_color, _default_header_appearances, _header_triggers);
selected_aggregate = new PNLHeaderRowVM(settings.header_background_color, _default_header_appearances, _header_triggers);
// load/subscribe to data
load_from(settings);
_rows_view = new PNLRowCollectionView(rows, _default_group_appearances, _group_triggers);
@@ -323,8 +323,8 @@ namespace bts.shell.pnl {
_header_triggers = settings.header_triggers();
foreach (var r in rows)
r.on_settings(_default_appearances, _triggers);
total_aggregate.on_settings(_default_header_appearances, _header_triggers);
selected_aggregate.on_settings(_default_header_appearances, _header_triggers);
total_aggregate.on_settings(settings.header_background_color, _default_header_appearances, _header_triggers);
selected_aggregate.on_settings(settings.header_background_color,_default_header_appearances, _header_triggers);
void map_appearances(ref ImmutableDictionary<ColumnKeys, PNLCellAppearance> from, IEnumerable<GridColumnSettings> col_settings, PNLCellAppearance fallback_appearance) {
var dabd = from.ToBuilder();
foreach (var k in EnumHelper.get_values<ColumnKeys>()) {
@@ -321,6 +321,7 @@
<SolidColorBrush Color="{Binding foreground}"/>
</Setter.Value>
</Setter>
<Setter Property="Margin" Value="0,0,0,1"/>
<Setter Property="HorizontalAlignment" Value="Stretch"/>
<Setter Property="FontWeight" Value="{Binding font_weight}"/>
<Setter Property="Text" Value="{Binding text}"/>
@@ -414,6 +415,7 @@
<SolidColorBrush Color="{Binding foreground}"/>
</Setter.Value>
</Setter>
<Setter Property="Margin" Value="0,0,0,1"/>
<Setter Property="HorizontalAlignment" Value="Stretch"/>
<Setter Property="FontWeight" Value="{Binding font_weight}"/>
<Setter Property="FontSize" Value="{Binding font_size}"/>
@@ -502,9 +504,6 @@
<!--DIYGrid-->
<!--Totals Row (use Margin Hack to position it just below the column headers)-->
<StackPanel Grid.Row="1" Panel.ZIndex="1" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,30,0,0">
<StackPanel.Background>
<SolidColorBrush Color="{StaticResource HeaderRowBackgroundColor}"/>
</StackPanel.Background>
<Grid
c:DIYGrid.SyncWithColumnGeometrySource="{Binding ElementName=_grid}"
c:DIYGrid.SyncWithColumnGeometry="True"
@@ -522,7 +521,10 @@
</Binding.Converter>
</Binding>
</Grid.Visibility>
<Rectangle Grid.ColumnSpan="99" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Stroke="Gray" StrokeThickness="1"/>
<Grid.Background>
<SolidColorBrush Color="{Binding total_aggregate.background_color}"/>
</Grid.Background>
<Rectangle Grid.ColumnSpan="99" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1" Fill="Gray"/>
<TextBlock Style="{StaticResource HeaderRowHeaderText}">
<TextBlock.Text>
<MultiBinding Converter="{x:Static pnl:PNLView.TotalHeaderRowDisplayTextConverter}">
@@ -572,7 +574,10 @@
</Binding.Converter>
</Binding>
</Grid.Visibility>
<Rectangle Grid.ColumnSpan="99" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Stroke="Gray" StrokeThickness="1"/>
<Grid.Background>
<SolidColorBrush Color="{Binding selected_aggregate.background_color}"/>
</Grid.Background>
<Rectangle Grid.ColumnSpan="99" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1" Fill="Gray"/>
<TextBlock Text="{Binding selected_rows.Count, StringFormat='Selected ({0})'}" Style="{StaticResource HeaderRowHeaderText}"/>
<!--SOD-->
<c:TextCell c:DIYGrid.ColumnKey="SODPNL" DataContext="{Binding selected_aggregate.sod_pnl}" Style="{StaticResource HeaderRowTextCell}"/>
@@ -148,6 +148,7 @@ namespace mbts.ui {
public static Color anchor_color => Colors.Gold;
public static Color profit_color => Colors.Green;
public static Color loss_color => BTSColors.red;
public static Color header_row_background_color => 0xFFAAAAAA.argb_color();
}
public static class Orders {