From 528d082e62d756b0f04987ca0dd660f17af48b39 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 24 Feb 2021 21:30:50 +0100 Subject: [PATCH] UI - Removed now unused sample size setting --- src/Artemis.Core/Services/RgbService.cs | 2 - .../Tabs/General/GeneralSettingsTabView.xaml | 21 --------- .../General/GeneralSettingsTabViewModel.cs | 43 +++++-------------- 3 files changed, 10 insertions(+), 56 deletions(-) diff --git a/src/Artemis.Core/Services/RgbService.cs b/src/Artemis.Core/Services/RgbService.cs index 5ca291db6..459f140e7 100644 --- a/src/Artemis.Core/Services/RgbService.cs +++ b/src/Artemis.Core/Services/RgbService.cs @@ -25,7 +25,6 @@ namespace Artemis.Core.Services private readonly IPluginManagementService _pluginManagementService; private readonly IDeviceRepository _deviceRepository; private readonly PluginSetting _targetFrameRateSetting; - private readonly PluginSetting _sampleSizeSetting; private ListLedGroup? _surfaceLedGroup; private bool _modifyingProviders; @@ -35,7 +34,6 @@ namespace Artemis.Core.Services _pluginManagementService = pluginManagementService; _deviceRepository = deviceRepository; _targetFrameRateSetting = settingsService.GetSetting("Core.TargetFrameRate", 25); - _sampleSizeSetting = settingsService.GetSetting("Core.SampleSize", 1); Surface = new RGBSurface(); diff --git a/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabView.xaml b/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabView.xaml index 9f0564084..6aef820f3 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabView.xaml +++ b/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabView.xaml @@ -347,27 +347,6 @@ - - - - - - - - - - - - - LED sample size - - Sets the amount of samples that is taken to determine each LEDs color. This means a LED can be semi off if it is not completely covered by a color. - - - - - - diff --git a/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs index 21a54084c..a84a3281e 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs @@ -3,11 +3,9 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using System.Net.Mime; +using System.Security.Principal; using System.Threading.Tasks; -using System.Windows; using System.Xml.Linq; -using System.Xml.XPath; using Artemis.Core; using Artemis.Core.LayerBrushes; using Artemis.Core.Services; @@ -16,7 +14,6 @@ using Artemis.UI.Screens.StartupWizard; using Artemis.UI.Services; using Artemis.UI.Shared; using Artemis.UI.Shared.Services; -using MaterialDesignThemes.Wpf; using Ninject; using Serilog.Events; using Stylet; @@ -26,17 +23,16 @@ namespace Artemis.UI.Screens.Settings.Tabs.General public class GeneralSettingsTabViewModel : Screen { private readonly IDebugService _debugService; - private readonly IKernel _kernel; - private readonly IWindowManager _windowManager; + private readonly PluginSetting _defaultLayerBrushDescriptor; private readonly IDialogService _dialogService; + private readonly IKernel _kernel; + private readonly IMessageService _messageService; private readonly ISettingsService _settingsService; private readonly IUpdateService _updateService; - private readonly IMessageService _messageService; - private List> _renderScales; - private List _sampleSizes; - private List> _targetFrameRates; - private readonly PluginSetting _defaultLayerBrushDescriptor; + private readonly IWindowManager _windowManager; private bool _canOfferUpdatesIfFound = true; + private List> _renderScales; + private List> _targetFrameRates; public GeneralSettingsTabViewModel( IKernel kernel, @@ -68,9 +64,6 @@ namespace Artemis.UI.Screens.Settings.Tabs.General for (int i = 10; i <= 30; i += 5) TargetFrameRates.Add(new Tuple(i + " FPS", i)); - // Anything else is kinda broken right now - SampleSizes = new List {1, 9}; - List layerBrushProviders = pluginManagementService.GetFeaturesOfType(); LayerBrushDescriptors = new BindableCollection(layerBrushProviders.SelectMany(l => l.LayerBrushDescriptors)); @@ -111,12 +104,6 @@ namespace Artemis.UI.Screens.Settings.Tabs.General set => SetAndNotify(ref _renderScales, value); } - public List SampleSizes - { - get => _sampleSizes; - set => SetAndNotify(ref _sampleSizes, value); - } - public bool StartWithWindows { get => _settingsService.GetSetting("UI.AutoRun", false).Value; @@ -239,16 +226,6 @@ namespace Artemis.UI.Screens.Settings.Tabs.General } } - public int SampleSize - { - get => _settingsService.GetSetting("Core.SampleSize", 1).Value; - set - { - _settingsService.GetSetting("Core.SampleSize", 1).Value = value; - _settingsService.GetSetting("Core.SampleSize", 1).Save(); - } - } - public PluginSetting WebServerPortSetting { get; } public bool CanOfferUpdatesIfFound @@ -320,7 +297,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.General File.Delete(autoRunFile); // TODO: Don't do anything if running a development build, only auto-run release builds - + // Create or remove the task if necessary try { @@ -363,13 +340,13 @@ namespace Artemis.UI.Screens.Settings.Tabs.General task.Descendants().First(d => d.Name.LocalName == "RegistrationInfo").Descendants().First(d => d.Name.LocalName == "Date") .SetValue(DateTime.Now); task.Descendants().First(d => d.Name.LocalName == "RegistrationInfo").Descendants().First(d => d.Name.LocalName == "Author") - .SetValue(System.Security.Principal.WindowsIdentity.GetCurrent().Name); + .SetValue(WindowsIdentity.GetCurrent().Name); task.Descendants().First(d => d.Name.LocalName == "Triggers").Descendants().First(d => d.Name.LocalName == "LogonTrigger").Descendants().First(d => d.Name.LocalName == "Delay") .SetValue(TimeSpan.FromSeconds(AutoRunDelay)); task.Descendants().First(d => d.Name.LocalName == "Principals").Descendants().First(d => d.Name.LocalName == "Principal").Descendants().First(d => d.Name.LocalName == "UserId") - .SetValue(System.Security.Principal.WindowsIdentity.GetCurrent().User.Value); + .SetValue(WindowsIdentity.GetCurrent().User.Value); task.Descendants().First(d => d.Name.LocalName == "Actions").Descendants().First(d => d.Name.LocalName == "Exec").Descendants().First(d => d.Name.LocalName == "WorkingDirectory") .SetValue(Constants.ApplicationFolder);