Devices - Added custom layout loading

src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigView.xaml

@@ -155,12 +155,39 @@
                     <shared:ColorPicker Grid.Column="1"
                                         Margin="0,0,5,0"
                                         HorizontalAlignment="Right"
-                                        Color="{Binding CurrentColor, Converter={StaticResource SKColorToColorConverter}}" 
-                                        VerticalAlignment="Center"/>
+                                        Color="{Binding CurrentColor, Converter={StaticResource SKColorToColorConverter}}"
+                                        VerticalAlignment="Center" />
                 </Grid>
             </Grid>
         </Grid>
 
+        <!-- Layout -->
+        <TextBlock Style="{StaticResource MaterialDesignSubtitle1TextBlock}" Margin="0 25 0 0">
+            Custom layout
+        </TextBlock>
+        <TextBlock Style="{StaticResource MaterialDesignCaptionTextBlock}"
+                   Foreground="{DynamicResource MaterialDesignBodyLight}"
+                   TextWrapping="Wrap"
+                   TextAlignment="Justify">
+            Select a custom layout below if you want to change the appearance and/or LEDs of this device.
+        </TextBlock>
+
+        <TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}"
+                 Text="{Binding Device.CustomLayoutPath}"
+                 VerticalAlignment="Center"
+                 materialDesign:TextFieldAssist.HasClearButton="True"
+                 IsReadOnly="True"
+                 PreviewMouseLeftButtonUp="{s:Action BrowseCustomLayout}">
+            <materialDesign:HintAssist.Hint>
+                <StackPanel Orientation="Horizontal" Margin="-2 0 0 0">
+                    <materialDesign:PackIcon Kind="Xml" Width="20" />
+                    <TextBlock>
+                        Layout path
+                    </TextBlock>
+                </StackPanel>
+            </materialDesign:HintAssist.Hint>
+        </TextBox>
+
         <!-- Buttons -->
         <StackPanel Orientation="Horizontal"
                     HorizontalAlignment="Right">

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

@@ -1,7 +1,12 @@
-using System.Threading.Tasks;
+using System.ComponentModel;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Windows.Input;
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Shared.Services;
+using MaterialDesignThemes.Wpf;
+using Ookii.Dialogs.Wpf;
 using SkiaSharp;
 using Stylet;
 
@@ -10,6 +15,8 @@ namespace Artemis.UI.Screens.SurfaceEditor.Dialogs
     public class SurfaceDeviceConfigViewModel : DialogViewModelBase
     {
         private readonly ICoreService _coreService;
+        private readonly IRgbService _rgbService;
+        private readonly IMessageService _messageService;
         private readonly double _initialRedScale;
         private readonly double _initialGreenScale;
         private readonly double _initialBlueScale;
@@ -23,41 +30,43 @@ namespace Artemis.UI.Screens.SurfaceEditor.Dialogs
         private SKColor _currentColor;
         private bool _displayOnDevices;
 
-        public SurfaceDeviceConfigViewModel(ArtemisDevice device, ICoreService coreService, IModelValidator<SurfaceDeviceConfigViewModel> validator) : base(validator)
+        public SurfaceDeviceConfigViewModel(ArtemisDevice device,
+            ICoreService coreService,
+            IRgbService rgbService,
+            IMessageService messageService,
+            IModelValidator<SurfaceDeviceConfigViewModel> validator) : base(validator)
         {
             _coreService = coreService;
+            _rgbService = rgbService;
+            _messageService = messageService;
 
             Device = device;
 
-            X = (int)Device.X;
-            Y = (int)Device.Y;
+            X = (int) Device.X;
+            Y = (int) Device.Y;
             Scale = Device.Scale;
-            Rotation = (int)Device.Rotation;
+            Rotation = (int) Device.Rotation;
             RedScale = Device.RedScale * 100d;
             GreenScale = Device.GreenScale * 100d;
             BlueScale = Device.BlueScale * 100d;
             //we need to store the initial values to be able to restore them when the user clicks "Cancel"
-            _initialRedScale =  Device.RedScale;
+            _initialRedScale = Device.RedScale;
             _initialGreenScale = Device.GreenScale;
             _initialBlueScale = Device.BlueScale;
             CurrentColor = SKColors.White;
             _coreService.FrameRendering += OnFrameRendering;
-        }
-
-        private void OnFrameRendering(object sender, FrameRenderingEventArgs e)
-        {
-            if (!_displayOnDevices)
-                return;
-
-            using SKPaint overlayPaint = new()
-            {
-                Color = CurrentColor
-            };
-            e.Canvas.DrawRect(0, 0, e.Canvas.LocalClipBounds.Width, e.Canvas.LocalClipBounds.Height, overlayPaint);
+            Device.PropertyChanged += DeviceOnPropertyChanged;
         }
 
         public ArtemisDevice Device { get; }
 
+        public override void OnDialogClosed(object sender, DialogClosingEventArgs e)
+        {
+            _coreService.FrameRendering -= OnFrameRendering;
+            Device.PropertyChanged -= DeviceOnPropertyChanged;
+            base.OnDialogClosed(sender, e);
+        }
+
         public int X
         {
             get => _x;
@@ -130,7 +139,6 @@ namespace Artemis.UI.Screens.SurfaceEditor.Dialogs
             Device.BlueScale = BlueScale / 100d;
 
             _coreService.ModuleRenderingDisabled = false;
-            _coreService.FrameRendering -= OnFrameRendering;
             Session.Close(true);
         }
 
@@ -141,6 +149,26 @@ namespace Artemis.UI.Screens.SurfaceEditor.Dialogs
             Device.BlueScale = BlueScale / 100d;
         }
 
+        public void BrowseCustomLayout(object sender, MouseEventArgs e)
+        {
+            if (e.OriginalSource is Button)
+            {
+                Device.CustomLayoutPath = null;
+                _messageService.ShowMessage("Cleared imported layout");
+                return;
+            }
+
+            VistaOpenFileDialog dialog = new();
+            dialog.Filter = "Layout files (*.xml)|*.xml";
+            dialog.Title = "Select device layout file";
+            bool? result = dialog.ShowDialog();
+            if (result == true)
+            {
+                Device.CustomLayoutPath = dialog.FileName;
+                _messageService.ShowMessage($"Imported layout from {dialog.FileName}");
+            }
+        }
+
         public override void Cancel()
         {
             Device.RedScale = _initialRedScale;
@@ -149,5 +177,25 @@ namespace Artemis.UI.Screens.SurfaceEditor.Dialogs
 
             base.Cancel();
         }
+
+        private void DeviceOnPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(Device.CustomLayoutPath))
+            {
+                _rgbService.ApplyBestDeviceLayout(Device);
+            }
+        }
+
+        private void OnFrameRendering(object sender, FrameRenderingEventArgs e)
+        {
+            if (!_displayOnDevices)
+                return;
+
+            using SKPaint overlayPaint = new()
+            {
+                Color = CurrentColor
+            };
+            e.Canvas.DrawRect(0, 0, e.Canvas.LocalClipBounds.Width, e.Canvas.LocalClipBounds.Height, overlayPaint);
+        }
     }
 }

src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs

@@ -16,6 +16,7 @@ using Artemis.UI.Screens.SurfaceEditor.Dialogs;
 using Artemis.UI.Screens.SurfaceEditor.Visualization;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
+using SkiaSharp;
 using Stylet;
 using MouseButton = System.Windows.Input.MouseButton;
 
@@ -27,13 +28,16 @@ namespace Artemis.UI.Screens.SurfaceEditor
         private readonly IInputService _inputService;
         private readonly IDialogService _dialogService;
         private readonly IRgbService _rgbService;
+        private readonly ICoreService _coreService;
         private readonly ISettingsService _settingsService;
         private Cursor _cursor;
         private PanZoomViewModel _panZoomViewModel;
         private RectangleGeometry _selectionRectangle;
         private PluginSetting<GridLength> _surfaceListWidth;
+        private List<ArtemisDevice> _shuffledDevices;
 
         public SurfaceEditorViewModel(IRgbService rgbService,
+            ICoreService coreService,
             IDialogService dialogService,
             ISettingsService settingsService,
             IDeviceService deviceService,
@@ -48,6 +52,7 @@ namespace Artemis.UI.Screens.SurfaceEditor
             ListDeviceViewModels = new BindableCollection<ListDeviceViewModel>();
 
             _rgbService = rgbService;
+            _coreService = coreService;
             _dialogService = dialogService;
             _settingsService = settingsService;
             _deviceService = deviceService;
@@ -105,6 +110,22 @@ namespace Artemis.UI.Screens.SurfaceEditor
             SurfaceListWidth.Save();
         }
 
+
+        private void CoreServiceOnFrameRendering(object sender, FrameRenderingEventArgs e)
+        {
+            float amount = 360f / _shuffledDevices.Count;
+            for (int i = 0; i < _shuffledDevices.Count; i++)
+            {
+                ArtemisDevice rgbServiceDevice = _shuffledDevices[i];
+                foreach (ArtemisLed artemisLed in rgbServiceDevice.Leds)
+                {
+                    SKColor color = SKColor.FromHsv(amount * i, 100, 100);
+                    e.Canvas.DrawRect(artemisLed.AbsoluteRectangle, new SKPaint(){Color = color});
+                }
+            }
+            
+        }
+
         #region Overrides of Screen
 
         protected override void OnInitialActivate()
@@ -112,6 +133,10 @@ namespace Artemis.UI.Screens.SurfaceEditor
             LoadWorkspaceSettings();
             SurfaceDeviceViewModels.AddRange(_rgbService.EnabledDevices.OrderBy(d => d.ZIndex).Select(d => new SurfaceDeviceViewModel(d, _rgbService)));
             ListDeviceViewModels.AddRange(_rgbService.EnabledDevices.OrderBy(d => d.ZIndex * -1).Select(d => new ListDeviceViewModel(d)));
+            _shuffledDevices = _rgbService.EnabledDevices.OrderBy(d => Guid.NewGuid()).ToList();
+
+            _coreService.FrameRendering += CoreServiceOnFrameRendering;
+
             base.OnInitialActivate();
         }
 
@@ -120,6 +145,9 @@ namespace Artemis.UI.Screens.SurfaceEditor
             SaveWorkspaceSettings();
             SurfaceDeviceViewModels.Clear();
             ListDeviceViewModels.Clear();
+
+            _coreService.FrameRendering -= CoreServiceOnFrameRendering;
+
             base.OnClose();
         }
 

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

@@ -14,6 +14,10 @@
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <shared:DeviceVisualizer Device="{Binding Device}" Width="30" Height="30" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" />
-        <TextBlock Text="{Binding Device.RgbDevice.DeviceInfo.DeviceName}" Grid.Column="1" VerticalAlignment="Center" />
+        <StackPanel Grid.Column="1" VerticalAlignment="Center" >
+            <TextBlock Text="{Binding Device.RgbDevice.DeviceInfo.Model}" />
+            <TextBlock Text="{Binding Device.RgbDevice.DeviceInfo.Manufacturer}" Foreground="{DynamicResource MaterialDesignBodyLight}" />
+        </StackPanel>
+
     </Grid>
 </UserControl>