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

New boundaries of chordlines, stopped grips allowing user to change chordline kind visually.

Browse source
This commit is contained in:
John Pirie 2014-08-13 23:32:29 +01:00
parent 39eea565d0
commit c6cd137d66
20 changed files with 83 additions and 353 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
libmscore/chordline.cpp
View file

@ -30,8 +30,8 @@ ChordLine::ChordLine(Score* s)
modified = false;
_chordLineType = ChordLineType::NOTYPE;
_straight = false;
_lengthX = 10;
_lengthY = 10;
_lengthX = 0.0;
_lengthY = 0.0;
}
ChordLine::ChordLine(const ChordLine& cl)
@ -110,14 +110,42 @@ void ChordLine::layout()
else
setPos(0.0, 0.0);
QRectF r(path.boundingRect());
if (_straight && (_chordLineType == ChordLineType::FALL || _chordLineType == ChordLineType::DOIT))
bbox().setRect(r.x() + _spatium * 2.5, r.y(), r.width() + _spatium * 2.5, r.height());
else if (_straight && _chordLineType == ChordLineType::SCOOP)
bbox().setRect(r.x() - _spatium * 3, r.y() - _spatium, r.width() - _spatium*2, r.height());
else if (_straight && _chordLineType == ChordLineType::PLOP)
bbox().setRect(r.x() - _spatium * 4, r.y() + _spatium, r.width() + _spatium, r.height());
else
bbox().setRect(r.x() * _spatium, r.y() * _spatium, r.width() * _spatium, r.height() * _spatium);
int x1, y1, width, height = 0;
// negative gradient after note
if (_straight && _chordLineType == ChordLineType::FALL) {
x1 = r.x() + _spatium;
y1 = r.height() + _spatium * 0.8 + _lengthY * 0.95;
width = r.width() + _spatium * 2 + _lengthX;
height = -r.height() - _spatium * 2 - _lengthY * 0.95;
}
// positive gradient after note
else if (_straight && _chordLineType == ChordLineType::DOIT) {
x1 = r.x() + _spatium;
y1 = r.y() + _spatium * 0.5 - _lengthY * 0.15;
width = r.width() + _spatium * 2.2 + _lengthX * 0.95;
height = -r.height() - _spatium * 2 + _lengthY * 0.95;
}
// negative gradient before note
else if (_straight && _chordLineType == ChordLineType::SCOOP) {
x1 = -r.x() - _spatium * 1.3;
y1 = -r.y() / 4 - _spatium * 0.5;
width = -r.width() - _spatium * 2.5 + _lengthX;
height = r.height() - _spatium * 1.9 + _lengthY * 1.1;
}
// positive gradient before note
else if (_straight && _chordLineType == ChordLineType::PLOP) {
x1 = -r.x() - _spatium * 1.2;
y1 = -r.y() + _spatium * 1.5 + _lengthY;
width = -r.width() - _spatium * 2.9 + _lengthX * 1.15;
height = -r.height() - _spatium * 2.5 - _lengthY * 0.93;
}
else {
x1 = r.x() * _spatium;
y1 = r.y() * _spatium;
width = r.width() * _spatium;
height = r.height() * _spatium;
}
bbox().setRect(x1, y1, width, height);
}
//---------------------------------------------------------
@ -194,8 +222,8 @@ void ChordLine::write(Xml& xml) const
xml.stag(name());
xml.tag("subtype", int(_chordLineType));
xml.tag("straight", _straight, false);
xml.tag("lengthX", _lengthX, false);
xml.tag("lengthY", _lengthY, false);
xml.tag("lengthX", _lengthX, 0.0);
xml.tag("lengthY", _lengthY, 0.0);
Element::writeProperties(xml);
if (modified) {
int n = path.elementCount();
@ -224,18 +252,17 @@ void ChordLine::draw(QPainter* painter) const
pen.setWidthF(_spatium * .15);
pen.setCapStyle(Qt::RoundCap);
painter->setPen(pen);
// negative gradient after note
if (_chordLineType == ChordLineType::FALL)
painter->drawLine(QLineF(20.0, -4.0, 20.0 + _lengthX, -4.0 + _lengthY));
painter->drawLine(QLineF(_spatium + 3.0, -_spatium + 2.0, _spatium * 3 + _lengthX, 2.0 + _spatium / 2 + _lengthY));
// positive gradient, after note
else if (_chordLineType == ChordLineType::DOIT)
painter->drawLine(QLineF(20.0, 4.0, 20.0 + _lengthX, 4.0 - _lengthY));
else if (_chordLineType == ChordLineType::SCOOP) {
painter->translate(-50.0, -5.0);
painter->drawLine(QLineF(20.0, -4.0, 20.0 + _lengthX, -4.0 + _lengthY));
}
else if (_chordLineType == ChordLineType::PLOP) {
painter->translate(-50.0, 5.0);
painter->drawLine(QLineF(20.0, 4.0, 20.0 + _lengthX, 4.0 - _lengthY));
}
painter->drawLine(QLineF(_spatium + 3.0, _spatium / 3 - 2.0, _spatium * 3 + _lengthX, -2.0 - _spatium / 2 + _lengthY));
else if (_chordLineType == ChordLineType::SCOOP)
painter->drawLine(QLineF(-3.5 * _spatium + _lengthX, -_spatium * 2 + _lengthY, -_spatium - 2.0, -_spatium / 2));
else if (_chordLineType == ChordLineType::PLOP)
painter->drawLine(QLineF(-3.5 * _spatium + _lengthX, _spatium + 3.0 + _lengthY, -_spatium - 3.0, -_spatium / 5));
painter->restore();
}
else {
@ -258,6 +285,15 @@ void ChordLine::editDrag(const EditData& ed)
qreal sp = spatium();
_lengthX += ed.delta.x();
_lengthY += ed.delta.y();
if ((_chordLineType == ChordLineType::PLOP || _chordLineType == ChordLineType::FALL) && _lengthY < -10)
_lengthY = -10;
else if ((_chordLineType == ChordLineType::FALL || _chordLineType == ChordLineType::DOIT) && _lengthX < -10)
_lengthX = -10;
else if ((_chordLineType == ChordLineType::DOIT || _chordLineType == ChordLineType::SCOOP) && _lengthY > 10)
_lengthY = 10;
else if ((_chordLineType == ChordLineType::SCOOP || _chordLineType == ChordLineType::PLOP) && _lengthX > 10)
_lengthX = 10;
qreal dx = ed.delta.x() / sp;
qreal dy = ed.delta.y() / sp;
for (int i = 0; i < n; ++i) {

8
libmscore/chordline.h
View file

@ -40,8 +40,8 @@ class ChordLine : public Element {
bool _straight;
QPainterPath path;
bool modified;
int _lengthX;
int _lengthY;
float _lengthX;
float _lengthY;
public:
ChordLine(Score*);
@ -54,8 +54,8 @@ class ChordLine : public Element {
Chord* chord() const { return (Chord*)(parent()); }
virtual bool isStraight() const { return _straight; }
virtual void setStraight(bool straight) { _straight = straight; }
virtual void setLengthX(int length) { _lengthX = length; }
virtual void setLengthY(int length) { _lengthY = length; }
virtual void setLengthX(float length) { _lengthX = length; }
virtual void setLengthY(float length) { _lengthY = length; }
virtual void read(XmlReader&);
virtual void write(Xml& xml) const;

42
mscore/menus.cpp
View file

@ -551,27 +551,6 @@ Palette* MuseScore::newArticulationsPalette()
tb->points().append(PitchValue(60, 0, false));
sp->append(tb, qApp->translate("articulation", "Tremolo Bar"));
ChordLine* clFall = new ChordLine(gscore);
clFall->setChordLineType(ChordLineType::FALL);
clFall->setStraight(true);
sp->append(clFall, qApp->translate("articulation", "Slide out down"));
ChordLine* clDoit = new ChordLine(gscore);
clDoit->setChordLineType(ChordLineType::DOIT);
clDoit->setStraight(true);
sp->append(clDoit, qApp->translate("articulation", "Slide out up"));
ChordLine* clScoop = new ChordLine(gscore);
clScoop->setChordLineType(ChordLineType::SCOOP);
clScoop->setStraight(true);
sp->append(clScoop, qApp->translate("articulation", "Slide in below"));
ChordLine* clPlop = new ChordLine(gscore);
clPlop->setChordLineType(ChordLineType::PLOP);
clPlop->setStraight(true);
sp->append(clPlop, qApp->translate("articulation", "Slide in above"));
return sp;
}
@ -673,6 +652,27 @@ Palette* MuseScore::newArpeggioPalette()
cl->setChordLineType(ChordLineType::SCOOP);
sp->append(cl, tr(scorelineNames[3]));
cl = new ChordLine(gscore);
cl->setChordLineType(ChordLineType::FALL);
cl->setStraight(true);
sp->append(cl, qApp->translate("articulation", "Slide out down"));
cl = new ChordLine(gscore);
cl->setChordLineType(ChordLineType::DOIT);
cl->setStraight(true);
sp->append(cl, qApp->translate("articulation", "Slide out up"));
cl = new ChordLine(gscore);
cl->setChordLineType(ChordLineType::SCOOP);
cl->setStraight(true);
sp->append(cl, qApp->translate("articulation", "Slide in below"));
cl = new ChordLine(gscore);
cl->setChordLineType(ChordLineType::PLOP);
cl->setStraight(true);
sp->append(cl, qApp->translate("articulation", "Slide in above"));
return sp;
}

24
mtest/guitarpro/slide-in-above.gp4-ref.mscx
View file

@ -130,8 +130,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -148,8 +146,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -166,8 +162,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -184,8 +178,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>20</lid>
</ChordLine>
</Chord>
@ -346,8 +338,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -364,8 +354,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -382,8 +370,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -400,8 +386,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>20</lid>
</ChordLine>
</Chord>
@ -430,8 +414,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -448,8 +430,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -466,8 +446,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -484,8 +462,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>20</lid>
</ChordLine>
</Chord>

24
mtest/guitarpro/slide-in-above.gp5-ref.mscx
View file

@ -110,8 +110,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>7</lid>
</ChordLine>
</Chord>
@ -128,8 +126,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>10</lid>
</ChordLine>
</Chord>
@ -146,8 +142,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>13</lid>
</ChordLine>
</Chord>
@ -164,8 +158,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>16</lid>
</ChordLine>
</Chord>
@ -327,8 +319,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>7</lid>
</ChordLine>
</Chord>
@ -345,8 +335,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>10</lid>
</ChordLine>
</Chord>
@ -363,8 +351,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>13</lid>
</ChordLine>
</Chord>
@ -381,8 +367,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>16</lid>
</ChordLine>
</Chord>
@ -432,8 +416,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>7</lid>
</ChordLine>
</Chord>
@ -450,8 +432,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>10</lid>
</ChordLine>
</Chord>
@ -468,8 +448,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>13</lid>
</ChordLine>
</Chord>
@ -486,8 +464,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>16</lid>
</ChordLine>
</Chord>

24
mtest/guitarpro/slide-in-above.gpx-ref.mscx
View file

@ -134,8 +134,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -152,8 +150,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -170,8 +166,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -188,8 +182,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -354,8 +346,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -372,8 +362,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -390,8 +378,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -408,8 +394,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -438,8 +422,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -456,8 +438,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -474,8 +454,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -492,8 +470,6 @@
<ChordLine>
<subtype>4</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>

24
mtest/guitarpro/slide-in-below.gp4-ref.mscx
View file

@ -130,8 +130,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -148,8 +146,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -166,8 +162,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -184,8 +178,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>20</lid>
</ChordLine>
</Chord>
@ -346,8 +338,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -364,8 +354,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -382,8 +370,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -400,8 +386,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>20</lid>
</ChordLine>
</Chord>
@ -430,8 +414,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -448,8 +430,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -466,8 +446,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -484,8 +462,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>20</lid>
</ChordLine>
</Chord>

24
mtest/guitarpro/slide-in-below.gp5-ref.mscx
View file

@ -110,8 +110,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>7</lid>
</ChordLine>
</Chord>
@ -128,8 +126,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>10</lid>
</ChordLine>
</Chord>
@ -146,8 +142,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>13</lid>
</ChordLine>
</Chord>
@ -164,8 +158,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>16</lid>
</ChordLine>
</Chord>
@ -327,8 +319,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>7</lid>
</ChordLine>
</Chord>
@ -345,8 +335,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>10</lid>
</ChordLine>
</Chord>
@ -363,8 +351,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>13</lid>
</ChordLine>
</Chord>
@ -381,8 +367,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>16</lid>
</ChordLine>
</Chord>
@ -432,8 +416,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>7</lid>
</ChordLine>
</Chord>
@ -450,8 +432,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>10</lid>
</ChordLine>
</Chord>
@ -468,8 +448,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>13</lid>
</ChordLine>
</Chord>
@ -486,8 +464,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>16</lid>
</ChordLine>
</Chord>

24
mtest/guitarpro/slide-in-below.gpx-ref.mscx
View file

@ -134,8 +134,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -152,8 +150,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -170,8 +166,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -188,8 +182,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -354,8 +346,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -372,8 +362,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -390,8 +378,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -408,8 +394,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -438,8 +422,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -456,8 +438,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -474,8 +454,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -492,8 +470,6 @@
<ChordLine>
<subtype>3</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>

24
mtest/guitarpro/slide-out-down.gp4-ref.mscx
View file

@ -130,8 +130,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -148,8 +146,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -166,8 +162,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -184,8 +178,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>20</lid>
</ChordLine>
</Chord>
@ -346,8 +338,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -364,8 +354,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -382,8 +370,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -400,8 +386,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>20</lid>
</ChordLine>
</Chord>
@ -430,8 +414,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -448,8 +430,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -466,8 +446,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -484,8 +462,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>20</lid>
</ChordLine>
</Chord>

24
mtest/guitarpro/slide-out-down.gp5-ref.mscx
View file

@ -110,8 +110,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>7</lid>
</ChordLine>
</Chord>
@ -128,8 +126,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>10</lid>
</ChordLine>
</Chord>
@ -146,8 +142,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>13</lid>
</ChordLine>
</Chord>
@ -164,8 +158,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>16</lid>
</ChordLine>
</Chord>
@ -327,8 +319,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>7</lid>
</ChordLine>
</Chord>
@ -345,8 +335,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>10</lid>
</ChordLine>
</Chord>
@ -363,8 +351,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>13</lid>
</ChordLine>
</Chord>
@ -381,8 +367,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>16</lid>
</ChordLine>
</Chord>
@ -432,8 +416,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>7</lid>
</ChordLine>
</Chord>
@ -450,8 +432,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>10</lid>
</ChordLine>
</Chord>
@ -468,8 +448,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>13</lid>
</ChordLine>
</Chord>
@ -486,8 +464,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>16</lid>
</ChordLine>
</Chord>

24
mtest/guitarpro/slide-out-down.gpx-ref.mscx
View file

@ -134,8 +134,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -152,8 +150,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -170,8 +166,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -188,8 +182,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -354,8 +346,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -372,8 +362,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -390,8 +378,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -408,8 +394,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -438,8 +422,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -456,8 +438,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -474,8 +454,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -492,8 +470,6 @@
<ChordLine>
<subtype>1</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>

24
mtest/guitarpro/slide-out-up.gp4-ref.mscx
View file

@ -135,8 +135,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>12</lid>
</ChordLine>
</Chord>
@ -153,8 +151,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>15</lid>
</ChordLine>
</Chord>
@ -171,8 +167,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>18</lid>
</ChordLine>
</Chord>
@ -189,8 +183,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>21</lid>
</ChordLine>
</Chord>
@ -364,8 +356,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>12</lid>
</ChordLine>
</Chord>
@ -382,8 +372,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>15</lid>
</ChordLine>
</Chord>
@ -400,8 +388,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>18</lid>
</ChordLine>
</Chord>
@ -418,8 +404,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>21</lid>
</ChordLine>
</Chord>
@ -456,8 +440,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>12</lid>
</ChordLine>
</Chord>
@ -474,8 +456,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>15</lid>
</ChordLine>
</Chord>
@ -492,8 +472,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>18</lid>
</ChordLine>
</Chord>
@ -510,8 +488,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>21</lid>
</ChordLine>
</Chord>

24
mtest/guitarpro/slide-out-up.gp5-ref.mscx
View file

@ -115,8 +115,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -133,8 +131,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -151,8 +147,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -169,8 +163,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -345,8 +337,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -363,8 +353,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -381,8 +369,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -399,8 +385,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -458,8 +442,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -476,8 +458,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -494,8 +474,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -512,8 +490,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>

24
mtest/guitarpro/slide-out-up.gpx-ref.mscx
View file

@ -134,8 +134,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -152,8 +150,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -170,8 +166,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -188,8 +182,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -365,8 +357,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -383,8 +373,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -401,8 +389,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -419,8 +405,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>
@ -460,8 +444,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>8</lid>
</ChordLine>
</Chord>
@ -478,8 +460,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>11</lid>
</ChordLine>
</Chord>
@ -496,8 +476,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>14</lid>
</ChordLine>
</Chord>
@ -514,8 +492,6 @@
<ChordLine>
<subtype>2</subtype>
<straight>1</straight>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>17</lid>
</ChordLine>
</Chord>

4
mtest/libmscore/parts/part-chordline-add.mscx
View file

@ -166,8 +166,6 @@
</Note>
<ChordLine>
<subtype>1</subtype>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>119</lid>
</ChordLine>
</Chord>
@ -804,8 +802,6 @@
</Note>
<ChordLine>
<subtype>1</subtype>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>119</lid>
</ChordLine>
</Chord>

4
mtest/libmscore/parts/part-chordline-parts.mscx
View file

@ -152,8 +152,6 @@
</Note>
<ChordLine>
<subtype>1</subtype>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>6</lid>
</ChordLine>
</Chord>
@ -787,8 +785,6 @@
</Note>
<ChordLine>
<subtype>1</subtype>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>6</lid>
</ChordLine>
</Chord>

4
mtest/libmscore/parts/part-chordline-udel.mscx
View file

@ -152,8 +152,6 @@
</Note>
<ChordLine>
<subtype>1</subtype>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>7</lid>
</ChordLine>
</Chord>
@ -785,8 +783,6 @@
</Note>
<ChordLine>
<subtype>1</subtype>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>7</lid>
</ChordLine>
</Chord>

4
mtest/libmscore/parts/part-chordline-uradd.mscx
View file

@ -166,8 +166,6 @@
</Note>
<ChordLine>
<subtype>1</subtype>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>120</lid>
</ChordLine>
</Chord>
@ -804,8 +802,6 @@
</Note>
<ChordLine>
<subtype>1</subtype>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
<lid>120</lid>
</ChordLine>
</Chord>

2
mtest/libmscore/parts/part-chordline.mscx
View file

@ -146,8 +146,6 @@
</Note>
<ChordLine>
<subtype>1</subtype>
<lengthX>10</lengthX>
<lengthY>10</lengthY>
</ChordLine>
</Chord>
<Chord>