fix grace note layout

musescore · Jul 6, 2017 · d0a4afc · d0a4afc
1 parent dfa6ed0
commit d0a4afc
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 43 deletions.
diff --git a/libmscore/chord.cpp b/libmscore/chord.cpp
@@ -1436,8 +1436,6 @@ void Chord::layoutStem()
       // NON-TAB (or TAB with stems through staff)
       //
       if (_stem) {
-            // if (isGrace())
-            //      abort();
             if (_hook) {
                   _hook->layout();
                   QPointF p(_stem->hookPos());
@@ -2053,10 +2051,6 @@ void Chord::layoutPitched()
 
       for (Note* note : _notes)
             note->layout2();
-
-//      QRectF bb;
-//      processSiblings([&bb] (Element* e) { bb |= e->bbox().translated(e->pos()); } );
-//      setbbox(bb.translated(_spatium*2, 0));
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/chordrest.cpp b/libmscore/chordrest.cpp
@@ -1133,7 +1133,7 @@ QVariant ChordRest::propertyDefault(P_ID propertyId) const
 
 bool ChordRest::isGrace() const
       {
-      return isChord() && toChord(this)->noteType() != NoteType::NORMAL;
+      return isChord() && toChord(this)->isGrace();
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -2313,8 +2313,7 @@ void Score::getNextMeasure(LayoutContext& lc)
             Staff* staff           = Score::staff(staffIdx);
             const Drumset* drumset = staff->part()->instrument()->useDrumset() ? staff->part()->instrument()->drumset() : 0;
             AccidentalState as;      // list of already set accidentals for this measure
-            int tick = measure->tick();
-            as.init(staff->keySigEvent(tick), staff->clef(tick));
+            as.init(staff->keySigEvent(measure->tick()), staff->clef(measure->tick()));
 
             for (Segment& segment : measure->segments()) {
                   if (segment.isKeySigType()) {
@@ -2331,43 +2330,43 @@ void Score::getNextMeasure(LayoutContext& lc)
 
                         for (int t = track; t < endTrack; ++t) {
                               ChordRest* cr = segment.cr(t);
-                              if (cr) {
-                                    qreal m = staff->mag(segment.tick());
-                                    if (cr->small())
-                                          m *= score()->styleD(StyleIdx::smallNoteMag);
-
-                                    if (cr->isChord()) {
-                                          Chord* chord = toChord(cr);
-                                          for (Chord* c : chord->graceNotes()) {
-                                                c->setMag(m * score()->styleD(StyleIdx::graceNoteMag));
-                                                c->computeUp();
-                                                if (c->stemDirection() != Direction::AUTO)
-                                                      c->setUp(c->stemDirection() == Direction::UP);
-                                                else
-                                                      c->setUp(!(t % 2));
-                                                c->layoutStem1();
-                                                }
-                                          chord->cmdUpdateNotes(&as);
-                                          if (drumset) {
-                                                for (Note* note : chord->notes()) {
-                                                      int pitch = note->pitch();
-                                                      if (!drumset->isValid(pitch)) {
-                                                            // qDebug("unmapped drum note %d", pitch);
-                                                            }
-                                                      else if (!note->fixed()) {
-                                                            note->undoChangeProperty(P_ID::HEAD_GROUP, int(drumset->noteHead(pitch)));
-                                                            // note->setHeadGroup(drumset->noteHead(pitch));
-                                                            note->setLine(drumset->line(pitch));
-                                                            continue;
-                                                            }
+                              if (!cr)
+                                    continue;
+                              qreal m = staff->mag(segment.tick());
+                              if (cr->small())
+                                    m *= score()->styleD(StyleIdx::smallNoteMag);
+
+                              if (cr->isChord()) {
+                                    Chord* chord = toChord(cr);
+                                    chord->cmdUpdateNotes(&as);
+                                    for (Chord* c : chord->graceNotes()) {
+                                          c->setMag(m * score()->styleD(StyleIdx::graceNoteMag));
+                                          c->computeUp();
+                                          if (c->stemDirection() != Direction::AUTO)
+                                                c->setUp(c->stemDirection() == Direction::UP);
+                                          else
+                                                c->setUp(!(t % 2));
+                                          c->layoutStem1();
+                                          }
+                                    if (drumset) {
+                                          for (Note* note : chord->notes()) {
+                                                int pitch = note->pitch();
+                                                if (!drumset->isValid(pitch)) {
+                                                      // qDebug("unmapped drum note %d", pitch);
+                                                      }
+                                                else if (!note->fixed()) {
+                                                      note->undoChangeProperty(P_ID::HEAD_GROUP, int(drumset->noteHead(pitch)));
+                                                      // note->setHeadGroup(drumset->noteHead(pitch));
+                                                      note->setLine(drumset->line(pitch));
+                                                      continue;
                                                       }
                                                 }
-                                          chord->computeUp();
-                                          chord->layoutStem1();   // create stems needed to calculate spacing
-                                                                  // stem direction can change later during beam processing
                                           }
-                                    cr->setMag(m);
+                                    chord->computeUp();
+                                    chord->layoutStem1();   // create stems needed to calculate spacing
+                                                            // stem direction can change later during beam processing
                                     }
+                              cr->setMag(m);
                               }
                         }
                   else if (segment.isClefType()) {

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -199,7 +199,6 @@ void MeasureBaseList::insert(MeasureBase* fm, MeasureBase* lm)
 
 void MeasureBaseList::remove(MeasureBase* fm, MeasureBase* lm)
       {
-      printf("remove measures %p %p\n", fm, lm);
       --_size;
       for (MeasureBase* m = fm; m != lm; m = m->next())
             --_size;