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

Merge pull request #235 from Soerboe/fix3510

Browse source 
fix #3510 and better handling of timesigs when deleting measures
This commit is contained in:
Werner Schweer 2013-03-14 08:15:33 -07:00
commit 0d2c1748c4
1 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libmscore/edit.cpp
View file

@ -1233,6 +1233,7 @@ void Score::cmdDeleteSelectedMeasures()
else
ie = lastMeasure();
int endIdx = measureIdx(ie);
Measure* mBeforeSel = is->prevMeasure();
// createEndBar if last measure is deleted
bool createEndBar = false;
@ -1241,6 +1242,22 @@ void Score::cmdDeleteSelectedMeasures()
createEndBar = (iem == lastMeasure()) && (iem->endBarLineType() == END_BAR);
}
// get the last deleted timesig in order to restore after deletion
TimeSig* lastDeletedSig = 0;
for (MeasureBase* mb = ie;; mb = mb->prev()) {
if (mb->type() == Element::MEASURE) {
Measure* m = static_cast<Measure*>(mb);
Segment* sts = m->findSegment(Segment::SegTimeSig, m->tick());
if (sts) {
lastDeletedSig = static_cast<TimeSig*>(sts->element(0));
break;
}
}
if (mb == is)
break;
}
QList<Score*> scores = scoreList();
foreach(Score* score, scores) {
MeasureBase* is = score->measure(startIdx);
@ -1266,6 +1283,29 @@ void Score::cmdDeleteSelectedMeasures()
}
}
}
// insert correct timesig after deletion
Measure* mAfterSel = mBeforeSel ? mBeforeSel->nextMeasure() : firstMeasure();
if (mAfterSel && lastDeletedSig) {
bool changed = true;
if (mBeforeSel) {
if (mBeforeSel->timesig() == mAfterSel->timesig()) {
changed = false;
}
}
Segment* s = mAfterSel->findSegment(Segment::SegTimeSig, mAfterSel->tick());
if (!s && changed) {
Segment* ns = mAfterSel->undoGetSegment(Segment::SegTimeSig, mAfterSel->tick());
for (int staffIdx = 0; staffIdx < nstaves(); staffIdx++) {
TimeSig* nts = new TimeSig(this);
nts->setTrack(staffIdx * VOICES);
nts->setParent(ns);
nts->setSig(lastDeletedSig->sig(), lastDeletedSig->subtype());
undoAddElement(nts);
}
}
}
select(0, SELECT_SINGLE, 0);
_is.setSegment(0); // invalidate position
}