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

fix testTempo1

Browse source
This commit is contained in:
Leon Vinken 2015-04-06 14:01:12 +02:00
parent 5a39ce9799
commit 7574ad9393
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mscore/importmxmlpass2.cpp
View file

@ -2144,7 +2144,7 @@ void MusicXMLParserDirection::direction(const QString& partId,
if (_wordsText != "" || _rehearsalText != "" || _metroText != "") {
Text* t = 0;
if (_tpoSound > 0.1 || _metroText != "") {
if (_tpoSound > 0.1) {
_tpoSound /= 60;
t = new TempoText(_score);
t->setText(_wordsText + _metroText);
@ -2153,9 +2153,9 @@ void MusicXMLParserDirection::direction(const QString& partId,
_score->setTempo(tick, _tpoSound);
}
else {
if (_wordsText != "") {
if (_wordsText != "" || _metroText != "") {
t = new StaffText(_score);
t->setText(_wordsText);
t->setText(_wordsText + _metroText);
}
else {
t = new RehearsalMark(_score);

2
mtest/musicxml/io/tst_mxml_io.cpp
View file

@ -129,7 +129,7 @@ private slots:
void tablature1() { mxmlIoTest("testTablature1"); }
void tablature2() { mxmlIoTest("testTablature2"); }
void tablature3() { mxmlIoTest("testTablature3"); }
//void tempo1() { mxmlIoTest("testTempo1"); } incorrectly generates tempo=0 in measure 7
void tempo1() { mxmlIoTest("testTempo1"); }
void tempo2() { mxmlIoTestRef("testTempo2"); }
void timesig1() { mxmlIoTest("testTimesig1"); }
void timesig3() { mxmlIoTest("testTimesig3"); }