Data model conditions - Expanded events UI logic

src/Artemis.Core/Models/Profile/Conditions/Abstract/DataModelConditionPart.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using Artemis.Storage.Entities.Profile.Abstract;
 
 namespace Artemis.Core
@@ -36,6 +37,8 @@ namespace Artemis.Core
                     _children.Insert(index.Value, dataModelConditionPart);
                 else
                     _children.Add(dataModelConditionPart);
+
+                OnChildAdded();
             }
         }
 
@@ -49,9 +52,19 @@ namespace Artemis.Core
             {
                 dataModelConditionPart.Parent = null;
                 _children.Remove(dataModelConditionPart);
+                OnChildRemoved();
             }
         }
 
+        /// <summary>
+        ///     Removes all children. You monster.
+        /// </summary>
+        public void ClearChildren()
+        {
+            while (Children.Any())
+                RemoveChild(Children[0]);
+        }
+
         /// <summary>
         ///     Evaluates the condition part on the data model
         /// </summary>
@@ -88,5 +101,22 @@ namespace Artemis.Core
         }
 
         #endregion
+
+        #region Events
+
+        public event EventHandler ChildAdded;
+        public event EventHandler ChildRemoved;
+
+        protected virtual void OnChildAdded()
+        {
+            ChildAdded?.Invoke(this, EventArgs.Empty);
+        }
+
+        protected virtual void OnChildRemoved()
+        {
+            ChildRemoved?.Invoke(this, EventArgs.Empty);
+        }
+
+        #endregion
     }
 }

src/Artemis.Core/Models/Profile/Conditions/DataModelConditionEvent.cs

@@ -93,8 +93,7 @@ namespace Artemis.Core
             SubscribeToEventPath();
 
             // Remove the old root group that was tied to the old data model
-            while (Children.Any())
+            ClearChildren();
-                RemoveChild(Children[0]);
 
             if (EventPath != null)
             {
@@ -164,6 +163,8 @@ namespace Artemis.Core
 
         internal void Initialize()
         {
+            ClearChildren();
+
             if (Entity.EventPath == null)
                 return;
 

src/Artemis.Core/Models/Profile/Conditions/DataModelConditionGroup.cs

@@ -46,6 +46,8 @@ namespace Artemis.Core
                     AddChild(new DataModelConditionGeneralPredicate(this, predicateEntity));
                 else if (childEntity is DataModelConditionListPredicateEntity listPredicateEntity)
                     AddChild(new DataModelConditionListPredicate(this, listPredicateEntity)); 
+                else if (childEntity is DataModelConditionEventPredicateEntity eventPredicateEntity)
+                    AddChild(new DataModelConditionEventPredicate(this, eventPredicateEntity));
             }
         }
 

src/Artemis.Core/Models/Profile/DataModel/DataModelPath.cs

@@ -281,6 +281,13 @@ namespace Artemis.Core
 
             Entity.Path = Path;
             Entity.DataModelGuid = DataModelGuid;
+            
+            Entity.WrapperType = Target switch
+            {
+                ListPredicateWrapperDataModel _ => PathWrapperType.List,
+                EventPredicateWrapperDataModel _ => PathWrapperType.Event,
+                _ => PathWrapperType.None
+            };
         }
 
         #endregion

src/Artemis.Core/Models/Profile/Layer.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.Linq;
 using Artemis.Core.LayerBrushes;
 using Artemis.Core.LayerEffects;
@@ -68,27 +67,6 @@ namespace Artemis.Core
             Initialize();
         }
 
-        internal LayerEntity LayerEntity { get; set; }
-
-        /// <inheritdoc />
-        public override List<ILayerProperty> GetAllLayerProperties()
-        {
-            List<ILayerProperty> result = new List<ILayerProperty>();
-            result.AddRange(General.GetAllLayerProperties());
-            result.AddRange(Transform.GetAllLayerProperties());
-            if (LayerBrush?.BaseProperties != null)
-                result.AddRange(LayerBrush.BaseProperties.GetAllLayerProperties());
-            foreach (BaseLayerEffect layerEffect in LayerEffects)
-            {
-                if (layerEffect.BaseProperties != null)
-                    result.AddRange(layerEffect.BaseProperties.GetAllLayerProperties());
-            }
-
-            return result;
-        }
-
-        internal override RenderElementEntity RenderElementEntity => LayerEntity;
-
         /// <summary>
         ///     A collection of all the LEDs this layer is assigned to.
         /// </summary>
@@ -131,6 +109,25 @@ namespace Artemis.Core
             internal set => SetAndNotify(ref _layerBrush, value);
         }
 
+        internal LayerEntity LayerEntity { get; set; }
+
+        internal override RenderElementEntity RenderElementEntity => LayerEntity;
+
+        /// <inheritdoc />
+        public override List<ILayerProperty> GetAllLayerProperties()
+        {
+            List<ILayerProperty> result = new List<ILayerProperty>();
+            result.AddRange(General.GetAllLayerProperties());
+            result.AddRange(Transform.GetAllLayerProperties());
+            if (LayerBrush?.BaseProperties != null)
+                result.AddRange(LayerBrush.BaseProperties.GetAllLayerProperties());
+            foreach (BaseLayerEffect layerEffect in LayerEffects)
+                if (layerEffect.BaseProperties != null)
+                    result.AddRange(layerEffect.BaseProperties.GetAllLayerProperties());
+
+            return result;
+        }
+
         /// <inheritdoc />
         public override string ToString()
         {
@@ -309,7 +306,9 @@ namespace Artemis.Core
             if (stickToMainSegment)
             {
                 if (!DisplayContinuously)
+                {
                     TimelinePosition = StartSegmentLength + timeOverride;
+                }
                 else
                 {
                     double progress = timeOverride.TotalMilliseconds % MainSegmentLength.TotalMilliseconds;
@@ -320,7 +319,9 @@ namespace Artemis.Core
                 }
             }
             else
+            {
                 TimelinePosition = timeOverride;
+            }
 
             double delta = (TimelinePosition - beginTime).TotalSeconds;
 
@@ -356,7 +357,9 @@ namespace Artemis.Core
                 return;
 
             if (_layerBitmap == null)
+            {
                 _layerBitmap = new SKBitmap(new SKImageInfo((int) Path.Bounds.Width, (int) Path.Bounds.Height));
+            }
             else if (_layerBitmap.Info.Width != (int) Path.Bounds.Width || _layerBitmap.Info.Height != (int) Path.Bounds.Height)
             {
                 _layerBitmap.Dispose();
@@ -475,7 +478,9 @@ namespace Artemis.Core
                 throw new ObjectDisposedException("Layer");
 
             if (!Leds.Any())
+            {
                 Path = new SKPath();
+            }
             else
             {
                 SKPath path = new SKPath {FillType = SKPathFillType.Winding};
@@ -548,6 +553,44 @@ namespace Artemis.Core
             }
         }
 
+        /// <summary>
+        ///     Creates a transformation matrix that applies the current transformation settings
+        /// </summary>
+        /// <param name="zeroBased">
+        ///     If true, treats the layer as if it is located at 0,0 instead of its actual position on the
+        ///     surface
+        /// </param>
+        /// <returns>The transformation matrix containing the current transformation settings</returns>
+        public SKMatrix GetTransformMatrix(bool zeroBased)
+        {
+            if (_disposed)
+                throw new ObjectDisposedException("Layer");
+
+            SKSize sizeProperty = Transform.Scale.CurrentValue;
+            float rotationProperty = Transform.Rotation.CurrentValue;
+
+            SKPoint anchorPosition = GetLayerAnchorPosition(Path, zeroBased);
+            SKPoint anchorProperty = Transform.AnchorPoint.CurrentValue;
+
+            // Translation originates from the unscaled center of the shape and is tied to the anchor
+            float x = anchorPosition.X - (zeroBased ? Bounds.MidX - Bounds.Left : Bounds.MidX) - anchorProperty.X * Bounds.Width;
+            float y = anchorPosition.Y - (zeroBased ? Bounds.MidY - Bounds.Top : Bounds.MidY) - anchorProperty.Y * Bounds.Height;
+
+            if (General.ResizeMode == LayerResizeMode.Normal)
+            {
+                SKMatrix transform = SKMatrix.MakeTranslation(x, y);
+                transform = transform.PostConcat(SKMatrix.MakeRotationDegrees(rotationProperty, anchorPosition.X, anchorPosition.Y));
+                transform = transform.PostConcat(SKMatrix.MakeScale(sizeProperty.Width / 100f, sizeProperty.Height / 100f, anchorPosition.X, anchorPosition.Y));
+                return transform;
+            }
+            else
+            {
+                SKMatrix transform = SKMatrix.MakeTranslation(x, y);
+                transform = transform.PostConcat(SKMatrix.MakeRotationDegrees(rotationProperty * -1, anchorPosition.X, anchorPosition.Y));
+                return transform;
+            }
+        }
+
         /// <summary>
         ///     Excludes the provided path from the translations applied to the layer by applying translations that cancel the
         ///     layer translations out

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertiesViewModel.cs

@@ -41,7 +41,7 @@ namespace Artemis.UI.Shared
             PopulateProperties(dataModelUIService);
 
             // Only update children if the parent is expanded
-            if (Parent != null && !Parent.IsVisualizationExpanded && !Parent.IsRootViewModel)
+            if (Parent != null && !Parent.IsRootViewModel && !Parent.IsVisualizationExpanded)
                 return;
 
             foreach (DataModelVisualizationViewModel dataModelVisualizationViewModel in Children)
@@ -50,9 +50,9 @@ namespace Artemis.UI.Shared
 
         public override object GetCurrentValue()
         {
-            if (Parent == null)
+            if (Parent == null || Parent.IsRootViewModel || IsRootViewModel)
-                return null;
+                return DataModel;
-            return Parent.IsRootViewModel ? DataModel : base.GetCurrentValue();
+            return base.GetCurrentValue();
         }
 
         /// <inheritdoc />

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs

@@ -28,7 +28,7 @@ namespace Artemis.UI.Shared
             Children = new BindableCollection<DataModelVisualizationViewModel>();
             IsMatchingFilteredTypes = true;
 
-            if (dataModel == null && parent == null && dataModelPath == null)
+            if (parent == null)
                 IsRootViewModel = true;
             else
                 PropertyDescription = DataModelPath?.GetPropertyDescription() ?? DataModel.DataModelDescription;
@@ -184,7 +184,10 @@ namespace Artemis.UI.Shared
 
         internal void PopulateProperties(IDataModelUIService dataModelUIService)
         {
-            if (IsRootViewModel)
+            // if (IsRootViewModel)
+            //     return;
+
+            if (Parent == null && DataModel == null)
                 return;
 
             Type modelType = Parent == null || Parent.IsRootViewModel ? DataModel.GetType() : DataModelPath.GetPropertyType();
@@ -235,6 +238,7 @@ namespace Artemis.UI.Shared
             if (toRemoveDynamic.Any())
                 Children.RemoveRange(toRemoveDynamic);
         }
+
         private DataModelVisualizationViewModel CreateChild(IDataModelUIService dataModelUIService, string path, int depth)
         {
             if (depth > MaxDepth)

src/Artemis.UI.Shared/Extensions/DataModelWrapperExtensions.cs

@@ -1,17 +1,29 @@
-using Artemis.Core;
+using System.Linq;
+using Artemis.Core;
+using Artemis.UI.Shared.Services;
 
 namespace Artemis.UI.Shared
 {
     public static class DataModelWrapperExtensions
     {
-        public static DataModelPropertiesViewModel CreateViewModel(this EventPredicateWrapperDataModel wrapper)
+        public static DataModelPropertiesViewModel CreateViewModel(this EventPredicateWrapperDataModel wrapper, IDataModelUIService dataModelUIService)
         {
-            return new DataModelPropertiesViewModel(wrapper, null, new DataModelPath(wrapper));
+            DataModelPropertiesViewModel viewModel = new DataModelPropertiesViewModel(wrapper, null, new DataModelPath(wrapper));
+            viewModel.Update(dataModelUIService);
+            viewModel.UpdateRequested += (sender, args) => viewModel.Update(dataModelUIService);
+            viewModel.Children.First().IsVisualizationExpanded = true;
+
+            return viewModel;
         }
 
-        public static DataModelPropertiesViewModel CreateViewModel(this ListPredicateWrapperDataModel wrapper)
+        public static DataModelPropertiesViewModel CreateViewModel(this ListPredicateWrapperDataModel wrapper, IDataModelUIService dataModelUIService)
         {
-            return new DataModelPropertiesViewModel(wrapper, null, new DataModelPath(wrapper));
+            DataModelPropertiesViewModel viewModel = new DataModelPropertiesViewModel(wrapper, null, new DataModelPath(wrapper));
+            viewModel.Update(dataModelUIService);
+            viewModel.UpdateRequested += (sender, args) => viewModel.Update(dataModelUIService);
+            viewModel.Children.First().IsVisualizationExpanded = true;
+
+            return viewModel;
         }
     }
 }

src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionGroupView.xaml

@@ -17,7 +17,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/Artemis.UI;component/ResourceDictionaries/DataModelConditions.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            <utilities:BindingProxy x:Key="DataContextProxy" Data="{Binding}" />
+            <Converters:InverseBooleanConverter x:Key="InverseBooleanConverter" />
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -45,13 +45,24 @@
         </Button>
         <Button Grid.Row="0"
                 Grid.Column="1"
-                ToolTip="Change the operator of the group, determining which conditions should match"
                 Style="{StaticResource DataModelConditionButtonLeftClickMenu}"
                 Background="#E74C4C"
                 BorderBrush="#E74C4C"
                 Margin="3 1"
                 Content="{Binding SelectedBooleanOperator}"
-                Visibility="{Binding DisplayBooleanOperator, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}">
+                Visibility="{Binding DisplayBooleanOperator, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}"
+                IsEnabled="{Binding IsEventGroup, Converter={StaticResource InverseBooleanConverter}}"
+                ToolTipService.ShowOnDisabled="True">
+            <Button.ToolTip>
+                <StackPanel>
+                    <TextBlock Visibility="{Binding IsEventGroup, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}, Mode=OneWay}">
+                        Change the operator of the group, determining which conditions should match
+                    </TextBlock>
+                    <TextBlock Visibility="{Binding IsEventGroup, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}">
+                        The operator of the root group cannot be changed for event-based conditions
+                    </TextBlock>
+                </StackPanel>
+            </Button.ToolTip>
             <Button.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="And"

src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionGroupViewModel.cs

@@ -19,6 +19,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
         private readonly IProfileEditorService _profileEditorService;
         private bool _isInitialized;
         private bool _isRootGroup;
+        private bool _isEventGroup;
 
         public DataModelConditionGroupViewModel(DataModelConditionGroup dataModelConditionGroup,
             ConditionGroupType groupType,
@@ -48,6 +49,12 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             set => SetAndNotify(ref _isRootGroup, value);
         }
 
+        public bool IsEventGroup
+        {
+            get => _isEventGroup;
+            set => SetAndNotify(ref _isEventGroup, value);
+        }
+
         public bool IsInitialized
         {
             get => _isInitialized;
@@ -98,7 +105,6 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
         public override void Update()
         {
             NotifyOfPropertyChange(nameof(SelectedBooleanOperator));
-
             // Remove VMs of effects no longer applied on the layer
             Items.RemoveRange(Items.Where(c => !DataModelConditionGroup.Children.Contains(c.Model)).ToList());
 
@@ -140,8 +146,12 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             foreach (DataModelConditionViewModel childViewModel in Items)
                 childViewModel.Update();
 
-            if (IsRootGroup && Parent is DisplayConditionsViewModel displayConditionsViewModel)
+            IsEventGroup = Items.Any(i => i is DataModelConditionEventViewModel);
-                displayConditionsViewModel.DisplayStartHint = !Items.Any();
+            if (IsEventGroup)
+            {
+                if (DataModelConditionGroup.BooleanOperator != BooleanOperator.And)
+                    SelectBooleanOperator("And");
+            }
 
             OnUpdated();
         }

src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionEventPredicateViewModel.cs

@@ -54,7 +54,8 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
 
         protected override List<DataModelPropertiesViewModel> GetExtraRightSideDataModelViewModels()
         {
-            return new List<DataModelPropertiesViewModel> {GetEventDataModel()};
+            // Extra data models are expected to not have an empty root, so lets return the child
+            return GetEventDataModel().Children.Cast<DataModelPropertiesViewModel>().ToList();
         }
 
         private DataModelPropertiesViewModel GetEventDataModel()
@@ -63,7 +64,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
                 DataModelConditionEventPredicate.DataModelConditionEvent.EventArgumentType
             );
 
-            return wrapper.CreateViewModel();
+            return wrapper.CreateViewModel(_dataModelUIService);
         }
     }
 }

src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionGeneralPredicateViewModel.cs

@@ -20,6 +20,10 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             : base(dataModelConditionGeneralPredicate, profileEditorService, dataModelUIService, conditionOperatorService, settingsService)
         {
             _dataModelUIService = dataModelUIService;
+        }
+
+        protected override void OnInitialActivate()
+        {
             Initialize();
         }
 
@@ -29,8 +33,13 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             List<Type> supportedInputTypes = editors.Select(e => e.SupportedType).ToList();
             supportedInputTypes.AddRange(editors.Where(e => e.CompatibleConversionTypes != null).SelectMany(e => e.CompatibleConversionTypes));
             supportedInputTypes.Add(typeof(IEnumerable<>));
+
+            // Events are only supported in the root group enforce that here
+            if (Parent is DataModelConditionGroupViewModel groupViewModel && groupViewModel.IsRootGroup)
+            {
                 supportedInputTypes.Add(typeof(DataModelEvent));
                 supportedInputTypes.Add(typeof(DataModelEvent<>));
+            }
 
             return supportedInputTypes;
         }

src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml

@@ -179,5 +179,17 @@
                 </Grid>
             </materialDesign:ColorZone>
         </Grid>
+
+        <!-- Indicator for events, overlaps the previous grid -->
+        <materialDesign:Card Grid.Row="3" 
+                             Grid.Column="0" 
+                             Margin="-10 0 -10 -10" 
+                             Opacity="0.95"
+                             Background="{DynamicResource MaterialDesignPaper}"
+                             Visibility="{Binding IsEventCondition, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}">
+            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="14">
+                <materialDesign:PackIcon Kind="FlashAlert" Height="20" Width="20" Margin="0 -5" /> Timeline modes not available to event-based conditions
+            </TextBlock>
+        </materialDesign:Card>
     </Grid>
 </UserControl>

src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using Artemis.Core;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.Conditions;
@@ -14,6 +15,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
         private readonly IProfileEditorService _profileEditorService;
         private RenderProfileElement _renderProfileElement;
         private bool _displayStartHint;
+        private bool _isEventCondition;
 
         public DisplayConditionsViewModel(IProfileEditorService profileEditorService, IDataModelConditionsVmFactory dataModelConditionsVmFactory)
         {
@@ -27,6 +29,12 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             set => SetAndNotify(ref _displayStartHint, value);
         }
 
+        public bool IsEventCondition
+        {
+            get => _isEventCondition;
+            set => SetAndNotify(ref _isEventCondition, value);
+        }
+
         public RenderProfileElement RenderProfileElement
         {
             get => _renderProfileElement;
@@ -71,7 +79,14 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 
         private void ProfileEditorServiceOnProfileElementSelected(object sender, RenderProfileElementEventArgs e)
         {
+            if (RenderProfileElement != null)
+            {
+                RenderProfileElement.DisplayCondition.ChildAdded -= DisplayConditionOnChildrenModified;
+                RenderProfileElement.DisplayCondition.ChildRemoved -= DisplayConditionOnChildrenModified;
+            }
+
             RenderProfileElement = e.RenderProfileElement;
+
             NotifyOfPropertyChange(nameof(DisplayContinuously));
             NotifyOfPropertyChange(nameof(AlwaysFinishTimeline));
             NotifyOfPropertyChange(nameof(ConditionBehaviourEnabled));
@@ -90,8 +105,17 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             ActiveItem.IsRootGroup = true;
             ActiveItem.Update();
 
-            // Only show the intro to conditions once, and only if the layer has no conditions
+            DisplayStartHint = !RenderProfileElement.DisplayCondition.Children.Any();
-            DisplayStartHint = !ActiveItem.Items.Any();
+            IsEventCondition = RenderProfileElement.DisplayCondition.Children.Any(c => c is DataModelConditionEvent);
+
+            RenderProfileElement.DisplayCondition.ChildAdded += DisplayConditionOnChildrenModified;
+            RenderProfileElement.DisplayCondition.ChildRemoved += DisplayConditionOnChildrenModified;
+        }
+
+        private void DisplayConditionOnChildrenModified(object? sender, EventArgs e)
+        {
+            DisplayStartHint = !RenderProfileElement.DisplayCondition.Children.Any();
+            IsEventCondition = RenderProfileElement.DisplayCondition.Children.Any(c => c is DataModelConditionEvent);
         }
     }
 }

src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/PluginDataModelExpansion.cs

@@ -13,6 +13,12 @@ namespace Artemis.Plugins.DataModelExpansions.TestData
         {
             _rand = new Random();
             AddTimedUpdate(TimeSpan.FromSeconds(1), TimedUpdate);
+            AddTimedUpdate(TimeSpan.FromSeconds(5), TriggerEvent);
+        }
+
+        private void TriggerEvent(double obj)
+        {
+            DataModel.Event2.Trigger(new TestEventArgs(Guid.NewGuid().ToString()));
         }
 
         public override void DisablePlugin()