Skip to content

Commit 1703fa3

Browse files
committed
Remove old hack
1 parent 86bd8e3 commit 1703fa3

File tree

1 file changed

+8
-18
lines changed

1 file changed

+8
-18
lines changed

src/engraving/rw/read460/measureread.cpp

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,6 @@ void MeasureRead::readVoice(Measure* measure, XmlReader& e, ReadContext& ctx, in
430430
TRead::read(expr, e, ctx);
431431
segment->add(expr);
432432
} else if (tag == "Harmony") {
433-
// hack - getSegment needed because tick tags are unreliable in 1.3 scores
434-
// for symbols attached to anything but a measure
435433
segment = measure->getSegment(SegmentType::ChordRest, ctx.tick());
436434
Harmony* el = Factory::createHarmony(segment);
437435

@@ -442,8 +440,6 @@ void MeasureRead::readVoice(Measure* measure, XmlReader& e, ReadContext& ctx, in
442440
}
443441
segment->add(el);
444442
} else if (tag == "FretDiagram") {
445-
// hack - getSegment needed because tick tags are unreliable in 1.3 scores
446-
// for symbols attached to anything but a measure
447443
segment = measure->getSegment(SegmentType::ChordRest, ctx.tick());
448444
FretDiagram* el = Factory::createFretDiagram(segment);
449445

@@ -454,8 +450,6 @@ void MeasureRead::readVoice(Measure* measure, XmlReader& e, ReadContext& ctx, in
454450
}
455451
segment->add(el);
456452
} else if (tag == "TremoloBar") {
457-
// hack - getSegment needed because tick tags are unreliable in 1.3 scores
458-
// for symbols attached to anything but a measure
459453
segment = measure->getSegment(SegmentType::ChordRest, ctx.tick());
460454
TremoloBar* el = Factory::createTremoloBar(segment);
461455
el->setTrack(ctx.track());
@@ -465,8 +459,6 @@ void MeasureRead::readVoice(Measure* measure, XmlReader& e, ReadContext& ctx, in
465459
}
466460
segment->add(el);
467461
} else if (tag == "Symbol") {
468-
// hack - getSegment needed because tick tags are unreliable in 1.3 scores
469-
// for symbols attached to anything but a measure
470462
segment = measure->getSegment(SegmentType::ChordRest, ctx.tick());
471463
Symbol* el = Factory::createSymbol(segment);
472464

@@ -477,9 +469,7 @@ void MeasureRead::readVoice(Measure* measure, XmlReader& e, ReadContext& ctx, in
477469
}
478470
segment->add(el);
479471
} else if (tag == "Tempo") {
480-
// hack - getSegment needed because tick tags are unreliable in 1.3 scores
481-
// for symbols attached to anything but a measure
482-
segment = measure->getSegment(SegmentType::ChordRest, ctx.tick());
472+
segment = measure->getChordRestOrTimeTickSegment(ctx.tick());
483473
TempoText* el = Factory::createTempoText(segment);
484474

485475
el->setTrack(ctx.track());
@@ -489,9 +479,7 @@ void MeasureRead::readVoice(Measure* measure, XmlReader& e, ReadContext& ctx, in
489479
}
490480
segment->add(el);
491481
} else if (tag == "StaffText") {
492-
// hack - getSegment needed because tick tags are unreliable in 1.3 scores
493-
// for symbols attached to anything but a measure
494-
segment = measure->getSegment(SegmentType::ChordRest, ctx.tick());
482+
segment = measure->getChordRestOrTimeTickSegment(ctx.tick());
495483
StaffText* el = Factory::createStaffText(segment);
496484
el->setTrack(ctx.track());
497485
TRead::read(el, e, ctx);
@@ -510,10 +498,12 @@ void MeasureRead::readVoice(Measure* measure, XmlReader& e, ReadContext& ctx, in
510498
|| tag == "FiguredBass"
511499
|| tag == "HarpPedalDiagram"
512500
) {
513-
// hack - getSegment needed because tick tags are unreliable in 1.3 scores
514-
// for symbols attached to anything but a measure
515-
segment = measure->getSegment(SegmentType::ChordRest, ctx.tick());
516-
EngravingItem* el = Factory::createItemByName(tag, segment);
501+
EngravingItem* el = Factory::createItemByName(tag, ctx.dummy());
502+
if (el->allowTimeAnchor()) {
503+
segment = measure->getChordRestOrTimeTickSegment(ctx.tick());
504+
} else {
505+
segment = measure->getSegment(SegmentType::ChordRest, ctx.tick());
506+
}
517507

518508
el->setTrack(ctx.track());
519509
TRead::readItem(el, e, ctx);

0 commit comments

Comments
 (0)