Merge pull request #28245 from mike-spa/tapping

Tapping implementation

Author: miiizen

src/engraving/dom/articulation.h

@@ -110,13 +110,13 @@ class Articulation : public EngravingItem
     Articulation(const Articulation&) = default;
     Articulation& operator=(const Articulation&) = delete;
 
-    Articulation* clone() const override { return new Articulation(*this); }
+    virtual Articulation* clone() const override { return new Articulation(*this); }
 
-    double mag() const override;
+    virtual double mag() const override;
 
     SymId symId() const { return m_symId; }
     void setSymId(SymId id);
-    int subtype() const override;
+    virtual int subtype() const override;
     void setTextType(ArticulationTextType textType);
     ArticulationTextType textType() const { return m_textType; }
     TranslatableString typeUserName() const override;
@@ -158,7 +158,7 @@ class Articulation : public EngravingItem
     String channelName() const { return m_channelName; }
     void setChannelName(const String& s) { m_channelName = s; }
 
-    String accessibleInfo() const override;
+    virtual String accessibleInfo() const override;
 
     bool isDouble() const { return m_categories & ArticulationCategory::DOUBLE; }
     bool isTenuto() const { return m_categories & ArticulationCategory::TENUTO; }

src/engraving/dom/chord.cpp

@@ -634,6 +634,7 @@ void Chord::add(EngravingItem* e)
         break;
     case ElementType::ARTICULATION:
     case ElementType::ORNAMENT:
+    case ElementType::TAPPING:
     {
         Articulation* a = toArticulation(e);
         if (a->layoutCloseToNote()) {
@@ -736,6 +737,7 @@ void Chord::remove(EngravingItem* e)
     break;
     case ElementType::ARTICULATION:
     case ElementType::ORNAMENT:
+    case ElementType::TAPPING:
     {
         Articulation* a = toArticulation(e);
         if (!muse::remove(m_articulations, a)) {
@@ -1331,6 +1333,7 @@ EngravingItem* Chord::drop(EditData& data)
     switch (e->type()) {
     case ElementType::ARTICULATION:
     case ElementType::ORNAMENT:
+    case ElementType::TAPPING:
     {
         Articulation* atr = toArticulation(e);
         Articulation* oa = hasArticulation(atr);
@@ -1604,6 +1607,20 @@ Articulation* Chord::hasArticulation(const Articulation* aa)
     return 0;
 }
 
+Tapping* Chord::tapping() const
+{
+    std::vector<Tapping*> tappings;
+    tappings.reserve(1);
+    for (Articulation* a : m_articulations) {
+        if (a->isTapping()) {
+            tappings.push_back(toTapping(a));
+        }
+    }
+    DO_ASSERT(tappings.size() <= 1);
+
+    return tappings.size() > 0 ? tappings.front() : nullptr;
+}
+
 void Chord::updateArticulations(const std::set<SymId>& newArticulationIds, ArticulationsUpdateMode updateMode)
 {
     Articulation* staccato = nullptr;

src/engraving/dom/chord.h

@@ -247,6 +247,7 @@ class Chord final : public ChordRest
     const std::vector<Articulation*>& articulations() const { return m_articulations; }
     std::set<SymId> articulationSymbolIds() const;
     Articulation* hasArticulation(const Articulation*);
+    Tapping* tapping() const;
     bool hasSingleArticulation() const { return m_articulations.size() == 1; }
 
     void updateArticulations(const std::set<SymId>& newArticulationIds,

src/engraving/dom/chordrest.cpp

@@ -934,6 +934,7 @@ EngravingItem* ChordRest::nextElement()
     switch (e->type()) {
     case ElementType::ARTICULATION:
     case ElementType::ORNAMENT:
+    case ElementType::TAPPING:
     case ElementType::LYRICS: {
         EngravingItem* next = nextArticulationOrLyric(e);
         if (next) {
@@ -969,6 +970,7 @@ EngravingItem* ChordRest::prevElement()
     switch (e->type()) {
     case ElementType::ARTICULATION:
     case ElementType::ORNAMENT:
+    case ElementType::TAPPING:
     case ElementType::LYRICS: {
         EngravingItem* prev = prevArticulationOrLyric(e);
         if (prev) {

src/engraving/dom/cmd.cpp

@@ -2409,6 +2409,13 @@ bool Score::toggleArticulation(EngravingItem* el, Articulation* a)
         return false;
     }
 
+    Tapping* tap = c->tapping();
+    if (tap) {
+        // If we got here it means that the user is entering a tap
+        // of different hand, so replace the old one
+        undoRemoveElement(tap);
+    }
+
     if (!a->isDouble()) {
         a->setParent(c);
         a->setTrack(c->track());

src/engraving/dom/dom.cmake

@@ -332,6 +332,8 @@ set(DOM_SRC
     ${CMAKE_CURRENT_LIST_DIR}/systemdivider.h
     ${CMAKE_CURRENT_LIST_DIR}/systemtext.cpp
     ${CMAKE_CURRENT_LIST_DIR}/systemtext.h
+    ${CMAKE_CURRENT_LIST_DIR}/tapping.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/tapping.h
     ${CMAKE_CURRENT_LIST_DIR}/tempo.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tempo.h
     ${CMAKE_CURRENT_LIST_DIR}/tempotext.cpp

src/engraving/dom/edit.cpp

@@ -3104,6 +3104,14 @@ void Score::deleteItem(EngravingItem* el)
     }
     break;
 
+    case ElementType::TAPPING_HALF_SLUR_SEGMENT:
+    {
+        TappingHalfSlur* halfSlur = toTappingHalfSlur(toTappingHalfSlurSegment(el)->spanner());
+        Tapping* tapping = toTapping(halfSlur->parent());
+        undoRemoveElement(tapping);
+        break;
+    }
+
     case ElementType::HAMMER_ON_PULL_OFF_TEXT:
         undoRemoveHopoText(toHammerOnPullOffText(el));
         break;
@@ -6349,6 +6357,7 @@ void Score::undoAddElement(EngravingItem* element, bool addToLinkedStaves, bool
     if (ostaff == 0 || (
             et != ElementType::ARTICULATION
             && et != ElementType::ORNAMENT
+            && et != ElementType::TAPPING
             && et != ElementType::CHORDLINE
             && et != ElementType::LYRICS
             && et != ElementType::SLUR

src/engraving/dom/engravingobject.h

@@ -164,6 +164,9 @@ class SystemDivider;
 class SystemLockIndicator;
 class SystemText;
 class SoundFlag;
+class Tapping;
+class TappingHalfSlur;
+class TappingHalfSlurSegment;
 class TBox;
 class TempoText;
 class Text;
@@ -456,6 +459,9 @@ class EngravingObject
     CONVERT(HammerOnPullOff, HAMMER_ON_PULL_OFF)
     CONVERT(HammerOnPullOffSegment, HAMMER_ON_PULL_OFF_SEGMENT)
     CONVERT(HammerOnPullOffText, HAMMER_ON_PULL_OFF_TEXT)
+    CONVERT(Tapping, TAPPING)
+    CONVERT(TappingHalfSlur, TAPPING_HALF_SLUR)
+    CONVERT(TappingHalfSlurSegment, TAPPING_HALF_SLUR_SEGMENT)
 #undef CONVERT
 
     virtual bool isEngravingItem() const { return false; }   // overridden in element.h
@@ -487,12 +493,13 @@ class EngravingObject
 
     bool isSlur() const
     {
-        return type() == ElementType::SLUR || type() == ElementType::HAMMER_ON_PULL_OFF;
+        return type() == ElementType::SLUR || type() == ElementType::HAMMER_ON_PULL_OFF || type() == ElementType::TAPPING_HALF_SLUR;
     }
 
     bool isSlurSegment() const
     {
-        return type() == ElementType::SLUR_SEGMENT || type() == ElementType::HAMMER_ON_PULL_OFF_SEGMENT;
+        return type() == ElementType::SLUR_SEGMENT || type() == ElementType::HAMMER_ON_PULL_OFF_SEGMENT
+               || type() == ElementType::TAPPING_HALF_SLUR_SEGMENT;
     }
 
     bool isLineSegment() const
@@ -572,7 +579,7 @@ class EngravingObject
 
     bool isArticulationFamily() const
     {
-        return isArticulation() || isOrnament();
+        return isArticulation() || isOrnament() || isTapping();
     }
 
     bool isArticulationOrFermata() const
@@ -636,7 +643,7 @@ static inline SlurTieSegment* toSlurTieSegment(EngravingObject* e)
     assert(
         e == 0 || e->type() == ElementType::SLUR_SEGMENT || e->type() == ElementType::TIE_SEGMENT
         || e->type() == ElementType::LAISSEZ_VIB_SEGMENT || e->type() == ElementType::PARTIAL_TIE_SEGMENT
-        || e->type() == ElementType::HAMMER_ON_PULL_OFF_SEGMENT);
+        || e->type() == ElementType::HAMMER_ON_PULL_OFF_SEGMENT || e->type() == ElementType::TAPPING_HALF_SLUR_SEGMENT);
     return (SlurTieSegment*)e;
 }
 
@@ -645,7 +652,7 @@ static inline const SlurTieSegment* toSlurTieSegment(const EngravingObject* e)
     assert(
         e == 0 || e->type() == ElementType::SLUR_SEGMENT || e->type() == ElementType::TIE_SEGMENT
         || e->type() == ElementType::LAISSEZ_VIB_SEGMENT || e->type() == ElementType::PARTIAL_TIE_SEGMENT
-        || e->type() == ElementType::HAMMER_ON_PULL_OFF_SEGMENT);
+        || e->type() == ElementType::HAMMER_ON_PULL_OFF_SEGMENT || e->type() == ElementType::TAPPING_HALF_SLUR_SEGMENT);
     return (const SlurTieSegment*)e;
 }
 
@@ -890,5 +897,8 @@ CONVERT(ShadowNote)
 CONVERT(HammerOnPullOff)
 CONVERT(HammerOnPullOffSegment)
 CONVERT(HammerOnPullOffText)
+CONVERT(Tapping)
+CONVERT(TappingHalfSlur)
+CONVERT(TappingHalfSlurSegment)
 #undef CONVERT
 }

src/engraving/dom/factory.cpp

@@ -102,6 +102,7 @@
 #include "systemlock.h"
 #include "systemtext.h"
 #include "soundflag.h"
+#include "tapping.h"
 #include "tempotext.h"
 #include "text.h"
 #include "textline.h"
@@ -164,6 +165,7 @@ EngravingItem* Factory::doCreateItem(ElementType type, EngravingItem* parent)
     case ElementType::GLISSANDO:         return new Glissando(parent);
     case ElementType::BRACKET:           return new Bracket(parent);
     case ElementType::ARTICULATION:      return new Articulation(parent->isChordRest() ? toChordRest(parent) : dummy->chord());
+    case ElementType::TAPPING:           return new Tapping(parent->isChordRest() ? toChordRest(parent) : dummy->chord());
     case ElementType::ORNAMENT:          return new Ornament(parent->isChordRest() ? toChordRest(parent) : dummy->chord());
     case ElementType::FERMATA:           return new Fermata(parent);
     case ElementType::CHORDLINE:         return new ChordLine(parent->isChord() ? toChord(parent) : dummy->chord());
@@ -292,6 +294,11 @@ EngravingItem* Factory::doCreateItem(ElementType type, EngravingItem* parent)
     case ElementType::FIGURED_BASS_ITEM:
     case ElementType::DUMMY:
     case ElementType::SYSTEM_LOCK_INDICATOR:
+    case ElementType::HAMMER_ON_PULL_OFF_SEGMENT:
+    case ElementType::HAMMER_ON_PULL_OFF_TEXT:
+    case ElementType::TAPPING_HALF_SLUR:
+    case ElementType::TAPPING_HALF_SLUR_SEGMENT:
+    case ElementType::TAPPING_TEXT:
         break;
     }
 
@@ -342,6 +349,9 @@ MAKE_ITEM_IMPL(Arpeggio, Chord)
 CREATE_ITEM_IMPL(Articulation, ElementType::ARTICULATION, ChordRest, isAccessibleEnabled)
 MAKE_ITEM_IMPL(Articulation, ChordRest)
 
+CREATE_ITEM_IMPL(Tapping, ElementType::TAPPING, ChordRest, isAccessibleEnabled)
+MAKE_ITEM_IMPL(Tapping, ChordRest)
+
 CREATE_ITEM_IMPL(Ornament, ElementType::ORNAMENT, ChordRest, isAccessibleEnabled)
 MAKE_ITEM_IMPL(Ornament, ChordRest)
 

src/engraving/dom/factory.h

@@ -26,6 +26,7 @@
 
 #include "engravingitem.h"
 #include "durationtype.h"
+#include "tapping.h"
 #include "types.h"
 
 namespace mu::engraving {
@@ -57,6 +58,9 @@ class Factory
     static Articulation* createArticulation(ChordRest* parent, bool isAccessibleEnabled = true);
     static std::shared_ptr<Articulation> makeArticulation(ChordRest* parent);
 
+    static Tapping* createTapping(ChordRest* parent, bool isAccessibleEnabled = true);
+    static std::shared_ptr<Tapping> makeTapping(ChordRest* parent);
+
     static Ornament* createOrnament(ChordRest* parent, bool isAccessibleEnabled = true);
     static std::shared_ptr<Ornament> makeOrnament(ChordRest* parent);