Device visualizer - Added support for rotation and scale

Profile editor - Fixed keyframe context menu actions

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

@@ -23,7 +23,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
 
         #region Context menu actions
 
-        public void Copy()
+        public override void Copy()
         {
             var newKeyframe = new LayerPropertyKeyframe<T>(
                 LayerPropertyKeyframe.Value,
@@ -35,7 +35,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
             _profileEditorService.UpdateSelectedProfileElement();
         }
 
-        public void Delete()
+        public override void Delete()
         {
             LayerPropertyKeyframe.LayerProperty.RemoveKeyframe(LayerPropertyKeyframe);
             _profileEditorService.UpdateSelectedProfileElement();
@@ -73,23 +73,13 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
             Timestamp = $"{Math.Floor(BaseLayerPropertyKeyframe.Position.TotalSeconds):00}.{BaseLayerPropertyKeyframe.Position.Milliseconds:000}";
         }
 
-        #region Keyframe movement
+        public abstract void Copy();
 
-        #endregion
+        public abstract void Delete();
 
         #region Easing
 
-        public void ContextMenuOpening()
-        {
-            CreateEasingViewModels();
-        }
-
-        public void ContextMenuClosing()
-        {
-            EasingViewModels.Clear();
-        }
-
-        private void CreateEasingViewModels()
+        public void CreateEasingViewModels()
         {
             EasingViewModels.AddRange(Enum.GetValues(typeof(Easings.Functions)).Cast<Easings.Functions>().Select(v => new TimelineEasingViewModel(this, v)));
         }

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

@@ -63,12 +63,12 @@
                         </Ellipse.Style>
                         <Ellipse.ContextMenu>
                             <ContextMenu>
-                                <MenuItem Header="Copy" Command="{s:Action Copy}">
+                                <MenuItem Header="Copy" Command="{s:Action Copy}" CommandParameter="{Binding}">
                                     <MenuItem.Icon>
                                         <materialDesign:PackIcon Kind="ContentCopy" />
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem Header="Delete" Command="{s:Action Delete}">
+                                <MenuItem Header="Delete" Command="{s:Action Delete}" CommandParameter="{Binding}">
                                     <MenuItem.Icon>
                                         <materialDesign:PackIcon Kind="Delete" />
                                     </MenuItem.Icon>

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

@@ -2,9 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shapes;
+using Artemis.Core.Models.Profile.LayerProperties;
 using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
 using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Shared.Utilities;
@@ -58,7 +60,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
             if (viewModel == null)
                 return;
 
-            ((IInputElement) sender).CaptureMouse();
+            ((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))
@@ -74,7 +76,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
             _profileEditorService.UpdateSelectedProfileElement();
             ReleaseSelectedKeyframes();
 
-            ((IInputElement) sender).ReleaseMouseCapture();
+            ((IInputElement)sender).ReleaseMouseCapture();
         }
 
         public void KeyframeMouseMove(object sender, MouseEventArgs e)
@@ -85,6 +87,32 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
             e.Handled = true;
         }
 
+        #region Context menu actions
+
+        public void ContextMenuOpening(object sender, ContextMenuEventArgs e)
+        {
+            var viewModel = (sender as Ellipse)?.DataContext as TimelineKeyframeViewModel;
+            viewModel?.CreateEasingViewModels();
+        }
+
+        public void ContextMenuClosing(object sender, ContextMenuEventArgs e)
+        {
+            var viewModel = (sender as Ellipse)?.DataContext as TimelineKeyframeViewModel;
+            viewModel?.EasingViewModels.Clear();
+        }
+
+        public void Copy(TimelineKeyframeViewModel viewModel)
+        {
+            viewModel.Copy();
+        }
+
+        public void Delete(TimelineKeyframeViewModel viewModel)
+        {
+            viewModel.Delete();
+        }
+
+        #endregion
+
         private TimeSpan GetCursorTime(Point position)
         {
             // Get the parent grid, need that for our position
@@ -148,10 +176,10 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
             if (e.LeftButton == MouseButtonState.Released)
                 return;
 
-            ((IInputElement) sender).CaptureMouse();
+            ((IInputElement)sender).CaptureMouse();
 
             SelectionRectangle.Rect = new Rect();
-            _mouseDragStartPoint = e.GetPosition((IInputElement) sender);
+            _mouseDragStartPoint = e.GetPosition((IInputElement)sender);
             _mouseDragging = true;
             e.Handled = true;
         }
@@ -162,25 +190,25 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
             if (!_mouseDragging)
                 return;
 
-            var position = e.GetPosition((IInputElement) sender);
+            var position = e.GetPosition((IInputElement)sender);
             var selectedRect = new Rect(_mouseDragStartPoint, position);
             SelectionRectangle.Rect = selectedRect;
 
             var keyframeViewModels = GetAllKeyframeViewModels();
-            var selectedKeyframes = HitTestUtilities.GetHitViewModels<TimelineKeyframeViewModel>((Visual) sender, SelectionRectangle);
+            var selectedKeyframes = HitTestUtilities.GetHitViewModels<TimelineKeyframeViewModel>((Visual)sender, SelectionRectangle);
             foreach (var keyframeViewModel in keyframeViewModels)
                 keyframeViewModel.IsSelected = selectedKeyframes.Contains(keyframeViewModel);
 
             _mouseDragging = false;
             e.Handled = true;
-            ((IInputElement) sender).ReleaseMouseCapture();
+            ((IInputElement)sender).ReleaseMouseCapture();
         }
 
         public void TimelineCanvasMouseMove(object sender, MouseEventArgs e)
         {
             if (_mouseDragging && e.LeftButton == MouseButtonState.Pressed)
             {
-                var position = e.GetPosition((IInputElement) sender);
+                var position = e.GetPosition((IInputElement)sender);
                 var selectedRect = new Rect(_mouseDragStartPoint, position);
                 SelectionRectangle.Rect = selectedRect;
                 e.Handled = true;
@@ -236,7 +264,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
                 viewModels.AddRange(layerPropertyGroupViewModel.GetAllChildren());
 
             var keyframes = viewModels.Where(vm => vm is LayerPropertyViewModel)
-                .SelectMany(vm => ((LayerPropertyViewModel) vm).TimelinePropertyBaseViewModel.TimelineKeyframeViewModels)
+                .SelectMany(vm => ((LayerPropertyViewModel)vm).TimelinePropertyBaseViewModel.TimelineKeyframeViewModels)
                 .ToList();
 
             return keyframes;

src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigViewModel.cs

@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Screens.SurfaceEditor.Visualization;
 using Artemis.UI.Shared.Services.Dialog;
 using Stylet;
@@ -7,9 +8,12 @@ namespace Artemis.UI.Screens.SurfaceEditor.Dialogs
 {
     public class SurfaceDeviceConfigViewModel : DialogViewModelBase
     {
-        public SurfaceDeviceConfigViewModel(SurfaceDeviceViewModel surfaceDeviceViewModel, IModelValidator<SurfaceDeviceConfigViewModel> validator)
+        private readonly ICoreService _coreService;
+
+        public SurfaceDeviceConfigViewModel(SurfaceDeviceViewModel surfaceDeviceViewModel, ICoreService coreService, IModelValidator<SurfaceDeviceConfigViewModel> validator)
             : base(validator)
         {
+            _coreService = coreService;
             SurfaceDeviceViewModel = surfaceDeviceViewModel;
             Title = $"{SurfaceDeviceViewModel.Device.RgbDevice.DeviceInfo.DeviceName} - Properties";
 
@@ -33,11 +37,16 @@ namespace Artemis.UI.Screens.SurfaceEditor.Dialogs
             if (HasErrors)
                 return;
 
+            _coreService.ModuleRenderingDisabled = true;
+            await Task.Delay(100);
+
             SurfaceDeviceViewModel.Device.X = X;
             SurfaceDeviceViewModel.Device.Y = Y;
             SurfaceDeviceViewModel.Device.Scale = Scale;
             SurfaceDeviceViewModel.Device.Rotation = Rotation;
 
+            _coreService.ModuleRenderingDisabled = false;
+
             Session.Close(true);
         }
 

src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceView.xaml

@@ -21,12 +21,8 @@
     </UserControl.Resources>
     <Grid>
         <!-- Content -->
-        <Grid Width="{Binding Device.RgbDevice.ActualSize.Width}" Height="{Binding Device.RgbDevice.ActualSize.Height}">
-            <Grid.RenderTransform>
-                <RotateTransform Angle="{Binding Device.Rotation}" />
-            </Grid.RenderTransform>
-
-            <controls:DeviceVisualizer Device="{Binding Device}" />
+        <Grid>
+            <controls:DeviceVisualizer Device="{Binding Device}" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 
             <Rectangle Fill="{DynamicResource MaterialDesignCardBackground}"
                        Stroke="{DynamicResource MaterialDesignTextBoxBorder}"