diff --git a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml
index 9c4ef4b5b..279395d27 100644
--- a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml
+++ b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml
@@ -140,7 +140,7 @@
-
+
@@ -333,13 +333,61 @@
+
+
+
-
+
@@ -356,13 +404,39 @@
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
diff --git a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs
index ef8137e25..dbd554e6e 100644
--- a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs
+++ b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs
@@ -227,8 +227,8 @@ namespace mbts.ui.spark {
}
DataGridColumn _column_factory(LegSpreaderParamsTuple l) {
- var col = new DataGridColumnInternal(l.leg.Security, ParameterCellTemplateConverter, ParameterCellEditingTemplateConverter);
- col.HeaderTemplate = (DataTemplate)FindResource(IsNew ? RemovableColumnHeaderTemplateKey : NonRemovableColumnHeaderTemplateKey);
+ var col = new DataGridColumnInternal(l, ParameterCellTemplateConverter, ParameterCellEditingTemplateConverter);
+ col.HeaderTemplate = TryFindResource(IsNew ? RemovableColumnHeaderTemplateKey : NonRemovableColumnHeaderTemplateKey) as DataTemplate;
DataGridEx.SetRightBorder(col, new DataGridExVerticalLine(false, true, Colors.DarkGray, 1));
return col;
}
@@ -237,10 +237,12 @@ namespace mbts.ui.spark {
private class DataGridColumnInternal : DataGridDynamicColumn {
readonly IValueConverter _cell_template_converter, _cell_editing_template_converter;
+ readonly LegSpreaderParamsTuple _leg_tup;
- public DataGridColumnInternal(Security security, IValueConverter cell_template_converter, IValueConverter cell_editing_template_converter) {
- Header = security;
- SetValue(DataGridEx.CellKeyProperty, security);
+ public DataGridColumnInternal(LegSpreaderParamsTuple leg_tup, IValueConverter cell_template_converter, IValueConverter cell_editing_template_converter) {
+ _leg_tup = leg_tup;
+ Header = leg_tup;
+ SetValue(DataGridEx.CellKeyProperty, leg_tup);
_cell_template_converter = cell_template_converter;
_cell_editing_template_converter = cell_editing_template_converter;
}
@@ -248,8 +250,8 @@ namespace mbts.ui.spark {
// I decided this was an easy and simple enough solution to justify breaking the mvvm paradigm
// The alternative - within strict bounds of the paradigm - is to change the DataGridParameterCellTemplateConverter into an IMultiValueConverter, bound to data_type AND read_only
protected override FrameworkElement GenerateEditingElement(DataGridCell cell, object dataItem) {
- if (dataItem is SyntheticEditorVM.RowVM row_vm) {
- if (row_vm.read_only || row_vm.get_cell(Header) is SyntheticEditorVM.ICell cell_vm && !cell_vm.enabled)
+ if (dataItem is RowVM row_vm) {
+ if (row_vm.read_only || row_vm.get_cell(_leg_tup) is ICell cell_vm && !cell_vm.enabled)
return base.GenerateElement(cell, dataItem);
}
return base.GenerateEditingElement(cell, dataItem);
@@ -352,4 +354,4 @@ namespace mbts.ui.spark {
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) =>
throw new NotImplementedException();
}
-}
\ No newline at end of file
+}
diff --git a/src/client/spark/Modules/Spreader/LegSpreaderParamsTuple.cs b/src/client/spark/Modules/Spreader/LegSpreaderParamsTuple.cs
index edd831000..7afa0472c 100644
--- a/src/client/spark/Modules/Spreader/LegSpreaderParamsTuple.cs
+++ b/src/client/spark/Modules/Spreader/LegSpreaderParamsTuple.cs
@@ -1,17 +1,52 @@
using bts.api;
using bts.spark;
+using mbts.ui.shell;
+using System;
+
+namespace mbts.ui.spark {
+ class LegSpreaderParamsTuple : ViewModelBase, IEquatable {
+ [ThreadStatic]
+ static int _id_counter;
+
+ SecurityImmutable? _security;
-namespace mbts.ui.spark
-{
- internal class LegSpreaderParamsTuple
- {
public LegSpreaderParamsTuple(ContractLeg leg, LegSpreaderParams leg_params) {
+ id = unchecked(_id_counter++);
this.leg = leg;
this.leg_params = leg_params;
+ if (leg.Security != null)
+ _security = new SecurityImmutable(leg.Security);
}
+ public event Action security_changed;
+
+ public int id { get; }
+ ///
+ /// Important: do NOT modify security via ,
+ /// use instead ([only]the latter raises the PropertyChanged event).
+ ///
public ContractLeg leg { get; }
public LegSpreaderParams leg_params { get; }
+ public SecurityImmutable? security {
+ get => _security;
+ set {
+ if (!_security.Equals(value)) {
+ _security = value;
+ leg.Security = value?.CloneToMutable();
+ security_changed?.Invoke();
+ RaisePropertyChanged();
+ }
+ }
+ }
public uint SecurityKey => leg.Security.Id;
+
+ public bool Equals(LegSpreaderParamsTuple other) =>
+ ReferenceEquals(this, other);
+
+ public override bool Equals(object obj) =>
+ Equals(obj as LegSpreaderParamsTuple);
+
+ public override int GetHashCode() =>
+ id;
}
-}
\ No newline at end of file
+}
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossCrossTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossCrossTicksModel.cs
index e1c5a3a82..1397b9c55 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossCrossTicksModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossCrossTicksModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class PostHedgeOppositeMarketVolumeBasedCrossCrossTicksModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Cross Ticks";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_omv_cross(leg_tup) is PostHedgeOppositeMarketVolumeBasedForcedCross omv_cross)
omv_cross.CrossTicks = value;
}
@@ -34,7 +34,7 @@ namespace mbts.spark {
leg_tup.leg_params.PostHedgeParams.OppositeMarketVolumeBasedForcedCross;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PostHedgeOppositeMarketVolumeBasedForcedCross.CrossTicks);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PostHedgeOppositeMarketVolumeBasedForcedCross.CrossTicks);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossThresholdModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossThresholdModel.cs
index 5b8afafc6..6b473e5db 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossThresholdModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossThresholdModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class PostHedgeOppositeMarketVolumeBasedCrossThresholdModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Threshold";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, QuantityMeasure value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_omv_cross(leg_tup) is PostHedgeOppositeMarketVolumeBasedForcedCross omv_cross)
omv_cross.QuantityThreshold = value;
}
@@ -36,7 +36,7 @@ namespace mbts.spark {
leg_tup.leg_params.PostHedgeParams.OppositeMarketVolumeBasedForcedCross;
QuantityMeasure _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PostHedgeOppositeMarketVolumeBasedForcedCross.QuantityThreshold);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PostHedgeOppositeMarketVolumeBasedForcedCross.QuantityThreshold);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossMarketTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossMarketTicksModel.cs
index f66fa1405..d5ac32341 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossMarketTicksModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossMarketTicksModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class PostHedgePriceBasedCrossMarketTicksModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Cross Ticks";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_price_based_cross(leg_tup) is PostHedgePriceBasedForcedCross price_based_cross)
price_based_cross.MarketCrossTicks = value;
}
@@ -34,7 +34,7 @@ namespace mbts.spark {
leg_tup.leg_params.PostHedgeParams.PriceBasedCross;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PostHedgePriceBasedForcedCross.MarketCrossTicks);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PostHedgePriceBasedForcedCross.MarketCrossTicks);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossTicksModel.cs
index a89457e68..3dbfa6f6a 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossTicksModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossTicksModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class PostHedgePriceBasedCrossTicksModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Ticks";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_price_based_cross(leg_tup) is PostHedgePriceBasedForcedCross price_based_cross)
price_based_cross.TicksThreshold = value;
}
@@ -34,7 +34,7 @@ namespace mbts.spark {
leg_tup.leg_params.PostHedgeParams.PriceBasedCross;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PostHedgePriceBasedForcedCross.TicksThreshold);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PostHedgePriceBasedForcedCross.TicksThreshold);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossMarketTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossMarketTicksModel.cs
index 1eb364385..cdf718f5d 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossMarketTicksModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossMarketTicksModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class PostHedgeTimeBasedCrossMarketTicksModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Cross Ticks";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_time_based_cross(leg_tup) is PostHedgeTimeBasedForcedCross time_based_cross)
time_based_cross.MarketCrossTicks = value;
}
@@ -34,7 +34,7 @@ namespace mbts.spark {
leg_tup.leg_params.PostHedgeParams.TimeBasedForcedCross;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PostHedgeTimeBasedForcedCross.MarketCrossTicks);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PostHedgeTimeBasedForcedCross.MarketCrossTicks);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossTimeModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossTimeModel.cs
index 5af8a6b38..7958963a3 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossTimeModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossTimeModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class PostHedgeTimeBasedCrossTimeModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Time(ms)";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_time_based_cross(leg_tup) is PostHedgeTimeBasedForcedCross time_based_cross)
time_based_cross.TimeInMsThreshold = value;
}
@@ -34,7 +34,7 @@ namespace mbts.spark {
leg_tup.leg_params.PostHedgeParams.TimeBasedForcedCross;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PostHedgeTimeBasedForcedCross.TimeInMsThreshold);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PostHedgeTimeBasedForcedCross.TimeInMsThreshold);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessThresholdModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessThresholdModel.cs
index 7d334c946..d11bba2c1 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessThresholdModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessThresholdModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class PreHedgePaylessThresholdModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Threshold";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, QuantityMeasure value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_payless_ticks(leg_tup) is PreHedgeQuantityBasedPayLessTicks payless_ticks)
payless_ticks.QuantityThreshold = value;
}
@@ -36,7 +36,7 @@ namespace mbts.spark {
leg_tup.leg_params.PreHedgeParams.QuantityBasedPaylessTicks;
QuantityMeasure _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayLessTicks.QuantityThreshold);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayLessTicks.QuantityThreshold);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessTicksModel.cs
index ef62031fd..b4b7904d4 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessTicksModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessTicksModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class PreHedgePaylessTicksModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Payless Ticks";
public override string help_text { get; } = string.Empty;
@@ -23,7 +23,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_payless_ticks(leg_tup) is PreHedgeQuantityBasedPayLessTicks payless_ticks)
payless_ticks.PaylessTicks = value;
}
@@ -35,7 +35,7 @@ namespace mbts.spark {
leg_tup.leg_params.PreHedgeParams.QuantityBasedPaylessTicks;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayLessTicks.PaylessTicks);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayLessTicks.PaylessTicks);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupThresholdModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupThresholdModel.cs
index 9dbe329c6..142c0e70b 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupThresholdModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupThresholdModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class PreHedgePayupThresholdModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Threshold";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, QuantityMeasure value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_payup_ticks(leg_tup) is PreHedgeQuantityBasedPayupTicks payup_ticks)
payup_ticks.QuantityThreshold = value;
}
@@ -36,7 +36,7 @@ namespace mbts.spark {
leg_tup.leg_params.PreHedgeParams.QuantityBasedPayupTicks;
QuantityMeasure _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayUpTicks.QuantityThreshold);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayUpTicks.QuantityThreshold);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupTicksModel.cs
index ec39ec8a0..b4f2241a4 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupTicksModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupTicksModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class PreHedgePayupTicksModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Payup Ticks";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_payup_ticks(leg_tup) is PreHedgeQuantityBasedPayupTicks payup_ticks)
payup_ticks.PayupTicks = value;
}
@@ -34,7 +34,7 @@ namespace mbts.spark {
leg_tup.leg_params.PreHedgeParams.QuantityBasedPayupTicks;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayUpTicks.PayupTicks);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayUpTicks.PayupTicks);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingPriceTypeModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingPriceTypeModel.cs
index fc1e2517e..dc2ddde7a 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingPriceTypeModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingPriceTypeModel.cs
@@ -9,7 +9,7 @@ namespace mbts.spark {
{
class ConditionalQuotingPriceTypeModel : RowModelBase
{
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Price Type";
public override string help_text { get; } = string.Empty;
@@ -26,7 +26,7 @@ namespace mbts.spark {
public override void set_value(LegSpreaderParamsTuple leg_tup, PriceType value)
{
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_value(leg_tup) is ConditionalQuoting cond)
cond.PriceType = value;
}
@@ -37,7 +37,7 @@ namespace mbts.spark {
leg_tup.leg_params.QuoteParams.ConditionalQuoting;
PriceType _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.ConditionalQuoting.PriceType);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.ConditionalQuoting.PriceType);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingTicksModel.cs
index 92c56fcaf..83dfe65af 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingTicksModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingTicksModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class ConditionalQuotingTicksModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Ticks";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, int value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_value(leg_tup) is ConditionalQuoting cond)
cond.NTicks = value;
}
@@ -34,7 +34,7 @@ namespace mbts.spark {
leg_tup.leg_params.QuoteParams.ConditionalQuoting;
int _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.ConditionalQuoting.NTicks);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.ConditionalQuoting.NTicks);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Hidden/QuoteHiddenModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Hidden/QuoteHiddenModel.cs
index a0f2e1417..1c090a770 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Hidden/QuoteHiddenModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Hidden/QuoteHiddenModel.cs
@@ -6,7 +6,7 @@ using System.Windows;
namespace mbts.spark {
partial class SyntheticEditorVM {
class QuoteHiddenModel : RowModelBase, IHaveFontParams {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Hidden";
public override string help_text { get; } = "A hidden quote is not sent out until the market crosses the computed quoting price. When that happens, the quote is sent out as an IOC order. This continues until the synthetic spreader order is fully filled, or cancelled.";
@@ -21,7 +21,7 @@ namespace mbts.spark {
_get_throttle(leg_tup) != null;
public override void set_value(LegSpreaderParamsTuple leg_tup, bool value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
leg_tup.leg_params.QuoteParams.QuoteHidden = value ? new QuoteHidden() : null;
}
@@ -32,7 +32,7 @@ namespace mbts.spark {
leg_tup.leg_params.QuoteParams.QuoteHidden;
bool _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => false);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => false);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs
index f38365209..2890aa98d 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class QuoteInsideMarketDistanceTowardModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Toward Distance";
public override string help_text { get; } = string.Empty;
@@ -21,7 +21,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_inside_market_distance(leg_tup) is QuoteInsideMarketDistanceThrottle inside_market_distance)
inside_market_distance.OnTowardDistance = value;
}
@@ -33,7 +33,7 @@ namespace mbts.spark {
leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey);
+ _value_store.GetValueOrDefault(leg_tup.id);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleMinMove.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleMinMove.cs
index 0a4550dee..7511b83d6 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleMinMove.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleMinMove.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class QuoteInsideMarketThrottleMinMoveModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Min Move";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_inside_market_throttle(leg_tup) is QuoteInsideMarketDistanceWithTravel inside_market_throttle)
inside_market_throttle.Limit = value;
}
@@ -34,7 +34,7 @@ namespace mbts.spark {
leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceWithTravel;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistanceWithTravel.Limit);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistanceWithTravel.Limit);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleTicksModel.cs
index 99798bc96..01bab5a5c 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleTicksModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleTicksModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class QuoteInsideMarketThrottleTicksModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Ticks";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_inside_market_throttle(leg_tup) is QuoteInsideMarketDistanceWithTravel inside_market_throttle)
inside_market_throttle.TicksFromInside = value;
}
@@ -34,7 +34,7 @@ namespace mbts.spark {
leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceWithTravel;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistanceWithTravel.TicksFromInside);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistanceWithTravel.TicksFromInside);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/QuoteQueueHolderModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/QuoteQueueHolderModel.cs
index 0342d0489..a3e3f2f28 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/QuoteQueueHolderModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/QuoteQueueHolderModel.cs
@@ -9,7 +9,7 @@ namespace mbts.spark
{
class QuoteQueueHolderModel : RowModelBase, IHaveFontParams
{
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public QuoteQueueHolderModel()
{
}
@@ -27,7 +27,7 @@ namespace mbts.spark
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value)
{
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
leg_tup.leg_params.QuoteParams.NQueueHolderOrders = value ;
}
@@ -38,7 +38,7 @@ namespace mbts.spark
leg_tup.leg_params.QuoteParams;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => 0u);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => 0u);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/ShowQuantity/ShowQuantityQuantityModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/ShowQuantity/ShowQuantityQuantityModel.cs
index 4cdb916f1..8f1673cee 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/ShowQuantity/ShowQuantityQuantityModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/ShowQuantity/ShowQuantityQuantityModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
internal class ShowQuantityQuantityModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name => "Quantity";
@@ -24,7 +24,7 @@ namespace mbts.spark {
_get_value(leg_tup) is NullableQuantity show_quantity ? show_quantity.Quantity : _value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_value(leg_tup) is NullableQuantity show_quantity) {
show_quantity.Quantity = value;
}
@@ -37,7 +37,7 @@ namespace mbts.spark {
leg_tup.leg_params.QuoteParams.ShowQuantity;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.ShowQuantity.Quantity);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.ShowQuantity.Quantity);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleInsideTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleInsideTicksModel.cs
index fbb31e836..da7bd2b38 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleInsideTicksModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleInsideTicksModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class QuoteThrottleInsideTicksModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Inside Ticks";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_throttle(leg_tup) is QuoteMuteZone throttle)
throttle.InsideTicks = value;
}
@@ -34,7 +34,7 @@ namespace mbts.spark {
leg_tup.leg_params.QuoteParams.QuoteMuteZone;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteMuteZone.InsideTicks);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.QuoteMuteZone.InsideTicks);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleOutsideTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleOutsideTicksModel.cs
index cfa2c8194..a1df97c4f 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleOutsideTicksModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleOutsideTicksModel.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace mbts.spark {
partial class SyntheticEditorVM {
class QuoteThrottleOutsideTicksModel : RowModelBase {
- IDictionary _value_store = new Dictionary();
+ IDictionary _value_store = new Dictionary();
public override string display_name { get; } = "Outside Ticks";
public override string help_text { get; } = string.Empty;
@@ -22,7 +22,7 @@ namespace mbts.spark {
_value_from_store(leg_tup);
public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
- _value_store[leg_tup.SecurityKey] = value;
+ _value_store[leg_tup.id] = value;
if (_get_throttle(leg_tup) is QuoteMuteZone throttle)
throttle.OutsideTicks = value;
}
@@ -34,7 +34,7 @@ namespace mbts.spark {
leg_tup.leg_params.QuoteParams.QuoteMuteZone;
uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
- _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteMuteZone.OutsideTicks);
+ _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.QuoteMuteZone.OutsideTicks);
}
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs
index 3d516614f..8575c953c 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs
@@ -42,8 +42,8 @@ namespace mbts.spark {
}
internal abstract class RowModelBase : ViewModelBase, IRowModel {
- readonly Dictionary> _enabled_store = new Dictionary>();
- readonly Dictionary> _override_value_store = new Dictionary>();
+ readonly Dictionary> _enabled_store = new Dictionary>();
+ readonly Dictionary> _override_value_store = new Dictionary>();
protected RowModelBase() { }
@@ -59,22 +59,22 @@ namespace mbts.spark {
public virtual ICell create_cell(LegSpreaderParamsTuple leg_tup) => new Cell(this, leg_tup);
public void set_enabled(LegSpreaderParamsTuple leg_tup, bool enabled) =>
- _enabled_store.GetOrAdd(leg_tup.SecurityKey, sec => new ReplaySubject(1)).OnNext(enabled);
+ _enabled_store.GetOrAdd(leg_tup, sec => new ReplaySubject(1)).OnNext(enabled);
public void override_value(LegSpreaderParamsTuple leg_tup, T value) {
- if (_override_value_store.TryGetValue(leg_tup.SecurityKey, out Subject subject))
+ if (_override_value_store.TryGetValue(leg_tup, out Subject subject))
subject.OnNext(value);
}
public IObservable observe_enabled(LegSpreaderParamsTuple leg_tup) =>
- _enabled_store.GetOrAdd(leg_tup.leg.Security.Id, sec => {
+ _enabled_store.GetOrAdd(leg_tup, sec => {
var rs = new ReplaySubject(1);
rs.OnNext(_get_enabled(leg_tup));
return rs;
});
public IObservable observe_override_value(LegSpreaderParamsTuple leg_tup) =>
- _override_value_store.GetOrAdd(leg_tup.leg.Security.Id, sec => new Subject());
+ _override_value_store.GetOrAdd(leg_tup, sec => new Subject());
protected virtual bool _get_enabled(LegSpreaderParamsTuple leg_tup) => true;
#region IRowModel (explicit)
diff --git a/src/client/spark/Modules/Spreader/VM/RowVM.cs b/src/client/spark/Modules/Spreader/VM/RowVM.cs
index 7f7b9019e..86493bd0c 100644
--- a/src/client/spark/Modules/Spreader/VM/RowVM.cs
+++ b/src/client/spark/Modules/Spreader/VM/RowVM.cs
@@ -1,6 +1,4 @@
-using bts.api;
-using mbts.collections;
-using mbts.ui.controls;
+using mbts.ui.controls;
using mbts.ui.spark;
using mbts.ui.utility;
using System;
@@ -18,8 +16,8 @@ namespace mbts.spark {
ParameterSection[] section_path { get; }
}
- internal class RowVM : DataGridExRow, IParameterRowVM, IDisposable {
- readonly ObservableKeyedCollection, uint> _cells = new ObservableKeyedCollection, uint>(kv => kv.Key);
+ internal class RowVM : DataGridExRow, IParameterRowVM, IDisposable {
+ readonly ObservableCollection<(LegSpreaderParamsTuple leg, ICell cell)> _cells = new ObservableCollection<(LegSpreaderParamsTuple leg, ICell cell)>();
readonly Property _has_errors;
IDisposable _dispose;
@@ -34,15 +32,16 @@ namespace mbts.spark {
_has_errors = backing(nameof(has_errors), false);
_dispose = Disposable.Create(
- ObservableAutoWrapper.connect(legs, _cells, lt => new KeyValuePair(lt.SecurityKey, (model.create_cell(lt), lt))),
- ObservableAutoWrapper.connect_item_hooks(_cells, kv => {
- kv.Value.cell.value_changed += raise_cell_value_changed;
+ ObservableAutoWrapper.connect(legs, _cells, lt => (lt, model.create_cell(lt))),
+ ObservableAutoWrapper.connect_item_hooks(_cells, tup => {
+ var (leg, cell) = tup;
+ cell.value_changed += raise_cell_value_changed;
return new CompositeDisposable {
- Disposable.Create(() => kv.Value.cell.value_changed -= raise_cell_value_changed),
- kv.Value.cell as IDisposable ?? Disposable.empty
+ Disposable.Create(() => cell.value_changed -= raise_cell_value_changed),
+ cell as IDisposable ?? Disposable.empty
};
void raise_cell_value_changed() =>
- cell_value_changed?.Invoke(kv.Value.cell, kv.Value.leg);
+ cell_value_changed?.Invoke(cell, leg);
}, true));
}
@@ -56,8 +55,13 @@ namespace mbts.spark {
public bool read_only { get; }
public bool has_errors => _has_errors.Value;
- public override object get_cell(Security col_key) =>
- _cells.TryGetValue(col_key.Id, out KeyValuePair kv) ? kv.Value.cell : null;
+ public override object get_cell(LegSpreaderParamsTuple leg_tup) =>
+ // Note this is an O(n) op.
+ // If need ever arises to improve perf here,
+ // an id member could be added to the LegSpreaderParamsTuple,
+ // which could serve as a sorting key to enable Log(n) lookups.
+ leg_tup != null &&
+ _cells.TryGetFirst(t => t.leg == leg_tup, out var match) ? match.cell : null;
public ParameterSection this[string section_no] =>
int.TryParse(section_no, out int i) && i < section_path.Length ? section_path[i] : null;
diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs
index b9c676d9e..fe3ed2d9b 100644
--- a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs
+++ b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs
@@ -88,7 +88,7 @@ namespace mbts.spark {
_close_new_leg_popup();
}
};
- remove_leg = new DelegateCommand(s => leg_tuples.removeFirst(l => l.leg.Security.Id == s.Id));
+ remove_leg = new DelegateCommand(l => leg_tuples.Remove(l));
commit = new AsyncCommand(commit_async, () => leg_count >= 2);
if (override_auto_set_behavior) {
@@ -112,6 +112,14 @@ namespace mbts.spark {
commit.RaiseCanExecuteChanged();
_validate_leg_count();
};
+ _resources.Add(ObservableAutoWrapper.connect_item_hooks(leg_tuples, l => {
+ l.security_changed += on_sec_changed;
+ return Disposable.Create(() => l.security_changed -= on_sec_changed);
+ void on_sec_changed() {
+ if (_set_name_automatically)
+ _deduce_name();
+ }
+ }));
async Task commit_async() {
RequestUpdate?.Invoke();
@@ -377,4 +385,4 @@ namespace mbts.spark {
else clear_error(nameof(leg_count));
}
}
-}
\ No newline at end of file
+}
diff --git a/src/client/spark/view/Controls/Popup/PopupControl.xaml.cs b/src/client/spark/view/Controls/Popup/PopupControl.xaml.cs
index b8b07bddb..60cdfd30d 100644
--- a/src/client/spark/view/Controls/Popup/PopupControl.xaml.cs
+++ b/src/client/spark/view/Controls/Popup/PopupControl.xaml.cs
@@ -23,6 +23,18 @@ namespace mbts.ui.controls {
public event RoutedEventHandler Opened { add => AddHandler(OpenedEvent, value); remove => RemoveHandler(OpenedEvent, value); }
public event RoutedEventHandler Closed { add => AddHandler(ClosedEvent, value); remove => RemoveHandler(ClosedEvent, value); }
+ #region ButtonStyle
+ public static readonly DependencyProperty ButtonStyleProperty =
+ WPFHelper.create_dp