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

fix #48406: cannot extend range past grace notes with keybaord

Browse source
This commit is contained in:
Marc Sabatella 2015-02-22 09:07:08 -07:00
parent d25a3d63b4
commit 96d6641d90
3 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmscore/cmd.cpp
View file

@ -1918,9 +1918,9 @@ Element* Score::selectMove(const QString& cmd)
ChordRest* el = 0;
if (cmd == "select-next-chord")
el = nextChordRest(cr);
el = nextChordRest(cr, true);
else if (cmd == "select-prev-chord")
el = prevChordRest(cr);
el = prevChordRest(cr, true);
else if (cmd == "select-next-measure")
el = nextMeasure(cr, true, true);
else if (cmd == "select-prev-measure")

23
libmscore/navigate.cpp
View file

@ -36,7 +36,7 @@ namespace Ms {
// return next Chord or Rest
//---------------------------------------------------------
ChordRest* nextChordRest(ChordRest* cr)
ChordRest* nextChordRest(ChordRest* cr, bool skipGrace)
{
if (!cr)
return 0;
@ -48,7 +48,10 @@ ChordRest* nextChordRest(ChordRest* cr)
Chord* c = static_cast<Chord*>(cr);
Chord* pc = static_cast<Chord*>(cr->parent());
if (cr->isGraceBefore()) {
if (skipGrace) {
cr = static_cast<ChordRest*>(cr->parent());
}
else if (cr->isGraceBefore()) {
QList<Chord*> cl = pc->graceNotesBefore();
auto i = std::find(cl.begin(), cl.end(), c);
if (i == cl.end())
@ -74,7 +77,7 @@ ChordRest* nextChordRest(ChordRest* cr)
else {
//
// cr is not a grace note
if (cr->type() == Element::Type::CHORD) {
if (cr->type() == Element::Type::CHORD && !skipGrace) {
Chord* c = static_cast<Chord*>(cr);
if (!c->graceNotes().empty()) {
QList<Chord*> cl = c->graceNotesAfter();
@ -90,7 +93,7 @@ ChordRest* nextChordRest(ChordRest* cr)
for (Segment* seg = cr->segment()->next1MM(st); seg; seg = seg->next1MM(st)) {
ChordRest* e = static_cast<ChordRest*>(seg->element(track));
if (e) {
if (e->type() == Element::Type::CHORD) {
if (e->type() == Element::Type::CHORD && !skipGrace) {
Chord* c = static_cast<Chord*>(e);
if (!c->graceNotes().empty()) {
QList<Chord*> cl = c->graceNotesBefore();
@ -108,9 +111,10 @@ ChordRest* nextChordRest(ChordRest* cr)
//---------------------------------------------------------
// prevChordRest
// return previous Chord or Rest
// if grace is true, include grace notes
//---------------------------------------------------------
ChordRest* prevChordRest(ChordRest* cr)
ChordRest* prevChordRest(ChordRest* cr, bool skipGrace)
{
if (!cr)
return 0;
@ -122,7 +126,10 @@ ChordRest* prevChordRest(ChordRest* cr)
Chord* c = static_cast<Chord*>(cr);
Chord* pc = static_cast<Chord*>(cr->parent());
if (cr->isGraceBefore()) {
if (skipGrace) {
cr = static_cast<ChordRest*>(cr->parent());
}
else if (cr->isGraceBefore()) {
QList<Chord*> cl = pc->graceNotesBefore();
auto i = std::find(cl.begin(), cl.end(), c);
if (i == cl.end())
@ -146,7 +153,7 @@ ChordRest* prevChordRest(ChordRest* cr)
else {
//
// cr is not a grace note
if (cr->type() == Element::Type::CHORD) {
if (cr->type() == Element::Type::CHORD && !skipGrace) {
Chord* c = static_cast<Chord*>(cr);
QList<Chord*> cl = c->graceNotesBefore();
if (!cl.isEmpty())
@ -159,7 +166,7 @@ ChordRest* prevChordRest(ChordRest* cr)
for (Segment* seg = cr->segment()->prev1MM(st); seg; seg = seg->prev1MM(st)) {
ChordRest* e = static_cast<ChordRest*>(seg->element(track));
if (e) {
if (e->type() == Element::Type::CHORD) {
if (e->type() == Element::Type::CHORD && !skipGrace) {
QList<Chord*> cl = static_cast<Chord*>(e)->graceNotesAfter();
if (!cl.isEmpty())
return cl.last();

4
libmscore/navigate.h
View file

@ -18,8 +18,8 @@ namespace Ms {
class ChordRest;
extern int pitch2y(int pitch, int enh, int clefOffset, int key, int& prefix, const char* tversatz);
extern ChordRest* nextChordRest(ChordRest* cr);
extern ChordRest* prevChordRest(ChordRest* cr);
extern ChordRest* nextChordRest(ChordRest* cr, bool skipGrace = false);
extern ChordRest* prevChordRest(ChordRest* cr, bool skipGrace = false);
} // namespace Ms