Project cleanup

src/Artemis.Core/Models/Profile/Folder.cs

@@ -77,6 +77,11 @@ namespace Artemis.Core.Models.Profile
             return layer;
         }
 
+        public override string ToString()
+        {
+            return $"[Folder] {nameof(Name)}: {Name}, {nameof(Order)}: {Order}";
+        }
+
         internal override void ApplyToEntity()
         {
             FolderEntity.Id = EntityId;
@@ -89,10 +94,5 @@ namespace Artemis.Core.Models.Profile
 
             // TODO: conditions
         }
-
-        public override string ToString()
-        {
-            return $"[Folder] {nameof(Name)}: {Name}, {nameof(Order)}: {Order}";
-        }
     }
 }

src/Artemis.Core/Models/Profile/Layer.cs

@@ -11,9 +11,6 @@ using Artemis.Core.Models.Surface;
 using Artemis.Core.Plugins.LayerBrush;
 using Artemis.Core.Plugins.Models;
 using Artemis.Storage.Entities.Profile;
-using Newtonsoft.Json;
-using Ninject;
-using Ninject.Parameters;
 using SkiaSharp;
 
 namespace Artemis.Core.Models.Profile
@@ -147,6 +144,11 @@ namespace Artemis.Core.Models.Profile
         /// </summary>
         public LayerBrush LayerBrush { get; internal set; }
 
+        public override string ToString()
+        {
+            return $"[Layer] {nameof(Name)}: {Name}, {nameof(Order)}: {Order}";
+        }
+
         #region Storage
 
         internal override void ApplyToEntity()
@@ -178,6 +180,35 @@ namespace Artemis.Core.Models.Profile
 
         #endregion
 
+        #region Shape management
+
+        private void ApplyShapeType()
+        {
+            switch (ShapeTypeProperty.CurrentValue)
+            {
+                case LayerShapeType.Ellipse:
+                    LayerShape = new Ellipse(this);
+                    break;
+                case LayerShapeType.Rectangle:
+                    LayerShape = new Rectangle(this);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        #endregion
+
+        private void OnLayerPropertyRegistered(LayerPropertyEventArgs e)
+        {
+            LayerPropertyRegistered?.Invoke(this, e);
+        }
+
+        private void OnLayerPropertyRemoved(LayerPropertyEventArgs e)
+        {
+            LayerPropertyRemoved?.Invoke(this, e);
+        }
+
         #region Rendering
 
         public override void Update(double deltaTime)
@@ -277,7 +308,7 @@ namespace Artemis.Core.Models.Profile
             renderPath.AddRect(Path.Bounds);
             LayerBrush?.Render(canvas, renderPath, paint);
         }
-        
+
         internal void CalculateRenderProperties()
         {
             if (!Leds.Any())
@@ -378,25 +409,6 @@ namespace Artemis.Core.Models.Profile
 
         #endregion
 
-        #region Shape management
-
-        private void ApplyShapeType()
-        {
-            switch (ShapeTypeProperty.CurrentValue)
-            {
-                case LayerShapeType.Ellipse:
-                    LayerShape = new Ellipse(this);
-                    break;
-                case LayerShapeType.Rectangle:
-                    LayerShape = new Rectangle(this);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-        }
-
-        #endregion
-
         #region Properties
 
         /// <summary>
@@ -534,21 +546,6 @@ namespace Artemis.Core.Models.Profile
         }
 
         #endregion
-
-        public override string ToString()
-        {
-            return $"[Layer] {nameof(Name)}: {Name}, {nameof(Order)}: {Order}";
-        }
-
-        private void OnLayerPropertyRegistered(LayerPropertyEventArgs e)
-        {
-            LayerPropertyRegistered?.Invoke(this, e);
-        }
-
-        private void OnLayerPropertyRemoved(LayerPropertyEventArgs e)
-        {
-            LayerPropertyRemoved?.Invoke(this, e);
-        }
     }
 
     public enum LayerShapeType

src/Artemis.Core/Models/Profile/LayerShapes/Ellipse.cs

@@ -1,5 +1,4 @@
-using Artemis.Storage.Entities.Profile;
-using SkiaSharp;
+using SkiaSharp;
 
 namespace Artemis.Core.Models.Profile.LayerShapes
 {

src/Artemis.Core/Models/Profile/LayerShapes/Rectangle.cs

@@ -1,5 +1,4 @@
-using Artemis.Storage.Entities.Profile;
-using SkiaSharp;
+using SkiaSharp;
 
 namespace Artemis.Core.Models.Profile.LayerShapes
 {

src/Artemis.Core/Models/Profile/Profile.cs

@@ -74,6 +74,27 @@ namespace Artemis.Core.Models.Profile
             return (Folder) Children.Single();
         }
 
+        public void ApplyToProfile()
+        {
+            Name = ProfileEntity.Name;
+
+            lock (_children)
+            {
+                _children.Clear();
+                // Populate the profile starting at the root, the rest is populated recursively
+                var rootFolder = ProfileEntity.Folders.FirstOrDefault(f => f.ParentId == new Guid());
+                if (rootFolder == null)
+                    AddChild(new Folder(this, null, "Root folder"));
+                else
+                    AddChild(new Folder(this, null, rootFolder));
+            }
+        }
+
+        public override string ToString()
+        {
+            return $"[Profile] {nameof(Name)}: {Name}, {nameof(IsActivated)}: {IsActivated}, {nameof(PluginInfo)}: {PluginInfo}";
+        }
+
         internal override void ApplyToEntity()
         {
             ProfileEntity.Id = EntityId;
@@ -91,22 +112,6 @@ namespace Artemis.Core.Models.Profile
             ProfileEntity.Layers.AddRange(GetAllLayers().Select(f => f.LayerEntity));
         }
 
-        public void ApplyToProfile()
-        {
-            Name = ProfileEntity.Name;
-
-            lock (_children)
-            {
-                _children.Clear();
-                // Populate the profile starting at the root, the rest is populated recursively
-                var rootFolder = ProfileEntity.Folders.FirstOrDefault(f => f.ParentId == new Guid());
-                if (rootFolder == null)
-                    AddChild(new Folder(this, null, "Root folder"));
-                else
-                    AddChild(new Folder(this, null, rootFolder));
-            }
-        }
-
         internal void Activate(ArtemisSurface surface)
         {
             lock (this)
@@ -137,11 +142,6 @@ namespace Artemis.Core.Models.Profile
                 layer.PopulateLeds(surface);
         }
 
-        public override string ToString()
-        {
-            return $"[Profile] {nameof(Name)}: {Name}, {nameof(IsActivated)}: {IsActivated}, {nameof(PluginInfo)}: {PluginInfo}";
-        }
-
         #region Events
 
         /// <summary>

src/Artemis.Core/Models/Profile/ProfileElement.cs

@@ -46,11 +46,6 @@ namespace Artemis.Core.Models.Profile
         /// </summary>
         public abstract void Render(double deltaTime, SKCanvas canvas);
 
-        /// <summary>
-        ///     Applies the profile element's properties to the underlying storage entity
-        /// </summary>
-        internal abstract void ApplyToEntity();
-
         public List<Folder> GetAllFolders()
         {
             var folders = new List<Folder>();
@@ -131,5 +126,10 @@ namespace Artemis.Core.Models.Profile
                 child.Parent = null;
             }
         }
+
+        /// <summary>
+        ///     Applies the profile element's properties to the underlying storage entity
+        /// </summary>
+        internal abstract void ApplyToEntity();
     }
 }

src/Artemis.Core/Models/Surface/ArtemisDevice.cs

@@ -76,6 +76,18 @@ namespace Artemis.Core.Models.Surface
             set => DeviceEntity.ZIndex = value;
         }
 
+        public override string ToString()
+        {
+            return $"[{RgbDevice.DeviceInfo.DeviceType}] {RgbDevice.DeviceInfo.DeviceName} - {X}.{Y}.{ZIndex}";
+        }
+
+        public event EventHandler DeviceUpdated;
+
+        protected virtual void OnDeviceUpdated()
+        {
+            DeviceUpdated?.Invoke(this, EventArgs.Empty);
+        }
+
         internal void ApplyToEntity()
         {
             // Other properties are computed
@@ -113,17 +125,5 @@ namespace Artemis.Core.Models.Surface
 
             RenderPath = path;
         }
-
-        public override string ToString()
-        {
-            return $"[{RgbDevice.DeviceInfo.DeviceType}] {RgbDevice.DeviceInfo.DeviceName} - {X}.{Y}.{ZIndex}";
-        }
-
-        public event EventHandler DeviceUpdated;
-
-        protected virtual void OnDeviceUpdated()
-        {
-            DeviceUpdated?.Invoke(this, EventArgs.Empty);
-        }
     }
 }

src/Artemis.Core/Models/Surface/ArtemisSurface.cs

@@ -48,6 +48,15 @@ namespace Artemis.Core.Models.Surface
         internal SurfaceEntity SurfaceEntity { get; set; }
         internal Guid EntityId { get; set; }
 
+        public void UpdateScale(double value)
+        {
+            Scale = value;
+            foreach (var device in Devices)
+                device.CalculateRenderProperties();
+
+            OnScaleChanged();
+        }
+
         internal void ApplyToEntity()
         {
             SurfaceEntity.Id = EntityId;
@@ -62,15 +71,6 @@ namespace Artemis.Core.Models.Surface
             }
         }
 
-        public void UpdateScale(double value)
-        {
-            Scale = value;
-            foreach (var device in Devices)
-                device.CalculateRenderProperties();
-
-            OnScaleChanged();
-        }
-
         #region Events
 
         public event EventHandler<EventArgs> ScaleChanged;

src/Artemis.Core/Plugins/LayerBrush/LayerBrush.cs

@@ -1,7 +1,6 @@
 using System;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.Core.Services;
 using Artemis.Core.Services.Interfaces;
 using SkiaSharp;
 

src/Artemis.Core/Plugins/Models/PluginSetting.cs

@@ -78,14 +78,14 @@ namespace Artemis.Core.Plugins.Models
 
         public event EventHandler<EventArgs> SettingChanged;
 
-        protected virtual void OnSettingChanged()
-        {
-            SettingChanged?.Invoke(this, EventArgs.Empty);
-        }
-
         public override string ToString()
         {
             return $"{nameof(Name)}: {Name}, {nameof(Value)}: {Value}, {nameof(HasChanged)}: {HasChanged}";
         }
+
+        protected virtual void OnSettingChanged()
+        {
+            SettingChanged?.Invoke(this, EventArgs.Empty);
+        }
     }
 }

src/Artemis.Core/Services/CoreService.cs

@@ -55,6 +55,16 @@ namespace Artemis.Core.Services
 
         public bool IsInitialized { get; set; }
 
+        protected virtual void OnFrameRendering(FrameRenderingEventArgs e)
+        {
+            FrameRendering?.Invoke(this, e);
+        }
+
+        protected virtual void OnFrameRendered(FrameRenderedEventArgs e)
+        {
+            FrameRendered?.Invoke(this, e);
+        }
+
         private void ConfigureJsonConvert()
         {
             JsonConvert.DefaultSettings = () => new JsonSerializerSettings
@@ -136,16 +146,6 @@ namespace Artemis.Core.Services
             OnFrameRendered(new FrameRenderedEventArgs(_rgbService.BitmapBrush, _rgbService.Surface));
         }
 
-        protected virtual void OnFrameRendering(FrameRenderingEventArgs e)
-        {
-            FrameRendering?.Invoke(this, e);
-        }
-
-        protected virtual void OnFrameRendered(FrameRenderedEventArgs e)
-        {
-            FrameRendered?.Invoke(this, e);
-        }
-
         #region Events
 
         public event EventHandler Initialized;

src/Artemis.Core/Services/SettingsService.cs

@@ -1,5 +1,4 @@
-using System;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage.Repositories.Interfaces;