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

enhance single note tremolo layout

Browse source
This commit is contained in:
Werner Schweer 2012-11-14 12:24:08 +01:00
parent c64b06668e
commit e993aa6fdd
6 changed files with 160 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libmscore/chord.cpp
View file

@ -1140,7 +1140,8 @@ void Chord::layoutStem()
int ul = upnote->line();
int dl = downnote->line();
bool shortenStem = score()->styleB(ST_shortenStem);
if (hookIdx >= 2 || _tremolo)
shortenStem = false;
Spatium progression(score()->styleS(ST_shortStemProgression));
qreal shortest(score()->styleS(ST_shortestStem).val());
@ -1160,8 +1161,6 @@ void Chord::layoutStem()
normalStemLen += .5;
shortenStem = false;
}
if (hookIdx >= 2)
shortenStem = false;
}
if (_noteType != NOTE_NORMAL) {
@ -1200,7 +1199,6 @@ void Chord::layoutStem()
}
QPointF npos(stemPos());
_stem->setLen(stemLen * _spatium);
_stem->setPos(npos - pagePos());
if (_stemSlash) {
@ -1208,6 +1206,30 @@ void Chord::layoutStem()
_stemSlash->layout();
}
// adjust stem len for tremolo
if (_tremolo && !_tremolo->twoNotes()) {
// hook up odd lines
int tab[2][2][2][4] = {
{ { { 0, 0, 0, 1 }, // stem - down - even - lines
{ 0, 0, 0, 2 } // stem - down - odd - lines
},
{ { 0, 0, 0, -1 }, // stem - up - even - lines
{ 0, 0, 0, -2 } // stem - up - odd - lines
}
},
{ { { 0, 0, 1, 2 }, // hook - down - even - lines
{ 0, 0, 1, 2 } // hook - down - odd - lines
},
{ { 0, 0, -1, -2 }, // hook - up - even - lines
{ 0, 0, -1, -2 } // hook - up - odd - lines
}
}
};
int odd = (up() ? upLine() : downLine()) & 1;
int n = tab[_hook ? 1 : 0][up() ? 1 : 0][odd][_tremolo->lines()-1];
stemLen += n * .5;
}
_stem->setLen(stemLen * _spatium);
if (_hook) {
_hook->setPos(_stem->hookPos());
_hook->adjustReadPos();

2
libmscore/rehearsalmark.cpp
View file

@ -21,6 +21,6 @@
RehearsalMark::RehearsalMark(Score* s)
: Text(s)
{
setTextStyle(s->textStyle(TEXT_STYLE_REHEARSAL_MARK));
setTextStyleType(TEXT_STYLE_REHEARSAL_MARK);
}

16
libmscore/style.cpp
View file

@ -199,7 +199,12 @@ StyleType styleTypes[] = {
StyleType("ottavaHook", ST_SPATIUM),
StyleType("ottavaLineWidth", ST_SPATIUM),
StyleType("tabClef", ST_INT),
StyleType("tabClef", ST_INT),
StyleType("tremoloWidth", ST_SPATIUM),
StyleType("tremoloBoxHeight", ST_SPATIUM),
StyleType("tremoloLineWidth", ST_SPATIUM),
StyleType("tremoloDistance", ST_SPATIUM),
};
static const QString ff("FreeSerifMscore");
@ -564,7 +569,14 @@ StyleData::StyleData()
StyleVal(ST_ottavaY, Spatium(-3.0)),
StyleVal(ST_ottavaHook, Spatium(1.9)),
StyleVal(ST_ottavaLineWidth, Spatium(.1)),
StyleVal(ST_tabClef, int(CLEF_TAB2))
StyleVal(ST_tabClef, int(CLEF_TAB2)),
StyleVal(ST_tremoloWidth, Spatium(1.2)), // tremolo stroke width: note head width
StyleVal(ST_tremoloBoxHeight, Spatium(0.65)),
StyleVal(ST_tremoloStrokeWidth, Spatium(0.35)),
StyleVal(ST_tremoloDistance, Spatium(0.8))
};
for (int idx = 0; idx < ST_STYLES; ++idx)

5
libmscore/style.h
View file

@ -305,6 +305,11 @@ enum StyleIdx {
ST_tabClef,
ST_tremoloWidth,
ST_tremoloBoxHeight,
ST_tremoloStrokeWidth,
ST_tremoloDistance,
ST_STYLES
};

163
libmscore/tremolo.cpp
View file

@ -27,7 +27,7 @@
Tremolo::Tremolo(Score* score)
: Element(score)
{
_subtype = TREMOLO_R8;
setSubtype(TREMOLO_R8);
_chord1 = 0;
_chord2 = 0;
setFlags(ELEMENT_MOVABLE | ELEMENT_SELECTABLE);
@ -51,45 +51,55 @@ void Tremolo::draw(QPainter* painter) const
}
}
//---------------------------------------------------------
// setSubtype
//---------------------------------------------------------
void Tremolo::setSubtype(TremoloType t)
{
_subtype = t;
switch (subtype()) {
case TREMOLO_R16:
case TREMOLO_C16:
_lines = 2;
break;
case TREMOLO_R32:
case TREMOLO_C32:
_lines = 3;
break;
case TREMOLO_R64:
case TREMOLO_C64:
_lines = 4;
break;
default:
_lines = 1;
break;
}
}
//---------------------------------------------------------
// layout
//---------------------------------------------------------
void Tremolo::layout()
{
qreal sp = spatium();
qreal w = sp * 1.2;
qreal h = sp * .8;
qreal lw = sp * .35;
qreal d = sp * 0.8;
qreal _spatium = spatium();
qreal w2 = _spatium * score()->styleS(ST_tremoloWidth).val() * .5;
qreal h2 = _spatium * score()->styleS(ST_tremoloBoxHeight).val() * .5;
qreal lw = _spatium * score()->styleS(ST_tremoloStrokeWidth).val();
qreal td = _spatium * score()->styleS(ST_tremoloDistance).val();
path = QPainterPath();
qreal y = 0.0;
int lines;
switch(subtype()) {
case TREMOLO_R16:
case TREMOLO_C16:
lines = 2;
break;
case TREMOLO_R32:
case TREMOLO_C32:
lines = 3;
break;
case TREMOLO_R64:
case TREMOLO_C64:
lines = 4;
break;
default:
lines = 1;
break;
}
for (int i = 0; i < lines; ++i) {
path.moveTo(-w*.5, y + h - lw);
path.lineTo(w*.5, y);
path.lineTo(w*.5, y + lw);
path.lineTo(-w*.5, y + h);
qreal ty = 0.0;
for (int i = 0; i < _lines; ++i) {
path.moveTo(-w2, ty + h2 - lw);
path.lineTo( w2, ty - h2);
path.lineTo( w2, ty - h2 + lw);
path.lineTo(-w2, ty + h2);
path.closeSubpath();
y += d;
ty += td;
}
setbbox(path.boundingRect());
@ -98,7 +108,7 @@ void Tremolo::layout()
return;
Note* anchor1 = _chord1->upNote();
Stem* stem = _chord1->stem();
qreal x;
qreal x, y, h;
if (stem) {
x = stem->pos().x();
y = stem->pos().y();
@ -108,32 +118,77 @@ void Tremolo::layout()
// center tremolo above note
x = anchor1->x() + anchor1->headWidth() * .5;
y = anchor1->y();
h = 2.0 * spatium() + bbox().height();
h = 2.0 * _spatium + bbox().height();
if (anchor1->line() > 4)
h *= -1;
}
if (!twoNotes()) {
if (_chord1->hook()) {
y += (h - bbox().height()) * .5;
y -= spatium() * .5 * (_chord1->up() ? -1.0 : 1.0);
}
else {
bool up = _chord1->up();
qreal d = _chord1->downNote()->y() - _chord1->upNote()->y();
if (_chord1->beam()) {
qreal bd = score()->styleD(ST_beamDistance);
qreal bw = score()->styleS(ST_beamWidth).val() * sp;
int n = _chord1->durationType().hooks();
qreal beamHeight = bw * n + bw * bd * (n-1);
if (up)
h += beamHeight;
else
h -= beamHeight;
//
// single note tremolos
//
bool up = _chord1->up();
int line = up ? _chord1->upLine() : _chord1->downLine();
static const qreal t[3][2][4][2] = {
// normal stem
{
// DOWN
{
// even line odd line
{ 6, 5 }, // line 1
{ 6 - 2 * .8, 5 - 2 * .8 }, // line 2
{ 6 - 4 * .8, 3 }, // line 3
{ 2 , 3 } // line 4
},
// UP
{
// even line odd line
{ -6, -5 }, // line 1
{ -6, -5 }, // line 2
{ -6, -3 - 4 * .8 }, // line 3
{ -2 - 6 * .8, -3 - 6 * .8 } // line 4
}
if (!up)
d = -d;
y = y - d - ((bbox().height() - d - h) * .5);
}
},
// stem with hook
{
// DOWN
{
// even line odd line
{ 3, 3 }, // line 1
{ 2, 2 }, // line 2
{ 2, 2 }, // line 3
{ 2, 2 } // line 4
},
// UP
{
// even line odd line
{ -3, -3 }, // line 1
{ -2 - 2 * .8, -2 - 2 * .8 }, // line 2
{ -2 - 4 * .8, -2 - 4 * .8 }, // line 3
{ -2 - 6 * .8, -2 - 6 * .8 } // line 4
}
},
// stem with beam
{
// DOWN
{
// even line odd line
{ 3, 3 }, // line 1
{ 2, 2 }, // line 2
{ 2, 2 }, // line 3
{ 2, 2 } // line 4
},
// UP
{
// even line odd line
{ -3, -3 }, // line 1
{ -2 - 2 * .8, -2 - 2 * .8 }, // line 2
{ -2 - 4 * .8, -2 - 4 * .8 }, // line 3
{ -2 - 6 * .8, -2 - 6 * .8 } // line 4
}
},
};
int idx = _chord1->hook() ? 1 : (_chord1->beam() ? 2 : 0);
y = (line + t[idx][up][_lines-1][line & 1]) * _spatium * .5;
setPos(x, y);
_chord1->setTremoloChordType(TremoloSingle);
return;
@ -242,7 +297,7 @@ void Tremolo::setSubtype(const QString& s)
t = TREMOLO_C64;
else
t = TremoloType(s.toInt()); // for compatibility with old tremolo type
_subtype = t;
setSubtype(t);
}
//---------------------------------------------------------

6
libmscore/tremolo.h
View file

@ -44,6 +44,8 @@ class Tremolo : public Element {
Chord* _chord2;
QPainterPath path;
int _lines; // derived from _subtype
public:
Tremolo(Score*);
Tremolo &operator=(const Tremolo&);
@ -52,7 +54,8 @@ class Tremolo : public Element {
QString subtypeName() const;
void setSubtype(const QString& s);
void setSubtype(TremoloType t) { _subtype = t; }
void setSubtype(TremoloType t);
TremoloType subtype() const { return _subtype; }
virtual void draw(QPainter*) const;
@ -69,6 +72,7 @@ class Tremolo : public Element {
}
Fraction tremoloLen() const;
bool twoNotes() const { return subtype() > TREMOLO_R64; } // is it a two note tremolo?
int lines() const { return _lines; }
};
#endif