fix some spanner bugs

libmscore/accidental.h

@@ -19,7 +19,6 @@
 */
 
 #include "element.h"
-#include "mscore.h"
 
 class QPainter;
 

libmscore/articulation.h

@@ -13,7 +13,6 @@
 #ifndef __ARTICULATION_H__
 #define __ARTICULATION_H__
 
-#include "mscore.h"
 #include "element.h"
 
 class QPainter;

libmscore/beam.h

@@ -15,7 +15,6 @@
 
 #include "element.h"
 #include "durationtype.h"
-#include "spanner.h"
 
 class QPainter;
 
@@ -24,6 +23,8 @@ namespace Ms {
 class ChordRest;
 class MuseScoreView;
 class Chord;
+class System;
+enum class SpannerSegmentType : char;
 
 struct BeamFragment;
 

libmscore/bracket.h

@@ -14,7 +14,6 @@
 #define __BRACKET_H__
 
 #include "element.h"
-#include "mscore.h"
 
 class QPainter;
 

libmscore/chord.cpp

@@ -942,10 +942,8 @@ void Chord::write(Xml& xml) const
             _glissando->write(xml);
       if (_tremolo && tremoloChordType() != TremoloChordType::TremoloSecondNote)
             _tremolo->write(xml);
-      for (Element* e : _el) {
-            if (e->type() != Element::Type::SLUR)
-                  e->write(xml);
-            }
+      for (Element* e : _el)
+            e->write(xml);
       for (auto i : score()->spanner()) {     // TODO: dont search whole list
             Spanner* s = i.second;
             if (s->generated() || s->type() != Element::Type::SLUR)

libmscore/chord.h

@@ -18,10 +18,7 @@
  Definition of classes Chord, HelpLine and NoteList.
 */
 
-#include <functional>
 #include "chordrest.h"
-#include "noteevent.h"
-#include <vector>
 
 class QPainter;
 

libmscore/layout.cpp

@@ -1375,6 +1375,13 @@ void Score::doLayout()
       for (Measure* m = firstMeasureMM(); m; m = m->nextMeasureMM())
             m->layout2();
 
+      for (auto s : _spanner.map()) {           // DEBUG
+            Spanner* sp = s.second;
+            if (sp->type() == Element::Type::SLUR) {
+                  sp->layout();
+                  }
+            }
+
       rebuildBspTree();
 
       for (MuseScoreView* v : viewer) {
@@ -1402,12 +1409,6 @@ void Score::layoutSpanner()
                         }
                   Chord* c = static_cast<Chord*>(segment->element(track));
                   if (c && c->type() == Element::Type::CHORD) {
-                        for (Chord* cc : c->graceNotes()) {
-                              for (Element* e : cc->el()) {
-                                    if (e->type() == Element::Type::SLUR)
-                                          e->layout();
-                                    }
-                              }
                         c->layoutStem();
                         for (Note* n : c->notes()) {
                               Tie* tie = n->tieFor();

libmscore/line.cpp

@@ -28,11 +28,6 @@ namespace Ms {
 //   LineSegment
 //---------------------------------------------------------
 
-LineSegment::LineSegment(Score* s)
-   : SpannerSegment(s)
-      {
-      }
-
 LineSegment::LineSegment(const LineSegment& s)
    : SpannerSegment(s)
       {
@@ -144,28 +139,15 @@ QPointF LineSegment::getGrip(int grip) const
       return p;
       }
 
-//---------------------------------------------------------
-//   pagePos
-//    return position in canvas coordinates
-//---------------------------------------------------------
-
-QPointF LineSegment::pagePos() const
-      {
-      QPointF pt(pos());
-      if (parent())
-            pt += parent()->pos();
-      return pt;
-      }
-
 //---------------------------------------------------------
 //   gripAnchor
 //    return page coordinates
 //---------------------------------------------------------
 
 QPointF LineSegment::gripAnchor(int grip) const
       {
+      qreal y = system()->staffYpage(staffIdx());
       if (spannerSegmentType() == SpannerSegmentType::MIDDLE) {
-            qreal y = system()->staffYpage(staffIdx());
             qreal x;
             switch((GripLine)grip) {
                   case GripLine::START:
@@ -189,6 +171,7 @@ QPointF LineSegment::gripAnchor(int grip) const
             else {
                   System* s;
                   QPointF p(line()->linePos((GripLine)grip, &s));
+                  p.ry() += y - system()->pos().y();
                   if (s)
                         p += s->pos();
                   return p;
@@ -318,6 +301,7 @@ bool LineSegment::edit(MuseScoreView* sv, int curGrip, int key, Qt::KeyboardModi
             _score->rebuildBspTree();
       if (ls)
             _score->undoRemoveElement(ls);
+
       return true;
       }
 
@@ -452,7 +436,7 @@ SLine::SLine(const SLine& s)
 
 //---------------------------------------------------------
 //   linePos
-//    return System() coordinates
+//    return System/Staff coordinates
 //---------------------------------------------------------
 
 QPointF SLine::linePos(GripLine grip, System** sys)
@@ -524,21 +508,15 @@ QPointF SLine::linePos(GripLine grip, System** sys)
                   {
                   System* s = static_cast<Note*>(startElement())->chord()->segment()->system();
                   *sys = s;
-                  if (grip == GripLine::START)
-                        return startElement()->pagePos() - s->pagePos();
-                  else
-                        return endElement()->pagePos() - s->pagePos();
+                  Element* e = grip == GripLine::START ? startElement() : endElement();
+                  return e->pagePos() - QPointF(s->pagePos().x(), s->staffYpage(e->staffIdx()));
                   }
 
             case Spanner::Anchor::CHORD:
                   qFatal("Sline::linePos(): anchor not implemented");
                   break;
             }
-      qreal y = 0.0;
-      if (*sys)
-            y = (*sys)->staffYpage(staffIdx()) - (*sys)->pos().y();
-//      x += (*sys)->pos().x();
-      return QPointF(x, y);
+      return QPointF(x, 0.0);
       }
 
 //---------------------------------------------------------

libmscore/line.h

@@ -61,13 +61,12 @@ class LineSegment : public SpannerSegment {
       virtual QPointF gripAnchor(int) const override;
 
    public:
-      LineSegment(Score* s);
+      LineSegment(Score* s) : SpannerSegment(s) {}
       LineSegment(const LineSegment&);
       virtual LineSegment* clone() const = 0;
       virtual void draw(QPainter*) const = 0;
       SLine* line() const                         { return (SLine*)spanner(); }
       virtual void spatiumChanged(qreal, qreal) override;
-      virtual QPointF pagePos() const override;
 
       friend class SLine;
       virtual void read(XmlReader&) override;

libmscore/ottava.cpp

@@ -56,11 +56,12 @@ static const OttavaDefault ottavaDefault[] = {
 void OttavaSegment::layout()
       {
       TextLineSegment::layout1();
-      if (parent()) {     // for palette
+      if (parent()) {
             qreal yo(score()->styleS(StyleIdx::ottavaY).val() * spatium());
             if (ottava()->placement() == Element::Placement::BELOW)
                   yo = -yo + staff()->height();
             rypos() += yo;
+            return;
             }
       adjustReadPos();
       }
@@ -175,6 +176,7 @@ Ottava::Ottava(Score* s)
       lineWidthStyle = PropertyStyle::STYLED;
       setLineStyle(Qt::PenStyle(score()->styleI(StyleIdx::ottavaLineStyle)));
       lineStyleStyle = PropertyStyle::STYLED;
+      setFlag(ElementFlag::ON_STAFF, true);
       }
 
 Ottava::Ottava(const Ottava& o)

libmscore/ottava.h

@@ -39,11 +39,10 @@ class OttavaSegment : public TextLineSegment {
    protected:
 
    public:
-      // OttavaSegment(Score* s) : TextLineSegment(s) { setFlag(ElementFlag::ON_STAFF, true); }
-      OttavaSegment(Score* s) : TextLineSegment(s) { }
+      OttavaSegment(Score* s) : TextLineSegment(s)  { }
       virtual Element::Type type() const override   { return Element::Type::OTTAVA_SEGMENT; }
       virtual OttavaSegment* clone() const override { return new OttavaSegment(*this); }
-      Ottava* ottava() const               { return (Ottava*)spanner(); }
+      Ottava* ottava() const                        { return (Ottava*)spanner(); }
       virtual void layout() override;
       virtual QVariant getProperty(P_ID propertyId) const override;
       virtual bool setProperty(P_ID propertyId, const QVariant&) override;

libmscore/score.cpp

@@ -1348,10 +1348,10 @@ void Score::addElement(Element* element)
             case Element::Type::HAIRPIN:
                   {
                   Spanner* spanner = static_cast<Spanner*>(element);
-                  addSpanner(spanner);
                   if (et == Element::Type::TEXTLINE && spanner->anchor() == Spanner::Anchor::NOTE)
                         break;
-                  foreach(SpannerSegment* ss, spanner->spannerSegments()) {
+                  addSpanner(spanner);
+                  for (SpannerSegment* ss : spanner->spannerSegments()) {
                         if (ss->system())
                               ss->system()->add(ss);
                         }
@@ -1486,6 +1486,8 @@ void Score::removeElement(Element* element)
             case Element::Type::HAIRPIN:
                   {
                   Spanner* spanner = static_cast<Spanner*>(element);
+                  if (et == Element::Type::TEXTLINE && spanner->anchor() == Spanner::Anchor::NOTE)
+                        break;
                   removeSpanner(spanner);
                   for (SpannerSegment* ss : spanner->spannerSegments()) {
                         if (ss->system())

libmscore/score.h

@@ -19,26 +19,19 @@
 */
 
 #include "input.h"
-#include "mscore.h"
-#include "style.h"
-#include "durationtype.h"
 #include "select.h"
-#include "fraction.h"
-#include "interval.h"
 #include "synthesizerstate.h"
 #include "mscoreview.h"
 #include "segment.h"
 #include "accidental.h"
-#include "note.h"
 #include "ottava.h"
 #include "spannermap.h"
-#include "pitchspelling.h"
-#include "beam.h"
 
 class QPainter;
 
 namespace Ms {
 
+class Interval;
 class TempoMap;
 struct TEvent;
 class SigEvent;

libmscore/scorefile.cpp

@@ -1268,9 +1268,9 @@ void Score::writeSegments(Xml& xml, int strack, int etrack,
                         }
                   foreach (Element* e, segment->annotations()) {
                         if (e->track() != track || e->generated()
-                            || (e->systemFlag() && !writeSystemElements)) {
-                            continue;
-                        }
+                           || (e->systemFlag() && !writeSystemElements)) {
+                              continue;
+                              }
                         if (needTick) {
                               xml.tag("tick", segment->tick() - xml.tickDiff);
                               xml.curTick = segment->tick();

libmscore/slur.cpp

@@ -613,6 +613,8 @@ void SlurSegment::layout(const QPointF& p1, const QPointF& p2)
                         }
                   }
             }
+      if (system() && staffIdx() != -1)
+            setPos(QPointF(0.0, -system()->staff(staffIdx())->y()));
       setbbox(path.boundingRect());
       adjustReadPos();
       }
@@ -1452,6 +1454,5 @@ void SlurTie::fixupSegments(unsigned nsegs)
                   }
             }
       }
-
 }
 

libmscore/spanner.cpp

@@ -33,7 +33,7 @@ QList<QPointF> Spanner::userOffsets;
 SpannerSegment::SpannerSegment(Score* s)
    : Element(s)
       {
-      setFlags(ElementFlag::MOVABLE | ElementFlag::SELECTABLE | ElementFlag::SEGMENT);
+      setFlags(ElementFlag::MOVABLE | ElementFlag::SELECTABLE | ElementFlag::SEGMENT | ElementFlag::ON_STAFF);
       setSpannerSegmentType(SpannerSegmentType::SINGLE);
       _spanner = 0;
       }

libmscore/textline.cpp

@@ -27,11 +27,6 @@ namespace Ms {
 //   TextLineSegment
 //---------------------------------------------------------
 
-TextLineSegment::TextLineSegment(Score* s)
-   : LineSegment(s)
-      {
-      }
-
 TextLineSegment::TextLineSegment(const TextLineSegment& seg)
    : LineSegment(seg)
       {
@@ -565,16 +560,6 @@ LineSegment* TextLine::createLineSegment()
       return new TextLineSegment(score());
       }
 
-//---------------------------------------------------------
-//   layout
-//    compute segments from tick() to _tick2
-//---------------------------------------------------------
-
-void TextLine::layout()
-      {
-      SLine::layout();
-      }
-
 //---------------------------------------------------------
 //   spatiumChanged
 //---------------------------------------------------------