LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #474 from mgavioli/obey_multidigit_fret_nos_in_staff_linked_to_tab

Browse source 
Obey multi-digits fret nos. in staves linked to a TAB staff
This commit is contained in:
Maurizio M. Gavioli 2013-09-15 08:49:01 -07:00
commit ba833ba628
1 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libmscore/edit.cpp
View file

@ -682,7 +682,7 @@ void Score::putNote(const Position& p, bool replace)
const Instrument* instr = st->part()->instr(); const Instrument* instr = st->part()->instr();
MScore::Direction stemDirection = MScore::AUTO; MScore::Direction stemDirection = MScore::AUTO;
NoteVal nval; NoteVal nval;
Tablature* neck = 0; Tablature* stringData = 0;
StaffTypeTablature * tab = 0; StaffTypeTablature * tab = 0;
switch(st->staffType()->group()) { switch(st->staffType()->group()) {
@ -702,10 +702,10 @@ void Score::putNote(const Position& p, bool replace)
case TAB_STAFF_GROUP: { case TAB_STAFF_GROUP: {
if (_is.rest) if (_is.rest)
return; return;
neck = instr->tablature(); stringData = instr->tablature();
tab = (StaffTypeTablature*)st->staffType(); tab = (StaffTypeTablature*)st->staffType();
int string = tab->VisualStringToPhys(line); int string = tab->VisualStringToPhys(line);
if (string < 0 || string >= neck->strings()) if (string < 0 || string >= stringData->strings())
return; return;
// build a default NoteVal for that line // build a default NoteVal for that line
nval.string = string; nval.string = string;
@ -715,7 +715,7 @@ void Score::putNote(const Position& p, bool replace)
_is.setString(line); _is.setString(line);
nval.fret = 0; nval.fret = 0;
} }
nval.pitch = neck->getPitch(string, nval.fret); nval.pitch = stringData->getPitch(string, nval.fret);
break; break;
} }
@ -747,20 +747,31 @@ void Score::putNote(const Position& p, bool replace)
// if a note on same string already exists, update to new pitch/fret // if a note on same string already exists, update to new pitch/fret
foreach(Note * note, static_cast<Chord*>(cr)->notes()) foreach(Note * note, static_cast<Chord*>(cr)->notes())
if(note->string() == nval.string) { // if string is the same if(note->string() == nval.string) { // if string is the same
// if adding a new digit will keep fret number within fret limit // if adding a new digit will keep fret number within fret limit,
// add a digit // add a digit to existing fret number
if (neck && tab->useNumbers() && note->fret() >= 1) { if (stringData && tab->useNumbers() && note->fret() >= 1) {
int fret = note->fret() * 10 + nval.fret; int fret = note->fret() * 10 + nval.fret;
if (fret <= neck->frets() ) { if (fret <= stringData->frets() ) {
nval.fret = fret; nval.fret = fret;
nval.pitch = neck->getPitch(nval.string, nval.fret); nval.pitch = stringData->getPitch(nval.string, nval.fret);
} }
else else
qDebug("can't increase fret to %d", fret); qDebug("can't increase fret to %d", fret);
} }
// otherwise, replace with new fret // set fret number (orignal or combined) in all linked notes
note->undoChangeProperty(P_PITCH, nval.pitch); nval.tpc = pitch2tpc(nval.pitch, KEY_C, PREFER_NEAREST);
note->undoChangeProperty(P_FRET, nval.fret); foreach (Element* e, note->linkList()) {
Note* linkedNote = static_cast<Note*>(e);
Staff* staff = linkedNote->staff();
if (staff->isTabStaff()) {
(static_cast<Note*>(linkedNote))->undoChangeProperty(P_PITCH, nval.pitch);
(static_cast<Note*>(linkedNote))->undoChangeProperty(P_TPC, nval.tpc);
(static_cast<Note*>(linkedNote))->undoChangeProperty(P_FRET, nval.fret);
(static_cast<Note*>(linkedNote))->undoChangeProperty(P_STRING,nval.string);
}
else if (staff->isPitchedStaff())
undoChangePitch(linkedNote, nval.pitch, nval.tpc, linkedNote->line());
}
return; return;
} }
} }