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

fix #271616: Fermata tempo is not applied when importing 2.X->3.0 score

Browse source
This commit is contained in:
alexandr 2018-09-05 15:17:49 +02:00
parent 8035689770
commit 8422a7d410
4 changed files with 39 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmscore/layout.cpp
View file

@ -2454,6 +2454,7 @@ void Score::getNextMeasure(LayoutContext& lc)
}
}
measure->computeTicks();
for (Segment& segment : measure->segments()) {
if (segment.isBreathType()) {
qreal length = 0.0;
@ -3857,6 +3858,9 @@ void Score::doLayoutRange(int stick, int etick)
lc.prevMeasure = 0;
// we need to reset tempo because fermata is setted
//inside getNextMeasure and it lead to twice timeStretch
fixTicks();
getNextMeasure(lc);
lc.curSystem = collectSystem(lc);

54
libmscore/measure.cpp
View file

@ -3518,29 +3518,7 @@ void Measure::stretchMeasure(qreal targetWidth)
{
bbox().setWidth(targetWidth);
//---------------------------------------------------
// compute minTick and set ticks for all segments
//---------------------------------------------------
int minTick = ticks();
if (minTick <= 0) {
qDebug("=====minTick %d measure %p", minTick, this);
}
Q_ASSERT(minTick > 0);
Segment* ns = first();
while (ns && !ns->enabled())
ns = ns->next();
while (ns) {
Segment* s = ns;
ns = s->nextEnabled();
int nticks = (ns ? ns->rtick() : ticks()) - s->rtick();
if (nticks) {
if (nticks < minTick)
minTick = nticks;
}
s->setTicks(nticks);
}
int minTick = computeTicks();
//---------------------------------------------------
// compute stretch
@ -3674,6 +3652,36 @@ void Measure::stretchMeasure(qreal targetWidth)
}
}
//---------------------------------------------------
// computeTicks
// set ticks for all segments
// return minTick
//---------------------------------------------------
int Measure::computeTicks() {
int minTick = ticks();
if (minTick <= 0) {
qDebug("=====minTick %d measure %p", minTick, this);
}
Q_ASSERT(minTick > 0);
Segment* ns = first();
while (ns && !ns->enabled())
ns = ns->next();
while (ns) {
Segment* s = ns;
ns = s->nextEnabled();
int nticks = (ns ? ns->rtick() : ticks()) - s->rtick();
if (nticks) {
if (nticks < minTick)
minTick = nticks;
}
s->setTicks(nticks);
}
return minTick;
}
//---------------------------------------------------------
// endBarLine
// return the first one

1
libmscore/measure.h
View file

@ -159,6 +159,7 @@ class Measure final : public MeasureBase {
void setUserStretch(qreal v) { _userStretch = v; }
void stretchMeasure(qreal stretch);
int computeTicks();
void layout2();
Chord* findChord(int tick, int track);

3
libmscore/read206.cpp
View file

@ -1665,6 +1665,9 @@ Element* readArticulation(ChordRest* cr, XmlReader& e)
el->readProperties300(e);
}
}
else if (tag == "timeStretch")
if (el && el->isFermata())
el->setProperty(Pid::TIME_STRETCH ,e.readDouble());
else {
if (!el) {
qDebug("not handled <%s>", qPrintable(tag.toString()));