set correct tempo for metronome marking

Amended by @cbjeukendrup: added @CoolSpy3 as a co-author, because they originally created almost the same solution in #21458. Co-Authored-By: CoolSpy3 <55305038+coolspy3@users.noreply.github.com>
musescore · Feb 4, 2025 · fbed537 · fbed537
1 parent b3217a1
commit fbed537
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/notation/internal/masternotation.cpp b/src/notation/internal/masternotation.cpp
@@ -426,19 +426,22 @@ void MasterNotation::applyOptions(mu::engraving::MasterScore* score, const Score
         mu::engraving::Fraction ts(scoreOptions.timesigNumerator, scoreOptions.timesigDenominator);
 
         QString text("<sym>metNoteQuarterUp</sym> = %1");
-        double bpm = scoreOptions.tempo.valueBpm;
+        const double bpm = scoreOptions.tempo.valueBpm;
+        double tempo = bpm; // initial value for tempo, which internally is always expressed in quarter notes
 
         bool withDot = scoreOptions.tempo.withDot;
         switch (scoreOptions.tempo.duration) {
         case DurationType::V_WHOLE:
             text = "<sym>metNoteWhole</sym> = %1";
+            tempo *= 4.0;
             break;
         case DurationType::V_HALF:
             if (withDot) {
                 text = "<sym>metNoteHalfUp</sym><sym>space</sym><sym>metAugmentationDot</sym> = %1";
             } else {
                 text = "<sym>metNoteHalfUp</sym> = %1";
             }
+            tempo *= 2.0;
             break;
         case DurationType::V_QUARTER:
             if (withDot) {
@@ -453,24 +456,29 @@ void MasterNotation::applyOptions(mu::engraving::MasterScore* score, const Score
             } else {
                 text = "<sym>metNote8thUp</sym> = %1";
             }
+            tempo *= 0.5;
             break;
         case DurationType::V_16TH:
             if (withDot) {
                 text = "<sym>metNote16thUp</sym><sym>space</sym><sym>metAugmentationDot</sym> = %1";
             } else {
                 text = "<sym>metNote16thUp</sym> = %1";
             }
+            tempo *= 0.25;
             break;
         default:
             break;
         }
 
+        if (withDot) {
+            tempo *= 1.5;
+        }
+
         mu::engraving::Segment* seg = score->firstMeasure()->first(mu::engraving::SegmentType::ChordRest);
         mu::engraving::TempoText* tt = new mu::engraving::TempoText(seg);
         tt->setXmlText(text.arg(bpm));
 
-        double tempo = scoreOptions.tempo.valueBpm;
-        tempo /= 60; // bpm -> bps
+        tempo /= 60; // qpm -> qps
 
         tt->setTempo(tempo);
         tt->setFollowText(true);