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

Merge pull request #6093 from njvdberg/issue-279773-dublicated-articulations

Browse source 
Fix #279773 - Articulations are duplicated on adding linked staves, c…
This commit is contained in:
anatoly-os 2020-05-18 07:30:44 -07:00
parent edbececd40
commit 7be400bc34
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libmscore/excerpt.cpp
View file

@ -886,6 +886,10 @@ void Excerpt::cloneStaff(Staff* srcStaff, Staff* dstStaff)
ncr->lyrics().clear();
for (Element* e : seg->annotations()) {
if (!e) {
qDebug("cloneStaff: corrupted annotation found.");
continue;
}
if (e->generated() || e->systemFlag())
continue;
if (e->track() != srcTrack)
@ -901,6 +905,17 @@ void Excerpt::cloneStaff(Staff* srcStaff, Staff* dstStaff)
case ElementType::DYNAMIC:
case ElementType::LYRICS: // not normally segment-attached
continue;
case ElementType::FERMATA:
{
// Fermatas are special since the belong to a segment but should
// be created and linked on each staff.
Element* ne1 = e->linkedClone();
ne1->setTrack(dstTrack);
ne1->setParent(seg);
ne1->setScore(score);
score->undo(new AddElement(ne1));
continue;
}
default:
Element* ne1 = e->clone();
ne1->setTrack(dstTrack);
@ -931,7 +946,7 @@ void Excerpt::cloneStaff(Staff* srcStaff, Staff* dstStaff)
tie->setEndNote(nn);
}
else {
qDebug("cloneStave: cannot find tie");
qDebug("cloneStaff: cannot find tie");
}
}
// add back spanners (going back from end to start spanner element
@ -945,7 +960,7 @@ void Excerpt::cloneStaff(Staff* srcStaff, Staff* dstStaff)
score->addElement(newSp);
}
else {
qDebug("cloneStave: cannot find spanner start note");
qDebug("cloneStaff: cannot find spanner start note");
}
}
}
@ -1138,7 +1153,7 @@ void Excerpt::cloneStaff2(Staff* srcStaff, Staff* dstStaff, const Fraction& stic
tie->setEndNote(nn);
}
else {
qDebug("cloneStave: cannot find tie");
qDebug("cloneStaff2: cannot find tie");
}
}
}

5
mscore/instrdialog.cpp
View file

@ -295,7 +295,6 @@ void MuseScore::editInstrList()
masterScore->undo(new InsertPart(part, staffIdx));
pli->part = part;
QList<Staff*> linked;
for (int cidx = 0; pli->child(cidx); ++cidx) {
StaffListItem* sli = static_cast<StaffListItem*>(pli->child(cidx));
Staff* staff = new Staff(masterScore);
@ -311,10 +310,8 @@ void MuseScore::editInstrList()
++staffIdx;
Staff* linkedStaff = part->staves()->front();
if (sli->linked() && linkedStaff != staff) {
if (sli->linked() && linkedStaff != staff)
Excerpt::cloneStaff(linkedStaff, staff);
linked.append(staff);
}
}
//insert keysigs