refactor: Rename TimeAndSalesView.Columns -> TimeAndSalesColumnType
This commit is contained in:
1 parent
df789fed2e
commit
fccaa23d1f
5 files changed
+31
-24
No files matched your search
@@ -9,7 +9,7 @@ using System.Linq;
|
||||
|
||||
using static mbts.ui.controls.DIYGrid;
|
||||
|
||||
using Columns = bts.shell.time_and_sales.TimeAndSalesView.Columns;
|
||||
using Columns = bts.shell.time_and_sales.TimeAndSalesColumnType;
|
||||
|
||||
namespace bts.shell.time_and_sales {
|
||||
[ProtoContract]
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
namespace bts.shell.time_and_sales {
|
||||
enum TimeAndSalesColumnType {
|
||||
Time,
|
||||
Security,
|
||||
Price,
|
||||
Size,
|
||||
SecurityKey,
|
||||
Aggressor,
|
||||
RowKey
|
||||
}
|
||||
}
|
||||
@@ -63,7 +63,7 @@ namespace bts.shell.time_and_sales {
|
||||
_sort_change_count;
|
||||
|
||||
public TimeAndSalesVM(IWindowSettingsManager<GridSettings> settings_manager, Func<SecurityImmutable?, uint> get_display_qty_divisor) {
|
||||
_sort_manager = new ColumnSortManager(columns.WrapSelector(c => c as ISortableDIYGridColumn, null), TimeAndSalesView.Columns.RowKey.ToString());
|
||||
_sort_manager = new ColumnSortManager(columns.WrapSelector(c => c as ISortableDIYGridColumn, null), TimeAndSalesColumnType.RowKey.ToString());
|
||||
_get_display_qty_divisor = get_display_qty_divisor ?? new Func<SecurityImmutable?, uint>(sec => 1);
|
||||
_comparer_backing = _sort_manager.BuildComparer(_get_column_comparer);
|
||||
_log = new LoggerContext(Log.Ui, $"Time And Sales VM ({Interlocked.Increment(ref _id_counter)})", null);
|
||||
@@ -77,21 +77,21 @@ namespace bts.shell.time_and_sales {
|
||||
grid_settings_manager.load_from(settings_manager.current_settings());
|
||||
// Columns
|
||||
add_column(
|
||||
TimeAndSalesView.Columns.Security,
|
||||
TimeAndSalesColumnType.Security,
|
||||
r => r.security.ToString(),
|
||||
DefaultColumnHeaders.Security,
|
||||
DefaultColumnWidths.Security,
|
||||
security_filter,
|
||||
DataGridFilterKnownTemplates.Regex);
|
||||
add_column(
|
||||
TimeAndSalesView.Columns.Time,
|
||||
TimeAndSalesColumnType.Time,
|
||||
r => r.time.ToString("h:mm:ss tt"),
|
||||
DefaultColumnHeaders.Time,
|
||||
DefaultColumnWidths.Time,
|
||||
time_filter,
|
||||
DataGridFilterKnownTemplates.TimeFilter);
|
||||
add_column(
|
||||
TimeAndSalesView.Columns.Price,
|
||||
TimeAndSalesColumnType.Price,
|
||||
r => r.security.spec_or_default().format(r.price),
|
||||
DefaultColumnHeaders.Price,
|
||||
DefaultColumnWidths.Price,
|
||||
@@ -99,7 +99,7 @@ namespace bts.shell.time_and_sales {
|
||||
DataGridFilterKnownTemplates.DoubleMinMax,
|
||||
System.Windows.HorizontalAlignment.Right);
|
||||
add_column(
|
||||
TimeAndSalesView.Columns.Size,
|
||||
TimeAndSalesColumnType.Size,
|
||||
r => r.display_size.ToString(),
|
||||
DefaultColumnHeaders.Qty,
|
||||
DefaultColumnWidths.Qty,
|
||||
@@ -107,14 +107,14 @@ namespace bts.shell.time_and_sales {
|
||||
DataGridFilterKnownTemplates.UIntMinMax,
|
||||
System.Windows.HorizontalAlignment.Right);
|
||||
add_column(
|
||||
TimeAndSalesView.Columns.Aggressor,
|
||||
TimeAndSalesColumnType.Aggressor,
|
||||
r => r.aggressor_side.ToString(),
|
||||
DefaultColumnHeaders.Aggressor,
|
||||
DefaultColumnWidths.Aggressor,
|
||||
aggressor_filter,
|
||||
DataGridFilterKnownTemplates.EnumValues);
|
||||
add_column(
|
||||
TimeAndSalesView.Columns.SecurityKey,
|
||||
TimeAndSalesColumnType.SecurityKey,
|
||||
r => r.security_key.ToString(),
|
||||
DefaultColumnHeaders.SecurityKey,
|
||||
DefaultColumnWidths.SecurityKey,
|
||||
@@ -138,14 +138,14 @@ namespace bts.shell.time_and_sales {
|
||||
_dispose = Disposable.Create(resources.ToArray());
|
||||
// local methods
|
||||
void add_column(
|
||||
TimeAndSalesView.Columns col_key,
|
||||
TimeAndSalesColumnType col_key,
|
||||
Func<TimeAndSalesRowVM, string> get_cell_text,
|
||||
string header,
|
||||
double width,
|
||||
IDataGridColumnFilter filter,
|
||||
string filter_template,
|
||||
System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) =>
|
||||
columns.Add(new RenderTextColumn<TimeAndSalesRowVM, TimeAndSalesView.Columns>(
|
||||
columns.Add(new RenderTextColumn<TimeAndSalesRowVM, TimeAndSalesColumnType>(
|
||||
col_key, get_cell_text, filter, filter_template, _get_aggressor_brush) {
|
||||
id = col_key.col_id(),
|
||||
Header = header,
|
||||
@@ -348,17 +348,17 @@ namespace bts.shell.time_and_sales {
|
||||
}
|
||||
|
||||
static IComparer<TimeAndSalesRowVM> _get_column_comparer(string column_name) =>
|
||||
_get_column_comparer(EnumHelper.parse<TimeAndSalesView.Columns>(column_name));
|
||||
_get_column_comparer(EnumHelper.parse<TimeAndSalesColumnType>(column_name));
|
||||
|
||||
static IComparer<TimeAndSalesRowVM> _get_column_comparer(TimeAndSalesView.Columns column) {
|
||||
static IComparer<TimeAndSalesRowVM> _get_column_comparer(TimeAndSalesColumnType column) {
|
||||
switch (column) {
|
||||
case TimeAndSalesView.Columns.Aggressor: return wrap(r => r.aggressor_side);
|
||||
case TimeAndSalesView.Columns.Time: return wrap(r => r.time);
|
||||
case TimeAndSalesView.Columns.Security: return wrap(r => r.security);
|
||||
case TimeAndSalesView.Columns.Price: return wrap(r => r.price);
|
||||
case TimeAndSalesView.Columns.Size: return wrap(r => r.size);
|
||||
case TimeAndSalesView.Columns.SecurityKey: return wrap(r => r.security_key);
|
||||
case TimeAndSalesView.Columns.RowKey: return wrap(r => r.row_key);
|
||||
case TimeAndSalesColumnType.Aggressor: return wrap(r => r.aggressor_side);
|
||||
case TimeAndSalesColumnType.Time: return wrap(r => r.time);
|
||||
case TimeAndSalesColumnType.Security: return wrap(r => r.security);
|
||||
case TimeAndSalesColumnType.Price: return wrap(r => r.price);
|
||||
case TimeAndSalesColumnType.Size: return wrap(r => r.size);
|
||||
case TimeAndSalesColumnType.SecurityKey: return wrap(r => r.security_key);
|
||||
case TimeAndSalesColumnType.RowKey: return wrap(r => r.row_key);
|
||||
default: throw ExceptionBuilder.Argument.unexpected_case(column, nameof(column));
|
||||
}
|
||||
IComparer<TimeAndSalesRowVM> wrap<T>(Func<TimeAndSalesRowVM, T> selector) =>
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace bts.shell.time_and_sales {
|
||||
class TimeAndSalesRowView : DIYGrid.HighPerformanceRow<TimeAndSalesRowVM> { }
|
||||
|
||||
static class TimeAndSalesViewColumnsExtensions {
|
||||
public static string col_id(this TimeAndSalesView.Columns column) =>
|
||||
public static string col_id(this TimeAndSalesColumnType column) =>
|
||||
column.ToString();
|
||||
}
|
||||
}
|
||||
@@ -15,8 +15,6 @@ using System.Collections.Generic;
|
||||
using System.Reactive.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using Columns = bts.shell.time_and_sales.TimeAndSalesView.Columns;
|
||||
|
||||
namespace bts.shell {
|
||||
class TimeAndSalesWindowFactory : ShellWindowFactory<TimeAndSalesSettings> {
|
||||
readonly IBus _bus;
|
||||
@@ -39,8 +37,6 @@ namespace bts.shell {
|
||||
);
|
||||
}
|
||||
|
||||
public static string col_id(Columns col) => col.ToString();
|
||||
|
||||
public override Task<IShellWindow> load(TimeAndSalesSettings state) =>
|
||||
Task.FromResult<IShellWindow>(new TimeAndSalesWindow(this, _bus, _consumer, state, SparkCommands.PickTimeAndSales.icon,
|
||||
new WindowSettingsManager<GridSettings>(_settings_hub, state.grid, s => s.time_and_sales_grid, (s, g) => s.with(time_and_sales: g)),
|
||||
|
||||
Reference in new issue
Block a user