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

Start of work on tremolo bars

Browse source
This commit is contained in:
John Pirie 2014-07-30 11:59:48 +01:00
parent bce60b8096
commit d3a54d5da3
7 changed files with 117 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libmscore/segment.cpp
View file

@ -443,6 +443,7 @@ void Segment::add(Element* el)
case Element::Type::MARKER:
case Element::Type::IMAGE:
case Element::Type::TEXT:
case Element::Type::TREMOLOBAR:
case Element::Type::TAB_DURATION_SYMBOL:
case Element::Type::FIGURED_BASS:
_annotations.push_back(el);

7
mscore/importgtp-gp5.cpp
View file

@ -379,6 +379,7 @@ void GuitarPro5::readTracks()
skip(version > 500 ? 49 : 44);
if (version > 500) {
// british stack clean / amp tone
readDelphiString();
readDelphiString();
}
@ -535,10 +536,12 @@ void GuitarPro5::read(QFile* fp)
}
if (barBits & 0x80)
bar.barLine = BarLineType::DOUBLE;
if (barBits & 0x3)
if (barBits & 0x3) {
skip(4);
if ((barBits & 0x10) == 0)
}
if ((barBits & 0x10) == 0) {
skip(1);
}
readChar(); // triple feel (none, 8, 16)
bar.timesig = Fraction(tnumerator, tdenominator);
bars.append(bar);

108
mscore/importgtp-gp6.cpp
View file

@ -51,6 +51,7 @@
#include "libmscore/fingering.h"
#include "libmscore/sym.h"
#include "libmscore/ottava.h"
#include "libmscore/marker.h"
#include "preferences.h"
namespace Ms {
@ -514,6 +515,8 @@ int GuitarPro6::findNumMeasures(GPPartInfo* partInfo)
while (!masterBar.isNull()) {
GpBar gpBar;
gpBar.freeTime = false;
gpBar.direction = "";
gpBar.directionStyle = "";
masterBarElement = masterBar.firstChild();
while (!masterBarElement.isNull()) {
if (!masterBarElement.nodeName().compare("Key"))
@ -523,6 +526,10 @@ int GuitarPro6::findNumMeasures(GPPartInfo* partInfo)
QList<QString> timeSignatureList = timeSignature.split("/");
gpBar.timesig = Fraction(timeSignatureList.first().toInt(), timeSignatureList.last().toInt());
}
else if (!masterBarElement.nodeName().compare("Directions")) {
gpBar.direction = masterBarElement.firstChild().toElement().text();
gpBar.directionStyle = masterBarElement.firstChild().nodeName();
}
else if (!masterBarElement.nodeName().compare("FreeTime")) {
gpBar.freeTime = true;
gpBar.barLine = BarLineType::DOUBLE;
@ -768,6 +775,7 @@ int GuitarPro6::readBeats(QString beats, GPPartInfo* partInfo, Measure* measure,
ChordRest* cr = segment->cr(track);
bool tupletSet = false;
Tuplet* tuplet = tuplets[staffIdx * 2 + voiceNum];
int whammyOrigin, whammyMiddle, whammyEnd, whammyOriginOff, whammyMiddleOff1, whammyMiddleOff2, whammyEndOff = -1;
while (!currentNode.isNull()) {
if (currentNode.nodeName() == "Notes") {
noteSpecified = true;
@ -1089,9 +1097,38 @@ int GuitarPro6::readBeats(QString beats, GPPartInfo* partInfo, Measure* measure,
}
else if (!argument.compare("BarreString"))
halfBarre = true;
else if (!argument.compare("WhammyBarOriginValue"))
whammyOrigin = currentNode.firstChild().toElement().text().toInt();
else if (!argument.compare("WhammyBarMiddleValue"))
whammyMiddle = currentNode.firstChild().toElement().text().toInt();
else if (!argument.compare("WhammyBarDestinationValue"))
whammyEnd = currentNode.firstChild().toElement().text().toInt();
else if (!argument.compare("WhammyBarMiddleOffset1"))
whammyMiddleOff1 = currentNode.firstChild().toElement().text().toInt();
else if (!argument.compare("WhammyBarMiddleOffset2"))
whammyMiddleOff2 = currentNode.firstChild().toElement().text().toInt();
else if (!argument.compare("WhammyBarDestinationOffset"))
whammyEndOff = currentNode.firstChild().toElement().text().toInt();
currentProperty = currentProperty.nextSibling();
}
if (whammyOrigin != -1) {
// some sort of whammy bar has been detected
if ((whammyOrigin == whammyEnd) && (whammyOrigin != whammyMiddle)) {
// we are dealing with a dip
QList<PitchValue> points;
points.append(PitchValue(whammyOrigin, 0, false));
points.append(PitchValue(whammyMiddle, 50, false));
points.append(PitchValue(whammyEnd, 100, false));
TremoloBar* b = new TremoloBar(score);
b->setPoints(points);
b->setTrack(track);
segment->add(b);
}
}
// if a barre fret has been specified
if (barreFret.compare("")) {
TextStyle textStyle;
@ -1318,10 +1355,10 @@ int GuitarPro6::readBeats(QString beats, GPPartInfo* partInfo, Measure* measure,
score->add(ottava[track]);
}
}
currentNode = currentNode.nextSibling();
dotted = 0;
}
// we have handled the beat - was there a note?
if (!noteSpecified) {
// add a rest with length of l
@ -1518,6 +1555,75 @@ void GuitarPro6::readMasterBars(GPPartInfo* partInfo)
else
measure->setTimesig(bars[measureCounter].timesig);
measure->setLen(bars[measureCounter].timesig);
if (!bars[measureCounter].direction.compare("Fine") || (bars[measureCounter].direction.compare("") && !bars[measureCounter].directionStyle.compare("Jump"))) {
Segment* s = measure->getSegment(SegmentType::KeySig, measure->tick());
StaffText* st = new StaffText(score);
st->setTextStyleType(TextStyleType::STAFF);
if (!bars[measureCounter].direction.compare("Fine"))
st->setText("fine");
else if (!bars[measureCounter].direction.compare("DaCapo"))
st->setText("Da Capo");
else if (!bars[measureCounter].direction.compare("DaCapoAlCoda"))
st->setText("D.C. al Coda");
else if (!bars[measureCounter].direction.compare("DaCapoAlDoubleCoda"))
st->setText("D.C. al Double Coda");
else if (!bars[measureCounter].direction.compare("DaCapoAlFine"))
st->setText("D.C. al Fine");
else if (!bars[measureCounter].direction.compare("DaSegnoAlCoda"))
st->setText("D.S. al Coda");
else if (!bars[measureCounter].direction.compare("DaSegnoAlDoubleCoda"))
st->setText("D.S. al Double Coda");
else if (!bars[measureCounter].direction.compare("DaSegnoAlFine"))
st->setText("D.S. al Fine");
else if (!bars[measureCounter].direction.compare("DaSegnoSegno"))
st->setText("Da Segno Segno");
else if (!bars[measureCounter].direction.compare("DaSegnoSegnoAlCoda"))
st->setText("D.S.S. al Coda");
else if (!bars[measureCounter].direction.compare("DaSegnoSegnoAlDoubleCoda"))
st->setText("D.S.S. al Double Coda");
else if (!bars[measureCounter].direction.compare("DaSegnoSegnoAlFine"))
st->setText("D.S.S. al Fine");
else if (!bars[measureCounter].direction.compare("DaCoda"))
st->setText("Da Coda");
else if (!bars[measureCounter].direction.compare("DaDoubleCoda"))
st->setText("Da Double Coda");
st->setParent(s);
st->setTrack(0);
score->addElement(st);
bars[measureCounter].direction = "";
}
else if (bars[measureCounter].direction.compare("") && !bars[measureCounter].directionStyle.compare("Target")) {
Segment* s = measure->getSegment(SegmentType::BarLine, measure->tick());
Symbol* sym = new Symbol(score);
if (!bars[measureCounter].direction.compare("Segno"))
sym->setSym(SymId::segno);
else if (!bars[measureCounter].direction.compare("SegnoSegno")) {
sym->setSym(SymId::segno);
Segment* s2 = measure->getSegment(SegmentType::ChordRest, measure->tick());
Symbol* sym2 = new Symbol(score);
sym2->setSym(SymId::segno);
sym2->setParent(measure);
sym2->setTrack(0);
s2->add(sym2);
}
else if (!bars[measureCounter].direction.compare("Coda"))
sym->setSym(SymId::coda);
else if (!bars[measureCounter].direction.compare("DoubleCoda")) {
sym->setSym(SymId::coda);
Segment* s2 = measure->getSegment(SegmentType::ChordRest, measure->tick());
Symbol* sym2 = new Symbol(score);
sym2->setSym(SymId::coda);
sym2->setParent(measure);
sym2->setTrack(0);
s2->add(sym2);
}
sym->setParent(measure);
sym->setTrack(0);
s->add(sym);
bars[measureCounter].direction = "";
}
KeySig* t = new KeySig(score);
if (!masterBarElement.nodeName().compare("Key")) {
t->setKey(masterBarElement.firstChild().toElement().text().toInt());

2
mscore/importgtp.h
View file

@ -90,6 +90,8 @@ struct GpBar {
Repeat repeatFlags;
int repeats;
GPVolta volta;
QString direction;
QString directionStyle;
GpBar();
};

BIN
mtest/guitarpro/directions.gpx Normal file
View file

Binary file not shown.

1
mtest/guitarpro/tst_guitarpro.cpp
View file

@ -126,6 +126,7 @@ private slots:
void gpxRasg() { gpReadTest("rasg", "gpx"); }
void gp5Percussion() { gpReadTest("all-percussion", "gp5"); }
void gpxFermata() { gpReadTest("fermata", "gpx"); }
void gpxDirections() { gpReadTest("directions", "gpx"); }
};
//---------------------------------------------------------

1
mtest/guitarpro/updateReference
View file

@ -97,3 +97,4 @@ cp $MSCORE/ghost-note.gpx.mscx ghost-note.gpx-ref.mscx
cp $MSCORE/rasg.gpx.mscx rasg.gpx-ref.mscx
cp $MSCORE/all-percussion.gp5.mscx all-percussion.gp5-ref.mscx
cp $MSCORE/fermata.gpx.mscx fermata.gpx-ref.mscx
cp $MSCORE/directions.gpx.mscx directions.gpx-ref.mscx