Skip to content

[Tab Layout] Allow fingering string text to affect which tablature string is attempted to apply on a linked staff/tab staff #22254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jojo-Schmitz wants to merge 3 commits into from
Closed

[Tab Layout] Allow fingering string text to affect which tablature string is attempted to apply on a linked staff/tab staff #22254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9d89aa
Some more `const` parameters
Jojo-Schmitz Apr 8, 2024
a8d8629
[Tab Layout] Allow fingering string text to affect which tablature st…
worldwideweary Apr 8, 2024
b01426b
[Tablature] Make use of Capo Text in tab/linked tab scores.
worldwideweary Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/engraving/dom/stringdata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void StringData::set(const StringData& src)
// from highest (0) to lowest (strings()-1)
//---------------------------------------------------------

bool StringData::convertPitch(int pitch, Staff* staff, int* string, int* fret) const
bool StringData::convertPitch(int pitch, const Staff* staff, int* string, int* fret) const
{
return convertPitch(pitch, pitchOffsetAt(staff), string, fret);
}
Expand All @@ -105,7 +105,7 @@ bool StringData::convertPitch(int pitch, Staff* staff, int* string, int* fret) c
// Note: frets above max fret are accepted.
//---------------------------------------------------------

int StringData::getPitch(int string, int fret, Staff* staff) const
int StringData::getPitch(int string, int fret, const Staff* staff) const
{
return getPitch(string, fret, pitchOffsetAt(staff));
}
Expand All @@ -117,7 +117,7 @@ int StringData::getPitch(int string, int fret, Staff* staff) const
// Returns INVALID_FRET_INDEX if not possible
//---------------------------------------------------------

int StringData::fret(int pitch, int string, Staff* staff) const
int StringData::fret(int pitch, int string, const Staff* staff) const
{
return fret(pitch, string, pitchOffsetAt(staff));
}
Expand Down Expand Up @@ -303,7 +303,7 @@ int StringData::frettedStrings() const
// For string data calculations, pitch offset may depend on transposition, capos and, possibly, ottavas.
//---------------------------------------------------------

int StringData::pitchOffsetAt(Staff* staff)
int StringData::pitchOffsetAt(const Staff* staff)
{
return -(staff ? staff->part()->instrument()->transpose().chromatic : 0);
}
Expand Down
8 changes: 4 additions & 4 deletions src/engraving/dom/stringdata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ class StringData
bool isNull() const;

void set(const StringData& src);
bool convertPitch(int pitch, Staff* staff, int* string, int* fret) const;
int fret(int pitch, int string, Staff* staff) const;
bool convertPitch(int pitch, const Staff* staff, int* string, int* fret) const;
int fret(int pitch, int string, const Staff* staff) const;
void fretChords(Chord* chord) const;
int getPitch(int string, int fret, Staff* staff) const;
static int pitchOffsetAt(Staff* staff);
int getPitch(int string, int fret, const Staff* staff) const;
static int pitchOffsetAt(const Staff* staff);
size_t strings() const { return m_stringTable.size(); }
int frettedStrings() const;
const std::vector<instrString>& stringList() const { return m_stringTable; }
Expand Down
55 changes: 55 additions & 0 deletions src/engraving/rendering/dev/tlayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
#include "dom/ledgerline.h"
#include "dom/letring.h"
#include "dom/line.h"
#include "dom/linkedobjects.h"
#include "dom/lyrics.h"

#include "dom/marker.h"
Expand Down Expand Up @@ -4284,6 +4285,58 @@ void TLayout::layoutNote(const Note* item, Note::LayoutData* ldata)
}

const Staff* st = item->staff();
auto tick = item->chord()->segment()->tick();
auto stringData = item->staff()->part()->instrument(tick)->stringData();
auto scoreElement = item->links() ? item->links()->mainElement() : nullptr;
Note* staffNote = nullptr;
size_t maxStrings = stringData->strings();
int updatedString = item->string();
int updatedFret = item->fret();
if (scoreElement && scoreElement->isNote()) {
staffNote = toNote(scoreElement);
if (staffNote) {
// Handle String Text:
for (auto& e : staffNote->el()) {
if (e->isFingering()) {
if (auto fingering = toFingering(e)) {
if (fingering->textStyleType() == TextStyleType::STRING_NUMBER) {
int whichString = fingering->plainText().toInt();
if (whichString <= maxStrings && whichString >= 0) {
updatedString = whichString; // E.g: 1-6
updatedString -= 1; // E.g: 0-5 (internal representation)
updatedFret = stringData->fret(item->pitch(), updatedString, st);
}
}
}
}
}
const_cast<Note*>(item)->setString(updatedString);
const_cast<Note*>(item)->setFret(updatedFret);
}
}

// Handle Capo Text:
// (Can be on either clef or tab staff)
Staff* clefStaff = staffNote ? staffNote->staff() : nullptr;
const Staff* tabStaff = item->staff();
const Staff* staff = clefStaff ? clefStaff : tabStaff;
int capoPosition = staff->capo(tick).fretPosition;
if (capoPosition > 0) {
while (updatedFret < capoPosition) {
updatedString += 1;
updatedFret = stringData->fret(item->pitch(), updatedString, tabStaff);
if (updatedFret < 0 || updatedString > maxStrings) {
updatedFret = -1;
updatedString = item->string();
break;
} else if (updatedFret < capoPosition) {
continue;
}
}
const_cast<Note*>(item)->setString(updatedString);
const_cast<Note*>(item)->setFret(updatedFret);
}

const StaffType* tab = st->staffTypeForElement(item);
// not complete but we need systems to be laid out to add parenthesis
if (item->fixed()) {
Expand All @@ -4293,6 +4346,8 @@ void TLayout::layoutNote(const Note* item, Note::LayoutData* ldata)

if (item->negativeFretUsed()) {
const_cast<Note*>(item)->setFretString(u"-" + item->fretString());
} else if (item->fret() < 0) {
const_cast<Note*>(item)->setFretString(u"?");
}

if (item->displayFret() == Note::DisplayFretOption::ArtificialHarmonic) {
Expand Down