Skip to content

Commit 7f0f732

Browse files
committed
use Score::tick2measure instead of Score::measure
1 parent d6a89f6 commit 7f0f732

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/engraving/dom/utils.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -1582,7 +1582,7 @@ std::vector<Measure*> findFollowingRepeatMeasures(const Measure* measure)
15821582
const MasterScore* master = measure->masterScore();
15831583
const Score* score = measure->score();
15841584

1585-
const MeasureBase* masterMeasureBase = master->measure(measure->index());
1585+
const MeasureBase* masterMeasureBase = master->tick2measure(measure->tick());
15861586
const Measure* masterMeasure = masterMeasureBase && masterMeasureBase->isMeasure() ? toMeasure(masterMeasureBase) : nullptr;
15871587

15881588
const RepeatList& repeatList = master->repeatList(true, false);
@@ -1599,7 +1599,7 @@ std::vector<Measure*> findFollowingRepeatMeasures(const Measure* measure)
15991599
// Get next segment
16001600
const RepeatSegment* nextSeg = *nextSegIt;
16011601
const Measure* firstMasterMeasure = nextSeg->firstMeasure();
1602-
MeasureBase* firstMeasureBase = firstMasterMeasure ? score->measure(firstMasterMeasure->index()) : nullptr;
1602+
MeasureBase* firstMeasureBase = firstMasterMeasure ? score->tick2measure(firstMasterMeasure->tick()) : nullptr;
16031603
Measure* firstMeasure = firstMeasureBase && firstMeasureBase->isMeasure() ? toMeasure(firstMeasureBase) : nullptr;
16041604
if (!firstMeasure) {
16051605
continue;
@@ -1616,7 +1616,7 @@ std::vector<Measure*> findPreviousRepeatMeasures(const Measure* measure)
16161616
const MasterScore* master = measure->masterScore();
16171617
const Score* score = measure->score();
16181618

1619-
const MeasureBase* masterMeasureBase = master->measure(measure->index());
1619+
const MeasureBase* masterMeasureBase = master->tick2measure(measure->tick());
16201620
const Measure* masterMeasure = masterMeasureBase && masterMeasureBase->isMeasure() ? toMeasure(masterMeasureBase) : nullptr;
16211621

16221622
const RepeatList& repeatList = master->repeatList(true, false);
@@ -1633,7 +1633,7 @@ std::vector<Measure*> findPreviousRepeatMeasures(const Measure* measure)
16331633
// Get next segment
16341634
const RepeatSegment* prevSeg = *prevSegIt;
16351635
const Measure* lastMasterMeasure = prevSeg->lastMeasure();
1636-
MeasureBase* lastMeasureBase = lastMasterMeasure ? score->measure(lastMasterMeasure->index()) : nullptr;
1636+
MeasureBase* lastMeasureBase = lastMasterMeasure ? score->tick2measure(lastMasterMeasure->tick()) : nullptr;
16371637
Measure* lastMeasure = lastMeasureBase && lastMeasureBase->isMeasure() ? toMeasure(lastMeasureBase) : nullptr;
16381638
if (!lastMeasure) {
16391639
continue;
@@ -1677,10 +1677,10 @@ bool segmentsAreAdjacentInRepeatStructure(const Segment* firstSeg, const Segment
16771677
return true;
16781678
}
16791679

1680-
const MeasureBase* firstMasterMeasureBase = master->measure(firstMeasure->index());
1680+
const MeasureBase* firstMasterMeasureBase = master->tick2measure(firstMeasure->tick());
16811681
const Measure* firstMasterMeasure = firstMasterMeasureBase
16821682
&& firstMasterMeasureBase->isMeasure() ? toMeasure(firstMasterMeasureBase) : nullptr;
1683-
const MeasureBase* secondMasterMeasureBase = master->measure(secondMeasure->index());
1683+
const MeasureBase* secondMasterMeasureBase = master->tick2measure(secondMeasure->tick());
16841684
const Measure* secondMasterMeasure = secondMasterMeasureBase
16851685
&& secondMasterMeasureBase->isMeasure() ? toMeasure(secondMasterMeasureBase) : nullptr;
16861686

@@ -1738,10 +1738,10 @@ bool segmentsAreInDifferentRepeatSegments(const Segment* firstSeg, const Segment
17381738
return false;
17391739
}
17401740

1741-
const MeasureBase* firstMasterMeasureBase = master->measure(firstMeasure->index());
1741+
const MeasureBase* firstMasterMeasureBase = master->tick2measureBase(firstMeasure->tick());
17421742
const Measure* firstMasterMeasure = firstMasterMeasureBase
17431743
&& firstMasterMeasureBase->isMeasure() ? toMeasure(firstMasterMeasureBase) : nullptr;
1744-
const MeasureBase* secondMasterMeasureBase = master->measure(secondMeasure->index());
1744+
const MeasureBase* secondMasterMeasureBase = master->tick2measureBase(secondMeasure->tick());
17451745
const Measure* secondMasterMeasure = secondMasterMeasureBase
17461746
&& secondMasterMeasureBase->isMeasure() ? toMeasure(secondMasterMeasureBase) : nullptr;
17471747

0 commit comments

Comments
 (0)