Merge pull request #30340 from mathesoncalum/23492-partial_copy_errors

Fix #23492: Add error message when attempting to copy partial tuplet/tremolo

Author: mathesoncalum

src/engraving/dom/mscore.cpp

@@ -104,9 +104,11 @@ std::string MScore::errorToString(MsError err)
     case MsError::CANNOT_REMOVE_TIME_TUPLET: return "CANNOT_REMOVE_TIME_TUPLET";
     case MsError::CANNOT_REMOVE_TIME_MEASURE_REPEAT: return "CANNOT_REMOVE_TIME_MEASURE_REPEAT";
     case MsError::NO_DEST: return "NO_DEST";
+    case MsError::SOURCE_PARTIAL_TUPLET: return "SOURCE_PARTIAL_TUPLET";
     case MsError::DEST_TUPLET: return "DEST_TUPLET";
     case MsError::TUPLET_CROSSES_BAR: return "TUPLET_CROSSES_BAR";
     case MsError::DEST_LOCAL_TIME_SIGNATURE: return "DEST_LOCAL_TIME_SIGNATURE";
+    case MsError::SOURCE_PARTIAL_TREMOLO: return "SOURCE_PARTIAL_TREMOLO";
     case MsError::DEST_TREMOLO: return "DEST_TREMOLO";
     case MsError::NO_MIME: return "NO_MIME";
     case MsError::DEST_NO_CR: return "DEST_NO_CR";

src/engraving/dom/mscore.h

@@ -151,9 +151,11 @@ enum class MsError : unsigned char {
     CANNOT_REMOVE_TIME_TUPLET,
     CANNOT_REMOVE_TIME_MEASURE_REPEAT,
     NO_DEST,
+    SOURCE_PARTIAL_TUPLET,
     DEST_TUPLET,
     TUPLET_CROSSES_BAR,
     DEST_LOCAL_TIME_SIGNATURE,
+    SOURCE_PARTIAL_TREMOLO,
     DEST_TREMOLO,
     NO_MIME,
     DEST_NO_CR,

src/engraving/dom/select.cpp

@@ -1375,74 +1375,80 @@ std::vector<Note*> Selection::noteList(track_idx_t selTrack) const
 }
 
 //---------------------------------------------------------
-//   checkStart
-//     return false if element is NOT a tuplet or is start of a tuplet/tremolo
-//     return true  if element is part of a tuplet/tremolo, but not the start
+//   checkStartForPartialCopy
+//     return no error if element is NOT a tuplet or is start of a tuplet/tremolo
+//     return error if element is part of a tuplet/tremolo, but not the start
 //---------------------------------------------------------
 
-static bool checkStart(EngravingItem* e)
+static MsError checkStartForPartialCopy(EngravingItem* e)
 {
     if (!e || !e->isChordRest()) {
-        return false;
+        return MsError::MS_NO_ERROR;
     }
-    ChordRest* cr = toChordRest(e);
-    bool rv = false;
+
+    const ChordRest* cr = toChordRest(e);
     if (cr->tuplet()) {
         // check that complete tuplet is selected, all the way up to top level
         Tuplet* tuplet = cr->tuplet();
         while (tuplet) {
             if (tuplet->elements().front() != e) {
-                return true;
+                return MsError::SOURCE_PARTIAL_TUPLET;
             }
             e = tuplet;
             tuplet = tuplet->tuplet();
         }
-    } else if (cr->isChord()) {
-        rv = false;
-        Chord* chord = toChord(cr);
-        if (chord->tremoloTwoChord()) {
-            rv = chord->tremoloTwoChord()->chord2() == chord;
+    }
+
+    if (cr->isChord()) {
+        const Chord* chord = toChord(cr);
+        const TremoloTwoChord* ttc = chord ? chord->tremoloTwoChord() : nullptr;
+        if (ttc && ttc->chord2() == chord) {
+            return MsError::SOURCE_PARTIAL_TREMOLO;
         }
     }
-    return rv;
+
+    return MsError::MS_NO_ERROR;
 }
 
 //---------------------------------------------------------
-//   checkEnd
-//     return false if element is NOT a tuplet or is end of a tuplet
-//     return true  if element is part of a tuplet, but not the end
+//   checkEndForPartialCopy
+//     return no error if element is NOT a tuplet or is end of a tuplet/tremolo
+//     return error if element is part of a tuplet/tremolo, but not the end
 //---------------------------------------------------------
 
-static bool checkEnd(EngravingItem* e, const Fraction& endTick)
+static MsError checkEndForPartialCopy(EngravingItem* e, const Fraction& endTick)
 {
     if (!e || !e->isChordRest()) {
-        return false;
+        return MsError::MS_NO_ERROR;
     }
-    ChordRest* cr = toChordRest(e);
-    bool rv = false;
+
+    const ChordRest* cr = toChordRest(e);
     if (cr->tuplet()) {
         // check that complete tuplet is selected, all the way up to top level
         Tuplet* tuplet = cr->tuplet();
         while (tuplet) {
             if (tuplet->elements().back() != e) {
-                return true;
+                return MsError::SOURCE_PARTIAL_TUPLET;
             }
             e = tuplet;
             tuplet = tuplet->tuplet();
         }
         // also check that the selection extends to the end of the top-level tuplet
         tuplet = toTuplet(e);
         if (tuplet->endTick() > endTick) {
-            return true;
+            return MsError::SOURCE_PARTIAL_TUPLET;
         }
-    } else if (cr->isChord()) {
-        rv = false;
-        Chord* chord = toChord(cr);
-        if (chord->tremoloTwoChord()) {
-            rv = chord->tremoloTwoChord()->chord1() == chord;
+    }
+
+    if (cr->isChord()) {
+        const Chord* chord = toChord(cr);
+        const TremoloTwoChord* ttc = chord ? chord->tremoloTwoChord() : nullptr;
+        if (ttc && ttc->chord1() == chord) {
+            return MsError::SOURCE_PARTIAL_TREMOLO;
         }
     }
-    return rv;
+
+    return MsError::MS_NO_ERROR;
 }
 
 //---------------------------------------------------------
@@ -1469,8 +1475,12 @@ bool Selection::canCopy() const
 
             // check first cr in track within selection
             ChordRest* check = m_startSegment->nextChordRest(track);
-            if (check && check->tick() < endTick && checkStart(check)) {
-                return false;
+            if (check && check->tick() < endTick) {
+                const MsError err = checkStartForPartialCopy(check);
+                if (err != MsError::MS_NO_ERROR) {
+                    MScore::setError(err);
+                    return false;
+                }
             }
 
             if (!m_endSegment) {
@@ -1486,7 +1496,9 @@ bool Selection::canCopy() const
                 endSegmentSelection = endSegmentSelection->nextCR(track);
             }
 
-            if (checkEnd(endSegmentSelection->element(track), endTick)) {
+            const MsError err = checkEndForPartialCopy(endSegmentSelection->element(track), endTick);
+            if (err != MsError::MS_NO_ERROR) {
+                MScore::setError(err);
                 return false;
             }
         }

src/notation/internal/mscoreerrorscontroller.cpp

@@ -116,6 +116,10 @@ void MScoreErrorsController::checkAndShowMScoreError()
     case MsError::NO_DEST:
         title = muse::trc("notation", "No destination to paste");
         break;
+    case MsError::SOURCE_PARTIAL_TUPLET:
+        title = muse::trc("notation", "This selection cannot be copied");
+        message = muse::trc("notation", "Please select all notes that are part of this tuplet and try again.");
+        break;
     case MsError::DEST_TUPLET:
         title = muse::trc("notation", "Cannot paste into tuplet");
         break;
@@ -125,6 +129,10 @@ void MScoreErrorsController::checkAndShowMScoreError()
     case MsError::DEST_LOCAL_TIME_SIGNATURE:
         title = muse::trc("notation", "Cannot paste in local time signature");
         break;
+    case MsError::SOURCE_PARTIAL_TREMOLO:
+        title = muse::trc("notation", "This selection cannot be copied");
+        message = muse::trc("notation", "Please select all notes that are part of this tremolo and try again.");
+        break;
     case MsError::DEST_TREMOLO:
         title = muse::trc("notation", "Cannot paste in tremolo");
         break;

src/notation/internal/notationinteraction.cpp

@@ -5076,6 +5076,7 @@ void NotationInteraction::addBoxes(BoxType boxType, int count, int beforeBoxInde
 void NotationInteraction::copySelection()
 {
     if (!selection()->canCopy()) {
+        MScoreErrorsController(iocContext()).checkAndShowMScoreError();
         return;
     }