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

fix #12960

Browse source
This commit is contained in:
Bartlomiej Lewandowski 2014-07-27 11:15:46 +02:00
parent 25da8328df
commit 920a89ddd9
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libmscore/cmd.cpp
View file

@ -729,13 +729,23 @@ Fraction Score::makeGap(Segment* segment, int track, const Fraction& _sd, Tuplet
bool Score::makeGap1(int tick, int staffIdx, Fraction len)
{
ChordRest* cr = 0;
Segment* seg = tick2segment(tick, true, Segment::Type::ChordRest);
if (!seg) {
qDebug("1:makeGap1: no segment at %d", tick);
return false;
}
int track = staffIdx * VOICES;
int strack = staffIdx * VOICES;
for (int track = strack; track < strack + 4; track++) {
bool result = makeGapVoice(seg, track, len, tick);
if(track == strack && !result)
return false;
}
return true;
}
bool Score::makeGapVoice(Segment* seg, int track, Fraction len, int tick)
{
ChordRest* cr = 0;
cr = static_cast<ChordRest*>(seg->element(track));
if (!cr) {
// check if we are in the middle of a chord/rest
@ -761,7 +771,6 @@ bool Score::makeGap1(int tick, int staffIdx, Fraction len)
return false;
}
if (seg1->element(track)) {
tick = seg1->tick();
cr = static_cast<ChordRest*>(seg1->element(track));
break;
}

1
libmscore/score.h
View file

@ -546,6 +546,7 @@ class Score : public QObject {
Fraction makeGap(Segment*, int track, const Fraction&, Tuplet*, bool keepChord = false);
bool makeGap1(int tick, int staffIdx, Fraction len);
bool makeGapVoice(Segment* seg, int track, Fraction len, int tick);
Rest* addRest(int tick, int track, TDuration, Tuplet*);
Rest* addRest(Segment* seg, int track, TDuration d, Tuplet*);