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

Code review fixes

Browse source 
Move `m` up so that it can be reused; rename it to `measure`; inline `part`
This commit is contained in:
Casper Jeukendrup 2023-10-29 14:25:26 +01:00 committed by Igor Korsukov
parent c61f891683
commit 0a932d47cd
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/engraving/rendering/dev/chordlayout.cpp
View file

@ -2742,19 +2742,18 @@ void ChordLayout::layoutChords3(const MStyle& style, const std::vector<Chord*>&
void ChordLayout::getNoteListForDots(Chord* c, std::vector<Note*>& topDownNotes, std::vector<Note*>& bottomUpNotes,
std::vector<int>& anchoredDots)
{
bool hasVoices = c->measure()->hasVoices(c->vStaffIdx(), c->tick(), c->ticks());
Measure* measure = c->measure();
bool hasVoices = measure->hasVoices(c->vStaffIdx(), c->tick(), c->ticks());
bool hasCrossNotes = c->staffMove();
Measure* m = c->measure();
// Get the last track we need to check for cross staff notes.
// Either 1 stave away from the stave we are laying out or the bottom staff of the part
Part* part = c->part();
staff_idx_t partBottomStaff = part->endTrack() / VOICES;
staff_idx_t partBottomStaff = c->part()->endTrack() / VOICES;
track_idx_t lastVoice = std::min(c->vStaffIdx() + 2, partBottomStaff) * VOICES;
// Get bottom staff
if (!hasCrossNotes && partBottomStaff != c->vStaffIdx()) {
for (size_t i = (c->vStaffIdx() + 1) * VOICES; i < lastVoice; ++i) {
if (Chord* voiceChord = m->findChord(c->tick(), i)) {
if (Chord* voiceChord = measure->findChord(c->tick(), i)) {
if (voiceChord->vStaffIdx() == c->vStaffIdx()) {
hasCrossNotes = true;
break;
@ -2787,7 +2786,7 @@ void ChordLayout::getNoteListForDots(Chord* c, std::vector<Note*>& topDownNotes,
size_t firstVoice = c->staffMove() ? c->track() : c->track() - c->voice();
// Check staff below for moved chords (If staff below is available)
for (size_t i = firstVoice; i < lastVoice; ++i) {
if (Chord* voiceChord = m->findChord(c->tick(), i)) {
if (Chord* voiceChord = measure->findChord(c->tick(), i)) {
// Skip chords on adjacent staves which have not been moved to this staff
if (voiceChord->vStaffIdx() != c->vStaffIdx()) {
continue;