diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index 81e342b38..e3a8179b1 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -715,7 +715,7 @@ namespace mbts.spark.utilities { !b.HasChild); public static bool top_equals(TopOrderDefinitionImmutable a, TopOrderDefinitionImmutable b) => - a.WatchLevelTickOffset == b.WatchLevelTickOffset && + a.TicksOff == b.TicksOff && (a.HasTopThreshold ? b.HasTopThreshold && quantity_measure_equals(a.TopThreshold, b.TopThreshold) : !b.HasTopThreshold) && @@ -906,7 +906,7 @@ namespace mbts.spark.utilities { add_component(_get_hash(_get_tick_child(tick))); break; case CustomOrderDefinition.CustomOneofCase.Top: - add_component(def.Top.WatchLevelTickOffset.GetHashCode()); + add_component(def.Top.TicksOff.GetHashCode()); add_component(def.Top.HasTopThreshold ? def.Top.TopThreshold.GetHashCode() : 0); add_component(_get_top_child(def.Top).GetHashCode()); break; diff --git a/src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs index 984303599..8f41cbbaf 100644 --- a/src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs @@ -5,13 +5,16 @@ using TopDefi = bts.api.orderman.TopOrderDefinitionImmutable; namespace mbts.spark { static partial class OrderTypeVMFactory { class TopOrderVM : OrderTypeVMBase { + readonly Property _ticks_off; readonly Property _top_threshold; public TopOrderVM(AlgoKey key, string display_name, AlgoEditingPermissions editing_permissions) : base(key, display_name, editing_permissions) { + _ticks_off = add_nullable_property(nameof(ticks_off), TopDef.TicksOffFieldNumber); _top_threshold = add_property(nameof(top_threshold), TopDef.TopThresholdFieldNumber, new QuantityMeasureImmutable(new QuantityMeasure { Ratio = 1.0, Absolute = 1 })); } + public uint? ticks_off { get => _ticks_off.Value; set => _ticks_off.set(value); } public QuantityMeasureImmutable? top_threshold { get => _top_threshold.Value; set => _top_threshold.set(value); } } } diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index c64d29f52..a3b82fee1 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -489,6 +489,8 @@ + + @@ -503,9 +505,11 @@ + Ticks Off +