Devices - Reimplemented LED images

src/Artemis.Core/Models/Surface/ArtemisDevice.cs

@@ -334,11 +334,11 @@ namespace Artemis.Core
             if (layout.IsValid)
                 layout.RgbLayout!.ApplyTo(RgbDevice);
 
-            Layout = layout;
             Leds = RgbDevice.Select(l => new ArtemisLed(l, this)).ToList().AsReadOnly();
             LedIds = new ReadOnlyDictionary<LedId, ArtemisLed>(Leds.ToDictionary(l => l.RgbLed.Id, l => l));
+
+            Layout = layout;
             Layout.ApplyDevice(this);
-            Leds = Layout.Leds.Select(l => l.Led);
         }
 
         internal void ApplyToEntity()

src/Artemis.Core/Models/Surface/ArtemisLed.cs

@@ -1,5 +1,4 @@
-using System.Linq;
+using RGB.NET.Core;
-using RGB.NET.Core;
 using SkiaSharp;
 
 namespace Artemis.Core
@@ -17,9 +16,6 @@ namespace Artemis.Core
             RgbLed = led;
             Device = device;
             CalculateRectangles();
-
-            Layout = Device.Layout?.Leds.FirstOrDefault(l => l.RgbLayout.Id == led.Id.ToString());
-            
         }
 
         /// <summary>
@@ -50,13 +46,7 @@ namespace Artemis.Core
             private set => SetAndNotify(ref _absoluteRectangle, value);
         }
 
-        public ArtemisLedLayout? Layout { get; }
+        public ArtemisLedLayout? Layout { get; internal set; }
-
-        internal void CalculateRectangles()
-        {
-            Rectangle = RgbLed.Boundary.ToSKRect();
-            AbsoluteRectangle = RgbLed.AbsoluteBoundary.ToSKRect();
-        }
 
         /// <inheritdoc />
         public override string ToString()
@@ -72,5 +62,11 @@ namespace Artemis.Core
         {
             return RgbLed.Color.DivideRGB(Device.RedScale, Device.GreenScale, Device.BlueScale);
         }
+
+        internal void CalculateRectangles()
+        {
+            Rectangle = RgbLed.Boundary.ToSKRect();
+            AbsoluteRectangle = RgbLed.AbsoluteBoundary.ToSKRect();
+        }
     }
 }

src/Artemis.Core/Models/Surface/Layout/ArtemisLayout.cs

@@ -60,9 +60,9 @@ namespace Artemis.Core
         public bool IsValid { get; }
 
         /// <summary>
-        ///     Gets or sets the image of the device
+        ///     Gets the image of the device
         /// </summary>
-        public Uri? Image { get; set; }
+        public Uri? Image { get; private set; }
         
         public List<ArtemisLedLayout> Leds { get; }
 

src/Artemis.Core/Models/Surface/Layout/ArtemisLedLayout.cs

@@ -7,17 +7,20 @@ namespace Artemis.Core
 {
     public class ArtemisLedLayout
     {
-        internal ArtemisLedLayout(ArtemisLayout layout, ILedLayout led)
+        internal ArtemisLedLayout(ArtemisLayout deviceLayout, ILedLayout led)
         {
-            Layout = layout;
+            DeviceLayout = deviceLayout;
             RgbLayout = led;
             LayoutCustomLedData = (LayoutCustomLedData?) led.CustomData ?? new LayoutCustomLedData();
         }
 
-        public ArtemisLayout Layout { get; }
+        /// <summary>
+        ///     Gets the device layout of this LED layout
+        /// </summary>
+        public ArtemisLayout DeviceLayout { get; }
 
         /// <summary>
-        ///     Gets the RGB.NET LED Layout of this Artemis LED layout
+        ///     Gets the RGB.NET LED Layout of this LED layout
         /// </summary>
         public ILedLayout RgbLayout { get; }
 
@@ -38,18 +41,29 @@ namespace Artemis.Core
 
         internal LayoutCustomLedData LayoutCustomLedData { get; set; }
 
-        public void ApplyDevice(ArtemisDevice device)
+        internal void ApplyDevice(ArtemisDevice device)
         {
             Led = device.Leds.FirstOrDefault(d => d.RgbLed.Id.ToString() == RgbLayout.Id);
-            ApplyCustomLedData();
+            if (Led != null) 
+                Led.Layout = this;
+
+            ApplyCustomLedData(device);
         }
 
-        private void ApplyCustomLedData()
+        private void ApplyCustomLedData(ArtemisDevice artemisDevice)
         {
-            if (Led == null)
+            if (LayoutCustomLedData.LogicalLayouts == null || !LayoutCustomLedData.LogicalLayouts.Any())
                 return;
 
-            Uri layoutDirectory = new(Path.GetDirectoryName(Layout.FilePath)! + "\\", UriKind.Absolute);
+            Uri layoutDirectory = new(Path.GetDirectoryName(DeviceLayout.FilePath)! + "\\", UriKind.Absolute);
+            // Prefer a matching layout or else a default layout (that has no name)
+            LayoutCustomLedDataLogicalLayout logicalLayout = LayoutCustomLedData.LogicalLayouts
+                .OrderBy(l => l.Name == artemisDevice.LogicalLayout)
+                .ThenBy(l => l.Name == null)
+                .First();
+
+            LogicalName = logicalLayout.Name;
+            Image = new Uri(layoutDirectory, logicalLayout.Image);
         }
     }
 }

src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs

@@ -23,7 +23,7 @@ namespace Artemis.UI.Shared
                 Led.RgbLed.Size.Height
             );
 
-            if (Led.Layout?.Image != null && File.Exists(Led.Layout.Image.AbsolutePath))
+            if (Led.Layout?.Image != null && File.Exists(Led.Layout.Image.LocalPath))
                 LedImage = new BitmapImage(Led.Layout.Image);
           
             CreateLedGeometry();

src/Artemis.UI/Screens/Settings/Debug/DeviceDebugView.xaml

@@ -130,6 +130,24 @@
                                 </Grid>
                                 <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
 
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <StackPanel Grid.Column="0">
+                                        <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Physical layout</TextBlock>
+                                        <TextBlock Style="{StaticResource MaterialDesignTextBlock}"
+                                                   Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}"
+                                                   TextWrapping="Wrap"
+                                                   Text="{Binding Device.PhysicalLayout}" />
+                                    </StackPanel>
+                                </Grid>
+                                <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
+
                                 <Grid>
                                     <Grid.RowDefinitions>
                                         <RowDefinition />
@@ -203,6 +221,24 @@
                                 </Grid>
                                 <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
 
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <StackPanel Grid.Column="0">
+                                        <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Logical layout</TextBlock>
+                                        <TextBlock Style="{StaticResource MaterialDesignTextBlock}"
+                                                   Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}"
+                                                   TextWrapping="Wrap"
+                                                   Text="{Binding Device.LogicalLayout}" />
+                                    </StackPanel>
+                                </Grid>
+                                <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
+
                                 <Grid>
                                     <Grid.RowDefinitions>
                                         <RowDefinition />
@@ -234,8 +270,7 @@
                               materialDesign:DataGridAssist.CellPadding="13 8 8 8"
                               materialDesign:DataGridAssist.ColumnHeaderPadding="8"
                               SelectedItem="{Binding SelectedLed}"
-                              CanUserResizeRows="False"
+                              CanUserResizeRows="False">
-                              >
                         <DataGrid.Columns>
                             <materialDesign:DataGridTextColumn Binding="{Binding RgbLed.Id}" Header="LED ID" Width="Auto" />
                             <materialDesign:DataGridTextColumn Binding="{Binding RgbLed.Color}" Header="Color (ARGB)" Width="Auto" />