added 'ImmutableHeader' flag for MiniOB 'Commit' column

This commit is contained in:
John Colvin committed 2019-06-22 16:47:37 -05:00
1 parent 314eca0e89
commit 992eb7b104
6 files changed
+116 -13

No files matched your search

@@ -16,6 +16,9 @@ namespace bts.shell.orderbook {
class OrderBookGridSettingsManager : IDisposable, IObserver<OrderBookGridSettings> {
public static readonly IReadOnlyDictionary<string, GridColumnSettingsFeatureFlags> hard_column_flags;
readonly IObserver<OrderBookGridSettings> _core_man_as_observer;
AlgoTreeDisplayMode _algo_tree_display_mode;
static OrderBookGridSettingsManager() {
// make font-weight immutable for all columns (the font-weight rule is hard-coded: Regular for root-orders, Light for all others)
// TODO: Remove the immutable font-weight flags when cell animation is ready
@@ -24,14 +27,12 @@ namespace bts.shell.orderbook {
// make font-color immutable for Side, Size, and Filled columns (the font-color rule is hard-coded: MarketData.bid for Buy orders, MarketData.ask for Sells)
// TODO: Remove the immutable font-color flags when cell animation is ready
foreach (var c in new[] { Columns.Side, Columns.Size, Columns.Filled }) {
col_settings_flags[c.ToString()] = GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableFontWeight;
col_settings_flags[c.ToString()] |= GridColumnSettingsFeatureFlags.ImmutableFontWeight;
}
col_settings_flags[Columns.Commit.ToString()] |= GridColumnSettingsFeatureFlags.ImmutableHeader;
hard_column_flags = col_settings_flags;
}
readonly IObserver<OrderBookGridSettings> _core_man_as_observer;
AlgoTreeDisplayMode _algo_tree_display_mode;
public OrderBookGridSettingsManager(
IObservable<string> owner_title,
IBus bus,
@@ -46,6 +46,7 @@ namespace mbts.spark {
HorizontalAlignment _horizontal_alignment = HorizontalAlignment.Left;
bool
_is_visible,
_can_override_display_name = true,
_can_override_font_color = true,
_is_font_color_overridden,
_can_override_font_weight = true,
@@ -63,10 +64,12 @@ namespace mbts.spark {
}
public string id { get => _id; private set => Set(ref _id, value); }
public string display_name { get => _display_name; set => Set(ref _display_name, value); }
public double width { get => _width; set => Set(ref _width, value); }
public HorizontalAlignment horizontal_alignment { get => _horizontal_alignment; set => Set(ref _horizontal_alignment, value); }
public bool is_visible { get => _is_visible; set => Set(ref _is_visible, value); }
// display name
public bool can_override_display_name { get => _can_override_display_name; private set => Set(ref _can_override_display_name, value); }
public string display_name { get => _display_name; set => Set(ref _display_name, value); }
// font color override
public bool can_override_font_color { get => _can_override_font_color; private set => Set(ref _can_override_font_color, value); }
public bool is_font_color_overridden { get => _is_font_color_overridden; set => Set(ref _is_font_color_overridden, value); }
@@ -79,7 +82,10 @@ namespace mbts.spark {
public ObservableEditableCollection<PredicateCellAnimationVM> predicate_animations { get; }
public (GridColumnSettings settings, ILookup<TPredicateData, CellAnimation> animations) create() {
var settings = _settings.with(display_name, is_visible, null,
var settings = _settings.with(
can_override_display_name ? display_name : null,
is_visible,
null,
is_font_weight_overridden ? new NullableFontWeightProto(font_weight_override) : default,
is_font_color_overridden ? new NullableColorProto(font_color_override.color) : default,
width,
@@ -113,6 +119,10 @@ namespace mbts.spark {
}
public void apply_flags(GridColumnSettingsFeatureFlags flags) {
// display name
can_override_display_name = (flags & GridColumnSettingsFeatureFlags.ImmutableHeader) == 0;
if (!can_override_display_name)
display_name = id;
// font color
can_override_font_color = (flags & GridColumnSettingsFeatureFlags.ImmutableFontColor) == 0;
is_font_color_overridden &= can_override_font_color;
@@ -550,13 +550,35 @@
</c:DragDropListBox.ItemContainerStyle>
<c:DragDropListBox.ItemTemplate>
<DataTemplate>
<Grid>
<Grid x:Name="column_item_content_root">
<u:StateManager.Groups>
<u:StateGroupsManager>
<u:StateDefinitionCollection>
<u:StateDefinition State="{Binding DataContext.can_override_display_name, Source={u:DirectReference column_item_content_root}, Converter={x:Static usp:GridSettingsView.ColumnVisibilityToggleVisualStateConverter}}"/>
</u:StateDefinitionCollection>
</u:StateGroupsManager>
</u:StateManager.Groups>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup Name="{x:Static GroupName, MemberType={u:Nested usp:GridSettingsView.VisualStateNames.ColumnVisibilityToggle}}">
<VisualState Name="{x:Static Active, MemberType={u:Nested usp:GridSettingsView.VisualStateNames.ColumnVisibilityToggle}}"/>
<VisualState Name="{x:Static Inactive, MemberType={u:Nested usp:GridSettingsView.VisualStateNames.ColumnVisibilityToggle}}">
<Storyboard>
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="visibility_toggle" Storyboard.TargetProperty="(UIElement.IsEnabled)">
<DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
</BooleanAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="visibility_toggle" Storyboard.TargetProperty="(FrameworkElement.ToolTip)">
<DiscreteObjectKeyFrame KeyTime="0" Value="(N/A)"/>
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush}}"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<CheckBox IsChecked="{Binding is_visible}" />
<CheckBox x:Name="visibility_toggle" ToolTipService.ShowOnDisabled="True" IsChecked="{Binding is_visible}"/>
<StackPanel Grid.Column="2" Orientation="Horizontal">
<TextBlock Text="{Binding id, Converter={x:Static ut:DisplayNameHelper.CamelCaseSpacesConverter}}"/>
<TextBlock Margin="2,0,0,0" FontStyle="Italic" Text="{Binding display_name, Mode=OneWay, StringFormat='{} ({0})'}">
@@ -576,7 +598,29 @@
<GroupBox.Header>
<TextBlock Text="{Binding current_column.display_name, StringFormat='{}\'{0}\' Cell Appearance'}"/>
</GroupBox.Header>
<Grid>
<Grid x:Name="column_content_root">
<u:StateManager.Groups>
<u:StateGroupsManager>
<u:StateDefinitionCollection>
<u:StateDefinition State="{Binding DataContext.current_column.can_override_display_name, Source={u:DirectReference column_content_root}, Converter={x:Static usp:GridSettingsView.DisplayNameVisualStateConverter}}"/>
</u:StateDefinitionCollection>
</u:StateGroupsManager>
</u:StateManager.Groups>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup Name="{x:Static GroupName, MemberType={u:Nested usp:GridSettingsView.VisualStateNames.DisplayName}}">
<VisualState Name="{x:Static Active, MemberType={u:Nested usp:GridSettingsView.VisualStateNames.DisplayName}}"/>
<VisualState Name="{x:Static Inactive, MemberType={u:Nested usp:GridSettingsView.VisualStateNames.DisplayName}}">
<Storyboard>
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="display_name_text_box" Storyboard.TargetProperty="(UIElement.IsEnabled)">
<DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
</BooleanAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="display_name_text_box" Storyboard.TargetProperty="(FrameworkElement.ToolTip)">
<DiscreteObjectKeyFrame KeyTime="0" Value="(N/A)"/>
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="{Binding Source={StaticResource VerticalPush}}"/>
@@ -594,7 +638,7 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock>Header</TextBlock>
<TextBox Grid.Column="2" Text="{Binding current_column.display_name}"/>
<TextBox x:Name="display_name_text_box" Grid.Column="2" ToolTipService.ShowOnDisabled="True" Text="{Binding current_column.display_name}"/>
<TextBlock Grid.Row="2">Width</TextBlock>
<c:TickUpDownDouble Grid.Row="2" Grid.Column="2" Value="{Binding current_column.width}"/>
<TextBlock Grid.Row="4">Horizontal Alignment</TextBlock>
@@ -11,6 +11,10 @@ namespace mbts.ui.spark {
/// Interaction logic for GridSettingsView.xaml
/// </summary>
partial class GridSettingsView : UserControl {
public static readonly IValueConverter
DisplayNameVisualStateConverter = ValueConverter.create<bool, string>(can_override => can_override ? VisualStateNames.DisplayName.Active : VisualStateNames.DisplayName.Inactive),
ColumnVisibilityToggleVisualStateConverter = ValueConverter.create<bool, string>(can_override => can_override ? VisualStateNames.ColumnVisibilityToggle.Active : VisualStateNames.ColumnVisibilityToggle.Inactive);
public GridSettingsView() =>
InitializeComponent();
@@ -38,6 +42,24 @@ namespace mbts.ui.spark {
ValueConverter.create<string, string, Visibility>((id, header) => id == header ? Visibility.Collapsed : Visibility.Visible);
public bool EnableSoundTriggers { get; set; }
public static class VisualStateNames {
public static class DisplayName {
public const string GroupName = nameof(DisplayName);
public static readonly string
Active = $"{GroupName}{VisualStates.Active}",
Inactive = $"{GroupName}{VisualStates.Inactive}";
}
public static class ColumnVisibilityToggle {
public const string GroupName = nameof(ColumnVisibilityToggle);
public static readonly string
Active = $"{GroupName}{VisualStates.Active}",
Inactive = $"{GroupName}{VisualStates.Inactive}";
}
}
}
static class PredicateTemplateKeys {
@@ -12,6 +12,9 @@ namespace mbts.ui {
public static ImmutableColumnSettingStore create(GridColumnSettingsFeatureFlags flags) {
var stores_per_flag = new List<ImmutableColumnSettingStore>();
if ((flags & GridColumnSettingsFeatureFlags.ImmutableHeader) != 0) {
stores_per_flag.Add(new ImmutableHeaderOverrideStore());
}
if ((flags & GridColumnSettingsFeatureFlags.ImmutableFontColor) != 0) {
stores_per_flag.Add(new ImmutableFontColorOverrideStore());
}
@@ -24,6 +27,19 @@ namespace mbts.ui {
public abstract GridColumnSettings apply(GridColumnSettings settings);
public abstract void store(GridColumnSettings settings);
class ImmutableHeaderOverrideStore : ImmutableColumnSettingStore {
string _header;
public ImmutableHeaderOverrideStore()
: base(GridColumnSettingsFeatureFlags.ImmutableHeader) { }
public override GridColumnSettings apply(GridColumnSettings settings) =>
settings.with(display_name: _header);
public override void store(GridColumnSettings settings) =>
_header = settings.display_name;
}
class ImmutableFontColorOverrideStore : ImmutableColumnSettingStore {
NullableColorProto _value;
@@ -69,4 +85,4 @@ namespace mbts.ui {
}
}
}
}
}
@@ -17,6 +17,7 @@ namespace mbts.spark {
HorizontalAlignment _horizontal_alignment = HorizontalAlignment.Left;
bool
_is_visible,
_can_override_display_name = true,
_can_override_font_color = true,
_is_font_color_overridden,
_can_override_font_weight = true,
@@ -28,10 +29,12 @@ namespace mbts.spark {
this.owner = owner;
public string id { get => _id; private set => Set(ref _id, value); }
public string display_name { get => _display_name; set => Set(ref _display_name, value); }
public double width { get => _width; set => Set(ref _width, value); }
public HorizontalAlignment horizontal_alignment { get => _horizontal_alignment; set => Set(ref _horizontal_alignment, value); }
public bool is_visible { get => _is_visible; set => Set(ref _is_visible, value); }
// display name
public bool can_override_display_name { get => _can_override_display_name; private set => Set(ref _can_override_display_name, value); }
public string display_name { get => _display_name; set => Set(ref _display_name, value); }
// font color override
public bool can_override_font_color { get => _can_override_font_color; private set => Set(ref _can_override_font_color, value); }
public bool is_font_color_overridden { get => _is_font_color_overridden; set => Set(ref _is_font_color_overridden, value); }
@@ -42,7 +45,10 @@ namespace mbts.spark {
public FontWeight font_weight_override { get => _font_weight_override; set => Set(ref _font_weight_override, value); }
public GridColumnSettings create() =>
_settings.with(display_name, is_visible, null,
_settings.with(
can_override_display_name ? display_name : null,
is_visible,
null,
is_font_weight_overridden ? new NullableFontWeightProto(font_weight_override) : (NullableFontWeightProto?)null,
is_font_color_overridden ? new NullableColorProto(font_color_override.color) : (NullableColorProto?)null,
width,
@@ -68,6 +74,10 @@ namespace mbts.spark {
}
public void apply_flags(GridColumnSettingsFeatureFlags flags) {
// display name
can_override_display_name = (flags & GridColumnSettingsFeatureFlags.ImmutableHeader) == 0;
if (!can_override_display_name)
display_name = id;
// font color
can_override_font_color = (flags & GridColumnSettingsFeatureFlags.ImmutableFontColor) == 0;
is_font_color_overridden &= can_override_font_color;