Merge pull request #4788 from lvinken/285631-misplaced-ties

fix #285631 - Misplaced ties when importing MusicXML files
musescore · Mar 11, 2019 · 995e0f3 · 995e0f3
1 parent c5c83a5
commit 995e0f3
Show file tree

Hide file tree

Showing 5 changed files with 2,771 additions and 4 deletions.
diff --git a/mscore/importmxmlpass2.cpp b/mscore/importmxmlpass2.cpp
@@ -4587,7 +4587,7 @@ Note* MusicXMLParserPass2::note(const QString& partId,
       auto scoreRelStaff = _score->staffIdx(part);       // zero-based number of parts first staff in the score
       auto partRelTrack = msTrack + msVoice - scoreRelStaff * VOICES;
       // handle notations
-      notations.addToScore(cr, note, noteStartTime.ticks(), partRelTrack, _slurs, _glissandi, _spanners, _trills, _tie);
+      notations.addToScore(cr, note, noteStartTime.ticks(), _slurs, _glissandi, _spanners, _trills, _tie);
 
       // handle grace after state: remember current grace list size
       if (grace && notations.mustStopGraceAFter()) {
@@ -6058,7 +6058,7 @@ void MusicXMLParserNotations::parse()
  as in that case note is a nullptr.
  */
 
-void MusicXMLParserNotations::addToScore(ChordRest* const cr, Note* const note, const int tick, const int track, SlurStack& slurs,
+void MusicXMLParserNotations::addToScore(ChordRest* const cr, Note* const note, const int tick, SlurStack& slurs,
                                          Glissando* glissandi[MAX_NUMBER_LEVEL][2], MusicXmlSpannerMap& spanners,
                                          TrillStack& trills, Tie*& tie)
       {
@@ -6100,7 +6100,7 @@ void MusicXMLParserNotations::addToScore(ChordRest* const cr, Note* const note,
       if (note) {
             addChordLine(note, _chordLineType, _logger, &_e);
             addTechnical(note);
-            addTie(_score, note, track, _tiedType, _tiedOrientation, _tiedLineType, tie, _logger, &_e);
+            addTie(_score, note, cr->track(), _tiedType, _tiedOrientation, _tiedLineType, tie, _logger, &_e);
             }
       }
 

diff --git a/mscore/importmxmlpass2.h b/mscore/importmxmlpass2.h
@@ -156,7 +156,7 @@ class MusicXMLParserNotations {
 public:
       MusicXMLParserNotations(QXmlStreamReader& e, Score* score, MxmlLogger* logger);
       void parse();
-      void addToScore(ChordRest* const cr, Note* const note, const int tick, const int track, SlurStack& slurs,
+      void addToScore(ChordRest* const cr, Note* const note, const int tick, SlurStack& slurs,
                       Glissando* glissandi[MAX_NUMBER_LEVEL][2], MusicXmlSpannerMap& spanners, TrillStack& trills,
                       Tie*& tie);
       MusicXmlTupletDesc tupletDesc() const { return _tupletDesc; }

diff --git a/mtest/musicxml/io/testTrackHandling.pdf b/mtest/musicxml/io/testTrackHandling.pdf