DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 11:56:30 +00:00
Code Issues Releases Wiki Activity

Implemented surface config loading/saving/activating

Browse Source
This commit is contained in:
Robert Beekman committed 2019-10-22 22:52:02 +02:00
1 parent c4e5e412e0
commit c2c849201d
8 files changed
+210 -134
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/ViewModels/Controls/SurfaceEditor/SurfaceDeviceViewModel.cs
+33 -15
View File
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Windows;
using System.Windows.Input;
using Artemis.Core.Models.Surface;
using RGB.NET.Core;
using Stylet;
using Point = System.Windows.Point;
@@ -14,39 +15,56 @@ namespace Artemis.UI.ViewModels.Controls.SurfaceEditor
private double _dragOffsetY;
private readonly List<SurfaceLedViewModel> _leds;
public SurfaceDeviceViewModel(IRGBDevice device)
public SurfaceDeviceViewModel(SurfaceDeviceConfiguration deviceConfiguration)
{
Device = device;
DeviceConfiguration = deviceConfiguration;
_leds = new List<SurfaceLedViewModel>();
foreach (var led in Device)
_leds.Add(new SurfaceLedViewModel(led));
if (DeviceConfiguration.Device != null)
{
foreach (var led in DeviceConfiguration.Device)
_leds.Add(new SurfaceLedViewModel(led));
}
}
public IRGBDevice Device { get; }
public SurfaceDeviceConfiguration DeviceConfiguration { get; }
public SelectionStatus SelectionStatus { get; set; }
public Cursor Cursor { get; set; }
public int ZIndex { get; set; }
public double X
{
get => DeviceConfiguration.X;
set => DeviceConfiguration.X = value;
}
public double Y
{
get => DeviceConfiguration.Y;
set => DeviceConfiguration.Y = value;
}
public int ZIndex
{
get => DeviceConfiguration.ZIndex;
set => DeviceConfiguration.ZIndex = value;
}
public IReadOnlyCollection<SurfaceLedViewModel> Leds => _leds.AsReadOnly();
public Rect DeviceRectangle => new Rect(Device.Location.X, Device.Location.Y, Device.Size.Width, Device.Size.Height);
public Rect DeviceRectangle => new Rect(X, Y, DeviceConfiguration.Device.Size.Width, DeviceConfiguration.Device.Size.Height);
public void StartMouseDrag(Point mouseStartPosition)
{
_dragOffsetX = Device.Location.X - mouseStartPosition.X;
_dragOffsetY = Device.Location.Y - mouseStartPosition.Y;
_dragOffsetX = X - mouseStartPosition.X;
_dragOffsetY = Y - mouseStartPosition.Y;
}
public void UpdateMouseDrag(Point mousePosition)
{
var roundedX = Math.Round((mousePosition.X + _dragOffsetX) / 10, 0, MidpointRounding.AwayFromZero) * 10;
var roundedY = Math.Round((mousePosition.Y + _dragOffsetY) / 10, 0, MidpointRounding.AwayFromZero) * 10;
Device.Location = new RGB.NET.Core.Point(roundedX, roundedY);
}
public void FinishMouseDrag(Point mouseEndPosition)
{
// TODO: Save and update
X = roundedX;
Y = roundedY;
}
// ReSharper disable once UnusedMember.Global - Called from view
src/Artemis.UI/ViewModels/Controls/SurfaceEditor/SurfaceLedViewModel.cs
+10 -22
View File
@@ -1,5 +1,4 @@
using System;
using RGB.NET.Core;
using RGB.NET.Core;
using Stylet;
namespace Artemis.UI.ViewModels.Controls.SurfaceEditor
@@ -9,29 +8,18 @@ namespace Artemis.UI.ViewModels.Controls.SurfaceEditor
public SurfaceLedViewModel(Led led)
{
Led = led;
Update();
X = Led.LedRectangle.X;
Y = Led.LedRectangle.Y;
Width = Led.LedRectangle.Width;
Height = Led.LedRectangle.Height;
}
public Led Led { get; }
public double X { get; private set; }
public double Y { get; private set; }
public double Width { get; private set; }
public double Height { get; private set; }
public void Update()
{
if (Math.Abs(Led.LedRectangle.X - X) > 0.1)
X = Led.LedRectangle.X;
if (Math.Abs(Led.LedRectangle.Y - Y) > 0.1)
Y = Led.LedRectangle.Y;
if (Math.Abs(Led.LedRectangle.Width - Width) > 0.1)
Width = Led.LedRectangle.Width;
if (Math.Abs(Led.LedRectangle.Height - Height) > 0.1)
Height = Led.LedRectangle.Height;
}
public double X { get; }
public double Y { get; }
public double Width { get; }
public double Height { get; }
}
}
src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs
+81 -55
View File
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Threading.Tasks;
@@ -27,64 +28,31 @@ namespace Artemis.UI.ViewModels.Screens
SurfaceConfigurations = new ObservableCollection<SurfaceConfiguration>();
SelectionRectangle = new RectangleGeometry();
PanZoomViewModel = new PanZoomViewModel();
_rgbService = rgbService;
_surfaceService = surfaceService;
_rgbService.DeviceLoaded += RgbServiceOnDeviceLoaded;
foreach (var surfaceDevice in _rgbService.LoadedDevices)
{
var device = new SurfaceDeviceViewModel(surfaceDevice) {Cursor = Cursors.Hand};
Devices.Add(device);
device.ZIndex = Devices.IndexOf(device) + 1;
}
}
public RectangleGeometry SelectionRectangle { get; set; }
public ObservableCollection<SurfaceDeviceViewModel> Devices { get; set; }
public SurfaceConfiguration SelectedSurfaceConfiguration { get; set; }
public SurfaceConfiguration SelectedSurfaceConfiguration
{
get => _selectedSurfaceConfiguration;
set
{
_selectedSurfaceConfiguration = value;
ApplySelectedSurfaceConfiguration();
}
}
public ObservableCollection<SurfaceConfiguration> SurfaceConfigurations { get; set; }
public string NewConfigurationName { get; set; }
public PanZoomViewModel PanZoomViewModel { get; set; }
public string Title => "Surface Editor";
private void RgbServiceOnDeviceLoaded(object sender, DeviceEventArgs e)
{
Execute.OnUIThread(() =>
{
if (Devices.All(d => d.Device != e.Device))
{
var device = new SurfaceDeviceViewModel(e.Device) {Cursor = Cursors.Hand};
Devices.Add(device);
device.ZIndex = Devices.IndexOf(device) + 1;
}
});
}
private async Task LoadSurfaceConfigurations()
{
await Execute.OnUIThreadAsync(async () =>
{
SurfaceConfigurations.Clear();
// Get surface configs
var configs = await _surfaceService.GetSurfaceConfigurationsAsync();
// Populate the UI collection
foreach (var surfaceConfiguration in configs)
SurfaceConfigurations.Add(surfaceConfiguration);
// Select either the first active surface or the first available surface
SelectedSurfaceConfiguration = SurfaceConfigurations.FirstOrDefault(s => s.IsActive) ?? SurfaceConfigurations.FirstOrDefault();
// Create a default if there is none
if (SelectedSurfaceConfiguration == null)
SelectedSurfaceConfiguration = AddSurfaceConfiguration("Default");
});
}
public SurfaceConfiguration AddSurfaceConfiguration(string name)
{
var config = _surfaceService.CreateSurfaceConfiguration(name);
@@ -92,6 +60,65 @@ namespace Artemis.UI.ViewModels.Screens
return config;
}
private void LoadSurfaceConfigurations()
{
// Get surface configs
var configs = _surfaceService.SurfaceConfigurations;
// Get the active config, if empty, create a default config
var activeConfig = _surfaceService.ActiveSurfaceConfiguration;
if (activeConfig == null)
{
activeConfig = AddSurfaceConfiguration("Default");
_surfaceService.ActiveSurfaceConfiguration = activeConfig;
}
Execute.OnUIThread(() =>
{
// Populate the UI collection
SurfaceConfigurations.Clear();
foreach (var surfaceConfiguration in configs)
SurfaceConfigurations.Add(surfaceConfiguration);
// Set the active config
SelectedSurfaceConfiguration = activeConfig;
});
}
private void ApplySelectedSurfaceConfiguration()
{
if (SelectedSurfaceConfiguration == null)
{
Execute.OnUIThread(Devices.Clear);
return;
}
Task.Run(() =>
{
// Create VMs for the new config outside the UI thread
var viewModels = SelectedSurfaceConfiguration.DeviceConfigurations.Select(c => new SurfaceDeviceViewModel(c)).ToList();
// Commit the VMs to the view
Execute.OnUIThread(() =>
{
Devices.Clear();
foreach (var viewModel in viewModels.OrderBy(v => v.ZIndex))
Devices.Add(viewModel);
});
});
}
#region Overrides of Screen
protected override void OnActivate()
{
LoadSurfaceConfigurations();
base.OnActivate();
}
#endregion
#region Configuration management
public void ConfirmationDialogClosing()
{
if (!string.IsNullOrWhiteSpace(NewConfigurationName))
@@ -103,14 +130,6 @@ namespace Artemis.UI.ViewModels.Screens
NewConfigurationName = null;
}
#region Overrides of Screen
protected override void OnActivate()
{
Task.Run(LoadSurfaceConfigurations);
base.OnActivate();
}
#endregion
#region Context menu actions
@@ -166,6 +185,7 @@ namespace Artemis.UI.ViewModels.Screens
private MouseDragStatus _mouseDragStatus;
private Point _mouseDragStartPoint;
private SurfaceConfiguration _selectedSurfaceConfiguration;
// ReSharper disable once UnusedMember.Global - Called from view
public void EditorGridMouseClick(object sender, MouseEventArgs e)
@@ -251,6 +271,12 @@ namespace Artemis.UI.ViewModels.Screens
device.SelectionStatus = SelectionStatus.None;
}
}
else
{
foreach (var device in Devices)
device.DeviceConfiguration.ApplyToDevice();
_surfaceService.SaveToRepository(SelectedSurfaceConfiguration, true);
}
Mouse.OverrideCursor = null;
_mouseDragStatus = MouseDragStatus.None;
@@ -281,7 +307,7 @@ namespace Artemis.UI.ViewModels.Screens
foreach (var device in Devices.Where(d => d.SelectionStatus == SelectionStatus.Selected))
device.UpdateMouseDrag(position);
}
#endregion
#region Panning and zooming