Skip to content

Commit 730b5cd

Browse files
committed
fix crescendo on whole note
1 parent 92fe705 commit 730b5cd

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

libmscore/edit.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,13 +1940,13 @@ Lyrics* Score::addLyrics()
19401940
// addHairpin
19411941
//---------------------------------------------------------
19421942

1943-
Hairpin* Score::addHairpin(bool decrescendo, int tickStart, int ticks, int track)
1943+
Hairpin* Score::addHairpin(bool decrescendo, int tickStart, int tickEnd, int track)
19441944
{
19451945
Hairpin* pin = new Hairpin(this);
19461946
pin->setHairpinType(decrescendo ? Hairpin::Type::DECRESCENDO : Hairpin::Type::CRESCENDO);
19471947
pin->setTrack(track);
19481948
pin->setTick(tickStart);
1949-
pin->setTicks(ticks);
1949+
pin->setTick2(tickEnd);
19501950
undoAddElement(pin);
19511951
return pin;
19521952
}

libmscore/score.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ class Score : public QObject {
965965
void removeSpanner(Spanner*);
966966
void addSpanner(Spanner*);
967967

968-
Hairpin* addHairpin(bool crescendo, int tickStart, int ticks, int track);
968+
Hairpin* addHairpin(bool crescendo, int tickStart, int tickEnd, int track);
969969

970970
ChordRest* findCR(int tick, int track) const;
971971
ChordRest* findCRinStaff(int tick, int track) const;

mscore/scoreview.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4153,9 +4153,7 @@ void ScoreView::cmdAddHairpin(bool decrescendo)
41534153
if (!cr1)
41544154
continue;
41554155
if (cr2 == 0)
4156-
cr2 = nextChordRest(cr1);
4157-
if (cr2 == 0)
4158-
continue;
4156+
cr2 = cr1;
41594157
_score->addHairpin(decrescendo, cr1->tick(), cr2->tick() + cr2->actualTicks(), cr1->track());
41604158
}
41614159
_score->endCmd();
@@ -4168,9 +4166,7 @@ void ScoreView::cmdAddHairpin(bool decrescendo)
41684166
if (!cr1)
41694167
return;
41704168
if (cr2 == 0)
4171-
cr2 = nextChordRest(cr1);
4172-
if (cr2 == 0)
4173-
return;
4169+
cr2 = cr1;
41744170

41754171
_score->startCmd();
41764172
Hairpin* pin = _score->addHairpin(decrescendo, cr1->tick(), cr2->tick() + cr2->actualTicks(), cr1->track());

0 commit comments

Comments
 (0)