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

ported #6888 : Fix #313105: No chord MusicXML import

Browse source
This commit is contained in:
Igor Korsukov 2021-02-17 15:41:12 +02:00 committed by pereverzev+v
parent 716f71e1b1
commit fd95588c70
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp
View file

@ -5134,8 +5134,8 @@ void MusicXMLParserPass2::harmony(const QString& partId, Measure* measure, const
double dy = -0.1 * _e.attributes().value("default-y").toDouble();
#endif
bool printObject = _e.attributes().value("print-object") != "no";
QString printFrame = _e.attributes().value("print-frame").toString();
QString printStyle = _e.attributes().value("print-style").toString();
//QString printFrame = _e.attributes().value("print-frame").toString();
//QString printStyle = _e.attributes().value("print-style").toString();
QString kind, kindText, functionText, symbols, parens;
QList<HDegree> degreeList;
@ -5160,14 +5160,11 @@ void MusicXMLParserPass2::harmony(const QString& partId, Measure* measure, const
if (_e.name() == "root-step") {
// attributes: print-style
step = _e.readElementText();
/* TODO: check if this is required
if (ee.hasAttribute("text")) {
QString rtext = ee.attribute("text");
if (rtext == "") {
invalidRoot = true;
}
if (_e.attributes().hasAttribute("text")) {
if (_e.attributes().value("text").toString() == "") {
invalidRoot = true;
}
}
*/
} else if (_e.name() == "root-alter") {
// attributes: print-object, print-style
// location (left-right)
@ -5192,11 +5189,13 @@ void MusicXMLParserPass2::harmony(const QString& partId, Measure* measure, const
// attributes: use-symbols yes-no
// text, stack-degrees, parentheses-degree, bracket-degrees,
// print-style, halign, valign
kindText = _e.attributes().value("text").toString();
symbols = _e.attributes().value("use-symbols").toString();
parens = _e.attributes().value("parentheses-degrees").toString();
kind = _e.readElementText();
if (kind == "none") {
ha->setRootTpc(Tpc::TPC_INVALID);
}
} else if (_e.name() == "inversion") {
// attributes: print-style
skipLogCurrElem();