mirror of
https://github.com/Artemis-RGB/Artemis
synced 2026-11-11 03:19:56 +00:00
Merge branch 'development'
This commit is contained in:
commit
d9a3a238af
39 files changed
+601
-156
No files matched your search
@@ -385,31 +385,5 @@ public class DataModelPath : IStorageModel, IDisposable, IPluginFeatureDependent
|
||||
Entity.Type = pathType.FullName;
|
||||
}
|
||||
|
||||
#region Equality members
|
||||
|
||||
/// <inheritdoc cref="Equals(object)" />
|
||||
/// >
|
||||
protected bool Equals(DataModelPath other)
|
||||
{
|
||||
return ReferenceEquals(Target, other.Target) && Path == other.Path;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override bool Equals(object? obj)
|
||||
{
|
||||
if (ReferenceEquals(null, obj)) return false;
|
||||
if (ReferenceEquals(this, obj)) return true;
|
||||
if (obj.GetType() != GetType()) return false;
|
||||
return Equals((DataModelPath) obj);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override int GetHashCode()
|
||||
{
|
||||
return HashCode.Combine(Target, Path);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using RGB.NET.Layout;
|
||||
@@ -15,7 +16,7 @@ public class ArtemisLedLayout
|
||||
DeviceLayout = deviceLayout;
|
||||
RgbLayout = led;
|
||||
LayoutCustomLedData = (LayoutCustomLedData?) led.CustomData ?? new LayoutCustomLedData();
|
||||
|
||||
|
||||
// Default to the first logical layout for images
|
||||
LayoutCustomLedDataLogicalLayout? defaultLogicalLayout = LayoutCustomLedData.LogicalLayouts?.FirstOrDefault();
|
||||
if (defaultLogicalLayout != null)
|
||||
@@ -46,7 +47,14 @@ public class ArtemisLedLayout
|
||||
/// Gets the custom layout data embedded in the RGB.NET layout
|
||||
/// </summary>
|
||||
public LayoutCustomLedData LayoutCustomLedData { get; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Gets the logical layout names available for this LED
|
||||
/// </summary>
|
||||
public IEnumerable<string> GetLogicalLayoutNames()
|
||||
{
|
||||
return LayoutCustomLedData.LogicalLayouts?.Where(l => l.Name != null).Select(l => l.Name!) ?? [];
|
||||
}
|
||||
|
||||
internal void ApplyCustomLedData(ArtemisDevice artemisDevice)
|
||||
{
|
||||
@@ -61,11 +69,11 @@ public class ArtemisLedLayout
|
||||
|
||||
ApplyLogicalLayout(logicalLayout);
|
||||
}
|
||||
|
||||
|
||||
private void ApplyLogicalLayout(LayoutCustomLedDataLogicalLayout logicalLayout)
|
||||
{
|
||||
string? layoutDirectory = Path.GetDirectoryName(DeviceLayout.FilePath);
|
||||
|
||||
|
||||
LogicalName = logicalLayout.Name;
|
||||
if (layoutDirectory != null && logicalLayout.Image != null)
|
||||
Image = new Uri(Path.Combine(layoutDirectory, logicalLayout.Image!), UriKind.Absolute);
|
||||
|
||||
@@ -23,8 +23,7 @@ public class Profiler
|
||||
/// Gets the name of this profiler
|
||||
/// </summary>
|
||||
public string Name { get; }
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Gets a dictionary containing measurements by their identifiers
|
||||
/// </summary>
|
||||
|
||||
Reference in new issue
Block a user