Merge pull request #24152 from ketgg/gsoc_dynamics_popup_part_3

GSoC '24 - Dynamics Popup - Part 3
musescore · Feb 17, 2025 · 2c6fafc · 2c6fafc
2 parents 0584c02 + 2ad0ba8
commit 2c6fafc
Show file tree

Hide file tree

Showing 17 changed files with 259 additions and 30 deletions.
diff --git a/src/app/configs/data/shortcuts.xml b/src/app/configs/data/shortcuts.xml
@@ -362,6 +362,10 @@
     <key>flip</key>
     <seq>X</seq>
     </SC>
+  <SC>
+    <key>flip-horizontally</key>
+    <seq>Alt+X</seq>
+    </SC>
   <SC>
     <key>pitch-up</key>
     <seq>Up</seq>
@@ -538,6 +542,10 @@
     <key>add-slur</key>
     <seq>S</seq>
     </SC>
+  <SC>
+    <key>add-dynamic</key>
+    <seq>Ctrl+D</seq>
+    </SC>
   <SC>
     <key>add-hairpin</key>
     <seq>Shift+,</seq>
@@ -743,10 +751,6 @@
     <key>staff-text</key>
     <seq>Ctrl+T</seq>
     </SC>
-  <SC>
-    <key>dynamics</key>
-    <seq>Ctrl+D</seq>
-    </SC>
   <SC>
     <key>expression-text</key>
     <seq>Ctrl+E</seq>

diff --git a/src/app/configs/data/shortcuts_azerty.xml b/src/app/configs/data/shortcuts_azerty.xml
@@ -371,6 +371,10 @@
     <key>flip</key>
     <seq>X</seq>
     </SC>
+  <SC>
+    <key>flip-horizontally</key>
+    <seq>Alt+X</seq>
+    </SC>
   <SC>
     <key>pitch-up</key>
     <seq>Up</seq>
@@ -547,6 +551,10 @@
     <key>add-slur</key>
     <seq>S</seq>
     </SC>
+  <SC>
+    <key>add-dynamic</key>
+    <seq>Ctrl+D</seq>
+    </SC>
   <SC>
     <key>add-hairpin</key>
     <seq>Shift+,</seq>
@@ -769,10 +777,6 @@
     <key>staff-text</key>
     <seq>Ctrl+T</seq>
     </SC>
-  <SC>
-    <key>dynamics</key>
-    <seq>Ctrl+D</seq>
-    </SC>
   <SC>
     <key>expression-text</key>
     <seq>Ctrl+E</seq>

diff --git a/src/app/configs/data/shortcuts_mac.xml b/src/app/configs/data/shortcuts_mac.xml
@@ -362,6 +362,10 @@
     <key>flip</key>
     <seq>X</seq>
     </SC>
+  <SC>
+    <key>flip-horizontally</key>
+    <seq>Alt+X</seq>
+    </SC>
   <SC>
     <key>pitch-up</key>
     <seq>Up</seq>
@@ -538,6 +542,10 @@
     <key>add-slur</key>
     <seq>S</seq>
     </SC>
+  <SC>
+    <key>add-dynamic</key>
+    <seq>Ctrl+D</seq>
+    </SC>
   <SC>
     <key>add-hairpin</key>
     <seq>Shift+,</seq>
@@ -743,10 +751,6 @@
     <key>staff-text</key>
     <seq>Ctrl+T</seq>
     </SC>
-  <SC>
-    <key>dynamics</key>
-    <seq>Ctrl+D</seq>
-    </SC>
   <SC>
     <key>expression-text</key>
     <seq>Ctrl+E</seq>

diff --git a/src/appshell/view/appmenumodel.cpp b/src/appshell/view/appmenumodel.cpp
@@ -643,7 +643,7 @@ MenuItemList AppMenuModel::makeTextItems()
         makeSeparator(),
         makeMenuItem("system-text"),
         makeMenuItem("staff-text"),
-        makeMenuItem("dynamics"),
+        makeMenuItem("add-dynamic"),
         makeMenuItem("expression-text"),
         makeMenuItem("rehearsalmark-text"),
         makeMenuItem("instrument-change-text"),

diff --git a/src/engraving/dom/edit.cpp b/src/engraving/dom/edit.cpp
@@ -763,6 +763,15 @@ TextBase* Score::addText(TextStyleType type, EngravingItem* destinationElement)
         chordRest->undoAddAnnotation(textBox);
         break;
     }
+    case TextStyleType::DYNAMICS: {
+        ChordRest* chordRest = chordOrRest(destinationElement);
+        if (!chordRest) {
+            break;
+        }
+        textBox = Factory::createDynamic(dummy()->segment());
+        chordRest->undoAddAnnotation(textBox);
+        break;
+    }
     case TextStyleType::EXPRESSION: {
         ChordRest* chordRest = chordOrRest(destinationElement);
         if (!chordRest) {
@@ -955,15 +964,6 @@ TextBase* Score::addText(TextStyleType type, EngravingItem* destinationElement)
         undoAddElement(textBox);
         break;
     }
-    case TextStyleType::DYNAMICS: {
-        ChordRest* chordRest = chordOrRest(destinationElement);
-        if (!chordRest) {
-            break;
-        }
-        textBox = Factory::createDynamic(dummy()->segment());
-        chordRest->undoAddAnnotation(textBox);
-        break;
-    }
     case TextStyleType::HARP_PEDAL_DIAGRAM:
     case TextStyleType::HARP_PEDAL_TEXT_DIAGRAM: {
         ChordRest* chordRest = getSelectedChordRest();
@@ -2459,6 +2459,38 @@ void Score::cmdFlip()
     }
 }
 
+void Score::cmdFlipHorizontally()
+{
+    const std::vector<EngravingItem*>& el = selection().elements();
+    if (el.empty()) {
+        MScore::setError(MsError::NO_FLIPPABLE_SELECTED);
+        return;
+    }
+
+    std::set<const EngravingItem*> alreadyFlippedElements;
+    auto flipOnce = [&alreadyFlippedElements](const EngravingItem* element, std::function<void()> flipFunction) -> void {
+        if (alreadyFlippedElements.insert(element).second) {
+            flipFunction();
+        }
+    };
+
+    for (EngravingItem* e : el) {
+        if (e->isHairpinSegment()) {
+            e = toHairpinSegment(e)->hairpin();
+        }
+        if (e->isHairpin()) {
+            Hairpin* h = toHairpin(e);
+            flipOnce(h, [h] {
+                if (h->hairpinType() == HairpinType::CRESC_HAIRPIN) {
+                    h->undoChangeProperty(Pid::HAIRPIN_TYPE, int(HairpinType::DECRESC_HAIRPIN));
+                } else if (h->hairpinType() == HairpinType::DECRESC_HAIRPIN) {
+                    h->undoChangeProperty(Pid::HAIRPIN_TYPE, int(HairpinType::CRESC_HAIRPIN));
+                }
+            });
+        }
+    }
+}
+
 //---------------------------------------------------------
 //   deleteItem
 //---------------------------------------------------------

diff --git a/src/engraving/dom/hairpin.cpp b/src/engraving/dom/hairpin.cpp
@@ -520,6 +520,36 @@ DynamicType Hairpin::dynamicTypeTo() const
     return TConv::dynamicType(ba.constChar());
 }
 
+const Dynamic* Hairpin::dynamicSnappedBefore() const
+{
+    const LineSegment* seg = frontSegment();
+    if (!seg) {
+        return nullptr;
+    }
+
+    const EngravingItem* item = seg->ldata()->itemSnappedBefore();
+    if (!item || !item->isDynamic()) {
+        return nullptr;
+    }
+
+    return toDynamic(item);
+}
+
+const Dynamic* Hairpin::dynamicSnappedAfter() const
+{
+    const LineSegment* seg = backSegment();
+    if (!seg) {
+        return nullptr;
+    }
+
+    const EngravingItem* item = seg->ldata()->itemSnappedAfter();
+    if (!item || !item->isDynamic()) {
+        return nullptr;
+    }
+
+    return toDynamic(item);
+}
+
 //---------------------------------------------------------
 //   setHairpinType
 //---------------------------------------------------------

diff --git a/src/engraving/dom/hairpin.h b/src/engraving/dom/hairpin.h
@@ -115,6 +115,9 @@ class Hairpin final : public TextLineBase
     DynamicType dynamicTypeFrom() const;
     DynamicType dynamicTypeTo() const;
 
+    const Dynamic* dynamicSnappedBefore() const;
+    const Dynamic* dynamicSnappedAfter() const;
+
     HairpinType hairpinType() const { return m_hairpinType; }
     void setHairpinType(HairpinType val);
 

diff --git a/src/engraving/dom/score.h b/src/engraving/dom/score.h
@@ -378,6 +378,7 @@ class Score : public EngravingObject, public muse::Injectable
     void cmdAddMeasureRepeat(Measure*, int numMeasures, staff_idx_t staffIdx);
     bool makeMeasureRepeatGroup(Measure*, int numMeasures, staff_idx_t staffIdx);
     void cmdFlip();
+    void cmdFlipHorizontally();
     void resetUserStretch();
     void cmdResetToDefaultLayout();
     void cmdResetBeamMode();

diff --git a/src/notation/inotationinteraction.h b/src/notation/inotationinteraction.h
@@ -185,6 +185,7 @@ class INotationInteraction
     virtual void swapSelection() = 0;
     virtual void deleteSelection() = 0;
     virtual void flipSelection() = 0;
+    virtual void flipSelectionHorizontally() = 0;
     virtual void addTieToSelection() = 0;
     virtual void addTiedNoteToChord() = 0;
     virtual void addLaissezVibToSelection() = 0;
@@ -205,6 +206,9 @@ class INotationInteraction
 
     virtual void increaseDecreaseDuration(int steps, bool stepByDots) = 0;
 
+    virtual void autoFlipHairpinsType(engraving::Dynamic* selDyn) = 0;
+
+    virtual void toggleDynamicPopup() = 0;
     virtual bool toggleLayoutBreakAvailable() const = 0;
     virtual void toggleLayoutBreak(LayoutBreakType breakType) = 0;
     virtual void moveMeasureToPrevSystem() = 0;

diff --git a/src/notation/internal/notationactioncontroller.cpp b/src/notation/internal/notationactioncontroller.cpp
@@ -223,6 +223,7 @@ void NotationActionController::init()
     registerAction("notation-delete", &Interaction::deleteSelection, &Controller::hasSelection);
 
     registerAction("flip", &Interaction::flipSelection, &Controller::hasSelection);
+    registerAction("flip-horizontally", &Interaction::flipSelectionHorizontally, &Controller::hasSelection);
     registerAction("tie", &Controller::addTie);
     registerAction("chord-tie", &Controller::chordTie);
     registerAction("lv", &Controller::addLaissezVib);
@@ -322,6 +323,7 @@ void NotationActionController::init()
 
     registerAction("add-8va", &Interaction::addOttavaToSelection, OttavaType::OTTAVA_8VA);
     registerAction("add-8vb", &Interaction::addOttavaToSelection, OttavaType::OTTAVA_8VB);
+    registerAction("add-dynamic", &Interaction::toggleDynamicPopup, &Controller::noteOrRestSelected);
     registerAction("add-hairpin", &Interaction::addHairpinsToSelection, HairpinType::CRESC_HAIRPIN, &Controller::noteOrRestSelected);
     registerAction("add-hairpin-reverse", &Interaction::addHairpinsToSelection, HairpinType::DECRESC_HAIRPIN,
                    &Controller::noteOrRestSelected);
@@ -338,7 +340,6 @@ void NotationActionController::init()
 
     registerAction("system-text", [this]() { addText(TextStyleType::SYSTEM); });
     registerAction("staff-text", [this]() { addText(TextStyleType::STAFF); });
-    registerAction("dynamics", [this]() { addText(TextStyleType::DYNAMICS); });
     registerAction("expression-text", [this]() { addText(TextStyleType::EXPRESSION); });
     registerAction("rehearsalmark-text", [this]() { addText(TextStyleType::REHEARSAL_MARK); });
     registerAction("instrument-change-text", [this]() { addText(TextStyleType::INSTRUMENT_CHANGE); });