DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Surface editor - Auto-arrange new configs by default

Browse Source
This commit is contained in:
Robert 2020-12-09 23:03:49 +01:00
parent 8c42c916e8
commit dcd4a85e37
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Artemis.Core/Services/Storage/Interfaces/ISurfaceService.cs
View File

@ -45,9 +45,13 @@ namespace Artemis.Core.Services
void DeleteSurfaceConfiguration(ArtemisSurface surface); void DeleteSurfaceConfiguration(ArtemisSurface surface);
/// <summary> /// <summary>
/// Applies auto-arranging logic to the current active surface /// Applies auto-arranging logic to a surface
/// </summary> /// </summary>
void AutoArrange(); /// <param name="artemisSurface">
/// The surface to apply auto-arrange to. If <see langword="null" /> the
/// <see cref="ActiveSurface" /> is used.
/// </param>
void AutoArrange(ArtemisSurface? artemisSurface = null);
/// <summary> /// <summary>
/// Occurs when the active device entity has been changed /// Occurs when the active device entity has been changed

12
src/Artemis.Core/Services/Storage/SurfaceService.cs
View File

@ -49,6 +49,9 @@ namespace Artemis.Core.Services
configuration.Devices.Add(new ArtemisDevice(rgbDevice, deviceProvider, configuration)); configuration.Devices.Add(new ArtemisDevice(rgbDevice, deviceProvider, configuration));
} }
// Auto-arrange the new config
AutoArrange(configuration);
lock (_surfaceConfigurations) lock (_surfaceConfigurations)
{ {
_surfaceRepository.Add(configuration.SurfaceEntity); _surfaceRepository.Add(configuration.SurfaceEntity);
@ -102,6 +105,7 @@ namespace Artemis.Core.Services
deviceConfiguration.ApplyToRgbDevice(); deviceConfiguration.ApplyToRgbDevice();
} }
} }
surface.UpdateLedMap(); surface.UpdateLedMap();
_surfaceRepository.Save(surface.SurfaceEntity); _surfaceRepository.Save(surface.SurfaceEntity);
@ -200,11 +204,13 @@ namespace Artemis.Core.Services
#region AutoLayout #region AutoLayout
public void AutoArrange() public void AutoArrange(ArtemisSurface? artemisSurface = null)
{ {
artemisSurface ??= ActiveSurface;
SurfaceArrangement surfaceArrangement = SurfaceArrangement.GetDefaultArrangement(); SurfaceArrangement surfaceArrangement = SurfaceArrangement.GetDefaultArrangement();
surfaceArrangement.Arrange(ActiveSurface); surfaceArrangement.Arrange(artemisSurface);
UpdateSurfaceConfiguration(ActiveSurface, true); UpdateSurfaceConfiguration(artemisSurface, true);
} }
#endregion #endregion