Revert "Fix #298147 MusicXML: Handle measure number offsets"

See also musescore#7870, part 1, which is a backport of musescore#7617. There are many mtests failures caused by that PR that need to get fixed first
Jojo-Schmitz · Mar 5, 2023 · ffc0ea3 · ffc0ea3
1 parent ecee642
commit ffc0ea3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/importexport/musicxml/exportxml.cpp b/importexport/musicxml/exportxml.cpp
@@ -6326,7 +6326,6 @@ void MeasureNumberStateHandler::updateForMeasure(const Measure* const m)
             }
 
       // update measure numbers and cache result
-      _measureNo += m->noOffset();
       _cachedAttributes = " number=";
       if ((_irregularMeasureNo + _measureNo) == 2 && m->irregular()) {
             _cachedAttributes += "\"0\" implicit=\"yes\"";

diff --git a/importexport/musicxml/importmxmlpass2.cpp b/importexport/musicxml/importmxmlpass2.cpp
@@ -2290,8 +2290,8 @@ void MusicXMLParserPass2::measure(const QString& partId,
                                   const Fraction time)
       {
       Q_ASSERT(_e.isStartElement() && _e.name() == "measure");
-      int number = _e.attributes().value("number").toInt();
-      //qDebug("measure %d start", number);
+      //QString number = _e.attributes().value("number").toString();
+      //qDebug("measure %s start", qPrintable(number));
 
       Measure* measure = findMeasure(_score, time);
       if (!measure) {
@@ -2300,8 +2300,6 @@ void MusicXMLParserPass2::measure(const QString& partId,
             return;
             }
 
-      measure->setNoOffset(measure->no() - number);
-
       // handle implicit measure
       if (_e.attributes().value("implicit") == "yes")
             measure->setIrregular(true);