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

Merge pull request #15935 from Eism/score_corrupted_added_case

Browse source 
Added another case in which the score is considered corrupted
This commit is contained in:
Elnur Ismailzada 2023-01-23 08:21:19 +02:00 committed by GitHub
commit c07218674c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/engraving/libmscore/check.cpp
View file

@ -114,15 +114,23 @@ Ret Score::sanityCheck()
for (Measure* m = firstMeasure(); m; m = m->nextMeasure()) {
Fraction mLen = m->ticks();
size_t endStaff = staves().size();
for (size_t staffIdx = 0; staffIdx < endStaff; ++staffIdx) {
Rest* fmrest0 = 0; // full measure rest in voice 0
Fraction voices[VOICES];
#ifndef NDEBUG
m->setCorrupted(staffIdx, false);
#endif
for (Segment* s = m->first(SegmentType::ChordRest); s; s = s->next(SegmentType::ChordRest)) {
for (size_t v = 0; v < VOICES; ++v) {
ChordRest* cr = toChordRest(s->element(static_cast<int>(staffIdx) * VOICES + static_cast<int>(v)));
EngravingItem* element = s->element(static_cast<int>(staffIdx) * VOICES + static_cast<int>(v));
if (!element) {
continue;
}
ChordRest* cr = toChordRest(element);
if (cr == 0) {
continue;
}
@ -136,6 +144,21 @@ Ret Score::sanityCheck()
}
}
bool checkRepeats = m->isMeasureRepeatGroup(staffIdx);
bool repeatsIsValid = true;
if (checkRepeats) {
repeatsIsValid = m->measureRepeatElement(staffIdx) != nullptr;
}
if (!repeatsIsValid) {
errors << mtrc("engraving", u"<b>Corrupted measure</b>: Measure %1, Staff %2.")
.arg(mNumber).arg(staffIdx + 1);
#ifndef NDEBUG
m->setCorrupted(staffIdx, true);
#endif
}
if (voices[0] != mLen) {
errors << mtrc("engraving", u"<b>Incomplete measure</b>: Measure %1, Staff %2. Found: %3. Expected: %4.")
.arg(mNumber).arg(staffIdx + 1).arg(voices[0].toString(), mLen.toString());
@ -158,6 +181,7 @@ Ret Score::sanityCheck()
}
}
}
mNumber++;
}

2
src/engraving/libmscore/measure.cpp
View file

@ -3081,7 +3081,7 @@ MeasureRepeat* Measure::measureRepeatElement(staff_idx_t staffIdx) const
track_idx_t etrack = staff2track(staffIdx + 1);
for (track_idx_t track = strack; track < etrack; ++track) {
// should only be in first track, but just in case
for (Segment* s = m->first(SegmentType::ChordRest); s && s != m->last(); s = s->next(SegmentType::ChordRest)) {
for (Segment* s = m->first(SegmentType::ChordRest); s; s = s->next(SegmentType::ChordRest)) {
// should only be in first segment, but just in case
EngravingItem* e = s->element(track);
if (e && e->isMeasureRepeat()) {

5
src/engraving/libmscore/rendermidi.cpp
View file

@ -1139,9 +1139,14 @@ void MidiRenderer::renderStaffChunk(const Chunk& chunk, EventMap* events, const
if (m->isMeasureRepeatGroup(staffIdx)) {
MeasureRepeat* mr = m->measureRepeatElement(staffIdx);
Measure const* playMeasure = lastMeasure;
if (!playMeasure || !mr) {
continue;
}
for (int i = m->measureRepeatCount(staffIdx); i < mr->numMeasures() && playMeasure->prevMeasure(); ++i) {
playMeasure = playMeasure->prevMeasure();
}
int offset = (m->tick() - playMeasure->tick()).ticks();
collectMeasureEvents(events, playMeasure, sctx, tickOffset + offset);
} else {

15
src/engraving/libmscore/rest.cpp
View file

@ -1174,12 +1174,19 @@ void Rest::editDrag(EditData& editData)
bool Rest::shouldNotBeDrawn() const
{
const StaffType* st = staff() ? staff()->staffTypeForElement(this) : nullptr;
if (generated()
|| (st && st->isTabStaff() && (!st->showRests() || st->genDurations())
&& (!measure() || !measure()->isMMRest()))
|| (measure() && measure()->measureRepeatCount(staffIdx()))) {
if (generated()) {
return true;
}
if (st && st->isTabStaff() && (!st->showRests() || st->genDurations())
&& (!measure() || !measure()->isMMRest())) {
return true;
}
if (measure() && measure()->measureRepeatCount(staffIdx())) {
return true;
}
return false;
}