Guitar dives

Author: mike-spa

src/engraving/compat/midi/compatmidirenderinternal.cpp

@@ -336,7 +336,7 @@ static bool shouldProceedBend(const Note* note)
     const Note* baseNote = bendFor->startNoteOfChain();
 
     const GuitarBend* firstBend = baseNote->bendFor();
-    if (firstBend && firstBend->type() == GuitarBendType::PRE_BEND) {
+    if (firstBend && firstBend->bendType() == GuitarBendType::PRE_BEND) {
         const Note* nextNote = firstBend->endNote();
         if (nextNote) {
             baseNote = nextNote;
@@ -382,7 +382,7 @@ static std::unordered_map<const Note*, int> getGraceNoteBendDurations(const Note
     const Note* bendStartNote = nullptr;
     std::unordered_set<const Note*> currentNotes;
 
-    if (note->bendFor() && note->bendFor()->type() == GuitarBendType::SLIGHT_BEND) {
+    if (note->bendFor() && note->bendFor()->bendType() == GuitarBendType::SLIGHT_BEND) {
         return {};
     }
 
@@ -455,7 +455,7 @@ static void collectGuitarBend(const Note* note,
     int quarterOffsetFromStartNote = 0;
     int currentQuarterTones = 0;
 
-    if (note->bendFor()->type() == GuitarBendType::GRACE_NOTE_BEND) {
+    if (note->bendFor()->bendType() == GuitarBendType::GRACE_NOTE_BEND) {
         curPitchBendSegmentStart -= graceOffset;
     }
 
@@ -823,7 +823,7 @@ static void collectNote(EventsHolder& events, const Note* note, const CollectNot
         }
 
         // skipping the notes which are connected by bends
-        if (bendBack && bendBack->type() != GuitarBendType::PRE_BEND && i == 0) {
+        if (bendBack && bendBack->bendType() != GuitarBendType::PRE_BEND && i == 0) {
             continue;
         }
 
@@ -1087,7 +1087,7 @@ void CompatMidiRendererInternal::collectGraceBeforeChordEvents(Chord* chord, Cho
         for (Chord* c : grChords) {
             for (const Note* note : c->notes()) {
                 GuitarBend* bendFor = note->bendFor();
-                if (bendFor && bendFor->type() == GuitarBendType::PRE_BEND) {
+                if (bendFor && bendFor->bendType() == GuitarBendType::PRE_BEND) {
                     continue;
                 }
 
@@ -1096,7 +1096,7 @@ void CompatMidiRendererInternal::collectGraceBeforeChordEvents(Chord* chord, Cho
                 params.velocityMultiplier = veloMultiplier;
                 params.tickOffset = tickOffset;
 
-                bool isGraceBend = (note->bendFor() && note->bendFor()->type() == GuitarBendType::GRACE_NOTE_BEND);
+                bool isGraceBend = (note->bendFor() && note->bendFor()->bendType() == GuitarBendType::GRACE_NOTE_BEND);
                 if (prevChord) {
                     params.previousChordTicks = prevChord->actualTicks().ticks();
                 }

src/engraving/dom/actionicon.h

@@ -64,6 +64,11 @@ enum class ActionIconType : signed char {
     GRACE_NOTE_BEND,
     SLIGHT_BEND,
 
+    DIVE,
+    PRE_DIVE,
+    DIP,
+    SCOOP,
+
     NOTE_ANCHORED_LINE,
 
     SYSTEM_LOCK,

src/engraving/dom/chord.cpp

@@ -2215,7 +2215,8 @@ bool Chord::isPreBendOrGraceBendStart() const
 
     for (const Note* note : m_notes) {
         GuitarBend* gb = note->bendFor();
-        if (gb && (gb->type() == GuitarBendType::PRE_BEND || gb->type() == GuitarBendType::GRACE_NOTE_BEND)) {
+        if (gb && (gb->bendType() == GuitarBendType::PRE_BEND || gb->bendType() == GuitarBendType::GRACE_NOTE_BEND
+                   || gb->bendType() == GuitarBendType::PRE_DIVE)) {
             return true;
         }
     }
@@ -2231,65 +2232,14 @@ bool Chord::isGraceBendEnd() const
 
     for (const Note* note : m_notes) {
         GuitarBend* bendBack = note->bendBack();
-        if (bendBack && bendBack->type() == GuitarBendType::GRACE_NOTE_BEND) {
+        if (bendBack && bendBack->bendType() == GuitarBendType::GRACE_NOTE_BEND) {
             return true;
         }
     }
 
     return false;
 }
 
-bool Chord::preOrGraceBendSpacingExceptionInTab() const
-{
-    if (!staffType()->isTabStaff() || !isGrace()) {
-        return false;
-    }
-
-    std::vector<GuitarBend*> bends;
-    for (Note* note : m_notes) {
-        GuitarBend* bendFor = note->bendFor();
-        if (bendFor) {
-            GuitarBendType bendType = bendFor->type();
-            if (bendType == GuitarBendType::PRE_BEND || bendType == GuitarBendType::GRACE_NOTE_BEND) {
-                bends.push_back(bendFor);
-                break;
-            }
-        }
-    }
-
-    if (bends.empty() || bends.size() < m_notes.size()) {
-        return false;
-    }
-
-    Chord* endChord = bends.front()->endNote()->chord();
-    if (!endChord) {
-        return false;
-    }
-
-    GuitarBendType type = bends.front()->type();
-    for (GuitarBend* gb : bends) {
-        if (gb->type() != type || (gb->endNote() && gb->endNote()->chord() != endChord)) {
-            return false;
-        }
-    }
-
-    if (type == GuitarBendType::PRE_BEND) {
-        return true;
-    }
-
-    for (Note* note : endChord->notes()) {
-        GuitarBend* bendBack = note->bendBack();
-        if (bendBack) {
-            Note* startNote = bendBack->startNote();
-            if (!startNote || startNote->chord() != this) {
-                return false;
-            }
-        }
-    }
-
-    return bends.size() < endChord->notes().size();
-}
-
 void Chord::setIsTrillCueNote(bool v)
 {
     m_isTrillCueNote = v;

src/engraving/dom/chord.h

@@ -239,7 +239,6 @@ class Chord final : public ChordRest
 
     bool isPreBendOrGraceBendStart() const;
     bool isGraceBendEnd() const;
-    bool preOrGraceBendSpacingExceptionInTab() const;
 
     bool isTrillCueNote() const { return m_isTrillCueNote; }
     void setIsTrillCueNote(bool v);

src/engraving/dom/engravingobject.cpp

@@ -732,7 +732,7 @@ bool EngravingObject::isSLineSegment() const
     return isHairpinSegment() || isOttavaSegment() || isPedalSegment()
            || isTrillSegment() || isVoltaSegment() || isTextLineSegment()
            || isGlissandoSegment() || isLetRingSegment() || isVibratoSegment() || isPalmMuteSegment()
-           || isGradualTempoChangeSegment();
+           || isGradualTempoChangeSegment() || isWhammyBarSegment();
 }
 
 //---------------------------------------------------------

src/engraving/dom/excerpt.cpp

@@ -1598,7 +1598,7 @@ void Excerpt::cloneStaff2(Staff* srcStaff, Staff* dstStaff, const Fraction& star
                                 nn->addSpannerBack(newBend);
                             }
                             GuitarBend* bendFor = on->bendFor();
-                            if (bendFor && bendFor->type() == GuitarBendType::SLIGHT_BEND) {
+                            if (bendFor && bendFor->bendType() == GuitarBendType::SLIGHT_BEND) {
                                 // Because slight bends aren't detected as "bendBack"
                                 GuitarBend* newBend = toGuitarBend(bendFor->linkedClone());
                                 newBend->setScore(score);