Update tempo editing and add label editing

Author: CrSjimo

src/libs/3rdparty/scopicflow

@@ -38,6 +38,7 @@ function(diffscope_add_builtin_plugin _target)
 
     qm_configure_target(${_target}
         SOURCES ${_src}
+        INCLUDE_PRIVATE *
         ${FUNC_UNPARSED_ARGUMENTS}
     )
 

src/plugins/CMakeLists.txt

@@ -120,6 +120,7 @@ namespace VisualEditor {
         d->timelineInteractionController = new sflow::TimelineInteractionController(this);
         d->scrollBehaviorViewModel = new sflow::ScrollBehaviorViewModel(this);
         d->labelSequenceInteractionControllerOfTempo = ProjectViewModelContext::of(d->windowHandle)->createAndBindLabelSequenceInteractionControllerOfTempo();
+        d->labelSequenceInteractionControllerOfLabel = ProjectViewModelContext::of(d->windowHandle)->createAndBindLabelSequenceInteractionControllerOfLabel();
 
         d->positionAlignmentManipulator = new PositionAlignmentManipulator(this);
         d->positionAlignmentManipulator->setTimeLayoutViewModel(d->timeLayoutViewModel);
@@ -135,8 +136,7 @@ namespace VisualEditor {
         }
         auto o = component.createWithInitialProperties({
             {"addOn", QVariant::fromValue(d->addon)},
-            {"arrangementPanelInterface", QVariant::fromValue(this)},
-            {"projectViewModelContext", QVariant::fromValue(ProjectViewModelContext::of(d->windowHandle))},
+            {"arrangementPanelInterface", QVariant::fromValue(this)}
         });
         if (component.isError()) {
             qFatal() << component.errorString();
@@ -190,6 +190,11 @@ namespace VisualEditor {
         return d->labelSequenceInteractionControllerOfTempo;
     }
 
+    sflow::LabelSequenceInteractionController *ArrangementPanelInterface::labelSequenceInteractionControllerOfLabel() const {
+        Q_D(const ArrangementPanelInterface);
+        return d->labelSequenceInteractionControllerOfLabel;
+    }
+
     PositionAlignmentManipulator *ArrangementPanelInterface::positionAlignmentManipulator() const {
         Q_D(const ArrangementPanelInterface);
         return d->positionAlignmentManipulator;

src/plugins/visualeditor/core/ArrangementPanelInterface.cpp

@@ -42,6 +42,7 @@ namespace VisualEditor {
         Q_PROPERTY(sflow::ScrollBehaviorViewModel *scrollBehaviorViewModel READ scrollBehaviorViewModel CONSTANT)
         Q_PROPERTY(sflow::TimelineInteractionController *timelineInteractionController READ timelineInteractionController CONSTANT)
         Q_PROPERTY(sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfTempo READ labelSequenceInteractionControllerOfTempo CONSTANT)
+        Q_PROPERTY(sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfLabel READ labelSequenceInteractionControllerOfLabel CONSTANT)
         Q_PROPERTY(PositionAlignmentManipulator *positionAlignmentManipulator READ positionAlignmentManipulator CONSTANT)
         Q_PROPERTY(AutoPageScrollingManipulator *autoPageScrollingManipulator READ autoPageScrollingManipulator CONSTANT)
         Q_PROPERTY(QQuickItem *arrangementView READ arrangementView CONSTANT)
@@ -61,6 +62,7 @@ namespace VisualEditor {
         sflow::ScrollBehaviorViewModel *scrollBehaviorViewModel() const;
         sflow::TimelineInteractionController *timelineInteractionController() const;
         sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfTempo() const;
+        sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfLabel() const;
 
         PositionAlignmentManipulator *positionAlignmentManipulator() const;
         AutoPageScrollingManipulator *autoPageScrollingManipulator() const;

src/plugins/visualeditor/core/ArrangementPanelInterface.h

@@ -20,6 +20,7 @@ namespace VisualEditor {
         sflow::TimelineInteractionController *timelineInteractionController;
         sflow::ScrollBehaviorViewModel *scrollBehaviorViewModel;
         sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfTempo;
+        sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfLabel;
 
         PositionAlignmentManipulator *positionAlignmentManipulator;
         AutoPageScrollingManipulator *autoPageScrollingManipulator;

src/plugins/visualeditor/core/ArrangementPanelInterface_p.h

@@ -0,0 +1,91 @@
+#include "LabelSelectionController_p.h"
+
+#include <algorithm>
+#include <iterator>
+
+#include <QLoggingCategory>
+#include <QQuickWindow>
+
+#include <ScopicFlowCore/LabelViewModel.h>
+
+#include <dspxmodel/Label.h>
+#include <dspxmodel/LabelSelectionModel.h>
+#include <dspxmodel/LabelSequence.h>
+#include <dspxmodel/Model.h>
+#include <dspxmodel/SelectionModel.h>
+#include <dspxmodel/Timeline.h>
+
+#include <coreplugin/DspxDocument.h>
+#include <coreplugin/ProjectDocumentContext.h>
+#include <coreplugin/ProjectWindowInterface.h>
+
+#include <visualeditor/ProjectViewModelContext.h>
+
+namespace VisualEditor {
+
+    Q_STATIC_LOGGING_CATEGORY(lcLabelSelectionController, "diffscope.visualeditor.labelselectioncontroller")
+
+    LabelSelectionController::LabelSelectionController(ProjectViewModelContext *parent)
+        : SelectionController(parent), q(parent) {
+        labelSequence = q->windowHandle()->projectDocumentContext()->document()->model()->timeline()->labels();
+        selectionModel = q->windowHandle()->projectDocumentContext()->document()->selectionModel();
+        labelSelectionModel = q->windowHandle()->projectDocumentContext()->document()->selectionModel()->labelSelectionModel();
+        connect(labelSelectionModel, &dspx::LabelSelectionModel::currentItemChanged, this, &SelectionController::currentItemChanged);
+    }
+
+    LabelSelectionController::~LabelSelectionController() = default;
+
+    QObjectList LabelSelectionController::getSelectedItems() const {
+        QObjectList viewItems;
+        std::ranges::transform(labelSelectionModel->selectedItems(), std::back_inserter(viewItems), [=, this](dspx::Label *item) {
+            auto viewItem = q->getLabelViewItemFromDocumentItem(item);
+            Q_ASSERT(viewItem);
+            return viewItem;
+        });
+        return viewItems;
+    }
+
+    QObjectList LabelSelectionController::getItemsBetween(QObject *startItem, QObject *endItem) const {
+        auto startDocumentItem = startItem ? q->getLabelDocumentItemFromViewItem(qobject_cast<sflow::LabelViewModel *>(startItem)) : labelSequence->firstItem();
+        auto endDocumentItem = endItem ? q->getLabelDocumentItemFromViewItem(qobject_cast<sflow::LabelViewModel *>(endItem)) : labelSequence->lastItem();
+        Q_ASSERT(startDocumentItem && endDocumentItem);
+        QObjectList viewItems;
+        if (startDocumentItem->pos() > endDocumentItem->pos()) {
+            std::swap(startDocumentItem, endDocumentItem);
+        }
+        for (auto item = startDocumentItem; item; item = labelSequence->nextItem(item)) {
+            auto viewItem = q->getLabelViewItemFromDocumentItem(item);
+            Q_ASSERT(viewItem);
+            viewItems.append(viewItem);
+            if (item == endDocumentItem) {
+                break;
+            }
+        }
+        return viewItems;
+    }
+
+    void LabelSelectionController::select(QObject *item, SelectionCommand command) {
+        qCDebug(lcLabelSelectionController) << "Label view item selected" << item << command;
+        dspx::SelectionModel::SelectionCommand documentSelectionCommand = {};
+        if (command & Select) {
+            documentSelectionCommand |= dspx::SelectionModel::Select;
+        }
+        if (command & Deselect) {
+            documentSelectionCommand |= dspx::SelectionModel::Deselect;
+        }
+        if (command & ClearPreviousSelection) {
+            documentSelectionCommand |= dspx::SelectionModel::ClearPreviousSelection;
+        }
+        if (command & SetCurrentItem) {
+            documentSelectionCommand |= dspx::SelectionModel::SetCurrentItem;
+        }
+        auto documentItem = q->getLabelDocumentItemFromViewItem(qobject_cast<sflow::LabelViewModel *>(item));
+        Q_ASSERT(!item || documentItem);
+        selectionModel->select(documentItem, documentSelectionCommand, dspx::SelectionModel::ST_Label);
+    }
+
+    QObject *LabelSelectionController::currentItem() const {
+        return q->getLabelViewItemFromDocumentItem(labelSelectionModel->currentItem());
+    }
+
+}

src/plugins/visualeditor/core/LabelSelectionController.cpp

@@ -0,0 +1,39 @@
+#ifndef DIFFSCOPE_VISUALEDITOR_LABELSELECTIONCONTROLLER_P_H
+#define DIFFSCOPE_VISUALEDITOR_LABELSELECTIONCONTROLLER_P_H
+
+#include <ScopicFlowCore/SelectionController.h>
+
+class QQuickItem;
+
+namespace dspx {
+    class SelectionModel;
+    class Label;
+    class LabelSelectionModel;
+    class LabelSequence;
+}
+
+namespace VisualEditor {
+
+    class ProjectViewModelContext;
+
+    class LabelSelectionController : public sflow::SelectionController {
+        Q_OBJECT
+    public:
+        explicit LabelSelectionController(ProjectViewModelContext *parent);
+        ~LabelSelectionController() override;
+
+        QObjectList getSelectedItems() const override;
+        QObjectList getItemsBetween(QObject *startItem, QObject *endItem) const override;
+        void select(QObject *item, SelectionCommand command) override;
+        QObject *currentItem() const override;
+
+    private:
+        ProjectViewModelContext *q;
+        dspx::LabelSequence *labelSequence;
+        dspx::SelectionModel *selectionModel;
+        dspx::LabelSelectionModel *labelSelectionModel;
+    };
+
+}
+
+#endif //DIFFSCOPE_VISUALEDITOR_LABELSELECTIONCONTROLLER_P_H