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 layer LED assignment

Browse Source 
Added a centralised ProfileEditorSurface for communication between VMs
Prefixed Surface, Device and Led with Artemis to differentiate them better
This commit is contained in:
Robert committed 2019-11-29 17:37:22 +01:00
1 parent 8a596f1426
commit f32edcf502
50 files changed
+556 -662
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.xaml
+1 -1
View File
@@ -198,7 +198,7 @@
</Grid.RowDefinitions>
<ListBox Grid.Row="0" HorizontalContentAlignment="Stretch" ItemsSource="{Binding SurfaceConfigurations}" SelectedItem="{Binding SelectedSurface}">
<ListBox.Resources>
<DataTemplate DataType="{x:Type models:Surface}">
<DataTemplate DataType="{x:Type models:ArtemisSurface}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
+6 -6
View File
@@ -29,7 +29,7 @@ namespace Artemis.UI.Screens.SurfaceEditor
public SurfaceEditorViewModel(ISurfaceService surfaceService, IDialogService dialogService, ISettingsService settingsService, IDeviceService deviceService)
{
Devices = new ObservableCollection<SurfaceDeviceViewModel>();
SurfaceConfigurations = new ObservableCollection<Surface>();
SurfaceConfigurations = new ObservableCollection<ArtemisSurface>();
SelectionRectangle = new RectangleGeometry();
PanZoomViewModel = new PanZoomViewModel();
Cursor = null;
@@ -41,13 +41,13 @@ namespace Artemis.UI.Screens.SurfaceEditor
}
public ObservableCollection<SurfaceDeviceViewModel> Devices { get; set; }
public ObservableCollection<Surface> SurfaceConfigurations { get; set; }
public ObservableCollection<ArtemisSurface> SurfaceConfigurations { get; set; }
public RectangleGeometry SelectionRectangle { get; set; }
public PanZoomViewModel PanZoomViewModel { get; set; }
public PluginSetting<GridLength> SurfaceListWidth { get; set; }
public Cursor Cursor { get; set; }
public Surface SelectedSurface
public ArtemisSurface SelectedSurface
{
get => _selectedSurface;
set
@@ -62,7 +62,7 @@ namespace Artemis.UI.Screens.SurfaceEditor
public string Title => "Surface Editor";
public Surface CreateSurfaceConfiguration(string name)
public ArtemisSurface CreateSurfaceConfiguration(string name)
{
var config = _surfaceService.CreateSurfaceConfiguration(name);
Execute.PostToUIThread(() => SurfaceConfigurations.Add(config));
@@ -148,7 +148,7 @@ namespace Artemis.UI.Screens.SurfaceEditor
#region Configuration management
public async Task DeleteSurfaceConfiguration(Surface surface)
public async Task DeleteSurfaceConfiguration(ArtemisSurface surface)
{
var result = await _dialogService.ShowConfirmDialogAt(
"SurfaceListDialogHost",
@@ -240,7 +240,7 @@ namespace Artemis.UI.Screens.SurfaceEditor
private MouseDragStatus _mouseDragStatus;
private Point _mouseDragStartPoint;
private Surface _selectedSurface;
private ArtemisSurface _selectedSurface;
// ReSharper disable once UnusedMember.Global - Called from view
public void EditorGridMouseClick(object sender, MouseButtonEventArgs e)
src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceViewModel.cs
+2 -2
View File
@@ -13,7 +13,7 @@ namespace Artemis.UI.Screens.SurfaceEditor.Visualization
private double _dragOffsetX;
private double _dragOffsetY;
public SurfaceDeviceViewModel(Device device)
public SurfaceDeviceViewModel(ArtemisDevice device)
{
Device = device;
_leds = new List<SurfaceLedViewModel>();
@@ -25,7 +25,7 @@ namespace Artemis.UI.Screens.SurfaceEditor.Visualization
}
}
public Device Device { get; set; }
public ArtemisDevice Device { get; set; }
public SelectionStatus SelectionStatus { get; set; }
public Cursor Cursor { get; set; }