Fixed musescore#12869

vpereverzev · Oct 14, 2022 · 0995057 · 0995057
1 parent fb19f0f
commit 0995057
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 13 deletions.
diff --git a/src/engraving/libmscore/spannermap.cpp b/src/engraving/libmscore/spannermap.cpp
@@ -22,6 +22,7 @@
 
 #include "spannermap.h"
 #include "spanner.h"
+#include "part.h"
 
 #include "log.h"
 
@@ -45,10 +46,7 @@ SpannerMap::SpannerMap()
 
 void SpannerMap::update() const
 {
-    std::vector<interval_tree::Interval<Spanner*> > intervals;
-    for (auto i : *this) {
-        intervals.push_back(interval_tree::Interval<Spanner*>(i.second->tick().ticks(), i.second->tick2().ticks(), i.second));
-    }
+    IntervalList intervals = collectIntervals();
     tree = interval_tree::IntervalTree<Spanner*>(intervals);
     dirty = false;
 }
@@ -81,6 +79,44 @@ const std::vector<interval_tree::Interval<Spanner*> >& SpannerMap::findOverlappi
     return results;
 }
 
+SpannerMap::IntervalList SpannerMap::collectIntervals() const
+{
+    using IntervalsByPart = std::map<ID, IntervalList>;
+
+    IntervalsByPart intervalsByPart;
+
+    //!Note Because of the current UX of spanners adjustments spanners collision is a regular thing,
+    //!     so we have to manage those cases when two similar spanners (e.g. Pedal line) are overlapping
+    //!     with each other.
+    constexpr int collidingSpannersPadding = 1;
+
+    for (const auto& pair : *this) {
+        IntervalList& intervalList = intervalsByPart[pair.second->part()->id()];
+
+        int newSpannerStartTick = pair.second->tick().ticks();
+        int newSpannerEndTick = pair.second->tick2().ticks();
+
+        if (!intervalList.empty()) {
+            auto lastIntervalIt = intervalList.rbegin();
+            if (lastIntervalIt->stop >= newSpannerStartTick) {
+                lastIntervalIt->stop = newSpannerStartTick - collidingSpannersPadding;
+            }
+        }
+
+        intervalList.emplace_back(interval_tree::Interval<Spanner*>(newSpannerStartTick,
+                                                                    newSpannerEndTick,
+                                                                    pair.second));
+    }
+
+    IntervalList result;
+
+    for (const auto& pair : intervalsByPart) {
+        result.insert(result.end(), pair.second.begin(), pair.second.end());
+    }
+
+    return result;
+}
+
 //---------------------------------------------------------
 //   addSpanner
 //---------------------------------------------------------

diff --git a/src/engraving/libmscore/spannermap.h b/src/engraving/libmscore/spannermap.h
@@ -43,11 +43,16 @@ class SpannerMap : std::multimap<int, Spanner*>
     typedef typename std::multimap<int, Spanner*>::const_reverse_iterator const_reverse_it;
     typedef typename std::multimap<int, Spanner*>::const_iterator const_it;
 
+    using IntervalList = std::vector<interval_tree::Interval<Spanner *> >;
+
     SpannerMap();
 
     const std::vector<interval_tree::Interval<Spanner*> >& findContained(int start, int stop) const;
     const std::vector<interval_tree::Interval<Spanner*> >& findOverlapping(int start, int stop) const;
     const std::multimap<int, Spanner*>& map() const { return *this; }
+
+    IntervalList collectIntervals() const;
+
     const_reverse_it crbegin() const { return std::multimap<int, Spanner*>::crbegin(); }
     const_reverse_it crend() const { return std::multimap<int, Spanner*>::crend(); }
     const_it cbegin() const { return std::multimap<int, Spanner*>::cbegin(); }

diff --git a/src/engraving/playback/metaparsers/internal/spannersmetaparser.cpp b/src/engraving/playback/metaparsers/internal/spannersmetaparser.cpp
@@ -26,12 +26,13 @@
 #include "libmscore/note.h"
 #include "libmscore/spanner.h"
 #include "libmscore/trill.h"
+#include "libmscore/pedal.h"
 
 #include "playback/utils/pitchutils.h"
 
 using namespace mu::engraving;
 
-void SpannersMetaParser::doParse(const EngravingItem* item, const RenderingContext& ctx, mpe::ArticulationMap& result)
+void SpannersMetaParser::doParse(const EngravingItem* item, const RenderingContext& spannerCtx, mpe::ArticulationMap& result)
 {
     IF_ASSERT_FAILED(item->isSpanner()) {
         return;
@@ -43,7 +44,7 @@ void SpannersMetaParser::doParse(const EngravingItem* item, const RenderingConte
 
     mpe::pitch_level_t overallPitchRange = 0;
     mpe::dynamic_level_t overallDynamicRange = 0;
-    int overallDurationTicks = spanner->ticks().ticks();
+    int overallDurationTicks = spannerCtx.nominalDurationTicks;
 
     switch (spanner->type()) {
     case ElementType::SLUR: {
@@ -64,8 +65,13 @@ void SpannersMetaParser::doParse(const EngravingItem* item, const RenderingConte
 
         break;
     }
-    case ElementType::PEDAL:
-        type = mpe::ArticulationType::Pedal;
+    case ElementType::PEDAL: {
+            type = mpe::ArticulationType::Pedal;
+            const Pedal* pedal = toPedal(spanner);
+            if (pedal->endHookType() == HookType::HOOK_45) {
+                overallDurationTicks -= Constants::division / 4;
+            }
+        }
         break;
     case ElementType::LET_RING:
         type = mpe::ArticulationType::LaissezVibrer;
@@ -90,7 +96,7 @@ void SpannersMetaParser::doParse(const EngravingItem* item, const RenderingConte
         } else if (trill->trillType() == TrillType::PRALLPRALL_LINE) {
             type = mpe::ArticulationType::LinePrall;
         }
-        overallDurationTicks = ctx.nominalDurationTicks;
+        overallDurationTicks = spannerCtx.nominalDurationTicks;
         break;
     }
     case ElementType::GLISSANDO: {
@@ -135,11 +141,11 @@ void SpannersMetaParser::doParse(const EngravingItem* item, const RenderingConte
 
     mpe::ArticulationMeta articulationMeta;
     articulationMeta.type = type;
-    articulationMeta.pattern = ctx.profile->pattern(type);
-    articulationMeta.timestamp = ctx.nominalTimestamp;
+    articulationMeta.pattern = spannerCtx.profile->pattern(type);
+    articulationMeta.timestamp = spannerCtx.nominalTimestamp;
     articulationMeta.overallPitchChangesRange = overallPitchRange;
     articulationMeta.overallDynamicChangesRange = overallDynamicRange;
-    articulationMeta.overallDuration = durationFromTicks(ctx.beatsPerSecond.val, overallDurationTicks);
+    articulationMeta.overallDuration = durationFromTicks(spannerCtx.beatsPerSecond.val, overallDurationTicks);
 
     appendArticulationData(std::move(articulationMeta), result);
 }
diff --git a/src/engraving/playback/metaparsers/internal/spannersmetaparser.h b/src/engraving/playback/metaparsers/internal/spannersmetaparser.h
@@ -31,7 +31,7 @@ class SpannersMetaParser : public MetaParserBase<SpannersMetaParser>
 protected:
     friend MetaParserBase;
 
-    static void doParse(const EngravingItem* item, const RenderingContext& ctx, mpe::ArticulationMap& result);
+    static void doParse(const EngravingItem* item, const RenderingContext& spannerCtx, mpe::ArticulationMap& result);
 };
 }