Selection filter - change behaviour of All button

Author: mathesoncalum

src/engraving/dom/select.cpp

@@ -97,11 +97,20 @@ int SelectionFilter::filteredTypes() const
 
 bool SelectionFilter::isFiltered(SelectionFilterType type) const
 {
-    if (type == SelectionFilterType::NONE || type == SelectionFilterType::ALL) {
-        return m_filteredTypes == static_cast<unsigned int>(type);
+    switch (type) {
+    case SelectionFilterType::NONE:
+    case SelectionFilterType::ALL:
+    case SelectionFilterType::ALL_VOICES:
+    case SelectionFilterType::ALL_NOTATION_ELEMENTS: {
+        const unsigned int masked = m_filteredTypes & static_cast<unsigned int>(type);
+        return masked == static_cast<unsigned int>(type);
+    }
+    default:
+        return m_filteredTypes & static_cast<unsigned int>(type);
     }
 
-    return m_filteredTypes & static_cast<unsigned int>(type);
+    UNREACHABLE;
+    return false;
 }
 
 void SelectionFilter::setFiltered(SelectionFilterType type, bool filtered)

src/engraving/dom/select.h

@@ -92,11 +92,13 @@ enum class SelState : char {
 static constexpr size_t NUMBER_OF_SELECTION_FILTER_TYPES = 23;
 
 enum class SelectionFilterType : unsigned int {
-    NONE                    = 0,
+    // Voices...
     FIRST_VOICE             = 1 << 0,
     SECOND_VOICE            = 1 << 1,
     THIRD_VOICE             = 1 << 2,
     FOURTH_VOICE            = 1 << 3,
+
+    // Notation elements...
     DYNAMIC                 = 1 << 4,
     HAIRPIN                 = 1 << 5,
     FINGERING               = 1 << 6,
@@ -116,7 +118,12 @@ enum class SelectionFilterType : unsigned int {
     BREATH                  = 1 << 20,
     TREMOLO                 = 1 << 21,
     GRACE_NOTE              = 1 << 22,
-    ALL                     = ~(~0u << NUMBER_OF_SELECTION_FILTER_TYPES)
+
+    // Masks...
+    NONE                    = 0,
+    ALL                     = ~(~0u << NUMBER_OF_SELECTION_FILTER_TYPES),
+    ALL_VOICES              = FIRST_VOICE | SECOND_VOICE | THIRD_VOICE | FOURTH_VOICE,
+    ALL_NOTATION_ELEMENTS   = ALL & ~ALL_VOICES
 };
 
 //---------------------------------------------------------

src/notation/inotationinteraction.h

@@ -84,6 +84,7 @@ class INotationInteraction
     virtual void selectTopOrBottomOfChord(MoveDirection d) = 0;
 
     // SelectionFilter
+    virtual unsigned int currentSelectionFilter() const = 0;
     virtual bool isSelectionTypeFiltered(SelectionFilterType type) const = 0;
     virtual void setSelectionTypeFiltered(SelectionFilterType type, bool filtered) = 0;
 

src/notation/internal/notationinteraction.cpp

@@ -1025,6 +1025,11 @@ muse::async::Notification NotationInteraction::selectionChanged() const
     return m_selectionChanged;
 }
 
+unsigned int NotationInteraction::currentSelectionFilter() const
+{
+    return score()->selectionFilter().filteredTypes();
+}
+
 bool NotationInteraction::isSelectionTypeFiltered(SelectionFilterType type) const
 {
     return score()->selectionFilter().isFiltered(type);

src/notation/internal/notationinteraction.h

@@ -95,6 +95,7 @@ class NotationInteraction : public INotationInteraction, public muse::Injectable
     void moveSegmentSelection(MoveDirection d) override;
 
     // SelectionFilter
+    unsigned int currentSelectionFilter() const override;
     bool isSelectionTypeFiltered(SelectionFilterType type) const override;
     void setSelectionTypeFiltered(SelectionFilterType type, bool filtered) override;
 

src/notation/tests/mocks/notationinteractionmock.h

@@ -57,6 +57,7 @@ class NotationInteractionMock : public INotationInteraction
     MOCK_METHOD(muse::async::Notification, selectionChanged, (), (const, override));
     MOCK_METHOD(void, selectTopOrBottomOfChord, (MoveDirection), (override));
 
+    MOCK_METHOD(unsigned int, currentSelectionFilter, (), (const, override));
     MOCK_METHOD(bool, isSelectionTypeFiltered, (SelectionFilterType), (const, override));
     MOCK_METHOD(void, setSelectionTypeFiltered, (SelectionFilterType, bool), (override));
 

src/notation/view/selectionfiltermodel.cpp

@@ -40,7 +40,7 @@ void SelectionFilterModel::load()
     beginResetModel();
 
     m_types.clear();
-    m_types << SelectionFilterType::ALL;
+    m_types << SelectionFilterType::ALL_NOTATION_ELEMENTS;
 
     for (size_t i = 0; i < mu::engraving::NUMBER_OF_SELECTION_FILTER_TYPES; i++) {
         m_types << static_cast<SelectionFilterType>(1 << i);
@@ -81,8 +81,12 @@ QVariant SelectionFilterModel::data(const QModelIndex& index, int role) const
         return isFiltered(type);
 
     case IsIndeterminateRole:
-        if (type == SelectionFilterType::ALL) {
-            return !isFiltered(SelectionFilterType::ALL) && !isFiltered(SelectionFilterType::NONE);
+        if (type == SelectionFilterType::ALL_NOTATION_ELEMENTS) {
+            const unsigned int masked = filteredTypes() & static_cast<int>(SelectionFilterType::ALL_NOTATION_ELEMENTS);
+            const bool hasNonZeroNotationElements = masked != static_cast<int>(SelectionFilterType::NONE);
+
+            // Indeterminate if some notation elements types are selected, but not all...
+            return hasNonZeroNotationElements && !isFiltered(SelectionFilterType::ALL_NOTATION_ELEMENTS);
         }
 
         return false;
@@ -110,7 +114,7 @@ bool SelectionFilterModel::setData(const QModelIndex& index, const QVariant& dat
     const bool filtered = data.toBool();
 
     setFiltered(type, filtered);
-    if (type == SelectionFilterType::ALL) {
+    if (type == SelectionFilterType::ALL_NOTATION_ELEMENTS) {
         emit dataChanged(this->index(0), this->index(rowCount() - 1), { IsSelectedRole, IsIndeterminateRole });
     } else {
         emit dataChanged(this->index(0), this->index(0), { IsSelectedRole, IsIndeterminateRole });
@@ -157,6 +161,11 @@ INotationInteractionPtr SelectionFilterModel::currentNotationInteraction() const
     return currentNotation() ? currentNotation()->interaction() : nullptr;
 }
 
+unsigned int SelectionFilterModel::filteredTypes() const
+{
+    return currentNotationInteraction() ? currentNotationInteraction()->currentSelectionFilter() : 0;
+}
+
 bool SelectionFilterModel::isFiltered(SelectionFilterType type) const
 {
     return currentNotationInteraction() ? currentNotationInteraction()->isSelectionTypeFiltered(type) : false;
@@ -172,7 +181,7 @@ void SelectionFilterModel::setFiltered(SelectionFilterType type, bool filtered)
 QString SelectionFilterModel::titleForType(SelectionFilterType type) const
 {
     switch (type) {
-    case SelectionFilterType::ALL:
+    case SelectionFilterType::ALL_NOTATION_ELEMENTS:
         return muse::qtrc("notation", "All");
     case SelectionFilterType::FIRST_VOICE:
         return muse::qtrc("notation", "Voice %1").arg(1);
@@ -220,8 +229,7 @@ QString SelectionFilterModel::titleForType(SelectionFilterType type) const
         return muse::qtrc("notation", "Tremolos");
     case SelectionFilterType::GRACE_NOTE:
         return muse::qtrc("notation", "Grace notes");
-    case SelectionFilterType::NONE:
-        break;
+    default: break;
     }
 
     return {};

src/notation/view/selectionfiltermodel.h

@@ -79,6 +79,7 @@ class SelectionFilterModel : public QAbstractListModel, public muse::Injectable,
     INotationPtr currentNotation() const;
     INotationInteractionPtr currentNotationInteraction() const;
 
+    unsigned int filteredTypes() const;
     bool isFiltered(SelectionFilterType type) const;
     void setFiltered(SelectionFilterType type, bool filtered);