Data bindings - WIP commit

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingModifierView.xaml

@@ -62,8 +62,8 @@
                 Style="{StaticResource DisplayConditionButtonLeftClickMenu}"
                 Background="#7B7B7B"
                 BorderBrush="#7B7B7B"
-                Content="{Binding SelectedModifierType.Description}">
-            <!-- Click="PropertyButton_OnClick" -->
+                Content="{Binding SelectedModifierType.Description}"
+                Click="PropertyButton_OnClick">
             <Button.ContextMenu>
                 <ContextMenu ItemsSource="{Binding ModifierTypes}">
                     <ContextMenu.ItemTemplate>
@@ -85,34 +85,7 @@
             </Button.ContextMenu>
         </Button>
 
-        <Button Grid.Column="3"
-                Background="#ab47bc"
-                BorderBrush="#ab47bc"
-                Style="{StaticResource DisplayConditionButton}"
-                ToolTip="{Binding SelectedParameterProperty.DisplayPropertyPath}"
-                HorizontalAlignment="Left">
-            <Button.ContextMenu>
-                <ContextMenu ItemsSource="{Binding ParameterDataModel.Children}" IsOpen="{Binding ParameterDataModelOpen, Mode=OneWayToSource}">
-                    <ContextMenu.ItemContainerStyle>
-                        <Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource MaterialDesignMenuItem}">
-                            <Setter Property="ItemsSource" Value="{Binding Children}" />
-                            <Setter Property="Command" Value="{Binding Data.SelectModifierTypeCommand, Source={StaticResource DataContextProxy}}" />
-                            <Setter Property="CommandParameter" Value="{Binding}" />
-                            <Setter Property="CommandTarget" Value="{Binding}" />
-                            <Setter Property="IsEnabled" Value="{Binding IsMatchingFilteredTypes}" />
-                            <Setter Property="IsSubmenuOpen" Value="{Binding IsVisualizationExpanded, Mode=TwoWay}" />
-                            <Setter Property="HeaderTemplate" Value="{StaticResource DataModelDataTemplate}" />
-                        </Style>
-                    </ContextMenu.ItemContainerStyle>
-                </ContextMenu>
-            </Button.ContextMenu>
-            <Grid>
-                <TextBlock Text="{Binding SelectedParameterProperty.PropertyDescription.Name}"
-                           Visibility="{Binding SelectedParameterProperty, Converter={StaticResource NullToVisibilityConverter}}" />
-                <TextBlock Text="« Select a property »"
-                           FontStyle="Italic"
-                           Visibility="{Binding SelectedParameterProperty, Converter={StaticResource NullToVisibilityConverter}, ConverterParameter=Inverted}" />
-            </Grid>
-        </Button>
+        <ContentControl Grid.Column="3" s:View.Model="{Binding DynamicSelectionViewModel}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />
+        <ContentControl Grid.Column="3" s:View.Model="{Binding StaticInputViewModel}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />
     </Grid>
 </UserControl>

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingModifierView.xaml.cs

@@ -22,5 +22,15 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
         {
             InitializeComponent();
         }
+
+        private void PropertyButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            // DataContext is not set when using left button, I don't know why but there it is
+            if (sender is Button button && button.ContextMenu != null)
+            {
+                button.ContextMenu.DataContext = button.DataContext;
+                button.ContextMenu.IsOpen = true;
+            }
+        }
     }
 }

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingModifierViewModel.cs

@@ -1,7 +1,10 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
+using Artemis.UI.Exceptions;
 using Artemis.UI.Shared;
+using Artemis.UI.Shared.Input;
 using Artemis.UI.Shared.Services;
 using Stylet;
 
@@ -13,6 +16,8 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
         private readonly IDataModelUIService _dataModelUIService;
         private readonly IProfileEditorService _profileEditorService;
         private DataBindingModifierType _selectedModifierType;
+        private DataModelDynamicViewModel _dynamicSelectionViewModel;
+        private DataModelStaticViewModel _staticInputViewModel;
 
         public DataBindingModifierViewModel(DataBindingModifier modifier,
             IDataBindingService dataBindingService,
@@ -32,11 +37,10 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             SelectModifierTypeCommand = new DelegateCommand(ExecuteSelectModifierTypeCommand);
 
             // Initialize async, no need to wait for it
-            Task.Run(Initialize);
+            Execute.PostToUIThread(Initialize);
         }
 
-        public DelegateCommand SelectModifierTypeCommand { get; set; }
-
+        public DelegateCommand SelectModifierTypeCommand { get; }
         public PluginSetting<bool> ShowDataModelValues { get; }
         public DataBindingModifier Modifier { get; }
         public BindableCollection<DataBindingModifierType> ModifierTypes { get; }
@@ -47,30 +51,65 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             set => SetAndNotify(ref _selectedModifierType, value);
         }
 
-        public DataModelSelectionViewModel ParameterSelectionViewModel { get; private set; }
+        public DataModelDynamicViewModel DynamicSelectionViewModel
+        {
+            get => _dynamicSelectionViewModel;
+            private set => SetAndNotify(ref _dynamicSelectionViewModel, value);
+        }
+
+        public DataModelStaticViewModel StaticInputViewModel
+        {
+            get => _staticInputViewModel;
+            private set => SetAndNotify(ref _staticInputViewModel, value);
+        }
 
         private void Initialize()
         {
-            ParameterSelectionViewModel = _dataModelUIService.GetDataModelSelectionViewModel(_profileEditorService.GetCurrentModule());
-            ParameterSelectionViewModel.PropertySelected += ParameterSelectionViewModelOnPropertySelected;
-            ParameterSelectionViewModel.FilterTypes = new[] {Modifier.DataBinding.TargetProperty.PropertyType};
+            var sourceType = Modifier.DataBinding.GetSourceType();
+            if (sourceType == null)
+                throw new ArtemisUIException("Cannot initialize a data binding modifier VM for a data binding without a source");
+
+            if (Modifier.ParameterType == ProfileRightSideType.Dynamic)
+            {
+                StaticInputViewModel = null;
+                DynamicSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
+                DynamicSelectionViewModel.PropertySelected += ParameterSelectionViewModelOnPropertySelected;
+                DynamicSelectionViewModel.FilterTypes = new[] {sourceType};
+            }
+            else
+            {
+                DynamicSelectionViewModel = null;
+                StaticInputViewModel = _dataModelUIService.GetStaticInputViewModel(sourceType);
+                StaticInputViewModel.ValueUpdated += StaticInputViewModelOnValueUpdated;
+            }
 
             Update();
         }
 
-        private void ParameterSelectionViewModelOnPropertySelected(object sender, DataModelPropertySelectedEventArgs e)
+        private void ParameterSelectionViewModelOnPropertySelected(object sender, DataModelInputDynamicEventArgs e)
         {
             Modifier.UpdateParameter(e.DataModelVisualizationViewModel.DataModel, e.DataModelVisualizationViewModel.PropertyPath);
         }
 
+        private void StaticInputViewModelOnValueUpdated(object sender, DataModelInputStaticEventArgs e)
+        {
+            Modifier.UpdateParameter(e.Value);
+        }
+
         private void Update()
         {
+            var sourceType = Modifier.DataBinding.GetSourceType();
+
             // Modifier type
             ModifierTypes.Clear();
-            ModifierTypes.AddRange(_dataBindingService.GetCompatibleModifierTypes(Modifier.DataBinding.TargetProperty.PropertyType));
+            ModifierTypes.AddRange(_dataBindingService.GetCompatibleModifierTypes(sourceType));
             SelectedModifierType = Modifier.ModifierType;
 
-            ParameterSelectionViewModel.PopulateSelectedPropertyViewModel(Modifier.ParameterDataModel, Modifier.ParameterPropertyPath);
+            // Parameter
+            if (DynamicSelectionViewModel != null)
+                DynamicSelectionViewModel?.PopulateSelectedPropertyViewModel(Modifier.ParameterDataModel, Modifier.ParameterPropertyPath);
+            else if (StaticInputViewModel != null)
+                StaticInputViewModel.Value = Modifier.ParameterStaticValue;
         }
 
         private void ExecuteSelectModifierTypeCommand(object context)
@@ -83,5 +122,20 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
 
             Update();
         }
+
+        public void Delete()
+        {
+            Modifier.DataBinding.RemoveModifier(Modifier);
+        }
+
+        public void SwapType()
+        {
+            if (Modifier.ParameterType == ProfileRightSideType.Dynamic)
+                Modifier.UpdateParameter(Modifier.DataBinding.GetSourceType().GetDefault());
+            else
+                Modifier.UpdateParameter(null, null);
+
+            Initialize();
+        }
     }
 }

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingView.xaml.cs

@@ -12,15 +12,5 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
         {
             InitializeComponent();
         }
-
-        private void PropertyButton_OnClick(object sender, RoutedEventArgs e)
-        {
-            // DataContext is not set when using left button, I don't know why but there it is
-            if (sender is Button button && button.ContextMenu != null)
-            {
-                button.ContextMenu.DataContext = button.DataContext;
-                button.ContextMenu.IsOpen = true;
-            }
-        }
     }
 }

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingViewModel.cs

@@ -1,33 +1,27 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 using System.Timers;
 using Artemis.Core;
-using Artemis.Core.Services;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Shared;
+using Artemis.UI.Shared.Input;
 using Artemis.UI.Shared.Services;
-using Artemis.UI.Utilities;
 using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
 {
     public class DataBindingViewModel : PropertyChangedBase
     {
-        private readonly IDataModelUIService _dataModelUIService;
         private readonly IDataBindingsVmFactory _dataBindingsVmFactory;
+        private readonly IDataModelUIService _dataModelUIService;
         private readonly IProfileEditorService _profileEditorService;
         private readonly Timer _updateTimer;
         private DataBinding _dataBinding;
         private bool _isDataBindingEnabled;
-        private DataModelPropertiesViewModel _sourceDataModel;
-        private DataModelVisualizationViewModel _selectedSourceProperty;
-        private bool _sourceDataModelOpen;
+        private DataModelDynamicViewModel _targetSelectionViewModel;
         private object _testInputValue;
         private object _testResultValue;
-        private DataModelSelectionViewModel _targetSelectionViewModel;
 
         public DataBindingViewModel(BaseLayerProperty layerProperty,
             PropertyInfo targetProperty,
@@ -41,12 +35,14 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             _updateTimer = new Timer(500);
 
             DisplayName = targetProperty.Name.ToUpper();
+            ModifierViewModels = new BindableCollection<DataBindingModifierViewModel>();
 
             LayerProperty = layerProperty;
             TargetProperty = targetProperty;
             DataBinding = layerProperty.DataBindings.FirstOrDefault(d => d.TargetProperty == targetProperty);
 
-            ModifierViewModels = new BindableCollection<DataBindingModifierViewModel>();
+            if (DataBinding != null)
+                DataBinding.ModifiersUpdated += DataBindingOnModifiersUpdated;
 
             _isDataBindingEnabled = DataBinding != null;
 
@@ -59,7 +55,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
         public string DisplayName { get; }
         public BindableCollection<DataBindingModifierViewModel> ModifierViewModels { get; }
 
-        public DataModelSelectionViewModel TargetSelectionViewModel
+        public DataModelDynamicViewModel TargetSelectionViewModel
         {
             get => _targetSelectionViewModel;
             private set => SetAndNotify(ref _targetSelectionViewModel, value);
@@ -106,9 +102,13 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
                 return;
 
             DataBinding = LayerProperty.AddDataBinding(TargetProperty);
+            DataBinding.ModifiersUpdated += DataBindingOnModifiersUpdated;
             Update();
+
+            _profileEditorService.UpdateSelectedProfileElement();
         }
 
+
         public void RemoveDataBinding()
         {
             if (DataBinding == null)
@@ -117,7 +117,10 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             var toRemove = DataBinding;
             DataBinding = null;
             LayerProperty.RemoveDataBinding(toRemove);
+            toRemove.ModifiersUpdated -= DataBindingOnModifiersUpdated;
             Update();
+
+            _profileEditorService.UpdateSelectedProfileElement();
         }
 
         public void AddModifier()
@@ -128,12 +131,12 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             var modifier = new DataBindingModifier(ProfileRightSideType.Dynamic);
             DataBinding.AddModifier(modifier);
 
-            ModifierViewModels.Add(_dataBindingsVmFactory.DataBindingModifierViewModel(modifier));
+            _profileEditorService.UpdateSelectedProfileElement();
         }
 
         private void Initialize()
         {
-            TargetSelectionViewModel = _dataModelUIService.GetDataModelSelectionViewModel(_profileEditorService.GetCurrentModule());
+            TargetSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
             TargetSelectionViewModel.PropertySelected += TargetSelectionViewModelOnPropertySelected;
 
             Update();
@@ -153,11 +156,19 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             TargetSelectionViewModel.IsEnabled = true;
             TargetSelectionViewModel.PopulateSelectedPropertyViewModel(DataBinding.SourceDataModel, DataBinding.SourcePropertyPath);
             TargetSelectionViewModel.FilterTypes = new[] {DataBinding.TargetProperty.PropertyType};
+
+            UpdateModifierViewModels();
         }
 
-        private void TargetSelectionViewModelOnPropertySelected(object sender, DataModelPropertySelectedEventArgs e)
+        private void DataBindingOnModifiersUpdated(object sender, EventArgs e)
+        {
+            UpdateModifierViewModels();
+        }
+
+        private void TargetSelectionViewModelOnPropertySelected(object sender, DataModelInputDynamicEventArgs e)
         {
             DataBinding.UpdateSource(e.DataModelVisualizationViewModel.DataModel, e.DataModelVisualizationViewModel.PropertyPath);
+            _profileEditorService.UpdateSelectedProfileElement();
         }
 
         private void OnUpdateTimerOnElapsed(object sender, ElapsedEventArgs e)
@@ -184,6 +195,5 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             foreach (var dataBindingModifier in DataBinding.Modifiers)
                 ModifierViewModels.Add(_dataBindingsVmFactory.DataBindingModifierViewModel(dataBindingModifier));
         }
-
     }
 }