Fix XML tie import

Backport of musescore#24640, plus fixing some clazy warnings, including some that fix null pointer dereferencing and fix 2 MSVC compiler warnings (reg. conversion from size_t to int and reg. declaration hides class member)
Jojo-Schmitz · Oct 16, 2024 · 089ef5b · 089ef5b
1 parent 8e9758d
commit 089ef5b
Show file tree

Hide file tree

Showing 14 changed files with 2,386 additions and 65 deletions.
diff --git a/importexport/musicxml/importmxmlpass2.cpp b/importexport/musicxml/importmxmlpass2.cpp
diff --git a/importexport/musicxml/importmxmlpass2.h b/importexport/musicxml/importmxmlpass2.h
@@ -202,6 +202,7 @@ using HairpinsStack = std::array<MusicXmlExtendedSpannerDesc, MAX_NUMBER_LEVEL>;
 using InferredHairpinsStack = std::vector<Hairpin*>;
 using SpannerStack = std::array<MusicXmlExtendedSpannerDesc, MAX_NUMBER_LEVEL>;
 using SpannerSet = std::set<Spanner*>;
+using MusicXMLTieMap = std::map<TieLocation, Tie*>;
 
 //---------------------------------------------------------
 //   DelayedDirectionsList
@@ -222,7 +223,7 @@ class MusicXMLParserNotations {
       void parse();
       void addToScore(ChordRest* const cr, Note* const note, const int tick, SlurStack& slurs,
                       Glissando* glissandi[MAX_NUMBER_LEVEL][2], MusicXmlSpannerMap& spanners, TrillStack& trills,
-                      std::map<int, Tie*>& ties);
+                      MusicXMLTieMap& ties, std::vector<Note*>& unstartedTieNotes, std::vector<Note*>& unendedTieNotes);
       QString errors() const { return _errors; }
       MusicXmlTupletDesc tupletDesc() const { return _tupletDesc; }
       bool hasTremolo() const { return _hasTremolo; }
@@ -363,10 +364,11 @@ class MusicXMLParserPass2 {
 
       Glissando* _glissandi[MAX_NUMBER_LEVEL][2];   ///< Current slides ([0]) / glissandi ([1])
 
-      std::map<int, Tie*> _ties;
+      MusicXMLTieMap  _ties;
       Volta* _lastVolta;
       bool _hasDrumset;                           ///< drumset defined TODO: move to pass 1
-
+      std::vector<Note*> _unstartedTieNotes;
+      std::vector<Note*> _unendedTieNotes;
       MusicXmlSpannerMap _spanners;
 
       MusicXmlExtendedSpannerDesc _pedal;         ///< Current pedal

diff --git a/importexport/musicxml/musicxml.h b/importexport/musicxml/musicxml.h
@@ -121,6 +121,9 @@ class SlurDesc {
       State _state;
       };
 
+// Ties are identified by the pitch and track of their first note
+typedef std::pair<int, int> TieLocation;
+
 //---------------------------------------------------------
 //   MusicXml
 //---------------------------------------------------------

diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -2255,7 +2255,7 @@ void Score::deleteMeasures(MeasureBase* is, MeasureBase* ie, bool preserveTies)
                         size_t track = staffIdx * VOICES;
                         if (track < s->elist().size()) {
                               TimeSig* nts = new TimeSig(score);
-                              nts->setTrack(track);
+                              nts->setTrack(static_cast<int>(track));
                               nts->setParent(s);
                               nts->setSig(lastDeletedForThisStaff->sig());
                               nts->setStretch(nts->sig() / mAfterSel->timesig());

diff --git a/mscore/shortcutcapturedialog.cpp b/mscore/shortcutcapturedialog.cpp
@@ -190,15 +190,15 @@ void ShortcutCaptureDialog::keyPress(QKeyEvent* e)
             );
       }
 
-bool ShortcutCaptureDialog::isShiftAllowed(int key)
+bool ShortcutCaptureDialog::isShiftAllowed(int k)
       {
       // Letter keys where Shift should not be removed
-      if (key >= Qt::Key_A && key <= Qt::Key_Z) {
+      if (k >= Qt::Key_A && k <= Qt::Key_Z) {
             return true;
             }
 
       // non-letter keys where Shift should not be removed
-      switch (key) {
+      switch (k) {
             case Qt::Key_Up:
             case Qt::Key_Down:
             case Qt::Key_Left: