daa4802f33
Use NoteDot for the dots after rests, instead of the rest drawing its own dots, which were drawn outside of the rest's bbox.
82 lines
2.3 KiB
C++
82 lines
2.3 KiB
C++
//=============================================================================
|
|
// MuseScore
|
|
// Music Composition & Notation
|
|
//
|
|
// Copyright (C) 2002-2011 Werner Schweer
|
|
//
|
|
// This program is free software; you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License version 2
|
|
// as published by the Free Software Foundation and appearing in
|
|
// the file LICENCE.GPL
|
|
//=============================================================================
|
|
|
|
#include "notedot.h"
|
|
#include "score.h"
|
|
#include "staff.h"
|
|
#include "sym.h"
|
|
#include "xml.h"
|
|
#include "chord.h"
|
|
#include "rest.h"
|
|
|
|
namespace Ms {
|
|
|
|
//---------------------------------------------------------
|
|
// NoteDot
|
|
//---------------------------------------------------------
|
|
|
|
NoteDot::NoteDot(Score* s)
|
|
: Element(s)
|
|
{
|
|
setFlag(ElementFlag::MOVABLE, false);
|
|
}
|
|
|
|
//---------------------------------------------------------
|
|
// NoteDot::draw
|
|
//---------------------------------------------------------
|
|
|
|
void NoteDot::draw(QPainter* p) const
|
|
{
|
|
if (note() && note()->dotsHidden()) // don't draw dot if note is hidden
|
|
return;
|
|
int tick = note() ? note()->chord()->tick() : rest()->tick();
|
|
if (!staff()->isTabStaff(tick) || staff()->staffType(tick)->stemThrough()) {
|
|
p->setPen(curColor());
|
|
drawSymbol(SymId::augmentationDot, p);
|
|
}
|
|
}
|
|
|
|
//---------------------------------------------------------
|
|
// layout
|
|
//---------------------------------------------------------
|
|
|
|
void NoteDot::layout()
|
|
{
|
|
setbbox(symBbox(SymId::augmentationDot));
|
|
}
|
|
|
|
//---------------------------------------------------------
|
|
// read
|
|
//---------------------------------------------------------
|
|
|
|
void NoteDot::read(XmlReader& e)
|
|
{
|
|
while (e.readNextStartElement()) {
|
|
if (e.name() == "name") // obsolete
|
|
e.readElementText();
|
|
else if (e.name() == "subtype") // obsolete
|
|
e.readElementText();
|
|
else if (!Element::readProperties(e))
|
|
e.unknown();
|
|
}
|
|
}
|
|
|
|
//---------------------------------------------------------
|
|
// mag
|
|
//---------------------------------------------------------
|
|
|
|
qreal NoteDot::mag() const
|
|
{
|
|
return parent()->mag() * score()->styleD(Sid::dotMag);
|
|
}
|
|
}
|
|
|