Optimised getting stringData

musescore · Sep 15, 2023 · 54057d4 · 54057d4
1 parent 4ea1960
commit 54057d4
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 29 deletions.
diff --git a/src/engraving/dom/part.cpp b/src/engraving/dom/part.cpp
@@ -412,40 +412,40 @@ const StringData* Part::stringData(const Fraction& tick) const
         return nullptr;
     }
 
-    const StringTunings* stringTunings = nullptr;
+    auto it = m_stringTunings.upper_bound(tick.ticks());
+    if (it != m_stringTunings.begin()) {
+        --it;
+    }
+
+    StringTunings* stringTunings = nullptr;
     const Instrument* instrument = this->instrument(tick);
 
-    for (Measure* measure = score()->firstMeasure(); measure; measure = measure->nextMeasure()) {
-        if (measure->tick() > tick) {
-            break;
-        }
+    if (it != m_stringTunings.end()) {
+        stringTunings = it->second;
+    }
 
-        for (Segment* segment = measure->first(); segment; segment = segment->next()) {
-            if (segment->tick() > tick) {
-                break;
-            }
+    if (stringTunings) {
+        //!NOTE: if there is string tunings element between current instrument and current tick,
+        //! then return string data from string tunings element
+        const Instrument* stringTuningsInstrument = this->instrument(stringTunings->tick());
+        if (instrument == stringTuningsInstrument) {
+            return stringTunings->stringData();
+        }
+    }
 
-            std::vector<EngravingItem*> annotations = segment->annotations();
+    return instrument->stringData();
+}
 
-            for (EngravingItem* annotation : annotations) {
-                if (!annotation) {
-                    continue;
-                }
+void Part::addStringTunings(StringTunings* stringTunings)
+{
+    m_stringTunings[stringTunings->segment()->tick().ticks()] = stringTunings;
+}
 
-                if (annotation->isStringTunings()) {
-                    stringTunings = toStringTunings(annotation);
-                    instrument = nullptr;
-                    break;
-                } else if (annotation->isInstrumentChange()) {
-                    instrument = toInstrumentChange(annotation)->instrument();
-                    stringTunings = nullptr;
-                    break;
-                }
-            }
-        }
+void Part::removeStringTunings(StringTunings* stringTunings)
+{
+    if (m_stringTunings[stringTunings->segment()->tick().ticks()] == stringTunings) {
+        m_stringTunings.erase(stringTunings->segment()->tick().ticks());
     }
-
-    return stringTunings ? stringTunings->stringData() : instrument->stringData();
 }
 
 //---------------------------------------------------------

diff --git a/src/engraving/dom/part.h b/src/engraving/dom/part.h
@@ -149,6 +149,8 @@ class Part final : public EngravingObject
     const InstrumentList& instruments() const;
 
     const StringData* stringData(const Fraction& tick) const;
+    void addStringTunings(StringTunings* stringTunings);
+    void removeStringTunings(StringTunings* stringTunings);
 
     void insertTime(const Fraction& tick, const Fraction& len);
 
@@ -206,6 +208,8 @@ class Part final : public EngravingObject
     int _color = 0;                  ///User specified color for helping to label parts
 
     PreferSharpFlat _preferSharpFlat = PreferSharpFlat::AUTO;
+
+    std::map<int, StringTunings*> m_stringTunings;
 };
 } // namespace mu::engraving
 #endif
diff --git a/src/engraving/dom/segment.cpp b/src/engraving/dom/segment.cpp
@@ -621,6 +621,7 @@ void Segment::add(EngravingItem* el)
 
         if (!alreadyHasStringTunings) {
             _annotations.push_back(el);
+            el->part()->addStringTunings(toStringTunings(el));
         }
 
         break;
@@ -794,7 +795,6 @@ void Segment::remove(EngravingItem* el)
     case ElementType::TRIPLET_FEEL:
     case ElementType::PLAYTECH_ANNOTATION:
     case ElementType::CAPO:
-    case ElementType::STRING_TUNINGS:
     case ElementType::SYMBOL:
     case ElementType::TAB_DURATION_SYMBOL:
     case ElementType::TEMPO_TEXT:
@@ -805,6 +805,11 @@ void Segment::remove(EngravingItem* el)
         removeAnnotation(el);
         break;
 
+    case ElementType::STRING_TUNINGS:
+        el->part()->removeStringTunings(toStringTunings(el));
+        removeAnnotation(el);
+        break;
+
     case ElementType::STAFF_STATE:
         if (toStaffState(el)->staffStateType() == StaffStateType::INSTRUMENT) {
             Part* part = el->part();

diff --git a/src/engraving/dom/staff.h b/src/engraving/dom/staff.h
@@ -100,7 +100,7 @@ class Staff final : public EngravingItem
     ChangeMap _velocityMultiplications;         ///< cached value
     PitchList _pitchOffsets;        ///< cached value
 
-    bool m_reflectTranspositionInLinkedTab = false;
+    bool m_reflectTranspositionInLinkedTab = true;
 
     friend class Factory;
     Staff(Part* parent);