Merge branch 'beta' into chart-nps-graph

Author: uvcat7

bin/settings/shortcuts.txt

@@ -38,6 +38,17 @@ SELECT_QUANT_48  =
 SELECT_QUANT_64  =
 SELECT_QUANT_192 =
 
+SELECT_DENSITY_1  =
+SELECT_DENSITY_2  =
+SELECT_DENSITY_3  =
+SELECT_DENSITY_4  =
+SELECT_DENSITY_5  =
+SELECT_DENSITY_6  =
+SELECT_DENSITY_7  =
+SELECT_DENSITY_8  =
+SELECT_DENSITY_9  =
+SELECT_DENSITY_10 =
+
 SELECT_TEMPO_BPM        =
 SELECT_TEMPO_STOP       =
 SELECT_TEMPO_DELAY      =

src/Editor/Action.cpp

@@ -408,6 +408,10 @@ void Action::perform(Type action) {
 if (action >= FILE_OPEN_RECENT_BEGIN && action < FILE_OPEN_RECENT_END) {
     gEditor->openSimfile(action - FILE_OPEN_RECENT_BEGIN);
 }
+if (action >= SELECT_DENSITY_BEGIN && action < SELECT_DENSITY_END) {
+    gSelection->selectNotes(SelectModifier::SELECT_SET,
+                            action - SELECT_DENSITY_BEGIN + 1);
+}
 if (action >= SET_NOTESKIN_BEGIN && action < SET_NOTESKIN_END) {
     gNoteskin->setType(action - SET_NOTESKIN_BEGIN);
 }

src/Editor/Action.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Core/Core.h>
+#include <Editor/Common.h>
 
 namespace Vortex {
 
@@ -82,6 +83,9 @@ enum Type {
     SELECT_QUANT_64,
     SELECT_QUANT_192,
 
+    SELECT_DENSITY_BEGIN,
+    SELECT_DENSITY_END = SELECT_DENSITY_BEGIN + SIM_MAX_COLUMNS,
+
     SELECT_TEMPO_BPM,
     SELECT_TEMPO_STOP,
     SELECT_TEMPO_DELAY,

src/Editor/Menubar.cpp

@@ -38,6 +38,7 @@ struct MenuBarImpl : public Menubar {
 
     Item* myFileMenu;
     Item* myVisualSyncMenu;
+    Item* myNotesSelectMenu;
     Item* myViewMenu;
     Item* myBeatlineMenu;
     Item* myPreviewMenu;
@@ -159,8 +160,9 @@ struct MenuBarImpl : public Menubar {
         add(hSelectQuant, SELECT_QUANT_192, "192nd");
 
         // Notes > Select menu.
-        Item* hSelection = newMenu();
+        Item* hSelection = myNotesSelectMenu = newMenu();
         sub(hSelection, hSelectQuant, "Quantization");
+        add(hSelection, 0 /*dummy*/, "Density");
         sep(hSelection);
         add(hSelection, SELECT_ALL_STEPS, "Steps");
         add(hSelection, SELECT_ALL_MINES, "Mines");
@@ -499,6 +501,18 @@ struct MenuBarImpl : public Menubar {
             MENU->myViewMenu->setChecked(TOGGLE_CHART_PREVIEW,
                                          gView->hasChartPreview());
         };
+        myUpdateFunctions[SELECT_DENSITY] = [] {
+            Item* density = newMenu();
+            int numCol = gStyle->getNumCols();
+            if (numCol > 0) {
+                for (int i = 0; i < numCol; ++i) {
+                    add(density, static_cast<Type>(SELECT_DENSITY_BEGIN + i),
+                        Str::val(i + 1).c_str());
+                }
+            }
+            MENU->myNotesSelectMenu->replaceSubmenu(1, density, "Density",
+                                                    (numCol == 0));
+        };
         myUpdateFunctions[VIEW_MODE] = [] {
             MENU->myViewMenu->setChecked(USE_ROW_BASED_VIEW,
                                          !gView->isTimeBased());

src/Editor/Menubar.h

@@ -29,6 +29,8 @@ struct Menubar {
 
         VISUAL_SYNC_ANCHOR,
 
+        SELECT_DENSITY,
+
         BEATLINE_ENABLED,
         BEATLINE_SNAP,
         BEATLINE_COLOR,

src/Editor/Selection.cpp

@@ -293,6 +293,13 @@ struct SelectionImpl : public Selection {
         return numSelected;
     }
 
+    int selectNotes(SelectModifier mod, int density,
+                    bool ignoreRegion) override {
+        int numSelected = gNotes->selectDensity(mod, density, ignoreRegion);
+        showSelectionResult(mod, numSelected);
+        return numSelected;
+    }
+
     int selectNotes(SelectModifier mod, RowCol begin, RowCol end,
                     bool ignoreRegion) override {
         int numSelected = gNotes->selectRows(mod, begin.col, end.col, begin.row,

src/Editor/Selection.h

@@ -34,6 +34,8 @@ struct Selection : public InputHandler {
     virtual int selectNotes(NotesMan::Filter filter,
                             bool ignoreRegion = false) = 0;
     virtual int selectNotes(RowType rowType, bool ignoreRegion = false) = 0;
+    virtual int selectNotes(SelectModifier t, int density,
+                            bool ignoreRegion = false) = 0;
     virtual int selectNotes(SelectModifier t, RowCol begin, RowCol end,
                             bool ignoreRegion = false) = 0;
     virtual int selectNotes(SelectModifier t, const Vector<RowCol>& indices,

src/Editor/Shortcuts.cpp

@@ -368,10 +368,27 @@ static ActionEntry actionMap[] = {
     E(SHOW_SHORTCUTS),
     E(SHOW_MESSAGE_LOG),
     E(SHOW_DEBUG_LOG),
-    E(SHOW_ABOUT)
+    E(SHOW_ABOUT),
 
 #undef E
 
+#define E_DENSITY(n)       \
+    {"SELECT_DENSITY_" #n, \
+     static_cast<Action::Type>(SELECT_DENSITY_BEGIN + (n - 1))}
+
+    E_DENSITY(1),
+    E_DENSITY(2),
+    E_DENSITY(3),
+    E_DENSITY(4),
+    E_DENSITY(5),
+    E_DENSITY(6),
+    E_DENSITY(7),
+    E_DENSITY(8),
+    E_DENSITY(9),
+    E_DENSITY(10)
+
+#undef E_DENSITY
+
 };
 
 static const int NUM_MAPPED_ACTIONS = sizeof(actionMap) / sizeof(actionMap[0]);

src/Managers/NoteMan.cpp

@@ -528,6 +528,35 @@ struct NotesManImpl : public NotesMan {
         return numSelected;
     }
 
+    int selectDensity(SelectModifier mod, int density,
+                      bool ignoreRegion) override {
+        auto first = myNotes.begin();
+        auto last = myNotes.end() - 1;
+
+        return performSelection(
+            mod, ignoreRegion, [&](const ExpandedNote* note) {
+                if (note->isMine) {
+                    return false;
+                }
+
+                int count = 1;
+                for (const ExpandedNote* it = note - 1;
+                     it >= first && it->row == note->row; --it) {
+                    if (!it->isMine) {
+                        count++;
+                    }
+                }
+                for (const ExpandedNote* it = note + 1;
+                     it <= last && it->row == note->row; ++it) {
+                    if (!it->isMine) {
+                        count++;
+                    }
+                }
+
+                return count == density;
+            });
+    }
+
     int selectRows(SelectModifier mod, int firstCol, int lastCol, int firstRow,
                    int lastRow, bool ignoreRegion) override {
         auto region = gSelection->getSelectedRegion();

src/Managers/NoteMan.h

@@ -42,6 +42,8 @@ struct NotesMan {
     virtual void deselectAll() = 0;
     virtual int selectAll() = 0;
     virtual int selectQuant(int rowType, bool ignoreRegion) = 0;
+    virtual int selectDensity(SelectModifier mod, int rowType,
+                              bool ignoreRegion) = 0;
     virtual int selectRows(SelectModifier mod, int beginCol, int endCol,
                            int beginRow, int endRow, bool ignoreRegion) = 0;
     virtual int selectTime(SelectModifier mod, int beginCol, int endCol,