UI - Large amount of memory improvements in the VMs

Core - Minor memory improvements

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Windows;
-using System.Windows.Input;
 using Artemis.Core.Models.Profile.LayerProperties;
 using Artemis.Core.Utilities;
 using Artemis.UI.Shared.Services.Interfaces;
@@ -13,8 +12,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
     {
         private readonly IProfileEditorService _profileEditorService;
 
-        public TimelineKeyframeViewModel(IProfileEditorService profileEditorService, TimelineViewModel timelineViewModel, LayerPropertyKeyframe<T> layerPropertyKeyframe)
-            : base(profileEditorService, timelineViewModel, layerPropertyKeyframe)
+        public TimelineKeyframeViewModel(IProfileEditorService profileEditorService, LayerPropertyKeyframe<T> layerPropertyKeyframe)
+            : base(profileEditorService, layerPropertyKeyframe)
         {
             _profileEditorService = profileEditorService;
             LayerPropertyKeyframe = layerPropertyKeyframe;
@@ -48,13 +47,11 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
     public abstract class TimelineKeyframeViewModel : PropertyChangedBase
     {
         private readonly IProfileEditorService _profileEditorService;
-        private readonly TimelineViewModel _timelineViewModel;
         private int _pixelsPerSecond;
 
-        protected TimelineKeyframeViewModel(IProfileEditorService profileEditorService, TimelineViewModel timelineViewModel, BaseLayerPropertyKeyframe baseLayerPropertyKeyframe)
+        protected TimelineKeyframeViewModel(IProfileEditorService profileEditorService, BaseLayerPropertyKeyframe baseLayerPropertyKeyframe)
         {
             _profileEditorService = profileEditorService;
-            _timelineViewModel = timelineViewModel;
             BaseLayerPropertyKeyframe = baseLayerPropertyKeyframe;
             EasingViewModels = new BindableCollection<TimelineEasingViewModel>();
         }
@@ -78,64 +75,6 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
 
         #region Keyframe movement
 
-        public void KeyframeMouseDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.LeftButton == MouseButtonState.Released)
-                return;
-
-            ((IInputElement) sender).CaptureMouse();
-            if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift) && !IsSelected)
-                _timelineViewModel.SelectKeyframe(this, true, false);
-            else if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
-                _timelineViewModel.SelectKeyframe(this, false, true);
-            else if (!IsSelected)
-                _timelineViewModel.SelectKeyframe(this, false, false);
-
-            e.Handled = true;
-        }
-
-        public void KeyframeMouseUp(object sender, MouseButtonEventArgs e)
-        {
-            _profileEditorService.UpdateSelectedProfileElement();
-            _timelineViewModel.ReleaseSelectedKeyframes();
-
-            ((IInputElement) sender).ReleaseMouseCapture();
-        }
-
-        public void KeyframeMouseMove(object sender, MouseEventArgs e)
-        {
-            if (e.LeftButton == MouseButtonState.Pressed)
-                _timelineViewModel.MoveSelectedKeyframes(GetCursorTime(e.GetPosition(ParentView)));
-
-            e.Handled = true;
-        }
-
-        private TimeSpan GetCursorTime(Point position)
-        {
-            // Get the parent grid, need that for our position
-            var x = Math.Max(0, position.X);
-            var time = TimeSpan.FromSeconds(x / _pixelsPerSecond);
-
-            // Round the time to something that fits the current zoom level
-            if (_pixelsPerSecond < 200)
-                time = TimeSpan.FromMilliseconds(Math.Round(time.TotalMilliseconds / 5.0) * 5.0);
-            else if (_pixelsPerSecond < 500)
-                time = TimeSpan.FromMilliseconds(Math.Round(time.TotalMilliseconds / 2.0) * 2.0);
-            else
-                time = TimeSpan.FromMilliseconds(Math.Round(time.TotalMilliseconds));
-
-            // If shift is held, snap to the current time
-            // Take a tolerance of 5 pixels (half a keyframe width)
-            if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift))
-            {
-                var tolerance = 1000f / _pixelsPerSecond * 5;
-                if (Math.Abs(_profileEditorService.CurrentTime.TotalMilliseconds - time.TotalMilliseconds) < tolerance)
-                    time = _profileEditorService.CurrentTime;
-            }
-
-            return time;
-        }
-
         #endregion
 
         #region Easing

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs

@@ -6,7 +6,7 @@ using Stylet;
 
 namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
 {
-    public class TimelinePropertyGroupViewModel
+    public class TimelinePropertyGroupViewModel : PropertyChangedBase
     {
         public TimelinePropertyGroupViewModel(LayerPropertyBaseViewModel layerPropertyBaseViewModel)
         {
@@ -20,7 +20,6 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
 
         public LayerPropertyGroupViewModel LayerPropertyGroupViewModel { get; }
         public BindableCollection<double> TimelineKeyframeViewModels { get; set; }
-        public TimelineViewModel TimelineViewModel { get; set; }
 
         public void UpdateKeyframes()
         {

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml

@@ -33,7 +33,7 @@
                              Height="10"
                              Margin="-5,6,0,0"
                              ToolTip="{Binding Timestamp}"
-                             s:View.ActionTarget="{Binding}"
+                             s:View.ActionTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:TimelineView}}, Path=DataContext}"
                              MouseDown="{s:Action KeyframeMouseDown}"
                              MouseUp="{s:Action KeyframeMouseUp}"
                              MouseMove="{s:Action KeyframeMouseMove}"

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyViewModel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using Artemis.UI.Exceptions;
 using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
 using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
@@ -26,9 +25,6 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
 
         public override void UpdateKeyframes()
         {
-            if (TimelineViewModel == null)
-                throw new ArtemisUIException("Timeline view model must be set before keyframes can be updated");
-
             // Only show keyframes if they are enabled
             if (LayerPropertyViewModel.LayerProperty.KeyframesEnabled)
             {
@@ -37,7 +33,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
                 TimelineKeyframeViewModels.RemoveRange(toRemove);
                 TimelineKeyframeViewModels.AddRange(
                     keyframes.Where(k => TimelineKeyframeViewModels.All(t => t.BaseLayerPropertyKeyframe != k))
-                        .Select(k => new TimelineKeyframeViewModel<T>(_profileEditorService, TimelineViewModel, k))
+                        .Select(k => new TimelineKeyframeViewModel<T>(_profileEditorService, k))
                 );
             }
             else
@@ -67,7 +63,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
         }
     }
 
-    public abstract class TimelinePropertyViewModel : IDisposable
+    public abstract class TimelinePropertyViewModel : PropertyChangedBase, IDisposable
     {
         protected TimelinePropertyViewModel(LayerPropertyBaseViewModel layerPropertyBaseViewModel)
         {
@@ -76,7 +72,6 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
         }
 
         public LayerPropertyBaseViewModel LayerPropertyBaseViewModel { get; }
-        public TimelineViewModel TimelineViewModel { get; set; }
         public BindableCollection<TimelineKeyframeViewModel> TimelineKeyframeViewModels { get; set; }
 
         public abstract void Dispose();

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineViewModel.cs

@@ -4,19 +4,24 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Shapes;
 using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
+using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Shared.Utilities;
 using Stylet;
 
 namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
 {
-    public class TimelineViewModel : PropertyChangedBase
+    public class TimelineViewModel : Screen
     {
         private readonly LayerPropertiesViewModel _layerPropertiesViewModel;
+        private readonly IProfileEditorService _profileEditorService;
 
-        public TimelineViewModel(LayerPropertiesViewModel layerPropertiesViewModel, BindableCollection<LayerPropertyGroupViewModel> layerPropertyGroups)
+        public TimelineViewModel(LayerPropertiesViewModel layerPropertiesViewModel, BindableCollection<LayerPropertyGroupViewModel> layerPropertyGroups,
+            IProfileEditorService profileEditorService)
         {
             _layerPropertiesViewModel = layerPropertiesViewModel;
+            _profileEditorService = profileEditorService;
             LayerPropertyGroups = layerPropertyGroups;
             SelectionRectangle = new RectangleGeometry();
 
@@ -32,20 +37,82 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
         {
             foreach (var layerPropertyGroupViewModel in LayerPropertyGroups)
             {
-                layerPropertyGroupViewModel.TimelinePropertyGroupViewModel.TimelineViewModel = this;
                 layerPropertyGroupViewModel.TimelinePropertyGroupViewModel.UpdateKeyframes();
 
                 foreach (var layerPropertyBaseViewModel in layerPropertyGroupViewModel.GetAllChildren())
                 {
                     if (layerPropertyBaseViewModel is LayerPropertyViewModel layerPropertyViewModel)
-                    {
-                        layerPropertyViewModel.TimelinePropertyBaseViewModel.TimelineViewModel = this;
                         layerPropertyViewModel.TimelinePropertyBaseViewModel.UpdateKeyframes();
-                    }
                 }
             }
         }
 
+        #region Command handlers
+
+        public void KeyframeMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Released)
+                return;
+
+            var viewModel = (sender as Ellipse)?.DataContext as TimelineKeyframeViewModel;
+            if (viewModel == null)
+                return;
+
+            ((IInputElement) sender).CaptureMouse();
+            if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift) && !viewModel.IsSelected)
+                SelectKeyframe(viewModel, true, false);
+            else if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
+                SelectKeyframe(viewModel, false, true);
+            else if (!viewModel.IsSelected)
+                SelectKeyframe(viewModel, false, false);
+
+            e.Handled = true;
+        }
+
+        public void KeyframeMouseUp(object sender, MouseButtonEventArgs e)
+        {
+            _profileEditorService.UpdateSelectedProfileElement();
+            ReleaseSelectedKeyframes();
+
+            ((IInputElement) sender).ReleaseMouseCapture();
+        }
+
+        public void KeyframeMouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed)
+                MoveSelectedKeyframes(GetCursorTime(e.GetPosition(View)));
+
+            e.Handled = true;
+        }
+
+        private TimeSpan GetCursorTime(Point position)
+        {
+            // Get the parent grid, need that for our position
+            var x = Math.Max(0, position.X);
+            var time = TimeSpan.FromSeconds(x / _profileEditorService.PixelsPerSecond);
+
+            // Round the time to something that fits the current zoom level
+            if (_profileEditorService.PixelsPerSecond < 200)
+                time = TimeSpan.FromMilliseconds(Math.Round(time.TotalMilliseconds / 5.0) * 5.0);
+            else if (_profileEditorService.PixelsPerSecond < 500)
+                time = TimeSpan.FromMilliseconds(Math.Round(time.TotalMilliseconds / 2.0) * 2.0);
+            else
+                time = TimeSpan.FromMilliseconds(Math.Round(time.TotalMilliseconds));
+
+            // If shift is held, snap to the current time
+            // Take a tolerance of 5 pixels (half a keyframe width)
+            if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift))
+            {
+                var tolerance = 1000f / _profileEditorService.PixelsPerSecond * 5;
+                if (Math.Abs(_profileEditorService.CurrentTime.TotalMilliseconds - time.TotalMilliseconds) < tolerance)
+                    time = _profileEditorService.CurrentTime;
+            }
+
+            return time;
+        }
+
+        #endregion
+
         #region Keyframe movement
 
         public void MoveSelectedKeyframes(TimeSpan cursorTime)