From 5c6e393dd5c673b51b3107ce749753c23cedd7d5 Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Mon, 29 Feb 2016 10:24:14 +0100 Subject: [PATCH] Code cleanup --- Artemis/Artemis/App.config | 51 ++++++++++++++----- .../KeyboardProviders/Logitech/Orion.cs | 1 - Artemis/Artemis/Managers/EffectManager.cs | 4 +- Artemis/Artemis/Managers/MainManager.cs | 17 +++---- Artemis/Artemis/Models/EffectModel.cs | 3 +- .../AudioVisualizer/AudioVisualizerModel.cs | 10 ++-- .../AudioVisualizer/AudioVisualizerView.xaml | 4 +- .../Effects/Debug/DebugEffectView.xaml | 4 +- .../Effects/TypeHole/TypeHoleView.xaml | 3 +- .../Effects/TypeWave/TypeWaveView.xaml | 3 +- .../CounterStrike/CounterStrike.settings | 4 +- .../Games/RocketLeague/RocketLeague.settings | 4 +- .../Games/RocketLeague/RocketLeagueModel.cs | 13 +++-- .../Games/RocketLeague/RocketLeagueView.xaml | 5 +- .../RocketLeague/RocketLeagueViewModel.cs | 1 - .../Modules/Games/Witcher3/Witcher3.settings | 4 +- .../Modules/Games/Witcher3/Witcher3Model.cs | 16 +++--- .../VolumeDisplay/VolumeDisplay.settings | 4 +- .../VolumeDisplay/VolumeDisplayView.xaml | 12 ++--- .../Utilities/GameState/GameStateWebServer.cs | 2 +- .../Artemis/Utilities/Memory/MemoryHelpers.cs | 6 --- Artemis/Artemis/ViewModels/ShellViewModel.cs | 4 +- .../Artemis/ViewModels/SystemTrayViewModel.cs | 6 +-- .../Views/Flyouts/FlyoutSettingsView.xaml | 2 +- Artemis/Artemis/Views/WelcomeView.xaml | 4 +- Artemis/Artemis/packages.config | 1 + 26 files changed, 105 insertions(+), 83 deletions(-) diff --git a/Artemis/Artemis/App.config b/Artemis/Artemis/App.config index a339f73ad..81ce6d60e 100644 --- a/Artemis/Artemis/App.config +++ b/Artemis/Artemis/App.config @@ -2,19 +2,44 @@ - -
-
-
-
-
-
-
-
-
-
-
-
+ +
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs b/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs index 6cb31f494..3bd6fdb74 100644 --- a/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs +++ b/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Drawing; using System.Threading; -using System.Windows.Forms; using Artemis.KeyboardProviders.Logitech.Utilities; namespace Artemis.KeyboardProviders.Logitech diff --git a/Artemis/Artemis/Managers/EffectManager.cs b/Artemis/Artemis/Managers/EffectManager.cs index 694481b20..15107b191 100644 --- a/Artemis/Artemis/Managers/EffectManager.cs +++ b/Artemis/Artemis/Managers/EffectManager.cs @@ -10,8 +10,8 @@ namespace Artemis.Managers { public class EffectManager { - private readonly MainManager _mainManager; private readonly IEventAggregator _events; + private readonly MainManager _mainManager; public EffectManager(MainManager mainManager, IEventAggregator events) { @@ -121,7 +121,7 @@ namespace Artemis.Managers // Don't mess with the ActiveEffect if in the process of changing the effect. if (PauseEffect != null) return; - + if (ActiveEffect == null) return; diff --git a/Artemis/Artemis/Managers/MainManager.cs b/Artemis/Artemis/Managers/MainManager.cs index 2133e92d4..9e0ca8ef4 100644 --- a/Artemis/Artemis/Managers/MainManager.cs +++ b/Artemis/Artemis/Managers/MainManager.cs @@ -2,7 +2,6 @@ using System.Diagnostics; using System.Linq; using System.Threading; -using System.Windows.Forms; using Artemis.Events; using Artemis.Models; using Artemis.Utilities.GameState; @@ -28,7 +27,7 @@ namespace Artemis.Managers _fps = 25; UpdateWorker = new BackgroundWorker {WorkerSupportsCancellation = true}; - ProcessWorker = new BackgroundWorker { WorkerSupportsCancellation = true }; + ProcessWorker = new BackgroundWorker {WorkerSupportsCancellation = true}; UpdateWorker.DoWork += UpdateWorker_DoWork; UpdateWorker.RunWorkerCompleted += BackgroundWorkerExceptionCatcher; @@ -149,6 +148,13 @@ namespace Artemis.Managers Events.PublishOnUIThread(new ToggleEnabled(ProgramEnabled)); } + public void Shutdown() + { + Stop(); + ProcessWorker.CancelAsync(); + GameStateWebServer.Stop(); + } + #region Workers private void UpdateWorker_DoWork(object sender, DoWorkEventArgs e) @@ -255,12 +261,5 @@ namespace Artemis.Managers } #endregion - - public void Shutdown() - { - Stop(); - ProcessWorker.CancelAsync(); - GameStateWebServer.Stop(); - } } } \ No newline at end of file diff --git a/Artemis/Artemis/Models/EffectModel.cs b/Artemis/Artemis/Models/EffectModel.cs index d41fc862d..2c6aae812 100644 --- a/Artemis/Artemis/Models/EffectModel.cs +++ b/Artemis/Artemis/Models/EffectModel.cs @@ -8,9 +8,10 @@ namespace Artemis.Models { public delegate void SettingsUpdateHandler(EffectSettings settings); + public bool Initialized; + public MainManager MainManager; public string Name; - public bool Initialized; protected EffectModel(MainManager mainManager) { diff --git a/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerModel.cs b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerModel.cs index 9211b2c72..3452c7c04 100644 --- a/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerModel.cs +++ b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerModel.cs @@ -17,10 +17,10 @@ namespace Artemis.Modules.Effects.AudioVisualizer { private const int FftLength = 2048; private readonly SampleAggregator _sampleAggregator = new SampleAggregator(FftLength); - private bool _generating; - private IWaveIn _waveIn; - private int _sensitivity; private bool _fromBottom; + private bool _generating; + private int _sensitivity; + private IWaveIn _waveIn; public AudioVisualizerModel(MainManager mainManager, AudioVisualizerSettings settings) : base(mainManager) { @@ -92,7 +92,7 @@ namespace Artemis.Modules.Effects.AudioVisualizer } public override void Update() - { + { // Start filling the model _generating = true; @@ -118,7 +118,7 @@ namespace Artemis.Modules.Effects.AudioVisualizer height = (int) Math.Round(SpectrumData[i]/2.55); // Apply Sensitivity setting - height = height* _sensitivity; + height = height*_sensitivity; var keyboardHeight = (int) Math.Round(MainManager.KeyboardManager.ActiveKeyboard.Height/100.00*height*Scale); if (keyboardHeight > SoundRectangles[i].Height) diff --git a/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml index a5a22d8b9..517f9705f 100644 --- a/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml +++ b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml @@ -37,8 +37,8 @@