Refactor addHairpinOnGripDrag and fix crash

- Fix crash when the created hairpin has a length of zero ticks; in that case, it wouldn't have any HairpinSegments.
- Now, the `Hairpin` is only created at the moment that we're certain it will be added to the score, fixing a potentially somewhat significant memory leak.
- Now, it is also possible to create a hairpin that spans to the next or previous system.

Author: cbjeukendrup

src/engraving/dom/edit.cpp

@@ -27,6 +27,7 @@
 #include "infrastructure/messagebox.h"
 
 #include "accidental.h"
+#include "anchors.h"
 #include "articulation.h"
 #include "barline.h"
 #include "beam.h"
@@ -3964,33 +3965,43 @@ void Score::addHairpinToDynamic(Hairpin* hairpin, Dynamic* dynamic)
     undoAddElement(hairpin);
 }
 
-void Score::addHairpinOnGripDrag(Hairpin* hairpin, Dynamic* dynamic, const PointF& pos, Grip grip)
+Hairpin* Score::addHairpinToDynamicOnGripDrag(Dynamic* dynamic, bool isLeftGrip, const PointF& pos)
 {
-    track_idx_t track = dynamic->track();
-    hairpin->setTrack(track);
-    hairpin->setTrack2(track);
-
-    Segment* seg = nullptr;
-    double spacingFactor = 0.5;
+    const track_idx_t track = dynamic->track();
     staff_idx_t staffIndex = dynamic->staffIdx();
+    Segment* seg = nullptr;
+    constexpr double spacingFactor = 0.5;
+
+    // Ensure time tick segments are created
+    EditTimeTickAnchors::updateAnchors(dynamic, track);
 
     // Find segment of type ChordRest or TimeTick near cursor postion
-    dragPosition(pos, &staffIndex, &seg, spacingFactor, hairpin->allowTimeAnchor());
+    dragPosition(pos, &staffIndex, &seg, spacingFactor, /*allowTimeAnchor*/ true);
+
+    const bool hasValidTick = seg && (isLeftGrip
+                                      ? seg->tick() < dynamic->tick()
+                                      : seg->tick() > dynamic->tick());
+    if (!hasValidTick) {
+        return nullptr;
+    }
+
+    Hairpin* hairpin = Factory::createHairpin(dummy()->segment());
+    hairpin->setHairpinType(isLeftGrip ? HairpinType::DECRESC_HAIRPIN : HairpinType::CRESC_HAIRPIN);
 
-    switch (grip) {
-    case Grip::LEFT:
-        hairpin->setTick(seg ? seg->tick() : dynamic->segment()->prev1ChordRestOrTimeTick()->tick());
+    hairpin->setTrack(track);
+    hairpin->setTrack2(track);
+
+    if (isLeftGrip) {
+        hairpin->setTick(seg->tick());
         hairpin->setTick2(dynamic->tick());
-        break;
-    case Grip::RIGHT:
+    } else {
         hairpin->setTick(dynamic->tick());
-        hairpin->setTick2(seg ? seg->tick() : dynamic->segment()->next1ChordRestOrTimeTick()->tick());
-        break;
-    default:
-        break;
+        hairpin->setTick2(seg->tick());
     }
 
     undoAddElement(hairpin);
+
+    return hairpin;
 }
 
 //---------------------------------------------------------

src/engraving/dom/score.h

@@ -922,7 +922,7 @@ class Score : public EngravingObject, public muse::Injectable
     Hairpin* addHairpin(HairpinType type, ChordRest* cr1, ChordRest* cr2 = nullptr);
     void addHairpin(Hairpin* hairpin, ChordRest* cr1, ChordRest* cr2 = nullptr);
     void addHairpinToDynamic(Hairpin* hairpin, Dynamic* dynamic);
-    void addHairpinOnGripDrag(Hairpin* hairpin, Dynamic* dynamic, const PointF& pos, Grip grip);
+    Hairpin* addHairpinToDynamicOnGripDrag(Dynamic* dynamic, bool isLeftGrip, const PointF& pos);
 
     ChordRest* findCR(Fraction tick, track_idx_t track) const;
     ChordRest* findChordRestEndingBeforeTickInStaff(const Fraction& tick, staff_idx_t staffIdx) const;

src/notation/inotationinteraction.h

@@ -186,7 +186,7 @@ class INotationInteraction
     virtual void addLaissezVibToSelection() = 0;
     virtual void addSlurToSelection() = 0;
     virtual void addOttavaToSelection(OttavaType type) = 0;
-    virtual void addHairpinOnGripDrag(engraving::Dynamic* dynamic) = 0;
+    virtual void addHairpinOnGripDrag(engraving::Dynamic* dynamic, bool isLeftGrip) = 0;
     virtual void addHairpinsToSelection(HairpinType type) = 0;
     virtual void addAccidentalToSelection(AccidentalType type) = 0;
     virtual void putRestToSelection() = 0;

src/notation/internal/notationinteraction.cpp

@@ -1113,7 +1113,11 @@ void NotationInteraction::drag(const PointF& fromPos, const PointF& toPos, DragM
         m_editData.element->editDrag(m_dragData.ed);
 
         if (m_editData.element->isDynamic()) {
-            addHairpinOnGripDrag(toDynamic(m_editData.element));
+            // When the dynamic has no left grip, the right grip will have index zero, a.k.a. Grip::LEFT.
+            // TODO: refactor all code that works with Grips, so that this is not necessary
+            Dynamic* dynamic = toDynamic(m_editData.element);
+            bool isLeftGrip = dynamic->hasLeftGrip() ? m_editData.curGrip == Grip::LEFT : false;
+            addHairpinOnGripDrag(toDynamic(m_editData.element), isLeftGrip);
         }
     } else {
         if (m_editData.element) {
@@ -4369,39 +4373,35 @@ void NotationInteraction::addOttavaToSelection(OttavaType type)
     apply();
 }
 
-void NotationInteraction::addHairpinOnGripDrag(Dynamic* dynamic)
+void NotationInteraction::addHairpinOnGripDrag(Dynamic* dynamic, bool isLeftGrip)
 {
-    const PointF pos = m_dragData.ed.pos;
-    Hairpin* pin = Factory::createHairpin(score()->dummy()->segment());
-
-    // Right grip
-    if (dynamic->rightDragOffset() >= pin->spatium() * 0.8) {
-        pin->setHairpinType(HairpinType::CRESC_HAIRPIN);
-
-        startEdit(TranslatableString("undoableAction", "Add hairpin"));
-        score()->addHairpinOnGripDrag(pin, dynamic, pos, Grip::RIGHT);
-        apply();
+    startEdit(TranslatableString("undoableAction", "Add hairpin"));
 
-        dynamic->resetRightDragOffset(); // Reset grip offset to zero after drawing the hairpin
+    const PointF pos = m_dragData.ed.pos;
+    Hairpin* hairpin = score()->addHairpinToDynamicOnGripDrag(dynamic, isLeftGrip, pos);
 
-        LineSegment* segment = pin->frontSegment();
-        select({ segment });
-        startEditGrip(segment, Grip::END);
+    if (!hairpin) {
+        rollback();
+        return;
     }
 
-    // Left grip
-    if (abs(dynamic->leftDragOffset()) >= pin->spatium() * 0.8) {
-        pin->setHairpinType(engraving::HairpinType::DECRESC_HAIRPIN);
+    apply();
 
-        startEdit(TranslatableString("undoableAction", "Add hairpin"));
-        score()->addHairpinOnGripDrag(pin, dynamic, pos, Grip::LEFT);
-        apply();
+    // Reset grip offset to zero after drawing the hairpin
+    dynamic->resetRightDragOffset();
 
-        dynamic->resetLeftDragOffset(); // Reset grip offset to zero after drawing the hairpin
+    IF_ASSERT_FAILED(!hairpin->segmentsEmpty()) {
+        return;
+    }
 
-        LineSegment* segment = pin->frontSegment();
+    if (isLeftGrip) {
+        LineSegment* segment = hairpin->frontSegment();
         select({ segment });
         startEditGrip(segment, Grip::START);
+    } else {
+        LineSegment* segment = hairpin->backSegment();
+        select({ segment });
+        startEditGrip(segment, Grip::END);
     }
 }
 

src/notation/internal/notationinteraction.h

@@ -189,7 +189,7 @@ class NotationInteraction : public INotationInteraction, public muse::Injectable
     void addTiedNoteToChord() override;
     void addSlurToSelection() override;
     void addOttavaToSelection(OttavaType type) override;
-    void addHairpinOnGripDrag(engraving::Dynamic* dynamic) override;
+    void addHairpinOnGripDrag(engraving::Dynamic* dynamic, bool isLeftGrip) override;
     void addHairpinsToSelection(HairpinType type) override;
     void addAccidentalToSelection(AccidentalType type) override;
     void putRestToSelection() override;

src/notation/tests/mocks/notationinteractionmock.h

@@ -148,7 +148,7 @@ class NotationInteractionMock : public INotationInteraction
     MOCK_METHOD(void, addTiedNoteToChord, (), (override));
     MOCK_METHOD(void, addSlurToSelection, (), (override));
     MOCK_METHOD(void, addOttavaToSelection, (OttavaType), (override));
-    MOCK_METHOD(void, addHairpinOnGripDrag, (engraving::Dynamic*), (override));
+    MOCK_METHOD(void, addHairpinOnGripDrag, (engraving::Dynamic*, bool), (override));
     MOCK_METHOD(void, addHairpinsToSelection, (HairpinType), (override));
     MOCK_METHOD(void, addAccidentalToSelection, (AccidentalType), (override));
     MOCK_METHOD(void, putRestToSelection, (), (override));