Datamodels - A few small fixes to fix errors during startup

Layer properties - Reimplemented property tree Stylet - Add support for binding views to generic VMs
2026-11-12 11:56:30 +00:00 · 2020-05-17 18:54:15 +02:00
1 parent 8f639c9074
commit 2fd522bafb
@@ -18,8 +18,7 @@
        <KeyBinding Command="{s:Action PlayFromStart}" Modifiers="Shift" Key="Space" />
    </UserControl.InputBindings>
    <UserControl.Resources>
-        <s:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-        <Style x:Key="SVStyle" TargetType="{x:Type ScrollViewer}">
+        <Style x:Key="SvStyle" TargetType="{x:Type ScrollViewer}">
            <Setter Property="OverridesDefaultStyle" Value="True" />
            <Setter Property="Template">
                <Setter.Value>
@@ -37,6 +36,7 @@
                            <ScrollBar Name="PART_VerticalScrollBar"
                                       HorizontalAlignment="Right"
                                       Opacity="0.5"
+                                       Grid.Row="0" 
                                       Grid.Column="1"
                                       Value="{TemplateBinding VerticalOffset}"
                                       Maximum="{TemplateBinding ScrollableHeight}"
@@ -46,7 +46,8 @@
                                       VerticalAlignment="Bottom"
                                       Orientation="Horizontal"
                                       Opacity="0.5"
-                                       Grid.Row="1"
+                                       Grid.Row="1" 
+                                       Grid.Column="0"
                                       Value="{TemplateBinding HorizontalOffset}"
                                       Maximum="{TemplateBinding ScrollableWidth}"
                                       ViewportSize="{TemplateBinding ViewportWidth}"
@@ -127,14 +128,14 @@
                              VerticalScrollBarVisibility="Hidden"
                              ScrollChanged="TimelineScrollChanged">
                    <Border BorderThickness="0,0,1,0" BorderBrush="{DynamicResource MaterialDesignDivider}">
-                        <ContentControl s:View.Model="{Binding PropertyTree}" />
+                        <ContentControl s:View.Model="{Binding TreeViewModel}" />
                    </Border>
                </ScrollViewer>
            </materialDesign:DialogHost>
        </Grid>

        <!-- Right side -->
-        <Grid Grid.Column="1">
+        <Grid Grid.Row="0" Grid.Column="1">
            <Grid.RowDefinitions>
                <RowDefinition Height="56" />
                <RowDefinition Height="*" />
@@ -169,7 +170,7 @@
            <!-- Timeline rails -->
            <ScrollViewer x:Name="TimelineRailsScrollViewer"
                          Grid.Row="1"
-                          Style="{StaticResource SVStyle}"
+                          Style="{StaticResource SvStyle}"
                          HorizontalScrollBarVisibility="Auto"
                          VerticalScrollBarVisibility="Auto"
                          ScrollChanged="TimelineScrollChanged">
@@ -183,7 +184,7 @@
                        <Line X1="0" X2="0" Y1="0" Y2="{Binding ActualHeight, ElementName=ContainerGrid}"
                              StrokeThickness="2" Stroke="{StaticResource SecondaryAccentBrush}" />
                    </Canvas>
-                    <ContentControl x:Name="PropertyTimeLine" s:View.Model="{Binding PropertyTimeline}" />
+                    <ContentControl x:Name="PropertyTimeLine" s:View.Model="{Binding TimelineViewModel}" />
                </Grid>
            </ScrollViewer>
        </Grid>
@@ -31,6 +31,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
            _settingsService = settingsService;

            PixelsPerSecond = 31;
+            LayerPropertyGroups = new BindableCollection<LayerPropertyGroupViewModel>();
        }

        public bool Playing { get; set; }
@@ -59,9 +60,6 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties

        protected override void OnInitialActivate()
        {
-            TreeViewModel = new TreeViewModel(LayerPropertyGroups);
-            TimelineViewModel = new TimelineViewModel(LayerPropertyGroups);
-
            PopulateProperties(_profileEditorService.SelectedProfileElement);

            _profileEditorService.ProfileElementSelected += ProfileEditorServiceOnProfileElementSelected;
@@ -114,6 +112,9 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
                LayerPropertyGroups.Add(new LayerPropertyGroupViewModel(_profileEditorService, layer.General, (PropertyGroupDescriptionAttribute) generalAttribute));
                LayerPropertyGroups.Add(new LayerPropertyGroupViewModel(_profileEditorService, layer.Transform, (PropertyGroupDescriptionAttribute) transformAttribute));

+                if (layer.LayerBrush == null)
+                    return;
+
                // Add the rout group of the brush
                // The root group of the brush has no attribute so let's pull one out of our sleeve
                var brushDescription = new PropertyGroupDescriptionAttribute
@@ -123,6 +124,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
                };
                LayerPropertyGroups.Add(new LayerPropertyGroupViewModel(_profileEditorService, layer.LayerBrush.BaseProperties, brushDescription));
            }
+            TreeViewModel = new TreeViewModel(LayerPropertyGroups);
+            TimelineViewModel = new TimelineViewModel(LayerPropertyGroups);
        }

        #endregion
@@ -6,6 +6,7 @@ using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
 using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline;
 using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree;
 using Artemis.UI.Services.Interfaces;
+using Humanizer;

 namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
 {
@@ -17,11 +18,21 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
            LayerProperty = layerProperty;
            PropertyDescription = propertyDescription;

-            TreePropertyViewModel = new TreePropertyViewModel<T>(this);
+            TreePropertyViewModel = ProfileEditorService.CreateTreePropertyViewModel(this);
            TimelinePropertyViewModel = new TimelinePropertyViewModel<T>(this);

            TreePropertyBaseViewModel = TreePropertyViewModel;
            TimelinePropertyBaseViewModel = TimelinePropertyViewModel;
+
+            // Generate a fallback name if the description does not contain one
+            if (PropertyDescription.Name == null)
+            {
+                var propertyInfo = LayerProperty.Parent?.GetType().GetProperties().FirstOrDefault(p => ReferenceEquals(p.GetValue(LayerProperty.Parent), LayerProperty));
+                if (propertyInfo != null)
+                    PropertyDescription.Name = propertyInfo.Name.Humanize();
+                else
+                    PropertyDescription.Name = $"Unknown {typeof(T).Name} property";
+            }
        }

        public override bool IsVisible => !LayerProperty.IsHidden;
@@ -54,15 +65,15 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties

    public abstract class LayerPropertyViewModel : LayerPropertyBaseViewModel
    {
-        public IProfileEditorService ProfileEditorService { get; }
-        public BaseLayerProperty BaseLayerProperty { get; }
-
        protected LayerPropertyViewModel(IProfileEditorService profileEditorService, BaseLayerProperty baseLayerProperty)
        {
            ProfileEditorService = profileEditorService;
            BaseLayerProperty = baseLayerProperty;
        }

+        public IProfileEditorService ProfileEditorService { get; }
+        public BaseLayerProperty BaseLayerProperty { get; }
+
        public PropertyDescriptionAttribute PropertyDescription { get; protected set; }
        public TreePropertyViewModel TreePropertyBaseViewModel { get; set; }
        public TimelinePropertyViewModel TimelinePropertyBaseViewModel { get; set; }
@@ -0,0 +1,12 @@
+<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline.TimelineView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
@@ -8,7 +8,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree.PropertyI
 {
    public class SKPointPropertyInputViewModel : PropertyInputViewModel<SKPoint>
    {
-        public SKPointPropertyInputViewModel(LayerPropertyViewModel<SKPoint> layerPropertyViewModel, IModelValidator validator) : base(layerPropertyViewModel, validator)
+        public SKPointPropertyInputViewModel(LayerPropertyViewModel<SKPoint> layerPropertyViewModel, IModelValidator<SKPointPropertyInputViewModel> validator) 
+            : base(layerPropertyViewModel, validator)
        {
        }

@@ -8,7 +8,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree.PropertyI
 {
    public class SKSizePropertyInputViewModel : PropertyInputViewModel<SKSize>
    {
-        public SKSizePropertyInputViewModel(LayerPropertyViewModel<SKSize> layerPropertyViewModel, IModelValidator validator) : base(layerPropertyViewModel, validator)
+        public SKSizePropertyInputViewModel(LayerPropertyViewModel<SKSize> layerPropertyViewModel, IModelValidator<SKSizePropertyInputViewModel> validator) 
+            : base(layerPropertyViewModel, validator)
        {
        }

@@ -0,0 +1,52 @@
+<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree.TreePropertyView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:s="https://github.com/canton7/Stylet"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid Height="22">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <ToggleButton Grid.Column="0"
+                      Style="{StaticResource MaterialDesignFlatToggleButton}"
+                      ToolTip="Toggle key-framing"
+                      Width="18"
+                      Height="18"
+                      IsChecked="{Binding LayerPropertyViewModel.LayerProperty.KeyframesEnabled}"
+                      IsEnabled="{Binding LayerPropertyViewModel.LayerProperty.KeyframesSupported}"
+                      VerticalAlignment="Center" Padding="-25">
+            <materialDesign:PackIcon Kind="Stopwatch" Height="13" Width="13" />
+        </ToggleButton>
+
+        <TextBlock Grid.Column="1"
+                   Margin="5,0,0,0"
+                   Padding="0,0,5,0"
+                   VerticalAlignment="Center"
+                   TextTrimming="CharacterEllipsis"
+                   Text="{Binding LayerPropertyViewModel.PropertyDescription.Name}"
+                   ToolTip="{Binding LayerPropertyViewModel.PropertyDescription.Description}"
+                   HorizontalAlignment="Left" />
+
+        <ContentControl Grid.Column="2" Margin="20 0" s:View.Model="{Binding PropertyInputViewModel}" />
+
+        <Button Grid.Column="3"
+                Style="{StaticResource MaterialDesignOutlinedButton}"
+                Margin="0,1,0,1.2"
+                Padding="0"
+                Width="80"
+                Height="20"
+                ToolTip="Change the property's data binding"
+                VerticalAlignment="Center"
+                IsEnabled="False">
+            <TextBlock FontSize="10">DATA BINDING</TextBlock>
+        </Button>
+    </Grid>
+</UserControl>
@@ -30,9 +30,5 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree

        public LayerPropertyBaseViewModel LayerPropertyBaseViewModel { get; }
        public abstract void Dispose();
-
-        public static void RegisterPropertyInputViewModel()
-        {
-        }
    }
 }
@@ -103,9 +103,7 @@
                </StackPanel>
            </HierarchicalDataTemplate>
            <DataTemplate DataType="{x:Type layerProperties:LayerPropertyViewModel}">
-                <!-- <ContentControl s:View.Model="{Binding TreePropertyBaseViewModel}" /> -->
-                <TextBlock Text="{Binding PropertyDescription.Name}"
-                           ToolTip="{Binding PropertyDescription.Description}" Margin="5 0" VerticalAlignment="Center" />
+                <ContentControl s:View.Model="{Binding TreePropertyBaseViewModel}" />
            </DataTemplate>
        </TreeView.Resources>
    </TreeView>
@@ -1,4 +1,7 @@
-using Stylet;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using Stylet;

 namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree
 {
@@ -10,5 +13,20 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree
        }

        public BindableCollection<LayerPropertyGroupViewModel> LayerPropertyGroups { get; }
+
+        public void PropertyTreePreviewMouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            if (e.Handled || !(sender is TreeView))
+                return;
+
+            e.Handled = true;
+            var eventArg = new MouseWheelEventArgs(e.MouseDevice, e.Timestamp, e.Delta)
+            {
+                RoutedEvent = UIElement.MouseWheelEvent,
+                Source = sender
+            };
+            var parent = ((Control) sender).Parent as UIElement;
+            parent?.RaiseEvent(eventArg);
+        }
    }
 }