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

fix accidentals for trills

Browse source
This commit is contained in:
ws 2013-08-30 16:03:46 +02:00
parent 1eafb0e34d
commit 63fe67a54a
11 changed files with 135 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libmscore/accidental.cpp
View file

@ -291,9 +291,12 @@ void Accidental::layout()
return;
}
qreal m = magS();
qreal m = parent() ? parent()->mag() : 1.0;
if (_small)
m *= score()->styleD(ST_smallNoteMag);
setMag(m);
m = magS();
QPointF pos;
if (_hasBracket) {
SymElement e(leftparenSym, 0.0);
@ -377,13 +380,9 @@ void Accidental::draw(QPainter* painter) const
{
if (staff() && staff()->isTabStaff()) //in TAB, accidentals are not shown
return;
qreal m = magS();
if (_small)
m *= score()->styleD(ST_smallNoteMag);
painter->setPen(curColor());
foreach(const SymElement& e, el)
symbols[score()->symIdx()][e.sym].draw(painter, m, QPointF(e.x, 0.0));
symbols[score()->symIdx()][e.sym].draw(painter, magS(), QPointF(e.x, 0.0));
}
//---------------------------------------------------------

2
libmscore/accidental.h
View file

@ -106,8 +106,6 @@ private:
virtual Accidental* clone() const { return new Accidental(*this); }
virtual ElementType type() const { return ACCIDENTAL; }
virtual qreal mag() const { return parent() ? parent()->mag() : 1.0; }
const char* subtypeUserName() const;
void setSubtype(const QString& s);
void setAccidentalType(AccidentalType t) { _accidentalType = t; }

5
libmscore/edit.cpp
View file

@ -1202,7 +1202,10 @@ void Score::deleteItem(Element* el)
break;
case Element::ACCIDENTAL:
changeAccidental(static_cast<Note*>(el->parent()), Accidental::ACC_NONE);
if (el->parent()->type() == Element::NOTE)
changeAccidental(static_cast<Note*>(el->parent()), Accidental::ACC_NONE);
else
undoRemoveElement(el);
break;
case Element::BAR_LINE:

6
libmscore/element.cpp
View file

@ -447,9 +447,9 @@ QColor Element::curColor() const
return MScore::dropColor;
bool marked = false;
if (type() == Element::NOTE) {
const Note* note = static_cast<const Note*>(this);
marked = note->mark();
}
const Note* note = static_cast<const Note*>(this);
marked = note->mark();
}
if (_selected || marked ) {
if (track() == -1)
return MScore::selectColor[0];

2
libmscore/element.h
View file

@ -494,7 +494,7 @@ class Element : public QObject {
virtual qreal mag() const { return _mag; }
qreal magS() const;
virtual void setMag(qreal val) { _mag = val; }
void setMag(qreal val) { _mag = val; }
bool isText() const;

8
libmscore/system.cpp
View file

@ -971,7 +971,7 @@ void System::scanElements(void* data, void (*func)(void*, Element*), bool all)
func(data, t);
++idx;
}
foreach(SpannerSegment* ss, _spannerSegments) {
foreach (SpannerSegment* ss, _spannerSegments) {
int staffIdx = ss->spanner()->staffIdx();
if (staffIdx == -1) {
qDebug("System::scanElements: staffIDx == -1: %s %p", ss->spanner()->name(), ss->spanner());
@ -979,11 +979,11 @@ void System::scanElements(void* data, void (*func)(void*, Element*), bool all)
}
bool v = true;
Spanner* spanner = ss->spanner();
if(spanner->anchor() == Spanner::ANCHOR_SEGMENT || spanner->anchor() == Spanner::ANCHOR_CHORD) {
if (spanner->anchor() == Spanner::ANCHOR_SEGMENT || spanner->anchor() == Spanner::ANCHOR_CHORD) {
Element* se = spanner->startElement();
Element* ee = spanner->endElement();
bool v1 = true;
if(se && (se->type() == Element::CHORD || se->type() == Element::REST)) {
if (se && (se->type() == Element::CHORD || se->type() == Element::REST)) {
ChordRest* cr = static_cast<ChordRest*>(se);
Measure* m = cr->measure();
MStaff* mstaff = m->mstaff(cr->staffIdx());
@ -999,7 +999,7 @@ void System::scanElements(void* data, void (*func)(void*, Element*), bool all)
v = v1 || v2; // hide spanner if both chords are hidden
}
if (all || (score()->staff(staffIdx)->show() && v) || (spanner->type() == Element::VOLTA))
func(data, ss);
ss->spanner()->scanElements(data, func, all);
}
}

89
libmscore/trill.cpp
View file

@ -37,12 +37,16 @@ void TrillSegment::draw(QPainter* painter) const
qreal x2 = pos2().x();
QColor color;
if (selected() && !(score() && score()->printing()))
if (flag(ELEMENT_DROP_TARGET))
color = MScore::dropColor;
else if (selected() && !(score() && score()->printing()))
color = MScore::selectColor[0];
else if (!visible())
color = Qt::gray;
else
else {
color = trill()->curColor();
}
painter->setPen(color);
if (spannerSegmentType() == SEGMENT_SINGLE || spannerSegmentType() == SEGMENT_BEGIN) {
int sym = 0;
@ -104,6 +108,31 @@ void TrillSegment::draw(QPainter* painter) const
}
}
//---------------------------------------------------------
// add
//---------------------------------------------------------
void TrillSegment::add(Element* e)
{
e->setParent(this);
if (e->type() == ACCIDENTAL) {
// accidental is part of trill
trill()->setAccidental(static_cast<Accidental*>(e));
}
}
//---------------------------------------------------------
// remove
//---------------------------------------------------------
void TrillSegment::remove(Element* e)
{
if (trill()->accidental() == e) {
// accidental is part of trill
trill()->setAccidental(0);
}
}
//---------------------------------------------------------
// layout
//---------------------------------------------------------
@ -116,6 +145,16 @@ void TrillSegment::layout()
setbbox(rr);
if (parent())
rypos() += score()->styleS(ST_trillY).val() * spatium();
if (spannerSegmentType() == SEGMENT_SINGLE || spannerSegmentType() == SEGMENT_BEGIN) {
Accidental* a = trill()->accidental();
if (a) {
a->layout();
a->setMag(a->mag() * .6);
qreal _spatium = spatium();
a->setPos(_spatium*1.3, -2.2*_spatium);
a->adjustReadPos();
}
}
adjustReadPos();
}
@ -125,10 +164,8 @@ void TrillSegment::layout()
bool TrillSegment::acceptDrop(MuseScoreView*, const QPointF&, Element* e) const
{
if (e->type() == ACCIDENTAL) {
printf("========accept drop\n");
if (e->type() == ACCIDENTAL)
return true;
}
return false;
}
@ -141,7 +178,6 @@ Element* TrillSegment::drop(const DropData& data)
Element* e = data.element;
switch(e->type()) {
case ACCIDENTAL:
printf("========drop\n");
e->setParent(trill());
score()->undoAddElement(e);
break;
@ -204,6 +240,12 @@ Trill::Trill(Score* s)
: SLine(s)
{
_trillType = TRILL_LINE;
_accidental = 0;
}
Trill::~Trill()
{
delete _accidental;
}
//---------------------------------------------------------
@ -214,7 +256,7 @@ void Trill::add(Element* e)
{
if (e->type() == ACCIDENTAL) {
e->setParent(this);
_el.push_back(e);
_accidental = static_cast<Accidental*>(e);
}
else
SLine::add(e);
@ -226,8 +268,8 @@ void Trill::add(Element* e)
void Trill::remove(Element* e)
{
if (!_el.remove(e))
Spanner::remove(e);
if (e == _accidental)
_accidental = 0;
}
//---------------------------------------------------------
@ -237,11 +279,11 @@ void Trill::remove(Element* e)
void Trill::layout()
{
qreal _spatium = spatium();
// setPos(0.0, yoff() * _spatium);
SLine::layout();
if (score() == gscore)
return;
TrillSegment* ls = static_cast<TrillSegment*>(frontSegment());
//
// special case:
// if end segment is first chord/rest segment in measure,
@ -260,17 +302,12 @@ void Trill::layout()
Segment* s2 = m->last();
qreal x2 = s2->pagePos().x();
qreal dx = x1 - x2 + _spatium * .3;
TrillSegment* ls = static_cast<TrillSegment*>(frontSegment());
ls->setPos2(ls->ipos2() + QPointF(-dx, 0.0));
ls->layout();
}
}
foreach(Element* e, _el) {
e->setMag(.6);
e->layout();
e->setPos(_spatium*1.3, -2.2*_spatium);
e->adjustReadPos();
}
if (_accidental)
_accidental->setParent(ls);
}
//---------------------------------------------------------
@ -294,8 +331,8 @@ void Trill::write(Xml& xml) const
xml.stag(QString("%1 id=\"%2\"").arg(name()).arg(id()));
xml.tag("subtype", trillTypeName());
SLine::writeProperties(xml);
foreach(Element* e, _el)
e->write(xml);
if (_accidental)
_accidental->write(xml);
xml.etag();
}
@ -314,9 +351,9 @@ void Trill::read(XmlReader& e)
if (tag == "subtype")
setTrillType(e.readElementText());
else if (tag == "Accidental") {
Accidental* a = new Accidental(score());
a->read(e);
add(a);
_accidental = new Accidental(score());
_accidental->read(e);
_accidental->setParent(this);
}
else if (!SLine::readProperties(e))
e.unknown();
@ -372,9 +409,9 @@ QString Trill::trillTypeName() const
void Trill::scanElements(void* data, void (*func)(void*, Element*), bool all)
{
foreach(Element* e, _el)
e->scanElements(data, func, all);
func(data, this);
if (_accidental)
_accidental->scanElements(data, func, all);
func(data, this); // ?
SLine::scanElements(data, func, all);
}
@ -444,7 +481,5 @@ void Trill::setYoff(qreal val)
{
rUserYoffset() += (val - score()->styleS(ST_trillY).val()) * spatium();
}
}

51
libmscore/trill.h
View file

@ -33,15 +33,17 @@ class TrillSegment : public LineSegment {
public:
TrillSegment(Score* s) : LineSegment(s) {}
Trill* trill() const { return (Trill*)spanner(); }
virtual ElementType type() const { return TRILL_SEGMENT; }
virtual TrillSegment* clone() const { return new TrillSegment(*this); }
virtual void draw(QPainter*) const;
virtual bool acceptDrop(MuseScoreView*, const QPointF&, Element*) const;
virtual Element* drop(const DropData&);
virtual void layout();
virtual QVariant getProperty(P_ID propertyId) const;
virtual bool setProperty(P_ID propertyId, const QVariant&);
virtual QVariant propertyDefault(P_ID) const;
virtual ElementType type() const override { return TRILL_SEGMENT; }
virtual TrillSegment* clone() const override { return new TrillSegment(*this); }
virtual void draw(QPainter*) const override;
virtual bool acceptDrop(MuseScoreView*, const QPointF&, Element*) const override;
virtual Element* drop(const DropData&) override;
virtual void layout() override;
virtual QVariant getProperty(P_ID propertyId) const override;
virtual bool setProperty(P_ID propertyId, const QVariant&) override;
virtual QVariant propertyDefault(P_ID) const override;
virtual void add(Element*) override;
virtual void remove(Element*) override;
};
//---------------------------------------------------------
@ -61,33 +63,36 @@ class Trill : public SLine {
private:
Q_PROPERTY(TrillType trillType READ trillType WRITE undoSetTrillType)
TrillType _trillType;
ElementList _el; // accidentals etc.
Accidental* _accidental;
public:
Trill(Score* s);
virtual Trill* clone() const { return new Trill(*this); }
virtual ElementType type() const { return TRILL; }
virtual ~Trill();
virtual Trill* clone() const override { return new Trill(*this); }
virtual ElementType type() const override { return TRILL; }
virtual void layout();
virtual LineSegment* createLineSegment();
virtual void add(Element*);
virtual void remove(Element*);
virtual void write(Xml&) const;
virtual void read(XmlReader&);
virtual void layout() override;
virtual LineSegment* createLineSegment() override;
virtual void add(Element*) override;
virtual void remove(Element*) override;
virtual void write(Xml&) const override;
virtual void read(XmlReader&) override;
void setTrillType(const QString& s);
void undoSetTrillType(TrillType val);
void setTrillType(TrillType tt) { _trillType = tt; }
TrillType trillType() const { return _trillType; }
QString trillTypeName() const;
Accidental* accidental() const { return _accidental; }
void setAccidental(Accidental* a) { _accidental = a; }
Segment* segment() const { return (Segment*)parent(); }
virtual void scanElements(void* data, void (*func)(void*, Element*), bool all=true);
virtual void scanElements(void* data, void (*func)(void*, Element*), bool all=true) override;
virtual QVariant getProperty(P_ID propertyId) const;
virtual bool setProperty(P_ID propertyId, const QVariant&);
virtual QVariant propertyDefault(P_ID) const;
virtual void setYoff(qreal);
virtual QVariant getProperty(P_ID propertyId) const override;
virtual bool setProperty(P_ID propertyId, const QVariant&) override;
virtual QVariant propertyDefault(P_ID) const override;
virtual void setYoff(qreal) override;
};

20
mscore/debugger/accidental.ui
View file

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>487</width>
<height>103</height>
<height>120</height>
</rect>
</property>
<property name="windowTitle">
@ -17,7 +17,16 @@
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>8</number>
</property>
<property name="topMargin">
<number>8</number>
</property>
<property name="rightMargin">
<number>8</number>
</property>
<property name="bottomMargin">
<number>8</number>
</property>
<item>
@ -50,6 +59,13 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="small">
<property name="text">
<string>small</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

12
mscore/debugger/debugger.cpp
View file

@ -67,6 +67,7 @@
#include "libmscore/pitchspelling.h"
#include "libmscore/chordlist.h"
#include "libmscore/bracket.h"
#include "libmscore/trill.h"
namespace Ms {
@ -368,8 +369,14 @@ void Debugger::updateList(Score* s)
QTreeWidgetItem* li = new QTreeWidgetItem(list, Element::INVALID);
li->setText(0, "Global");
for (auto i : s->spanner())
new ElementItem(li, i.second);
for (auto i : s->spanner()) {
ElementItem* it = new ElementItem(li, i.second);
if (i.second->type() == Element::TRILL) {
Trill* trill = static_cast<Trill*>(i.second);
if (trill->accidental())
new ElementItem(it, trill->accidental());
}
}
int staves = cs->nstaves();
int tracks = staves * VOICES;
@ -2334,6 +2341,7 @@ void AccidentalView::setElement(Element* e)
acc.hasBracket->setChecked(s->hasBracket());
acc.accAuto->setChecked(s->role() == Accidental::ACC_AUTO);
acc.accUser->setChecked(s->role() == Accidental::ACC_USER);
acc.small->setChecked(s->small());
}
//---------------------------------------------------------

10
mscore/propertymenu.cpp
View file

@ -205,14 +205,6 @@ void ScoreView::createElementPropertyMenu(Element* e, QMenu* popup)
popup->addSeparator();
popup->addAction(tr("Time Signature Properties..."))->setData("ts-props");
}
else if (e->type() == Element::ACCIDENTAL) {
Accidental* acc = static_cast<Accidental*>(e);
genPropertyMenu1(e, popup);
QAction* a = popup->addAction(QT_TRANSLATE_NOOP("Properties", "small"));
a->setCheckable(true);
a->setChecked(acc->small());
a->setData("smallAcc");
}
else if (e->type() == Element::CLEF) {
genPropertyMenu1(e, popup);
Clef* clef = static_cast<Clef*>(e);
@ -481,8 +473,6 @@ void ScoreView::elementPropertyAction(const QString& cmd, Element* e)
}
}
}
else if (cmd == "smallAcc")
score()->undoChangeProperty(e, P_SMALL, !static_cast<Accidental*>(e)->small());
else if (cmd == "smallNote")
score()->undoChangeProperty(e, P_SMALL, !static_cast<Note*>(e)->small());
else if (cmd == "clef-courtesy") {