Refactored the edit tool

Fixed the fill shape but it might need some rethinking

src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionRemoveToolViewModel.cs

@@ -1,36 +1,97 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Windows;
 using System.Windows.Input;
+using Artemis.Core.Models.Profile;
+using Artemis.Core.Models.Surface;
+using Artemis.UI.Extensions;
 using Artemis.UI.Properties;
+using Artemis.UI.Services;
 using Artemis.UI.Services.Interfaces;
 
 namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
 {
     public class SelectionRemoveToolViewModel : VisualizationToolViewModel
     {
-        public SelectionRemoveToolViewModel(ProfileViewModel profileViewModel, IProfileEditorService profileEditorService) : base(profileViewModel, profileEditorService)
+        private readonly ILayerEditorService _layerEditorService;
+
+        public SelectionRemoveToolViewModel(ProfileViewModel profileViewModel, IProfileEditorService profileEditorService, ILayerEditorService layerEditorService) : base(profileViewModel,
+            profileEditorService)
         {
+            _layerEditorService = layerEditorService;
             using (var stream = new MemoryStream(Resources.aero_pen_min))
             {
                 Cursor = new Cursor(stream);
             }
         }
 
+        public Rect DragRectangle { get; set; }
+
         public override void MouseUp(object sender, MouseButtonEventArgs e)
         {
             base.MouseUp(sender, e);
 
-            var position = e.GetPosition((IInputElement) sender);
+            var position = ProfileViewModel.PanZoomViewModel.GetRelativeMousePosition(sender, e);
+            var selectedRect = new Rect(MouseDownStartPosition, position);
+
+            // Get selected LEDs
+            var selectedLeds = new List<ArtemisLed>();
+            foreach (var device in ProfileViewModel.DeviceViewModels)
+            {
+                foreach (var ledViewModel in device.Leds)
+                {
+                    if (ledViewModel.Led.RgbLed.AbsoluteLedRectangle.ToWindowsRect(1).IntersectsWith(selectedRect))
+                        selectedLeds.Add(ledViewModel.Led);
+                    // Unselect everything
+                    ledViewModel.IsSelected = false;
+                }
+            }
+
+            // Apply the selection to the selected layer layer
+            if (ProfileEditorService.SelectedProfileElement is Layer layer)
+            {
+                // If the layer has a shape, save it's size
+                var shapeSize = Rect.Empty;
+                if (layer.LayerShape != null)
+                    shapeSize = _layerEditorService.GetShapeRenderRect(layer.LayerShape);
+
+                var remainingLeds = layer.Leds.Except(selectedLeds).ToList();
+                layer.ClearLeds();
+                layer.AddLeds(remainingLeds);
+
+                // Restore the saved size
+                if (layer.LayerShape != null)
+                    _layerEditorService.SetShapeRenderRect(layer.LayerShape, shapeSize);
+
+                ProfileEditorService.UpdateSelectedProfileElement();
+            }
+        }
+
+        public override void MouseMove(object sender, MouseEventArgs e)
+        {
+            base.MouseMove(sender, e);
+            if (!IsMouseDown)
+            {
+                DragRectangle = new Rect(-1, -1, 0, 0);
+                return;
+            }
+
+            var position = ProfileViewModel.PanZoomViewModel.GetRelativeMousePosition(sender, e);
             var selectedRect = new Rect(MouseDownStartPosition, position);
 
             foreach (var device in ProfileViewModel.DeviceViewModels)
             {
                 foreach (var ledViewModel in device.Leds)
                 {
-                    if (ProfileViewModel.PanZoomViewModel.TransformContainingRect(ledViewModel.Led.RgbLed.AbsoluteLedRectangle).IntersectsWith(selectedRect))
+                    if (ledViewModel.Led.RgbLed.AbsoluteLedRectangle.ToWindowsRect(1).IntersectsWith(selectedRect))
+                        ledViewModel.IsSelected = true;
+                    else if (!Keyboard.IsKeyDown(Key.LeftShift) && !Keyboard.IsKeyDown(Key.RightShift))
                         ledViewModel.IsSelected = false;
                 }
             }
+
+            DragRectangle = selectedRect;
         }
     }
 }