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

fix #24223: rests outside staff should show ledger lines

Browse source
This commit is contained in:
lasconic 2014-03-15 12:32:58 +01:00
parent 1175da6303
commit f046cd7020
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmscore/element.h
View file

@ -363,7 +363,7 @@ class Element : public QObject {
qreal canvasX() const;
const QPointF& userOff() const { return _userOff; }
void setUserOff(const QPointF& o) { _userOff = o; }
virtual void setUserOff(const QPointF& o) { _userOff = o; }
void setUserXoffset(qreal v) { _userOff.setX(v); }
void setUserYoffset(qreal v) { _userOff.setY(v); }

34
libmscore/rest.cpp
View file

@ -119,27 +119,27 @@ void Rest::draw(QPainter* painter) const
}
//---------------------------------------------------------
// setUserOffset
// setUserOff, overriden from Element
// - raster vertical position in spatium units
// - half rests and whole rests outside the staff are
// replaced by special symbols with ledger lines
//---------------------------------------------------------
void Rest::setUserOffset(qreal x, qreal y)
void Rest::setUserOff(const QPointF& o)
{
qreal _spatium = spatium();
int line = lrint(y/_spatium);
#if 0
if (_sym == wholerestSym && (line <= -2 || line >= 3))
_sym = outsidewholerestSym;
else if (_sym == outsidewholerestSym && (line > -2 && line < 4))
_sym = wholerestSym;
else if (_sym == halfrestSym && (line <= -3 || line >= 3))
_sym = outsidehalfrestSym;
else if (_sym == outsidehalfrestSym && (line > -3 && line < 3))
_sym = halfrestSym;
#endif
setUserOff(QPointF(x, qreal(line) * _spatium));
int line = lrint(o.y()/_spatium);
if (_sym == SymId::restWhole && (line <= -2 || line >= 3))
_sym = SymId::restWholeLegerLine;
else if (_sym == SymId::restWholeLegerLine && (line > -2 && line < 4))
_sym = SymId::restWhole;
else if (_sym == SymId::restHalf && (line <= -3 || line >= 3))
_sym = SymId::restHalfLegerLine;
else if (_sym == SymId::restHalfLegerLine && (line > -3 && line < 3))
_sym = SymId::restHalf;
Element::setUserOff(QPointF(o.x(), qreal(line) * _spatium));
}
//---------------------------------------------------------
@ -155,7 +155,7 @@ QRectF Rest::drag(EditData* data)
static const qreal xDragRange = spatium() * 5;
if (fabs(s.x()) > xDragRange)
s.rx() = xDragRange * (s.x() < 0 ? -1.0 : 1.0);
setUserOffset(s.x(), s.y());
setUserOff(QPointF(s.x(), s.y()));
layout();
score()->rebuildBspTree();
return abbox() | r;
@ -268,9 +268,9 @@ SymId Rest::getSymbol(TDuration::DurationType type, int line, int lines, int* yo
// fall trough
case TDuration::V_WHOLE:
*yoffset = 1;
return (line <= -2 || line >= (lines - 1)) ? SymId::restWhole : SymId::restWhole;
return (line <= -2 || line >= (lines - 1)) ? SymId::restWholeLegerLine : SymId::restWhole;
case TDuration::V_HALF:
return (line <= -3 || line >= (lines - 2)) ? SymId::restHalf : SymId::restHalf;
return (line <= -3 || line >= (lines - 2)) ? SymId::restHalfLegerLine : SymId::restHalf;
case TDuration::V_QUARTER:
return SymId::restQuarter;
case TDuration::V_EIGHT:

2
libmscore/rest.h
View file

@ -37,7 +37,7 @@ class Rest : public ChordRest {
virtual qreal upPos() const override;
virtual qreal downPos() const override;
virtual qreal centerX() const override;
void setUserOffset(qreal x, qreal y);
virtual void setUserOff(const QPointF& o) override;
public:
Rest(Score* s = 0);