diff --git a/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs index f9b8f88f5..7eec736af 100644 --- a/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs @@ -2,7 +2,6 @@ using bts.api; using bts.api.orderman; using bts.collections; -using bts.spark; using Google.Protobuf; using Google.Protobuf.Reflection; using mbts.collections; @@ -18,18 +17,15 @@ using System.Reactive.Linq; using AlgoType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase; namespace mbts.spark { - static partial class OrderTypeVMFactory - { - internal class GenericOrderFactory - { - static public IAlgoVM create_vm(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions) - { + static partial class OrderTypeVMFactory { + internal class GenericOrderFactory { + static public IAlgoVM create_vm(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions) { var prop = typeof(CustomOrderDefinition).GetProperty(algo_type.ToString(), - System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public); + BindingFlags.Instance | BindingFlags.Public); var rt = prop.PropertyType; var propi = typeof(CustomOrderDefinitionImmutable).GetProperty(algo_type.ToString(), - System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public); + BindingFlags.Instance | BindingFlags.Public); var rti = propi.PropertyType; var vmt = typeof(GenericOrderVM<,>); @@ -38,38 +34,33 @@ namespace mbts.spark { object vm = Activator.CreateInstance(makevm, key, algo_type, display_name, editing_permissions); return (IAlgoVM)vm; } - static public void setup_generic_custom_order(CustomOrderDefinition custom, CustomOrderDefinition.CustomOneofCase type) - { + static public void setup_generic_custom_order(CustomOrderDefinition custom, CustomOrderDefinition.CustomOneofCase type) { var prop = typeof(CustomOrderDefinition).GetProperty(type.ToString(), - System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public); + BindingFlags.Instance | BindingFlags.Public); var rt = prop.PropertyType; var rtt = Activator.CreateInstance(rt); - + var ci = rt.GetProperties().Where(x => x.PropertyType == typeof(CustomOrderDefinition)); - foreach(var cid in ci) + foreach (var cid in ci) cid.SetValue(rtt, new CustomOrderDefinition { Limit = new LimitOrderDefinition() }); prop.SetValue(custom, rtt); } - } - + } + class GenericOrderVM : OrderTypeVMBase - where TMutable : class, IMessage, new() where TImmutable : struct, IImmutableMessage - { + where TMutable : class, IMessage, new() where TImmutable : struct, IImmutableMessage { readonly ObservableKeyedCollection, string> _parameters = new ObservableKeyedCollection, string>(vm => vm.descriptor.Name); readonly AlgoType _algo_type; public GenericOrderVM(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions) - : base(key, display_name, editing_permissions) - { + : base(key, display_name, editing_permissions) { _algo_type = algo_type; _parameters = new ObservableKeyedCollection, string>(vm => vm.descriptor.Name); _resources.AddRange( - ObservableAutoWrapper.connect_item_hooks(_parameters, p => - { + ObservableAutoWrapper.connect_item_hooks(_parameters, p => { p.PropertyChanged += on_param_prop_changed; - return Disposable.Create(() => - { + return Disposable.Create(() => { p.PropertyChanged -= on_param_prop_changed; remove_property(p.descriptor.Name); p.Dispose(); @@ -80,84 +71,76 @@ namespace mbts.spark { } public string algo_type => _algo_type.ToString(); - public override string abbreviation => + public override string abbreviation => model == null ? display_name : model.factory.abbreviate_algo(new OneOf(_algo_type)); public override AlgoDisplayGroup group => AlgoDisplayGroup.API; public ObservableCollection> parameters => _parameters; - protected override void on_model_internal() - { + protected override void on_model_internal() => _sync_generic_params(); - } - void _sync_generic_params() - { - if (model != null) - { - Google.Protobuf.Reflection.MessageDescriptor desc = new TMutable().Descriptor; + void _sync_generic_params() { + if (model != null) { + MessageDescriptor desc = new TMutable().Descriptor; _parameters.SyncWithDictionary( desc.Fields.InDeclarationOrder().Where(_is_value_param_desc).ToDictionary(p => p.Name), _mk_param_vm); } } - static bool _is_value_param_desc(FieldDescriptor desc) - { - return (desc.FieldType != Google.Protobuf.Reflection.FieldType.Message || + + static bool _is_value_param_desc(FieldDescriptor desc) => + (desc.FieldType != FieldType.Message || _is_quantity_measure_desc(desc)); - } - static bool _is_quantity_measure_desc(FieldDescriptor desc) - { - return desc.FieldType == Google.Protobuf.Reflection.FieldType.Message && + static bool _is_quantity_measure_desc(FieldDescriptor desc) => + desc.FieldType == FieldType.Message && desc.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName; - } - protected override IEnumerable get_selector_data() - { - var v = OrderDataHelper.get_child_algo_data(_algo_type); - return v; - } + protected override IEnumerable get_selector_data() => + OrderDataHelper.get_child_algo_data(_algo_type); - GenericOrderParamVM _mk_param_vm(FieldDescriptor descriptor) - { + GenericOrderParamVM _mk_param_vm(FieldDescriptor descriptor) { ExceptionAssert.Argument.NotNull(descriptor, nameof(descriptor)); - - if (descriptor.FieldType == FieldType.Message && - descriptor.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName) - { + if (descriptor.FieldType == FieldType.Message && + descriptor.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName) { var qm = new GenericOrderQuantityVM(descriptor); return attached(qm, GenericOrderHelper.get_quantity_value, GenericOrderHelper.set_quantity_value); - } - else if(descriptor.FieldType == FieldType.Enum) - { + } else if (descriptor.FieldType == FieldType.Enum) { var pvm = new GenericOrderEnumeratedVM(descriptor); attached(pvm, GenericOrderHelper.get_enumerated_value, GenericOrderHelper.set_enumerated_value); return pvm; - } - else if (descriptor.FieldType == FieldType.Bool) + } else if (descriptor.FieldType == FieldType.Bool) { return mk(descriptor, v => v, v => v.GetValueOrDefault()); - else if (descriptor.FieldType == FieldType.Double || descriptor.FieldType == FieldType.Float) + } else if (descriptor.FieldType == FieldType.Double || descriptor.FieldType == FieldType.Float) { return mk(descriptor, v => v, v => v, double.NaN); - else if (descriptor.FieldType == FieldType.Int32) + } else if (descriptor.FieldType == FieldType.Int32) { return mk(descriptor, v => v, v => v.GetValueOrDefault()); - else if (descriptor.FieldType == FieldType.UInt32) + } else if (descriptor.FieldType == FieldType.UInt32) { return mk(descriptor, v => v, v => v.GetValueOrDefault()); - else if (descriptor.FieldType == FieldType.String) + } else if (descriptor.FieldType == FieldType.String) { return mk(descriptor, v => v, v => v); - else - return null; + } else return null; } - GenericOrderParamVM mk(FieldDescriptor fdesc, Func convert, Func convert_back, TView default_value = default) - { - var pvm = new GenericOrderParamVM(fdesc, convert, convert_back); - return attached>(pvm, get_from_param, assign_to_param, default_value); + GenericOrderParamVM mk( + FieldDescriptor fdesc, + Func convert, + Func convert_back, + TView default_value = default) { + // + var pvm = new GenericOrderParamVM(fdesc, convert, convert_back); + return attached(pvm, get_from_param, assign_to_param, default_value); TView get_from_param(IMessage param, FieldDescriptor fd) => convert(ConvertUtils.try_convert(fdesc.Accessor.GetValue(param))); void assign_to_param(IMessage param, FieldDescriptor fd, TView value) => fdesc.Accessor.SetValue(param, convert_back(value)); } - TParam attached(TParam pvm, Func selector, Action assign_to_param, T default_value = default) where TParam : GenericOrderParamVM, IGenericOrderParamVM - { - add_property( + TParam attached( + TParam pvm, + Func + selector, Action assign_to_param, + T default_value = default) + where TParam : GenericOrderParamVM, IGenericOrderParamVM { + // + add_property( pvm.descriptor.Name, mdef => mdef != null ? selector(mdef, pvm.descriptor) : default_value, (mdef, v) => assign_to_param(mdef, pvm.descriptor, v), @@ -166,7 +149,7 @@ namespace mbts.spark { pvm.subscribe_value(), default_value); return pvm; - } + } } } -} \ No newline at end of file +}