Guitar dives #31292

mike-spa · 2025-12-01T10:55:35Z

Implements guitar dive notation.

Done:

New palette elements and icons for dives
New palette element for w/bar line
Center w/bar line between notation and tab staves
Support for standard dives and pre-dives, dips, scoops, slack
Support for layout on stave and above the stave
New style options for dives
Improved vertical alignement of TAB fret numbers to the notation stave, especially for grace notes. New options for aligning pre-bends and pre-dives to the grace note or to the main note.
Modified the property panel for dives

To do:

Support for adding bends and dives on the same notes

cbjeukendrup

I've looked through it relatively quickly (and I've assumed James will take a slightly deeper look at the engraving part than I did), and found a few boring comments; but generally looks good to me!

cbjeukendrup · 2025-12-18T02:51:13Z

src/notation/internal/notationuiactions.cpp

+    UiAction("dive",
+             mu::context::UiCtxProjectFocused,
+             mu::context::CTX_NOTATION_OPENED,
+             TranslatableString("action", "Dive"),


Maybe we should add a //: comment for each action, with a one-sentence explanation for translators, so that they know what these strings are about

cbjeukendrup · 2025-12-18T02:54:07Z

src/engraving/types/propertyvalue.h


    LH_TAPPING_SYMBOL,
    RH_TAPPING_SYMBOL,
+    VIBRATO_LINE_TYPE_TYPE,


Suggested change

VIBRATO_LINE_TYPE_TYPE,

VIBRATO_LINE_TYPE,

?

cbjeukendrup · 2025-12-18T03:06:14Z

src/engraving/types/types.h

-enum class VibratoType : unsigned char {
-    GUITAR_VIBRATO, GUITAR_VIBRATO_WIDE, VIBRATO_SAWTOOTH, VIBRATO_SAWTOOTH_WIDE
+enum class VibratoType : char {
+    NONE = -1,


There are some warnings about switches that don't handle NONE yet

cbjeukendrup · 2025-12-18T03:08:11Z

src/engraving/dom/guitarbend.cpp

+            while (note->tieBack() && note->tieBack()->startNote()) {
+                note = note->tieBack()->startNote();
+            }
+            GuitarBend* precedingBend = note->bendBack();


see MSVC warning: declaration of 'precedingBend' hides previous local declaration

cbjeukendrup · 2025-12-18T03:11:23Z

src/engraving/rendering/score/guitarbendlayout.cpp

+        item->mutldata()->setSymIds(SymIdList(symsCount, symId));
+        item->mutldata()->moveY(0.5 * item->symHeight(symId));
+        RectF bbox = item->symBbox(symId);
+        for (int i = 1; i < item->ldata()->symIds().size(); ++i) {


Suggested change

for (int i = 1; i < item->ldata()->symIds().size(); ++i) {

for (size_t i = 1; i < item->ldata()->symIds().size(); ++i) {

(compiler warning)

cbjeukendrup · 2025-12-18T03:20:43Z

src/notation/qml/MuseScore/NotationScene/internal/EditStyle/BendsPage.qml

+
+                    delegate: FlatRadioButton {
+                        width: 132
+                        height: 51


51 is a somewhat unusual value given that we tend to round to multiples of 4. But not very important

miiizen

Looking good to me! Spotted some trivial bits.
I like that we're reusing the guitar bend class. I think the only problem with that will be separating bends and dives in the DOM.

miiizen · 2025-12-18T08:24:48Z

src/engraving/rendering/score/guitardivelayout.cpp

+    bendText->setPos(PointF(vertex.x() - 0.5 * bendText->width(), bbox.top() - verticalTextPad - bendText->height()));
+}
+
+void GuitarDiveLayout::layoutScoop(GuitarBendSegment* item, LayoutContext& ctx)


Compiler warning - ctx unused

miiizen · 2025-12-18T08:27:10Z

src/engraving/rendering/score/guitardivelayout.cpp

+        return;
+    }
+
+    SymId scoopSym = SymId::guitarVibratoBarScoop;


Suggested change

SymId scoopSym = SymId::guitarVibratoBarScoop;

const SymId scoopSym = SymId::guitarVibratoBarScoop;

miiizen · 2025-12-18T08:46:41Z

src/engraving/rendering/score/systemlayout.cpp

    return prevStaffIdx != muse::nidx && mmRest->score()->staff(prevStaffIdx)->part() == itemPart;
 }

+bool SystemLayout::whammyBarShouldBeCenteredBetweenStaved(const WhammyBarSegment* wbar, const System* system)


Suggested change

bool SystemLayout::whammyBarShouldBeCenteredBetweenStaved(const WhammyBarSegment* wbar, const System* system)

bool SystemLayout::whammyBarShouldBeCenteredBetweenStaves(const WhammyBarSegment* wbar, const System* system)

miiizen · 2025-12-18T08:55:49Z

src/engraving/rendering/score/guitarbendlayout.cpp

+        item->mutldata()->setSymIds(SymIdList(symsCount, symId));
+        item->mutldata()->moveY(0.5 * item->symHeight(symId));
+        RectF bbox = item->symBbox(symId);
+        for (int i = 1; i < item->ldata()->symIds().size(); ++i) {


Suggested change

for (int i = 1; i < item->ldata()->symIds().size(); ++i) {

for (size_t i = 1; i < item->ldata()->symIds().size(); ++i) {

miiizen · 2025-12-18T08:59:02Z

src/inspector/qml/MuseScore/Inspector/notation/bends/BendSettings.qml

+
+    FlatRadioButtonGroupPropertyView {
+        id: holdLineStyle
+        visible: root.model && root.model.isHoldLine


This should also be disabled when the preceding bend is a dip, as the hold line will be using the vibrato symbols.

mike-spa force-pushed the dives branch 7 times, most recently from d3759e2 to 22db964 Compare December 9, 2025 09:35

mike-spa force-pushed the dives branch 2 times, most recently from 18c8ddb to 87a1af7 Compare December 15, 2025 13:55

mike-spa requested review from cbjeukendrup and miiizen December 15, 2025 15:57

cbjeukendrup reviewed Dec 18, 2025

View reviewed changes

miiizen reviewed Dec 18, 2025

View reviewed changes

mike-spa added 17 commits December 18, 2025 11:38

Guitar dives

925fcca

Updates

9d33bdc

Rebase correction

40f66fa

Add parenthesis on end not when full release

6ad701f

Fix fretting not updated on transpose

671ee95

Fix position of return point

ff3542a

Fix direction of dive interval number

7800551

Improve logic for force-show parenthesized fret

8585ba9

Don't enter grace bend when entering dive on grace note

8c685c7

Improve position of scoop

d403068

Improve layout when crossing system

45ec88c

Only one dive line on TAB staves

d7a0756

Rename style page

b9a69dd

Fix error for horizontal collision checks

39fc369

Limit searching for previous bend segment to same sytem

c95b849

Scoop corrections

499fcdc

Fix vibrato line issues

ef1678e

mike-spa added 11 commits December 18, 2025 11:38

Fix string not refretted when has octave line

f1b9701

Show parenthesised fret when dive continues at start of system

3e8d7bc

Predive correction

389bbf1

Fix interactions when deleting pre-bend and undo

834fbbd

Rename text style to "Bends and Dives"

44793e4

Allow inserting only one dip per chord

714f6be

Vibrato line ignore bend in skyline

90c0309

Allow edit line style for Hold

e69668b

Don't layout hold line if not top note in tab

eae5911

codestyle

eadf424

Fix utests

04579e5

mike-spa force-pushed the dives branch from a2cc84b to 0cb420d Compare December 18, 2025 11:14

Code review fixes

b4f2847

mike-spa force-pushed the dives branch from 0cb420d to b4f2847 Compare December 18, 2025 13:10

	for (int i = 1; i < item->ldata()->symIds().size(); ++i) {
	for (size_t i = 1; i < item->ldata()->symIds().size(); ++i) {

	SymId scoopSym = SymId::guitarVibratoBarScoop;
	const SymId scoopSym = SymId::guitarVibratoBarScoop;

	bool SystemLayout::whammyBarShouldBeCenteredBetweenStaved(const WhammyBarSegment* wbar, const System* system)
	bool SystemLayout::whammyBarShouldBeCenteredBetweenStaves(const WhammyBarSegment* wbar, const System* system)

Guitar dives #31292

Are you sure you want to change the base?

Guitar dives #31292

Conversation

mike-spa commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cbjeukendrup left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

miiizen left a comment

Choose a reason for hiding this comment

Uh oh!

miiizen Dec 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mike-spa commented Dec 1, 2025 •

edited

Loading

miiizen Dec 18, 2025 •

edited

Loading