Merge pull request #25762 from cbjeukendrup/copy-by-dragging/prototype

Move by dragging, copy by alt+dragging

Author: cbjeukendrup

src/engraving/dom/anchors.cpp

@@ -161,10 +161,11 @@ TimeTickAnchor::TimeTickAnchor(Segment* parent)
 TimeTickAnchor::DrawRegion TimeTickAnchor::drawRegion() const
 {
     const ShowAnchors& showAnchors = score()->showAnchors();
-    Fraction thisTick = segment()->tick();
+    const staff_idx_t thisStaffIdx = staffIdx();
+    const Fraction thisTick = segment()->tick();
 
-    bool trackOutOfRange = staffIdx() != showAnchors.staffIdx;
-    bool tickOutOfRange = thisTick < showAnchors.startTickExtendedRegion || thisTick >= showAnchors.endTickExtendedRegion;
+    const bool trackOutOfRange = thisStaffIdx < showAnchors.staffIdx || thisStaffIdx >= showAnchors.endStaffIdx;
+    const bool tickOutOfRange = thisTick < showAnchors.startTickExtendedRegion || thisTick >= showAnchors.endTickExtendedRegion;
     if (trackOutOfRange || tickOutOfRange) {
         return DrawRegion::OUT_OF_RANGE;
     }

src/engraving/dom/anchors.h

@@ -27,22 +27,23 @@
 #include "score.h"
 
 namespace mu::engraving {
+class Factory;
+
 class EditTimeTickAnchors
 {
 public:
     static void updateAnchors(const EngravingItem* item, track_idx_t track);
+    static void updateAnchors(Measure* measure, staff_idx_t staffIdx);
     static TimeTickAnchor* createTimeTickAnchor(Measure* measure, Fraction relTick, staff_idx_t staffIdx);
     static void updateLayout(Measure* measure);
-
-private:
-    static void updateAnchors(Measure* measure, staff_idx_t staffIdx);
 };
 
 class TimeTickAnchor : public EngravingItem
 {
-public:
     TimeTickAnchor(Segment* parent);
+    friend class Factory;
 
+public:
     Segment* segment() const { return toSegment(parentItem()); }
 
     TimeTickAnchor* clone() const override { return new TimeTickAnchor(*this); }

src/engraving/dom/cmd.cpp

@@ -1431,11 +1431,13 @@ Fraction Score::makeGap(Segment* segment, track_idx_t track, const Fraction& _sd
 
 bool Score::makeGap1(const Fraction& baseTick, staff_idx_t staffIdx, const Fraction& len, int voiceOffset[VOICES])
 {
-    Segment* seg = tick2segment(baseTick, true, SegmentType::ChordRest);
-    if (!seg) {
-        LOGD("no segment to paste at tick %d", baseTick.ticks());
+    Measure* m = tick2measure(baseTick);
+    if (!m) {
+        LOGD() << "No measure to paste at tick " << baseTick.toString();
         return false;
     }
+
+    Segment* seg = m->undoGetSegment(SegmentType::ChordRest, baseTick);
     track_idx_t strack = staffIdx * VOICES;
     for (track_idx_t track = strack; track < strack + VOICES; track++) {
         if (voiceOffset[track - strack] == -1) {

src/engraving/dom/score.h

@@ -217,7 +217,11 @@ struct ShowAnchors {
     ShowAnchors() = default;
     ShowAnchors(voice_idx_t vIdx, staff_idx_t stfIdx, const Fraction& sTickMain, const Fraction& eTickMain,
                 const Fraction& sTickExt, const Fraction& eTickExt)
-        : voiceIdx(vIdx), staffIdx(stfIdx), startTickMainRegion(sTickMain), endTickMainRegion(eTickMain),
+        : voiceIdx(vIdx), staffIdx(stfIdx), endStaffIdx(stfIdx + 1), startTickMainRegion(sTickMain), endTickMainRegion(eTickMain),
+        startTickExtendedRegion(sTickExt), endTickExtendedRegion(eTickExt) {}
+    ShowAnchors(voice_idx_t vIdx, staff_idx_t stfIdx, staff_idx_t endStfIdx, const Fraction& sTickMain, const Fraction& eTickMain,
+                const Fraction& sTickExt, const Fraction& eTickExt)
+        : voiceIdx(vIdx), staffIdx(stfIdx), endStaffIdx(endStfIdx), startTickMainRegion(sTickMain), endTickMainRegion(eTickMain),
         startTickExtendedRegion(sTickExt), endTickExtendedRegion(eTickExt) {}
 
     void reset()
@@ -232,6 +236,7 @@ struct ShowAnchors {
 
     voice_idx_t voiceIdx = muse::nidx;
     staff_idx_t staffIdx = muse::nidx;
+    staff_idx_t endStaffIdx = muse::nidx;
     Fraction startTickMainRegion = Fraction(-1, 1);
     Fraction endTickMainRegion = Fraction(-1, 1);
     Fraction startTickExtendedRegion = Fraction(-1, 1);
@@ -536,6 +541,8 @@ class Score : public EngravingObject, public muse::Injectable
     void restoreInitialKeySigAndTimeSig();
     void reconnectSlurs(MeasureBase* mbStart, MeasureBase* mbLast);
     void cmdDeleteSelection();
+    std::vector<ChordRest*> deleteRange(Segment* segStart, Segment* segEnd, track_idx_t trackStart, track_idx_t trackEnd,
+                                        const SelectionFilter& filter);
     void cmdFullMeasureRest();
 
     muse::Ret putNote(const PointF&, bool replace, bool insert);
@@ -1099,8 +1106,6 @@ class Score : public EngravingObject, public muse::Injectable
                               const SelectionFilter& filter);
     void deleteAnnotationsFromRange(Segment* segStart, Segment* segEnd, track_idx_t trackStart, track_idx_t trackEnd,
                                     const SelectionFilter& filter);
-    std::vector<ChordRest*> deleteRange(Segment* segStart, Segment* segEnd, track_idx_t trackStart, track_idx_t trackEnd,
-                                        const SelectionFilter& filter);
 
     void update(bool resetCmdState, bool layoutAllParts = false);
 

src/engraving/rw/read410/read410.cpp

@@ -305,7 +305,7 @@ bool Read410::readScore410(Score* score, XmlReader& e, ReadContext& ctx)
 
 bool Read410::pasteStaff(XmlReader& e, Segment* dst, staff_idx_t dstStaff, Fraction scale)
 {
-    assert(dst->isChordRestType());
+    assert(dst->isType(Segment::CHORD_REST_OR_TIME_TICK_TYPE));
 
     Score* score = dst->score();
     ReadContext ctx(score);

src/notation/CMakeLists.txt

@@ -203,6 +203,8 @@ set(MODULE_SRC
     ${CMAKE_CURRENT_LIST_DIR}/utilities/engravingitempreviewpainter.h
     ${CMAKE_CURRENT_LIST_DIR}/utilities/percussionutilities.cpp
     ${CMAKE_CURRENT_LIST_DIR}/utilities/percussionutilities.h
+    ${CMAKE_CURRENT_LIST_DIR}/utilities/scorerangeutilities.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/utilities/scorerangeutilities.h
 
     ${WIDGETS_SRC}
     ${STYLEDIALOG_SRC}

src/notation/inotationinteraction.h

@@ -19,8 +19,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef MU_NOTATION_INOTATIONINTERACTION_H
-#define MU_NOTATION_INOTATIONINTERACTION_H
+#pragma once
 
 #include <functional>
 
@@ -29,7 +28,6 @@
 #include "notationtypes.h"
 #include "inotationnoteinput.h"
 #include "inotationselection.h"
-#include "actions/actiontypes.h"
 
 class QKeyEvent;
 class QInputMethodEvent;
@@ -95,17 +93,21 @@ class INotationInteraction
     virtual void endDrag() = 0;
     virtual muse::async::Notification dragChanged() const = 0;
 
-    virtual bool isDragCopyStarted() const = 0;
-    virtual bool dragCopyAllowed(const EngravingItem* element) const = 0;
-    virtual void startDragCopy(const EngravingItem* element, QObject* dragSource) = 0;
-    virtual void endDragCopy() = 0;
+    virtual bool isOutgoingDragElementAllowed(const EngravingItem* element) const = 0;
+    virtual void startOutgoingDragElement(const EngravingItem* element, QObject* dragSource) = 0;
+    virtual void startOutgoingDragRange(QObject* dragSource) = 0;
+    virtual bool isOutgoingDragStarted() const = 0;
+    virtual void endOutgoingDrag() = 0;
 
     // Drop
     //! TODO Change KeyboardModifiers to modes
-    virtual void startDrop(const QByteArray& edata) = 0;
-    virtual bool startDrop(const QUrl& url) = 0;
-    virtual bool isDropAccepted(const muse::PointF& pos, Qt::KeyboardModifiers modifiers) = 0; //! NOTE Also may set drop target
-    virtual bool drop(const muse::PointF& pos, Qt::KeyboardModifiers modifiers) = 0;
+    virtual bool startDropSingle(const QByteArray& edata) = 0;
+    virtual bool startDropRange(const QByteArray& data) = 0;
+    virtual bool startDropImage(const QUrl& url) = 0;
+    virtual bool isDropSingleAccepted(const muse::PointF& pos, Qt::KeyboardModifiers modifiers) = 0; //! NOTE Also may set drop target
+    virtual bool isDropRangeAccepted(const muse::PointF& pos) = 0;
+    virtual bool dropSingle(const muse::PointF& pos, Qt::KeyboardModifiers modifiers) = 0;
+    virtual bool dropRange(const QByteArray& data, const muse::PointF& pos, bool deleteSourceMaterial) = 0;
     virtual void setDropTarget(EngravingItem* item, bool notify = true) = 0;
     virtual void setDropRect(const muse::RectF& rect) = 0;
     virtual void endDrop() = 0;
@@ -317,5 +319,3 @@ using INotationInteractionPtr = std::shared_ptr<INotationInteraction>;
 
 EngravingItem* contextItem(INotationInteractionPtr);
 }
-
-#endif // MU_NOTATION_INOTATIONINTERACTION_H