fix: importPdf, boundingRect of ShadowNote

chenlung · Jul 25, 2013 · e9a3cd0 · e9a3cd0
1 parent 2bf086a
commit e9a3cd0
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 19 deletions.
diff --git a/libmscore/pedal.cpp b/libmscore/pedal.cpp
@@ -55,9 +55,13 @@ void Pedal::read(XmlReader& e)
             setBeginSymbol(noSym);
             setEndHook(false);
             }
-      if (e.name() == "subtype")          // obsolete
-            e.skipCurrentElement();
-      TextLine::read(e);
+      setId(e.intAttribute("id", -1));
+      while (e.readNextStartElement()) {
+            if (e.name() == "subtype")          // obsolete
+                  e.skipCurrentElement();
+            else if (!TextLine::readProperties(e))
+                  e.unknown();
+            }
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/shadownote.cpp b/libmscore/shadownote.cpp
@@ -86,15 +86,19 @@ void ShadowNote::layout()
             }
       QRectF b = sym->bbox(magS());
       qreal _spatium = spatium();
-      qreal x  = b.width()/2 - _spatium;
+      qreal x  = b.width() * .5 - _spatium;
       qreal lw = point(score()->styleS(ST_ledgerLineWidth));
 
-      if (_line < 100 && _line > -100) {
-            QRectF r(0, -lw/2.0, 2 * _spatium, lw);
+      qreal x1 = sym->width(magS())*.5 - (_spatium * mag()) - lw * .5;
+      qreal x2 = x1 + 2 * _spatium * mag() + lw * .5;
+
+      InputState ps = score()->inputState();
+      QRectF r(x1, -lw * .5, x2 - x1, lw);
+      if (_line < 100 && _line > -100 && !ps.rest) {
             for (int i = -2; i >= _line; i -= 2)
-                  b |= r.translated(QPointF(x, _spatium * .5 * (i - _line)));
+                  b |= r.translated(QPointF(0, _spatium * .5 * (i - _line)));
             for (int i = 10; i <= _line; i += 2)
-                  b |= r.translated(QPointF(x, _spatium * .5 * (i - _line)));
+                  b |= r.translated(QPointF(0, _spatium * .5 * (i - _line)));
             }
       setbbox(b);
       }

diff --git a/libmscore/xml.cpp b/libmscore/xml.cpp
@@ -76,7 +76,8 @@ int XmlReader::intAttribute(const char* s) const
 
 double XmlReader::doubleAttribute(const char* s) const
       {
-      return attributes().value(s).toString().toDouble();
+      QString value(attributes().value(s).toString());
+      return value.toDouble();
       }
 
 double XmlReader::doubleAttribute(const char* s, double _default) const

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -3006,10 +3006,10 @@ void ScoreView::dragScoreView(QMouseEvent* ev)
 void ScoreView::dragNoteEntry(QMouseEvent* ev)
       {
       QPointF p = toLogical(ev->pos());
-      _score->addRefresh(shadowNote->canvasBoundingRect());
+      QRectF r(shadowNote->canvasBoundingRect());
       setShadowNote(p);
-      _score->addRefresh(shadowNote->canvasBoundingRect());
-      _score->end();
+      r |= shadowNote->canvasBoundingRect();
+      update(toPhysical(r).adjusted(-2, -2, 2, 2));
       }
 
 //---------------------------------------------------------

diff --git a/omr/importpdf.cpp b/omr/importpdf.cpp
@@ -231,9 +231,9 @@ Score::FileError importPdf(Score* score, const QString& path)
       if (sp == 0.0)
             sp = 1.5;
       score->setSpatium(sp * MScore::DPMM);
-      score->style()->set(StyleVal(ST_lastSystemFillLimit, 0.0));
-      score->style()->set(StyleVal(ST_staffLowerBorder, 0.0));
-      score->style()->set(StyleVal(ST_measureSpacing, 1.0));
+      score->style()->set(ST_lastSystemFillLimit, 0.0);
+      score->style()->set(ST_staffLowerBorder, 0.0);
+      score->style()->set(ST_measureSpacing, 1.0);
 
       PageFormat pF;
       pF.copy(*score->pageFormat());
@@ -245,9 +245,9 @@ Score::FileError importPdf(Score* score, const QString& path)
       pF.setOddBottomMargin(0);
       score->setPageFormat(pF);
 
-      score->style()->set(StyleVal(ST_minSystemDistance,   Spatium(omr->systemDistance())));
-      score->style()->set(StyleVal(ST_maxSystemDistance,   Spatium(omr->systemDistance())));
-      score->style()->set(StyleVal(ST_akkoladeDistance,    Spatium(omr->staffDistance())));
+      score->style()->set(ST_minSystemDistance,   Spatium(omr->systemDistance()));
+      score->style()->set(ST_maxSystemDistance,   Spatium(omr->systemDistance()));
+      score->style()->set(ST_akkoladeDistance,    Spatium(omr->staffDistance()));
 
       Part* part   = new Part(score);
       Staff* staff = new Staff(score, part, 0);
@@ -276,7 +276,7 @@ Score::FileError importPdf(Score* score, const QString& path)
 
       //---create bracket
 
-      score->staff(0)->setBracket(0, BRACKET_AKKOLADE);
+      score->staff(0)->setBracket(0, BRACKET_BRACE);
       score->staff(0)->setBracketSpan(0, 2);
 
       score->setShowOmr(true);