Data bindings - Finished main functionality

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

@@ -18,14 +18,6 @@
                 <ResourceDictionary>
                     <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
                     <utilities:BindingProxy x:Key="DataContextProxy" Data="{Binding}" />
-                    <DataTemplate x:Key="DataModelDataTemplate">
-                        <Control x:Name="TemplateControl" Focusable="False" Template="{StaticResource DataModelSelectionTemplate}" />
-                        <DataTemplate.Triggers>
-                            <DataTrigger Binding="{Binding Data.ShowDataModelValues.Value, Source={StaticResource DataContextProxy}}" Value="True">
-                                <Setter TargetName="TemplateControl" Property="Template" Value="{StaticResource DataModelSelectionTemplateWithValues}" />
-                            </DataTrigger>
-                        </DataTemplate.Triggers>
-                    </DataTemplate>
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
@@ -62,7 +54,6 @@
                 Style="{StaticResource DisplayConditionButtonLeftClickMenu}"
                 Background="#7B7B7B"
                 BorderBrush="#7B7B7B"
-                Content="{Binding SelectedModifierType.Description}"
                 Click="PropertyButton_OnClick">
             <Button.ContextMenu>
                 <ContextMenu ItemsSource="{Binding ModifierTypes}">
@@ -83,6 +74,15 @@
                     </ContextMenu.ItemContainerStyle>
                 </ContextMenu>
             </Button.ContextMenu>
+            <Grid>
+                <TextBlock Text="{Binding SelectedModifierType.Description}"
+                           Visibility="{Binding SelectedModifierType, Converter={StaticResource NullToVisibilityConverter}}" />
+                <TextBlock FontStyle="Italic"
+                           Visibility="{Binding SelectedModifierType, Converter={StaticResource NullToVisibilityConverter}, ConverterParameter=Inverted}">
+                    « Select a modifier »
+                </TextBlock>
+            </Grid>
+            
         </Button>
 
         <ContentControl Grid.Column="3" s:View.Model="{Binding DynamicSelectionViewModel}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />

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

@@ -1,4 +1,5 @@
-using Artemis.Core;
+using System;
+using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Exceptions;
 using Artemis.UI.Shared;
@@ -8,7 +9,7 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
 {
-    public class DataBindingModifierViewModel<TLayerProperty, TProperty> : PropertyChangedBase
+    public class DataBindingModifierViewModel<TLayerProperty, TProperty> : PropertyChangedBase, IDisposable
     {
         private readonly IDataBindingService _dataBindingService;
         private readonly IDataModelUIService _dataModelUIService;
@@ -34,8 +35,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
 
             SelectModifierTypeCommand = new DelegateCommand(ExecuteSelectModifierTypeCommand);
 
-            // Initialize async, no need to wait for it
-            Execute.PostToUIThread(Update);
+            Update();
         }
 
         public DelegateCommand SelectModifierTypeCommand { get; }
@@ -92,6 +92,12 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             if (sourceType == null)
                 throw new ArtemisUIException("Cannot use a data binding modifier VM for a data binding without a source");
 
+            if (DynamicSelectionViewModel != null)
+            {
+                DynamicSelectionViewModel.Dispose();
+                DynamicSelectionViewModel.PropertySelected -= ParameterSelectionViewModelOnPropertySelected;
+            }
+
             if (Modifier.ModifierType == null || !Modifier.ModifierType.SupportsParameter)
             {
                 StaticInputViewModel = null;
@@ -101,14 +107,22 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             {
                 StaticInputViewModel = null;
                 DynamicSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
-                DynamicSelectionViewModel.PropertySelected += ParameterSelectionViewModelOnPropertySelected;
-                DynamicSelectionViewModel.FilterTypes = new[] {sourceType};
+                if (DynamicSelectionViewModel != null)
+                {
+                    DynamicSelectionViewModel.PropertySelected += ParameterSelectionViewModelOnPropertySelected;
+                    DynamicSelectionViewModel.FilterTypes = new[] {sourceType};
+                }
             }
             else
             {
                 DynamicSelectionViewModel = null;
-                StaticInputViewModel = _dataModelUIService.GetStaticInputViewModel(sourceType);
-                StaticInputViewModel.ValueUpdated += StaticInputViewModelOnValueUpdated;
+                if (Modifier.ModifierType.PreferredParameterType != null && sourceType.IsCastableFrom(Modifier.ModifierType.PreferredParameterType))
+                    StaticInputViewModel = _dataModelUIService.GetStaticInputViewModel(Modifier.ModifierType.PreferredParameterType);
+                else
+                    StaticInputViewModel = _dataModelUIService.GetStaticInputViewModel(sourceType);
+
+                if (StaticInputViewModel != null)
+                    StaticInputViewModel.ValueUpdated += StaticInputViewModelOnValueUpdated;
             }
 
             // Modifier type
@@ -118,7 +132,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
 
             // Parameter
             if (DynamicSelectionViewModel != null)
-                DynamicSelectionViewModel?.PopulateSelectedPropertyViewModel(Modifier.ParameterDataModel, Modifier.ParameterPropertyPath);
+                DynamicSelectionViewModel.PopulateSelectedPropertyViewModel(Modifier.ParameterDataModel, Modifier.ParameterPropertyPath);
             else if (StaticInputViewModel != null)
                 StaticInputViewModel.Value = Modifier.ParameterStaticValue;
         }
@@ -133,5 +147,14 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
 
             Update();
         }
+
+        public void Dispose()
+        {
+            if (DynamicSelectionViewModel != null)
+            {
+                DynamicSelectionViewModel.Dispose();
+                DynamicSelectionViewModel.PropertySelected -= ParameterSelectionViewModelOnPropertySelected;
+            }
+        }
     }
 }

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

@@ -126,7 +126,7 @@
                             FontSize="12"
                             Padding="6 4"
                             Height="22"
-                            IsEnabled="{Binding IsDataBindingEnabled}"
+                            IsEnabled="{Binding CanAddModifier}"
                             Command="{s:Action AddModifier}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Margin="0 -1 4 0" Kind="Plus" />

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

@@ -6,6 +6,7 @@ using Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Input;
 using Artemis.UI.Shared.Services;
+using Ninject.Planning.Targets;
 using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
@@ -25,6 +26,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
         private TProperty _testInputValue;
         private TProperty _testResultValue;
         private bool _updating;
+        private bool _canAddModifier;
 
         public DataBindingViewModel(DataBindingRegistration<TLayerProperty, TProperty> registration,
             IProfileEditorService profileEditorService,
@@ -51,8 +53,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
 
             _isDataBindingEnabled = DataBinding != null;
 
-            // Initialize async, no need to wait for it
-            Execute.PostToUIThread(Initialize);
+            Initialize();
         }
 
         public DataBindingRegistration<TLayerProperty, TProperty> Registration { get; }
@@ -116,6 +117,12 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             }
         }
 
+        public bool CanAddModifier
+        {
+            get => _canAddModifier;
+            private set => SetAndNotify(ref _canAddModifier, value);
+        }
+
         public DataBinding<TLayerProperty, TProperty> DataBinding
         {
             get => _dataBinding;
@@ -169,7 +176,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             if (DataBinding == null)
                 return;
 
-            var modifier = new DataBindingModifier<TLayerProperty, TProperty>(ProfileRightSideType.Dynamic);
+            var modifier = new DataBindingModifier<TLayerProperty, TProperty>(DataBinding, ProfileRightSideType.Dynamic);
             DataBinding.AddModifier(modifier);
 
             _profileEditorService.UpdateSelectedProfileElement();
@@ -190,6 +197,8 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             if (_updating)
                 return;
 
+            CanAddModifier = IsDataBindingEnabled && DataBinding.SourceDataModel != null;
+
             if (DataBinding == null)
             {
                 TargetSelectionViewModel.IsEnabled = false;
@@ -218,9 +227,12 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             if (_updating)
                 return;
 
-            DataBinding.Mode = SelectedDataBindingMode;
-            DataBinding.EasingTime = TimeSpan.FromMilliseconds(EasingTime);
-            DataBinding.EasingFunction = SelectedEasingViewModel?.EasingFunction ?? Easings.Functions.Linear;
+            if (DataBinding != null)
+            {
+                DataBinding.Mode = SelectedDataBindingMode;
+                DataBinding.EasingTime = TimeSpan.FromMilliseconds(EasingTime);
+                DataBinding.EasingFunction = SelectedEasingViewModel?.EasingFunction ?? Easings.Functions.Linear;
+            }
 
             _profileEditorService.UpdateSelectedProfileElement();
             Update();
@@ -238,8 +250,8 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             var currentValue = TargetSelectionViewModel.SelectedPropertyViewModel?.GetCurrentValue();
             if (currentValue == null)
                 currentValue = default(TProperty);
-
-            TestInputValue = (TProperty) Convert.ChangeType(currentValue, typeof(TProperty));
+            
+            TestInputValue = Registration.Converter.ConvertFromObject(currentValue);
             if (DataBinding != null)
                 TestResultValue = DataBinding.GetValue(TestInputValue);
             else
@@ -248,7 +260,10 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
 
         private void UpdateModifierViewModels()
         {
+            foreach (var dataBindingModifierViewModel in ModifierViewModels) 
+                dataBindingModifierViewModel.Dispose();
             ModifierViewModels.Clear();
+
             if (DataBinding == null)
                 return;
 
@@ -269,6 +284,8 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
         private void TargetSelectionViewModelOnPropertySelected(object sender, DataModelInputDynamicEventArgs e)
         {
             DataBinding.UpdateSource(e.DataModelVisualizationViewModel.DataModel, e.DataModelVisualizationViewModel.PropertyPath);
+            Update();
+
             _profileEditorService.UpdateSelectedProfileElement();
         }
 
@@ -276,8 +293,14 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
         {
             _profileEditorService.ProfilePreviewUpdated -= ProfileEditorServiceOnProfilePreviewUpdated;
             TargetSelectionViewModel.PropertySelected -= TargetSelectionViewModelOnPropertySelected;
+            TargetSelectionViewModel.Dispose();
             if (DataBinding != null)
                 DataBinding.ModifiersUpdated -= DataBindingOnModifiersUpdated;
+
+            foreach (var dataBindingModifierViewModel in ModifierViewModels) 
+                dataBindingModifierViewModel.Dispose();
+            ModifierViewModels.Clear();
+            
         }
     }