Move RemoveSelectedEvents into NoteView.cs

paralleltree · May 8, 2021 · a7da4fb · a7da4fb
1 parent 4c4724c
commit a7da4fb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 29 deletions.
diff --git a/Ched/UI/MainForm.cs b/Ched/UI/MainForm.cs
@@ -610,35 +610,7 @@ private MenuStrip CreateMainMenu(NoteView noteView)
 
             var flipSelectedNotesItem = new ToolStripMenuItem(MainFormStrings.FlipSelectedNotes, null, (s, e) => noteView.FlipSelectedNotes());
             var removeSelectedNotesItem = shortcutItemBuilder.BuildItem(Commands.RemoveSelectedNotes, MainFormStrings.RemoveSelectedNotes);
-
-            var removeEventsItem = new ToolStripMenuItem(MainFormStrings.RemoveEvents, null, (s, e) =>
-            {
-                int minTick = noteView.SelectedRange.StartTick + (noteView.SelectedRange.Duration < 0 ? noteView.SelectedRange.Duration : 0);
-                int maxTick = noteView.SelectedRange.StartTick + (noteView.SelectedRange.Duration < 0 ? 0 : noteView.SelectedRange.Duration);
-                bool isContained(EventBase p) => p.Tick != 0 && minTick <= p.Tick && maxTick >= p.Tick;
-                var events = ScoreBook.Score.Events;
-
-                var bpmOp = events.BpmChangeEvents.Where(p => isContained(p)).ToList().Select(p =>
-                {
-                    ScoreBook.Score.Events.BpmChangeEvents.Remove(p);
-                    return new RemoveEventOperation<BpmChangeEvent>(events.BpmChangeEvents, p);
-                }).ToList();
-
-                var speedOp = events.HighSpeedChangeEvents.Where(p => isContained(p)).ToList().Select(p =>
-                {
-                    ScoreBook.Score.Events.HighSpeedChangeEvents.Remove(p);
-                    return new RemoveEventOperation<HighSpeedChangeEvent>(events.HighSpeedChangeEvents, p);
-                }).ToList();
-
-                var signatureOp = events.TimeSignatureChangeEvents.Where(p => isContained(p)).ToList().Select(p =>
-                {
-                    ScoreBook.Score.Events.TimeSignatureChangeEvents.Remove(p);
-                    return new RemoveEventOperation<TimeSignatureChangeEvent>(events.TimeSignatureChangeEvents, p);
-                }).ToList();
-
-                OperationManager.Push(new CompositeOperation("イベント削除", bpmOp.Cast<IOperation>().Concat(speedOp).Concat(signatureOp)));
-                noteView.Invalidate();
-            });
+            var removeEventsItem = new ToolStripMenuItem(MainFormStrings.RemoveEvents, null, (s, e) => noteView.RemoveSelectedEvents());
 
             var insertAirWithAirActionItem = new ToolStripMenuItem(MainFormStrings.InsertAirWithAirAction, null, (s, e) =>
             {

diff --git a/Ched/UI/NoteView.cs b/Ched/UI/NoteView.cs
@@ -15,6 +15,7 @@
 
 using Ched.Core;
 using Ched.Core.Notes;
+using Ched.Core.Events;
 using Ched.Drawing;
 using Ched.UI.Operations;
 
@@ -2100,6 +2101,32 @@ public void RemoveSelectedNotes()
             Invalidate();
         }
 
+        public void RemoveSelectedEvents()
+        {
+            int minTick = SelectedRange.StartTick + (SelectedRange.Duration < 0 ? SelectedRange.Duration : 0);
+            int maxTick = SelectedRange.StartTick + (SelectedRange.Duration < 0 ? 0 : SelectedRange.Duration);
+            bool isContained(EventBase p) => p.Tick != 0 && minTick <= p.Tick && maxTick >= p.Tick;
+            var events = ScoreEvents;
+
+            var bpmOp = events.BpmChangeEvents.Where(p => isContained(p)).ToList().Select(p =>
+            {
+                return new RemoveEventOperation<BpmChangeEvent>(events.BpmChangeEvents, p);
+            });
+
+            var speedOp = events.HighSpeedChangeEvents.Where(p => isContained(p)).ToList().Select(p =>
+            {
+                return new RemoveEventOperation<HighSpeedChangeEvent>(events.HighSpeedChangeEvents, p);
+            });
+
+            var signatureOp = events.TimeSignatureChangeEvents.Where(p => isContained(p)).ToList().Select(p =>
+            {
+                return new RemoveEventOperation<TimeSignatureChangeEvent>(events.TimeSignatureChangeEvents, p);
+            });
+
+            OperationManager.InvokeAndPush(new CompositeOperation("イベント削除", bpmOp.Cast<IOperation>().Concat(speedOp).Concat(signatureOp).ToList()));
+            Invalidate();
+        }
+
         public void FlipSelectedNotes()
         {
             var op = FlipNotes(GetSelectedNotes());